first step to socket.io integration

client/robot/robot.js

@@ -90,24 +90,6 @@ robot = {
     }
   },
 
-  openSTTSocket(easyrtcid) {
-    const ws = robotLib.stt.getTranscriptSocket(e => {
-      console.log('> ' + e.text);
-      robotLib.reco.send(
-        {
-          from: robot.room,
-          text: e.from + '\t' + e.until + '\t' + easyrtcid + '\t' + e.text
-        });
-    });
-    ws.addEventListener('error', e => {
-      // Try to open new connection on error
-      console.error('STT ws for ' + easyrtcid + ' error. Trying to reopen');
-      console.error(e);
-      robot.openSTTSocket(easyrtcid);
-    });
-    robot.recordedParticipantsWS[easyrtcid] = ws;
-  },
-
   getUserStream(easyrtcid) {
     robotController.getRemoteStream(easyrtcid).then(stream => {
       if (stream !== undefined) {
@@ -116,13 +98,13 @@ robot = {
     });
   },
 
-  audioGenerator(easyrtcid, e) {
-    robot.recordedParticipantsWS[easyrtcid].send(e.data);
+  audioGenerator(easyrtcid, audio) {
+    robot.socket.emit('audio_from_' + easyrtcid, audio.data)
   },
 
 
   recordParticipant(easyrtcid) {
-    robot.openSTTSocket(easyrtcid);
+    robot.socket.emit('new_user', easyrtcid);
     robot.getUserStream(easyrtcid);
   },
 
@@ -162,8 +144,21 @@ robot = {
   start: (room, clientConfig) => {
     robot.room = room;
     robot.clientConfig = clientConfig;
-
-    robotLib.stt = robotLib.stt(robot.clientConfig);
+    robot.socket = io.connect(robot.clientConfig.gstreamerURL, {
+      transports: ['websocket']
+    })
+    robot.socket.on('connect', () => {
+      console.log("Connected over websockets to proxy")
+    })
+    robot.socket.on('connect_error', (error) => {
+      console.log(error)
+    })
+    robot.socket.on('error', (e) => {
+      console.log(e)
+    })
+    robot.socket.on('resume_data', (data) => {
+      //send data to hublin
+    })
     robotLib.reco = robotLib.reco(robot.clientConfig);
     robotLib.archive = robotLib.archive(robot.clientConfig);
 
@@ -196,7 +191,7 @@ robot = {
       setInterval(() => robotLib.reco.getOnlineReco(robot.room)
         .then(robot.processReco)
         .catch(console.error),
-      8000));
+        8000));
 
     // Record current participants already present in the room
     // (except the robot itself)

config.json

@@ -24,10 +24,11 @@
     "name": "hublot",
     "avatar": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEoAAABECAYAAAAm2qMBAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH4QYNDTU7dwT3OwAABUtJREFUeNrtnF1oHFUUx38zjUlabWKtELU3WLQPFrSOgopaRawmIZdqLVTtQ1R8sVqsH9SvQptKBaWF6oMiLYhUKiLYtMVOGqu0Kgnq260txQejEIZU0BRrqsaQZH2YO3Hczu7Ofszs1/xhyWaZPXvnN+fOPffcc8cgBlm2g5LCe38xcBtgAdcAi4HLgUuAi4BG/bVJ4BxwBhgFfgZ+ABQwpKQYT7cdpYyY4KwCHgDuB1pL9BNjwEFgv5LiUNTQogTVCTwF3Ec86gPeVlIciwKaEQGgp4HtQDPl0TiwUUmxu5TAjBJ2r2eAt6gcpYAnlRS7LNsBKAqYUSwky3Y6gAPAXCpTfwArlRRfF+NdRhGA5gH7gC6qQ33AWj2a5g3MKBDSzcB32r2NKgGV0q8blBTf5/tlswBImzQkqgiS11YTOG7ZznrvnErqUT5I+4DV1IY+UFI8Gva+ZeQBaUhH1LWkz5UUHWFgGSEhfQPcUmVdLayOKilW5IJlhIA0AHTUKCRPnygp1hTjUTuB56gPbVZSvFaIR3UCA9SXblVSfBsKlB4ym4AJ6lNGUEB6XhylD/iiTiGlgMNBN3UzwKPWAsvr2Ju6LNvpDhOZf0iij7KCsmxna42HAWHVYtnO89k8qjdhNKsdgaAs23k2YfP/3mbZzmNBHrUxYXOeXpi9y+u46VrgRMIlUO1KCsfUMUNPwiOj1vm7XgIqs1Z7N6xm3JXaRMFa6nmUTFhkl2U7KxqAZTHMn8aBaWA+0FAiu1Pa7hxtN8pA+c4GPeJFpd+Aq7yCCn11jgD3Fmm3X0khfTYXAMPAgojO40rDsh0FXB+B8UklRVMGV94DPFKg3V1KinUZ7E5pDyu1Bk2gLaKrsCnLctAThRrNAgnglYjO5QozQnc9l+VkJ+L+zSLVauJmM6NQm16cCLr69xQxAt0U5E06cF4U0bk0GZbtpCK8mS9RUgynV5NYtvMnMK9Am2eUFAt93c1bLVoKnIrKUw3LdiYi9CqA94CX9XC+BthdIruPA/txSxl3FDE4hNGYYdnOaeCyJKzMqmET+CXhkFOnTeCnhENO/WgCJxMOOTViAscTDjn1lQn0JxxyzgaOmjpKHk1wZNQp+C/DubcMDZjBrdgNM52Z0MfOlKGdfeBmOAHeL0MDmpUUrbhbPtpwc9N9+p55AvgU2ICbfW3Rx15Yhna+C75kl2U7I0B7TD++RUmxLWCuFmau1wtsjamdJ5UU1/m7HsCbMV6lKf9kOQ9IoOvEY9JO742R1pBUXC1QUhSUuo2xjTNKitkkYHr+uhd4NY5WWLbzNzAIbMbdgzeppJhJO8bQk95lwOvEW470ov+foIq7GeKvaJkGfgf+0l0rpQHNxU0sNsTcnnElRYv/g6AG9JQhXJgDLNSvStDD6R8YGbrFIHB7nQaYh5UU3TlB6ZGlEfinTkGZQCp9JM5WPi2BQ3UGabmSYigTvUzDt01a1VmNqzcTJAi3aegA7u7yWtZeJUVPrv6YNRJWUqwCvqxhSP1Kip5ce/fy2YZ2DLirxiAdUVJ0Fr0NLQDWx8CDtUJJSWGEnZCbIQ16sB4CttQIp3fymZCbedD3/m4D7sBd0KxmjeUbXBXisoO4D535rIpBLY4clG/i2AV04z6Rp9qU1xJ8SbIElu2YuGnbN4i2jqHUeklJsT02UD5gjbhFYr0VlAnIpUXAaEnCgwKhdQHrgU7gggoG9SvuAsZ0NlhmhA0YUFKsBFpwH7K1R480lTZaXgqMkOMhPLFkMtMen9QO3AhcjVuRvAR39Wc+7nJUObwvBZwF7s703JZ/AccI0dMbvIyTAAAAAElFTkSuQmCC",
     "proxified": true,
-    "gstreamerURL": "ws://localhost:3001/kaldi",
+    "gstreamerURL": "http://localhost:3001",
     "externalLibs": [
       "https://cdnjs.cloudflare.com/ajax/libs/sockjs-client/1.1.4/sockjs.min.js",
-      "https://cdnjs.cloudflare.com/ajax/libs/stomp.js/2.3.3/stomp.min.js"
+      "https://cdnjs.cloudflare.com/ajax/libs/stomp.js/2.3.3/stomp.min.js",
+      "https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.1.0/socket.io.js"
     ],
     "archive": "http://localhost:8080/api/summary",
     "reco": {
@@ -43,7 +44,7 @@
       "reco": {
         "host": "hublot_recommender_1",
         "port": 8080,
-        "reconnectInterval": 5000
+        "reconnectInterval": 50000
       },
       "kaldi": "ws://hublot_kaldi-gstreamer_1:80/client/ws/speech?content-type=audio/x-matroska,+rate=(int)48000,+channels=(int)"
     }

lib/proxy.js

@@ -127,7 +127,7 @@ module.exports = config => {
             }
           } else {
             console.error('Online reco: error trying to reach http://%s:%s/resources',
-                          config.services.reco.host, config.services.reco.port);
+              config.services.reco.host, config.services.reco.port);
           }
           connectionToClient.close();
         }
