working loopback comms

Author: sevenbitbyte

examples/test-loopback-party.js

@@ -33,7 +33,7 @@ async function main(){
   })
 
 
-  let comms2 = new Dataparty.Comms.LoopbackComms({ channel: loopback.peer2 })
+  let comms2 = new Dataparty.Comms.LoopbackComms({ channel: loopback.peer2, session: 'foobar' })
 
   let peer2 = new Dataparty.PeerParty({
     comms: comms2,

src/comms/loopback-channel.js

@@ -1,16 +1,20 @@
+const debug = require('debug')('dataparty.comms.loopback-channel')
 const EventEmitter = require("eventemitter3")
 
 class PeerNode {
-  constructor(peer){
+  constructor(peer, name){
+    this.name = name
     this.events = new EventEmitter
     this.peer = peer
   }
 
   post(ns, msg){
+    debug('post('+this.name+')', ns, msg)
     this.events.emit(ns, msg)
   }
 
   on(ns, func){
+    debug('on('+this.name+')', ns)
     this.peer.events.on(ns, func)
   }
 }
@@ -19,8 +23,8 @@ module.exports = class LoopbackChannel {
   constructor(){
     //
 
-    this.peer1 = new PeerNode()
-    this.peer2 = new PeerNode(this.peer1)
+    this.peer1 = new PeerNode(undefined, '1')
+    this.peer2 = new PeerNode(this.peer1, '2')
 
     this.peer1.peer = this.peer2
   }

src/comms/loopback-comms.js

@@ -9,8 +9,8 @@ const LoopbackSocket = require('./loopback-socket')
 const AUTH_TIMEOUT_MS = 3000
 
 class LoopbackComms extends PeerComms {
-  constructor({remoteIdentity, host, party, channel}){
-    super({remoteIdentity, host, party})
+  constructor({remoteIdentity, host, party, channel, ...options}){
+    super({remoteIdentity, host, party, ...options})
 
     this.channel = channel
   }

src/comms/loopback-socket.js

@@ -19,7 +19,7 @@ module.exports = class LoopbackSocket extends EventEmitter {
 
   start(){
     debug('start')
-    this.channel.post('connected', true)
+    //this.channel.post('connected', true)
     this.ready_local = true
     this.checkConnected()
   }
@@ -30,15 +30,18 @@ module.exports = class LoopbackSocket extends EventEmitter {
       this.closed = false
       this.emit('connect', true)
       debug('checkConnected - connected')
+      this.channel.post('connected', true)
     }
     else if(!this.ready){
+      debug('checkConnected - not ready')
       this.channel.post('connected', true)
     }
   }
 
   onconnected(){
     debug('onconnected')
     if(!this.ready_remote){
+      debug('make ready')
       this.ready_remote = true
       this.checkConnected()
     }

src/comms/peer-comms.js

@@ -214,12 +214,12 @@ class PeerComms extends SocketComms {
     if(this.host){
       debug('host mode comms')
 
-      this.socket.on('connect', this.handleClientConnection.bind(this))
+      this.socket.once('connect', this.handleClientConnection.bind(this))
       this.socket.on('data', this.handleClientCall.bind(this))
     }
     else{
       debug('client mode comms')
-      this.socket.on('connect', this.onopen.bind(this))
+      this.socket.once('connect', this.onopen.bind(this))
       this.socket.on('data', this.handleMessage.bind(this))
     }