feat(WebChannel): make possible to specify a key for WebChannel.open

coast-team · Jul 27, 2016 · ac6d13b · ac6d13b
1 parent 79ee106
commit ac6d13b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/dist/netflux.es2015.js b/dist/netflux.es2015.js
@@ -2707,11 +2707,13 @@ class WebChannelGate {
    * @param {WebChannelGate~AccessData} accessData - Access data to join the
    * *WebChannel
    */
-  open (onChannel, url) {
+  open (onChannel, options) {
+    let url = options.signaling
+
     return new Promise((resolve, reject) => {
       let webRTCService = provide(WEBRTC)
       let webSocketService = provide(WEBSOCKET)
-      let key = this.generateKey()
+      let key = 'key' in options ? options.key : this.generateKey()
       webSocketService.connect(url)
         .then((ws) => {
           ws.onclose = (closeEvt) => {
@@ -3013,7 +3015,7 @@ class WebChannel {
     return this.gate.open((channel) => {
       this.initChannel(channel)
         .then((channel) => this.addChannel(channel))
-    }, settings.signaling)
+    }, settings)
   }
 
   /**

diff --git a/dist/netflux.es2015.umd.js b/dist/netflux.es2015.umd.js
@@ -2713,11 +2713,13 @@
      * @param {WebChannelGate~AccessData} accessData - Access data to join the
      * *WebChannel
      */
-    open (onChannel, url) {
+    open (onChannel, options) {
+      let url = options.signaling
+
       return new Promise((resolve, reject) => {
         let webRTCService = provide(WEBRTC)
         let webSocketService = provide(WEBSOCKET)
-        let key = this.generateKey()
+        let key = 'key' in options ? options.key : this.generateKey()
         webSocketService.connect(url)
           .then((ws) => {
             ws.onclose = (closeEvt) => {
@@ -3019,7 +3021,7 @@
       return this.gate.open((channel) => {
         this.initChannel(channel)
           .then((channel) => this.addChannel(channel))
-      }, settings.signaling)
+      }, settings)
     }
 
     /**

diff --git a/src/WebChannel.js b/src/WebChannel.js
@@ -243,7 +243,7 @@ class WebChannel {
     return this.gate.open((channel) => {
       this.initChannel(channel)
         .then((channel) => this.addChannel(channel))
-    }, settings.signaling)
+    }, settings)
   }
 
   /**

diff --git a/src/WebChannelGate.js b/src/WebChannelGate.js
@@ -63,11 +63,13 @@ class WebChannelGate {
    * @param {WebChannelGate~AccessData} accessData - Access data to join the
    * *WebChannel
    */
-  open (onChannel, url) {
+  open (onChannel, options) {
+    let url = options.signaling
+
     return new Promise((resolve, reject) => {
       let webRTCService = provide(WEBRTC)
       let webSocketService = provide(WEBSOCKET)
-      let key = this.generateKey()
+      let key = 'key' in options ? options.key : this.generateKey()
       webSocketService.connect(url)
         .then((ws) => {
           ws.onclose = (closeEvt) => {