hsync 0.20.0 → 0.23.0

package/lib/peers.js

@@ -12,10 +12,6 @@ const fetch = require('./fetch');
 
 function createPacket(topic, payload) {
   let payloadStr = payload;
-  console.log('mqttPacket', { topic, payload });
-  // if (payload instanceof Uint8Array) {
-  //   console.log('str payload', new TextDecoder().decode(payload));
-  // }
   const packet =  mqttPacket.generate({
     qos: 0,
     cmd: 'publish',
@@ -50,6 +46,7 @@ function initPeers(hsyncClient) {
     if (!peer) {
       debug('CREATING peer', hostName);
       peer = createRPCPeer({hostName, hsyncClient, timeout});
+      peer.myAuth = b64id.generateId();
       if (temporary) {
         peer.rpcTemporary = true;
       }
@@ -76,12 +73,13 @@ function initPeers(hsyncClient) {
   
     peer.localMethods.rtcSignal = (peerInfo, signal) => {
       debug('rtcSignal', signal.type);
-      if (signal.type === 'offer' && !peer.rtcCon && !signal.alreadySent) {
+      if (signal.type === 'offer') { // && !peer.rtcCon && !signal.alreadySent) {
+        peer.rtcStatus = 'connecting';
         rtc.answerPeer(peer, signal);
       } else if (signal.type === 'answer') {
         peer.handleRtcAnswer(signal);
       }
-      return 'rtcSignal ok';
+      return `rtcSignal ${signal.type} handled ok`;
     }
   
     peer.rtcEvents.on('packet', async (packet) => {
@@ -100,6 +98,13 @@ function initPeers(hsyncClient) {
           transport.receiveData(rpcMsg);
           //   return;
           // }
+        } else if (p1 === 'jsonMsg') {
+          try {
+            const jsonMsg = JSON.parse(msg.payload.toString());
+            peer.rtcEvents.emit('jsonMsg', jsonMsg);
+          } catch (e) {
+            debug('error parsing jsonMsg', e);
+          }
         } else if (p1 === 'socketData') {
           handleSocketPacket(msg);
         } else if (p1 === 'test') {
@@ -113,7 +118,7 @@ function initPeers(hsyncClient) {
     });
   
     peer.rtcEvents.on('dcOpen', () => {
-      debug('dcOpen');
+      debug(peer.answerer ? 'answerer' : 'offerer', 'dcOpen');
       peer.packAndSend = (topic, payload) => {
         const packet = createPacket(topic, payload);
         if (topic === 'test') {
@@ -157,20 +162,35 @@ function initPeers(hsyncClient) {
   
     peer.connectRTC = async () => {
       debug('connectRTC');
+      peer.rtcStatus = 'connecting';
+      peer.rtcEvents.emit('connecting');
       return new Promise(async (resolve, reject) => {
         try {
           const offer = await rtc.offerPeer(peer);
           debug('offer', offer);
           peer.rtcEvents.once('dcOpen', () => {
-            debug('dcOpen!');
+            peer.rtcStatus = 'connected';
+            debug('offerer dcOpen!');
             resolve(offer);
           });
         } catch (e) {
           debug('error connecting to rtc', e);
+          peer.rtcStatus = 'error';
           reject(e);
         }
       });
     };
+
+    peer.sendJSONMsg = (msg) => {
+      if (typeof msg !== 'object') {
+        throw new Error('sendJSONMsg requires an object');
+      }
+      if (!peer.packAndSend) {
+        throw new Error('peer not connected');
+      }
+      const payload = JSON.stringify(msg);
+      peer.packAndSend('jsonMsg', payload);
+    };
   
     transport.send = async (msg) => {
       const fullMsg = {
@@ -240,14 +260,14 @@ function initPeers(hsyncClient) {
         msg = JSON.stringify(msg);
       }
       const topic = `srpc/${hsyncClient.myHostName}`;
-      debug('↑ server rpc request', msg);
+      debug('↑ server rpc outbound', msg);
       hsyncClient.mqConn.publish(topic, Buffer.from(msg));
     };
     transport.receiveData = (msg) => {
       if(msg) {
         msg = JSON.parse(msg);
       }
-      debug('↓ server rpc reply', msg.method, msg.id);
+      debug('↓ server rpc inbound', msg);
       transport.emit('rpc', msg);
     };
     const peer = rawr({transport, methods, timeout: 5000});

package/lib/rtc-node.js

@@ -32,6 +32,12 @@ function offerPeer(peer) {
     let gatheringComplete = false;
     let offerSent = false;
     const start = Date.now();
+
+    peer.handleRtcAnswer = (answer) => {
+      debug('node handle RtcAnswer', answer.sdp.length);
+      peer.rtcCon.setRemoteDescription(answer.sdp, answer.type);
+      return 'node handle RtcAnswer ok';
+    }
   
     async function sendOffer() {
       const desc = con.localDescription();
@@ -86,10 +92,6 @@ function offerPeer(peer) {
         dc.sendMessageBinary(packet);
       };
       peer.rtcEvents.emit('dcOpen', dc);
-      // dc.sendMessage("Hello from node from offerer");
-      // peer.dc.onStateChange((state) => {
-      //   debug('dc state change', state);
-      // });
       debug('keys', Object.keys(dc));
     });
   
@@ -107,12 +109,6 @@ function offerPeer(peer) {
         offerSent = true;
       }
     }, GATHERING_TIMEOUT);
-  
-    peer.handleRtcAnswer = (answer) => {
-      debug('node handleRtcAnswer', answer.sdp.length);
-      con.setRemoteDescription(answer.sdp, answer.type);
-      return 'node handleRtcAnswer ok';
-    }
 
   });
 }
@@ -124,6 +120,7 @@ async function answerPeer(peer, offer) {
 
   const con = new rtc.PeerConnection('pc', defaultOptions);
   peer.rtcCon = con;
+  peer.answerer = true;
   
   function sendAnswer() {
     const desc = con.localDescription();
@@ -135,6 +132,16 @@ async function answerPeer(peer, offer) {
     if (state === 'connected') {
       peer.connected = true;
       peer.rtcEvents.emit('connected', con);
+    } else if (state === 'disconnected') {
+      peer.connected = false;
+      peer.rtcEvents.emit('disconnected', con);
+      peer.rtcCon = null;
+      peer.dc = null;
+    } else if (state === 'closed') {
+      peer.connected = false;
+      peer.rtcEvents.emit('closed', con);
+      peer.rtcCon = null;
+      peer.dc = null;
     }
   });
 
@@ -163,10 +170,6 @@ async function answerPeer(peer, offer) {
       dc.sendMessageBinary(packet);
     };
     peer.rtcEvents.emit('dcOpen', dc);
-
-    // peer.dc.onStateChange((state) => {
-    //   debug('dc state change', state);
-    // });
   });
 
 }

package/lib/rtc-web.js

@@ -53,10 +53,20 @@ async function offerPeer(peer) {
     };
 
     con.onconnectionstatechange = (event) => {
-      debug('connection state', con.connectionState, event);
+      debug('offerer connection state', con.connectionState, event);
       if(con.connectionState === 'connected') {
         peer.connected = true;
         peer.rtcEvents.emit('connected', con);
+      } else if (con.connectionState === 'disconnected') {
+        peer.connected = false;
+        peer.rtcEvents.emit('disconnected', con);
+        peer.rtcCon = null;
+        peer.dc = null;
+      } else if (con.connectionState === 'closed') {
+        peer.connected = false;
+        peer.rtcEvents.emit('closed', con);
+        peer.rtcCon = null;
+        peer.dc = null;
       }
     };
 
@@ -94,9 +104,9 @@ async function offerPeer(peer) {
     }, GATHERING_TIMEOUT);
 
     peer.handleRtcAnswer = (answer) => {
-      debug('node handleRtcAnswer', answer.sdp.length);
+      debug('web handle RtcAnswer', answer.sdp.length);
       con.setRemoteDescription(answer);
-      return 'web handleRtcAnswer ok';
+      return 'web handle RtcAnswer ok';
     }
   });
 }
@@ -107,6 +117,7 @@ async function answerPeer(peer, offer) {
   // window.rtc = rtc;
 
   peer.rtcCon = con;
+  peer.answerer = true;
   
   let gatheringComplete = false;
   const start = Date.now();
@@ -133,7 +144,7 @@ async function answerPeer(peer, offer) {
   };
 
   con.onconnectionstatechange = (event) => {
-    debug('connection state', con.connectionState, event);
+    debug('answerer connection state', con.connectionState, event);
     if(con.connectionState === 'connected') {
       peer.connected = true;
       peer.rtcEvents.emit('connected', con);

package/package.json

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