Added [email protected]

muaz-khan · Jan 19, 2016 · 4505cec · 4505cec
1 parent dbe1e2c
commit 4505cec
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 33 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -7,6 +7,8 @@ module.exports = function(grunt) {
         scope: 'devDependencies'
     });
 
+    var banner = '// Last time updated: <%= grunt.template.today("UTC:yyyy-mm-dd h:MM:ss TT Z") %>\n\n';
+
     // configure project
     grunt.initConfig({
         // make node configurations available
@@ -15,7 +17,7 @@ module.exports = function(grunt) {
             options: {
                 stripBanners: true,
                 separator: '\n',
-                banner: '// Last time updated at <%= grunt.template.today("dddd, mmmm dS, yyyy, h:MM:ss TT") %> \n\n'
+                banner: banner
             },
             dist: {
                 src: [
@@ -67,7 +69,7 @@ module.exports = function(grunt) {
         uglify: {
             options: {
                 mangle: false,
-                banner: '// Last time updated at <%= grunt.template.today("dddd, mmmm dS, yyyy, h:MM:ss TT") %> \n\n'
+                banner: banner
             },
             my_target: {
                 files: {

diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ All files from `/dist` directory are available on CDN: `https://cdn.webrtc-exper
 <script src="https://cdn.webrtc-experiment.com:443/rmc3.min.js"></script>
 
 <!-- or specific version -->
-<script src="https://github.com/muaz-khan/RTCMultiConnection/releases/download/3.2.86/rmc3.min.js"></script>
+<script src="https://github.com/muaz-khan/RTCMultiConnection/releases/download/3.2.87/rmc3.min.js"></script>
 ```
 
 If you're sharing files, you also need to link:
@@ -76,7 +76,7 @@ If you're sharing files, you also need to link:
 <script src="https://cdn.webrtc-experiment.com:443/rmc3.fbr.min.js"></script>
 
 <!-- or specific version -->
-<script src="https://github.com/muaz-khan/RTCMultiConnection/releases/download/3.2.86/rmc3.fbr.min.js"></script>
+<script src="https://github.com/muaz-khan/RTCMultiConnection/releases/download/3.2.87/rmc3.fbr.min.js"></script>
 ```
 
 > You can link multiple files from `dev` directory. Order doesn't matters.

diff --git a/RTCMultiConnection.js b/RTCMultiConnection.js
@@ -1,4 +1,4 @@
-// Last time updated at Sunday, January 17th, 2016, 5:28:51 PM 
+// Last time updated: 2016-01-19 9:53:08 AM UTC
 
 // ______________________________
 // RTCMultiConnection-v3.0 (Beta)
@@ -1248,7 +1248,7 @@
 
         // default value is 15k because Firefox's receiving limit is 16k!
         // however 64k works chrome-to-chrome
-        connection.chunkSize = 15 * 1000;
+        connection.chunkSize = 65 * 1000;
 
         connection.maxParticipantsAllowed = 1000;
 
@@ -2025,7 +2025,7 @@
             }, {
                 userid: connection.userid,
                 // extra: connection.extra,
-                chunkSize: connection.chunkSize || 0
+                chunkSize: isFirefox ? 15 * 1000 : connection.chunkSize || 0
             });
         };
 
@@ -2050,7 +2050,13 @@
         };
 
         this.onDataChannelOpened = function(channel, remoteUserId) {
+            // keep last channel only; we are not expecting parallel/channels channels
+            if (connection.peers[remoteUserId].channels.length) {
+                return;
+            }
+
             connection.peers[remoteUserId].channels.push(channel);
+
             connection.onopen({
                 userid: remoteUserId,
                 extra: connection.peers[remoteUserId] ? connection.peers[remoteUserId].extra : {},

diff --git a/RTCMultiConnection.min.js b/RTCMultiConnection.min.js
diff --git a/dev/FileBufferReader.js b/dev/FileBufferReader.js
@@ -38,7 +38,8 @@ function FileBufferReader() {
             uuid: file.uuid || 0,
             file: file,
             earlyCallback: earlyCallback,
-            extra: extra
+            extra: extra,
+            chunkSize: extra.chunkSize
         };
 
         fbrHelper.readAsArrayBuffer(fbr, options);

diff --git a/dev/MultiPeersHandler.js b/dev/MultiPeersHandler.js
@@ -412,7 +412,7 @@ function MultiPeers(connection) {
         }, {
             userid: connection.userid,
             // extra: connection.extra,
-            chunkSize: connection.chunkSize || 0
+            chunkSize: isFirefox ? 15 * 1000 : connection.chunkSize || 0
         });
     };
 
@@ -437,7 +437,13 @@ function MultiPeers(connection) {
     };
 
     this.onDataChannelOpened = function(channel, remoteUserId) {
+        // keep last channel only; we are not expecting parallel/channels channels
+        if (connection.peers[remoteUserId].channels.length) {
+            return;
+        }
+
         connection.peers[remoteUserId].channels.push(channel);
+
         connection.onopen({
             userid: remoteUserId,
             extra: connection.peers[remoteUserId] ? connection.peers[remoteUserId].extra : {},

diff --git a/dev/RTCMultiConnection.js b/dev/RTCMultiConnection.js
@@ -1239,7 +1239,7 @@ function RTCMultiConnection(roomid) {
 
     // default value is 15k because Firefox's receiving limit is 16k!
     // however 64k works chrome-to-chrome
-    connection.chunkSize = 15 * 1000;
+    connection.chunkSize = 65 * 1000;
 
     connection.maxParticipantsAllowed = 1000;
 

diff --git a/dist/rmc3.fbr.js b/dist/rmc3.fbr.js
@@ -38,7 +38,8 @@ function FileBufferReader() {
             uuid: file.uuid || 0,
             file: file,
             earlyCallback: earlyCallback,
-            extra: extra
+            extra: extra,
+            chunkSize: extra.chunkSize
         };
 
         fbrHelper.readAsArrayBuffer(fbr, options);

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 at Sunday, January 17th, 2016, 5:28:51 PM 
+// Last time updated: 2016-01-19 9:53:08 AM UTC
 
 // ______________________________
 // RTCMultiConnection-v3.0 (Beta)
@@ -1248,7 +1248,7 @@
 
         // default value is 15k because Firefox's receiving limit is 16k!
         // however 64k works chrome-to-chrome
-        connection.chunkSize = 15 * 1000;
+        connection.chunkSize = 65 * 1000;
 
         connection.maxParticipantsAllowed = 1000;
 
@@ -2025,7 +2025,7 @@
             }, {
                 userid: connection.userid,
                 // extra: connection.extra,
-                chunkSize: connection.chunkSize || 0
+                chunkSize: isFirefox ? 15 * 1000 : connection.chunkSize || 0
             });
         };
 
@@ -2050,7 +2050,13 @@
         };
 
         this.onDataChannelOpened = function(channel, remoteUserId) {
+            // keep last channel only; we are not expecting parallel/channels channels
+            if (connection.peers[remoteUserId].channels.length) {
+                return;
+            }
+
             connection.peers[remoteUserId].channels.push(channel);
+
             connection.onopen({
                 userid: remoteUserId,
                 extra: connection.peers[remoteUserId] ? connection.peers[remoteUserId].extra : {},

diff --git a/dist/rmc3.min.js b/dist/rmc3.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "rtcmulticonnection-v3",
   "preferGlobal": false,
-  "version": "3.2.86",
+  "version": "3.2.87",
   "author": {
     "name": "Muaz Khan",
     "email": "[email protected]",
@@ -49,15 +49,16 @@
   "homepage": "https://rtcmulticonnection.herokuapp.com/",
   "_from": "rtcmulticonnection-v3@",
   "devDependencies": {
-    "grunt": "latest",
-    "grunt-bump": "latest",
-    "grunt-cli": "latest",
-    "grunt-contrib-clean": "latest",
-    "grunt-contrib-concat": "latest",
-    "grunt-contrib-copy": "latest",
-    "grunt-contrib-uglify": "latest",
-    "grunt-jsbeautifier": "latest",
-    "grunt-replace": "latest",
-    "load-grunt-tasks": "latest"
+    "grunt": "0.4.5",
+    "grunt-cli": "0.1.13",
+    "load-grunt-tasks": "3.4.0",
+    "grunt-contrib-concat": "0.5.1",
+    "grunt-contrib-jshint": "0.11.3",
+    "grunt-contrib-uglify": "0.11.0",
+    "grunt-jsbeautifier": "0.2.10",
+    "grunt-bump": "0.7.0",
+    "grunt-contrib-clean": "0.6.0",
+    "grunt-contrib-copy": "0.8.2",
+    "grunt-replace": "0.11.0"
   }
 }