Fixed #201

muaz-khan · Jul 24, 2016 · 978d0a5 · 978d0a5
1 parent 82207b9
commit 978d0a5
Show file tree

Hide file tree

Showing 10 changed files with 305 additions and 165 deletions.
diff --git a/RTCMultiConnection.js b/RTCMultiConnection.js
@@ -1,4 +1,4 @@
-// Last time updated: 2016-07-15 1:32:16 PM UTC
+// Last time updated: 2016-07-24 8:06:16 AM UTC
 
 // _____________________
 // RTCMultiConnection-v3
@@ -1497,6 +1497,10 @@
             parameters += '&maxRelayLimitPerUser=' + (connection.maxRelayLimitPerUser || 2);
         }
 
+        if (connection.socketCustomParameters) {
+            parameters += connection.socketCustomParameters;
+        }
+
         try {
             io.sockets = {};
         } catch (e) {};

diff --git a/RTCMultiConnection.min.js b/RTCMultiConnection.min.js
diff --git a/demos/index.html b/demos/index.html
@@ -3,11 +3,6 @@
 
 <head>
     <meta name="google-site-verification" content="zhJ273gZGLJ_Cbl-muzPYYTR6jD7sCCgufDIRS5h4SE" />
-    <script>
-        if(location.protocol === 'http:') {
-            location.href = location.href.replace(location.protocol, 'https:');
-        }
-    </script>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta charset="utf-8">
     <link rel="stylesheet" href="https://cdn.webrtc-experiment.com/style.css">

diff --git a/dev/SocketConnection.js b/dev/SocketConnection.js
@@ -10,6 +10,10 @@ function SocketConnection(connection, connectCallback) {
         parameters += '&maxRelayLimitPerUser=' + (connection.maxRelayLimitPerUser || 2);
     }
 
+    if (connection.socketCustomParameters) {
+        parameters += connection.socketCustomParameters;
+    }
+
     try {
         io.sockets = {};
     } catch (e) {};

diff --git a/dist/rmc3.fbr.min.js b/dist/rmc3.fbr.min.js
diff --git a/dist/rmc3.js b/dist/rmc3.js
@@ -1,4 +1,4 @@
-// Last time updated: 2016-07-15 1:32:16 PM UTC
+// Last time updated: 2016-07-24 8:06:16 AM UTC
 
 // _____________________
 // RTCMultiConnection-v3
@@ -1497,6 +1497,10 @@
             parameters += '&maxRelayLimitPerUser=' + (connection.maxRelayLimitPerUser || 2);
         }
 
+        if (connection.socketCustomParameters) {
+            parameters += connection.socketCustomParameters;
+        }
+
         try {
             io.sockets = {};
         } catch (e) {};

diff --git a/dist/rmc3.min.js b/dist/rmc3.min.js
diff --git a/docs/api.md b/docs/api.md
@@ -2,6 +2,47 @@
 
 > RTCMultiConnection v3 API References
 
+### `socketURL`
+
+1. You can run nodejs on a separate domain or separate port or on a separate server
+2. You can set `socketURL="ip-address"` to link nodejs server
+3. Now you can run RTCMultiConnection-v3 demos on any webpage; whether it is PHP page, ASP.net page, python or ruby page or whatever framework running top over HTML.
+
+```javascript
+connection.socketURL = 'https://onlyChangingPort.com:8888/';
+connection.socketURL = 'https://separateDomain.com:443/';
+connection.socketURL = '/'; // same domain
+
+// or a free signaling server
+connection.socketURL = 'https://rtcmulticonnection.herokuapp.com:443/';
+```
+
+### `socketCustomParameters`
+
+You can pass your custom socket.io parameters as well:
+
+```javascript
+// starts with "&"
+// &fullName=Muaz
+// &meetingId=xyz
+connection.socketCustomParameters = '&fullName=Muaz&country=PK&meetingId=xyz';
+```
+
+Now you can open `server.js` and access above parameters here:
+
+```javascript
+// you can find below line on "server.js" file
+require('./Signaling-Server.js')(app, function(socket) {
+    var params = socket.handshake.query;
+
+    var meetingId = params.meetingId;
+    var fullName = params.fullName;
+    var country = params.country;
+    var userid = params.userid;
+    // etc.
+});
+```
+
 ### `applyConstraints`
 
 This method allows you change video resolutions or audio sources without making a new getUserMedia request i.e. it modifies your existing MediaStream:

diff --git a/server.js b/server.js
@@ -2,7 +2,7 @@
 // MIT License    - www.WebRTC-Experiment.com/licence
 // Documentation  - github.com/muaz-khan/RTCMultiConnection
 
-var isUseHTTPs = !(!!process.env.PORT || !!process.env.IP);
+var isUseHTTPs = false && !(!!process.env.PORT || !!process.env.IP);
 
 var port = process.env.PORT || 9001;
 
@@ -116,7 +116,12 @@ if (isUseHTTPs) {
 
 app = app.listen(port, process.env.IP || '0.0.0.0', function() {
     var addr = app.address();
-    console.log('Server listening at', addr.address + ':' + addr.port);
+
+    if (addr.address === '0.0.0.0') {
+        addr.address = 'localhost';
+    }
+
+    console.log('Server listening at ' + (isUseHTTPs ? 'https' : 'http') + '://' + addr.address + ':' + addr.port);
 });
 
 require('./Signaling-Server.js')(app, function(socket) {