@@ -147,21 +147,38 @@ module.exports = config => {
   return {
     create: (resume) => {
       resume.createFolder()
-
       const server = http.createServer();
-
       const stompClient = createStompClient();
+      const io = require('socket.io')(server, {
+        transports: ['websocket']
+      });
+
+      io.sockets.on('connection', (socket) => {
+        // let asd = {} //port 8881 - connexion de contrôle ASD
+        console.log("NEW CONNEXION !")
+        socket.on('new_user', (userId) => {
+          //create ASD stream  //port 8882 - connexion de data
+          let vad = userId
+
+          //asd.on("resume_data", soket.emit('resume_data'))
+          //register custom event for user
+          socket.on('audio_from_' + userId, (data) => {
+            console.log("DATA RECEIVED FOR USER : ",vad)
+            //console.log(data)
+            //asd.send(data)
+          })
+        })
+      });
+
 
+
+/*
       const wssServer = new WebSocket.Server({
         server,
         autoAcceptConnections: true
       });
 
       wssServer.on('connection', (connectionToClient, req) => {
-        if (req.url === '/kaldi') {
-          kaldiWS(connectionToClient, resume);
-          return;
-        }
         if (req.url === '/chat') {
           recoChatWS(connectionToClient, stompClient);
           return;
@@ -176,10 +193,11 @@ module.exports = config => {
         }
         console.error('proxy: unknown path for ws connection', req.url);
       });
-
+    */
       server.listen(config.port);
 
       console.log('Proxy listening on port', config.port);
+
     }
   };
 };