hsync 0.18.1 → 0.18.3

package/lib/peers.js

@@ -84,8 +84,13 @@ function createRPCPeer(options = {}) {
   }
 
   peer.rtcEvents.on('packet', async (packet) => {
+    debug('↓ on packet', packet);
+    let toParse = packet;
     try {
-      const msg = await parsePacket(packet);
+      if (packet instanceof Blob) {
+        toParse = await packet.arrayBuffer();
+      }
+      const msg = await parsePacket(toParse);
       const [p1, p2, p3] = msg.topic.split('/');
       if (p1 === 'rpc') {
         transport.receiveData(JSON.parse(msg.payload.toString()));
@@ -105,6 +110,9 @@ function createRPCPeer(options = {}) {
     debug('dcOpen');
     peer.packAndSend = (topic, payload) => {
       const packet = createPacket(topic, payload);
+      if (topic === 'test') {
+        debug('sending test packet', packet);
+      }
       peer.rtcSend(packet);
     }
     // firefox is weird about the first bit of data, so send a test packet

package/lib/rtc-node.js

@@ -66,7 +66,7 @@ async function offerPeer(peer) {
   });
 
   con.onDataChannel((dc) => {
-    debug('dc from offerer', dc);
+    debug('offerer onDataChannel', dc);
     peer.dc = dc;
   });
 
@@ -74,10 +74,10 @@ async function offerPeer(peer) {
   dc.onOpen(() => {
     peer.dc = dc;
     peer.dcOpen = true;
-    peer.rtcEvents.emit('dcOpen', dc);
     peer.rtcSend = (packet) => {
       dc.sendMessageBinary(packet);
     };
+    peer.rtcEvents.emit('dcOpen', dc);
     // dc.sendMessage("Hello from node from offerer");
     // peer.dc.onStateChange((state) => {
     //   debug('dc state change', state);
@@ -140,7 +140,7 @@ async function answerPeer(peer, offer) {
   con.setLocalDescription();
 
   con.onDataChannel((dc) => {
-    debug("node answerer got dataChannel: ", dc.getLabel());
+    debug("answerer onDataChannel", dc.getLabel());
     dc.onMessage((msg) => {
       debug('node answerer Received Msg:', msg.length);
       peer.rtcEvents.emit('packet', msg);
@@ -149,10 +149,10 @@ async function answerPeer(peer, offer) {
     // dc.sendMessage("Hello From node answerer");
     peer.dcOpen = true;
     peer.dc = dc;
-    peer.rtcEvents.emit('dcOpen', dc);
     peer.rtcSend = (packet) => {
       dc.sendMessageBinary(packet);
     };
+    peer.rtcEvents.emit('dcOpen', dc);
 
     // peer.dc.onStateChange((state) => {
     //   debug('dc state change', state);

package/lib/rtc-web.js

@@ -69,10 +69,10 @@ async function offerPeer(peer) {
   dc.onopen = (event) => { 
     peer.dcOpen = true;
     peer.dc = dc;
-    peer.rtcEvents.emit('dcOpen', dc);
     peer.rtcSend = (packet) => {
       dc.send(packet);
     };
+    peer.rtcEvents.emit('dcOpen', dc);
     // dc.send('yo waddup from the browser');
   };
 
@@ -144,13 +144,13 @@ async function answerPeer(peer, offer) {
   };
 
   con.ondatachannel = (event) => {
-    debug('dc from node', event);
+    debug('ondatachannel', event);
     peer.dcOpen = true;
     peer.dc = event.channel;
-    peer.rtcEvents.emit('dcOpen', peer.dc);
     peer.rtcSend = (packet) => {
       peer.dc.send(packet);
     };
+    peer.rtcEvents.emit('dcOpen', peer.dc);
     peer.dc.onmessage = (event) => {
       peer.rtcEvents.emit('packet', event.data);
     };

package/package.json

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