hsync 0.28.0 → 0.30.0

package/lib/peers.js

@@ -74,14 +74,20 @@ function initPeers(hsyncClient) {
     peer.localMethods = Object.assign({}, hsyncClient.peerMethods);
     peer.sockets = {};
   
-    peer.localMethods.rtcSignal = (peerInfo, signal) => {
+    peer.localMethods.rtcSignal = async (peerInfo, signal) => {
       debug('rtcSignal', signal.type);
-      if (signal.type === 'offer') { // && !peer.rtcCon && !signal.alreadySent) {
-        peer.rtcStatus = 'connecting';
-        rtc.answerPeer(peer, signal);
-      } else if (signal.type === 'answer') {
-        peer.handleRtcAnswer(signal);
+      try{
+        if (signal.type === 'offer') { // && !peer.rtcCon && !signal.alreadySent) {
+          peer.rtcStatus = 'connecting';
+          await rtc.answerPeer(peer, signal);
+        } else if (signal.type === 'answer') {
+          await peer.handleRtcAnswer(signal);
+        }
+      } catch (e) {
+        debug('error handling rtcSignal', e, signal);
+        return e.message;
       }
+      
       return `rtcSignal ${signal.type} handled ok`;
     }
   
@@ -205,7 +211,18 @@ function initPeers(hsyncClient) {
   
       debug('↑ peer rpc', peer.dcOpen ? 'RTC' : 'REST', `${hostName}/_hs/rpc`, msg.method);
   
-      if (peer.dcOpen) {
+      let msgObj = msg;
+      if (typeof msg !== 'object') {
+        try {
+          msgObj = JSON.parse(msg);
+        } catch (e) {
+          msgObj = {error: 'invalid JSON'};
+        }
+      }
+
+      // sometimes it takes a while for RTC do detect a disconnect
+      // do not rtcSignal messages over the RTC connection
+      if (peer.dcOpen && (msgObj.method !== 'rtcSignal')) {
         let payload = msg;
         if (typeof msg === 'object') {
           payload = JSON.stringify(payload);
@@ -280,10 +297,12 @@ function initPeers(hsyncClient) {
   hsyncClient.cachedPeers = cachedPeers;
   hsyncClient.getRPCPeer = getRPCPeer;
   hsyncClient.createServerPeer  = createServerPeer;
+  hsyncClient.createRPCPeer = createRPCPeer;
 
   peerLib.cachedPeers = cachedPeers;
   peerLib.getRPCPeer = getRPCPeer;
   peerLib.createRPCPeer = createRPCPeer;
+  peerLib.createServerPeer = createServerPeer;
 
   return peerLib;
 }

package/lib/rtc-node.js

@@ -33,9 +33,9 @@ function offerPeer(peer) {
     let offerSent = false;
     const start = Date.now();
 
-    peer.handleRtcAnswer = (answer) => {
+    peer.handleRtcAnswer = async (answer) => {
       debug('node handle RtcAnswer', answer.sdp.length);
-      peer.rtcCon.setRemoteDescription(answer.sdp, answer.type);
+      await peer.rtcCon.setRemoteDescription(answer.sdp, answer.type);
       return 'node handle RtcAnswer ok';
     }
   

package/lib/rtc-web.js

@@ -86,27 +86,33 @@ async function offerPeer(peer) {
       peer.dcOpen = true;
       peer.dc = dc;
       peer.rtcSend = (packet) => {
+        debug('sending packet', packet.toString(), dc.readyState);
         dc.send(packet);
       };
       peer.rtcEvents.emit('dcOpen', dc);
       // dc.send('yo waddup from the browser');
     };
+    
+    try {
+      const offer = await con.createOffer({offerToReceiveAudio:true, offerToReceiveVideo:true});
+      await con.setLocalDescription(offer);
+
+      setTimeout(() => {
+        if (!gatheringComplete) {
+          debug('didnt finish gathering');
+          sendOffer();
+          offerSent = true;
+        }
+      }, GATHERING_TIMEOUT);
 
-    const offer = await con.createOffer({offerToReceiveAudio:true, offerToReceiveVideo:true});
-    await con.setLocalDescription(offer);
-
-    setTimeout(() => {
-      if (!gatheringComplete) {
-        debug('didnt finish gathering');
-        sendOffer();
-        offerSent = true;
-      }
-    }, GATHERING_TIMEOUT);
-
-    peer.handleRtcAnswer = (answer) => {
-      debug('web handle RtcAnswer', answer.sdp.length);
-      con.setRemoteDescription(answer);
-      return 'web handle RtcAnswer ok';
+      peer.handleRtcAnswer = async (answer) => {
+        debug('web handle RtcAnswer', answer.sdp.length);
+        await con.setRemoteDescription(answer);
+        return 'web handle RtcAnswer ok';
+      };
+    } catch (e) {
+      debugError('error creating data channel', e);
+      reject(e);
     }
   });
 }
@@ -122,9 +128,13 @@ async function answerPeer(peer, offer) {
   let gatheringComplete = false;
   const start = Date.now();
 
-  function sendAnswer() {
+  async function sendAnswer() {
     const desc = con.localDescription;
-    peer.methods.rtcSignal({type: desc.type, sdp: desc.sdp});
+    try {
+      await peer.methods.rtcSignal({type: desc.type, sdp: desc.sdp});
+    } catch (e) {
+      debugError('error sending answer', e);
+    }
   }
 
   con.onicegatheringstatechange = (state) => {
@@ -166,6 +176,7 @@ async function answerPeer(peer, offer) {
     peer.dcOpen = true;
     peer.dc = event.channel;
     peer.rtcSend = (packet) => {
+      debug('sending packet', packet.toString(), peer.dc.readyState);
       peer.dc.send(packet);
     };
     peer.rtcEvents.emit('dcOpen', peer.dc);
@@ -174,6 +185,16 @@ async function answerPeer(peer, offer) {
     };
   };
 
+  con.ontrack = (event) => {
+    debug('rtc track', event);
+    peer.rtcEvents.emit('track', event);
+  };
+
+  con.onaddstream = (event) => {
+    debug('rtc stream', event);
+    peer.rtcEvents.emit('addstream', event);
+  };
+
   setTimeout(() => {
     if (!gatheringComplete) {
       debug('didnt finish gathering');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hsync",
-  "version": "0.28.0",
+  "version": "0.30.0",
   "description": "client for hsync-server",
   "main": "hsync.js",
   "scripts": {