should connect test passing

fruwe · Jan 10, 2020 · 0f1dbc1 · 0f1dbc1
1 parent de0364b
commit 0f1dbc1
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 10 deletions.
diff --git a/src/WebRtcCommunication.js b/src/WebRtcCommunication.js
@@ -7,7 +7,7 @@ import { isBrowser } from 'browser-or-node';
 import uuid from 'uuid/v4';
 import MewConnectCommon from './MewConnectCommon';
 
-const debug = debugLogger('MEWconnect:initiator');
+const debug = debugLogger('MEWconnect:webRTC-communication');
 const debugPeer = debugLogger('MEWconnectVerbose:peer-instances');
 const debugStages = debugLogger('MEWconnect:initiator-stages');
 const logger = createLogger('MewConnectInitiator');

diff --git a/src/socketVersions/MewConnectInitiator.js b/src/socketVersions/MewConnectInitiator.js
@@ -9,7 +9,7 @@ import MewConnectInitiatorV1 from './MewConnectInitiatorV1';
 
 import WebRtcCommunication from '../WebRtcCommunication';
 
-const debug = debugLogger('MEWconnect:initiator');
+const debug = debugLogger('MEWconnect:initiator-base');
 const debugPeer = debugLogger('MEWconnectVerbose:peer-instances');
 const debugStages = debugLogger('MEWconnect:initiator-stages');
 const logger = createLogger('MewConnectInitiator');
@@ -179,6 +179,7 @@ Keys
     debug('this.signed', this.signed);
   }
 
+
   // TODO change this to handle supplying urls at time point
   async initiatorStart(url, testPrivate) {
     this.generateKeys(testPrivate);
@@ -190,10 +191,18 @@ Keys
       uiCommunicator: this.uiCommunicator.bind(this),
       webRtcCommunication: this.webRtcCommunication
     };
+    this.webRtcCommunication.on('data', this.dataReceived.bind(this));
+    this.webRtcCommunication.on('address', (data) => console.log('address webrtc', data));
     this.V1 = new MewConnectInitiatorV1({ url: this.v1Url, ...options });
     this.V2 = new MewConnectInitiatorV2({ url: this.v2Url, ...options });
-    await this.V1.initiatorStart(this.v1Url, this.mewCrypto, {signed: this.signed, connId: this.connId});
-    await this.V2.initiatorStart(this.v2Url, this.mewCrypto, {signed: this.signed, connId: this.connId});
+    await this.V1.initiatorStart(this.v1Url, this.mewCrypto, {
+      signed: this.signed,
+      connId: this.connId
+    });
+    await this.V2.initiatorStart(this.v2Url, this.mewCrypto, {
+      signed: this.signed,
+      connId: this.connId
+    });
   }
 
   beginRtcSequence(source, data) {
@@ -209,7 +218,12 @@ Keys
   }
 
   async rtcSend(arg) {
-    this.webRtcCommunication.rtcSend(arg)
+    this.webRtcCommunication.rtcSend(arg);
+  }
+
+  dataReceived(data) {
+    debug('dataReceived', data);
+    this.uiCommunicator(data.type, data.data)
   }
 
 }
diff --git a/src/socketVersions/MewConnectInitiatorPror.js b/src/socketVersions/MewConnectInitiatorPror.js
@@ -10,7 +10,7 @@ import MewConnectCrypto from '../MewConnectCrypto';
 import MewConnectInitiatorV2 from './MewConnectInitiatorV2';
 import io from 'socket.io-client';
 
-const debug = debugLogger('MEWconnect:initiator');
+const debug = debugLogger('MEWconnect:initiator-old');
 const debugPeer = debugLogger('MEWconnectVerbose:peer-instances');
 const debugStages = debugLogger('MEWconnect:initiator-stages');
 const logger = createLogger('MewConnectInitiator');

diff --git a/src/socketVersions/MewConnectInitiatorV1.js b/src/socketVersions/MewConnectInitiatorV1.js
@@ -5,7 +5,7 @@ import wrtc from 'wrtc';
 import io from 'socket.io-client';
 import MewConnectCommon from '../MewConnectCommon';
 
-const debug = debugLogger('MEWconnect:initiator');
+const debug = debugLogger('MEWconnect:initiator-V1');
 const debugPeer = debugLogger('MEWconnectVerbose:peer-instances');
 // const debugStages = debugLogger('MEWconnect:initiator-stages');
 const debugStages = console.log;

diff --git a/src/socketVersions/MewConnectInitiatorV2.js b/src/socketVersions/MewConnectInitiatorV2.js
@@ -8,7 +8,7 @@ import MewConnectCommon from '../MewConnectCommon';
 import MewConnectCrypto from '../MewConnectCrypto';
 import WebRtcCommunication from '../WebRtcCommunication';
 
-const debug = debugLogger('MEWconnect:initiator');
+const debug = debugLogger('MEWconnect:initiator-V2');
 const debugPeer = debugLogger('MEWconnectVerbose:peer-instances');
 const debugStages = debugLogger('MEWconnect:initiator-stages');
 const logger = createLogger('MewConnectInitiator');
@@ -38,12 +38,13 @@ export default class MewConnectInitiatorV2 extends MewConnectCommon {
       this.iceState = '';
       this.turnServers = [];
 
+
+
       // this.Peer = options.wrtc || SimplePeer; //WebRTCConnection
       // this.webRtcCommunication = new WebRtcCommunication();
       // this.mewCrypto = options.cryptoImpl || MewConnectCrypto.create();
-
       this.socket = new WebSocket();
-      this.io = io;
+      // this.io = io;
       this.connPath = '';
 
       this.signals = this.jsonDetails.signals;

diff --git a/test/integration/basic.pairing.test.js b/test/integration/basic.pairing.test.js
@@ -122,6 +122,11 @@ describe('Pairing', () => {
 
       // Receiver //
 
+      initiator.on('address', (data) => {
+        if(!silent) console.log('address', data); // todo remove dev item
+        // initiator.rtcSend({ type: 'address', data: '' });
+      });
+
       await receiver.setKeys(
         initiator.publicKey,
         initiator.privateKey,
@@ -159,6 +164,8 @@ describe('Pairing', () => {
         initiator.rtcSend({ type: 'address', data: '' });
       });
 
+
+
     } catch (e) {
       // console.log(e); // todo remove dev item
       done.fail(e);