Merge pull request #99 from Pradhyumna02/Update-Uploads-Microsoft

Update uploads Microsoft

Author: Pradhyumna02

package.json

@@ -1,6 +1,6 @@
 {
   "name": "speed-testjs",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "description": "measure internet bandwidth",
   "main": "index.js",
   "author": "Maulan Byron",

public/examples/upload/index.html

@@ -61,7 +61,6 @@ <h1 class="logo"></h1>
 <script src="lib/uploadHttpConcurrent.js"></script>
 <script src="lib/uploadProbeTest.js"></script>
 <script src="lib/uploadHttpConcurrentProgress.js"></script>
-<script src="lib/uploadHttpMicrosoft.js"></script>
 <script src="uilib/echarts.min.js"></script>
 <script src="/examples/upload/uploadApp.js"></script>
 </body>

public/examples/upload/uploadApp.js

@@ -41,6 +41,7 @@
     var urls = [];
     var ports = [5020, 5021, 5022, 5023, 5024, 5025];
     var monitorInterval = 400;
+    var isMicrosoftBrowser = false;
 
     function initTest() {
         function addEvent(el, ev, fn) {
@@ -270,36 +271,21 @@
         }
 
         var uploadHttpConcurrentProgress;
-        var baseUrl;
+        var baseUrl = (version === 'IPv6') ? testPlan.baseUrlIPv6NoPort : testPlan.baseUrlIPv4NoPort;
+        for (var i = 0; i < ports.length; i++) {
+            for (var b = 0; b < 6; b++) {
+                urls.push('http://' + baseUrl + ':' + ports[i] + '/upload');
+            }
+        }
         //TODO needs to removed once we know the issues  with ie
         if (navigator.appVersion.indexOf("MSIE") != -1 || navigator.appVersion.indexOf("Trident") != -1 || navigator.appVersion.indexOf("Edge") != -1) {
-            var isIE = true;
-            uploadSize = 17526506;
-            uploadTestTimeout = 15000;
-            uploadTestLength = 15000;
-            uploadMovingAverage = 1;
-            var uiMicrsoftMovingAverage = 2;
+            isMicrosoftBrowser = true;
         }
 
-        if (isIE) {
-             baseUrl = (version === 'IPv6') ? 'http://' + testPlan.baseUrlIPv6 : 'http://' + testPlan.baseUrlIPv4;
-
-            uploadHttpConcurrentProgress = new window.uploadHttpMicrosoft(baseUrl + '/upload', 'POST', uploadCurrentRuns, uploadTestTimeout, uploadTestLength,
-                uploadMovingAverage, uiMicrsoftMovingAverage, uploadHttpOnComplete, uploadHttpOnProgress, uploadHttpOnError, uploadSize);
-            uploadHttpConcurrentProgress.initiateTest();
-        } else {
-            baseUrl = (version === 'IPv6') ? testPlan.baseUrlIPv6NoPort : testPlan.baseUrlIPv4NoPort;
-            for (var i = 0; i < ports.length; i++) {
-                for (var b = 0; b < 6; b++) {
-                    urls.push('http://' + baseUrl + ':' + ports[i] + '/upload');
-                }
-            }
-
-            uploadHttpConcurrentProgress = new window.uploadHttpConcurrentProgress(urls, 'POST', uploadCurrentRuns, uploadTestTimeout, uploadTestLength, uploadMovingAverage, uploadHttpOnComplete, uploadHttpOnProgress,
-                uploadHttpOnError, uploadSize, testPlan.maxuploadSize, monitorInterval);
+        uploadHttpConcurrentProgress = new window.uploadHttpConcurrentProgress(urls, 'POST', uploadCurrentRuns, uploadTestTimeout, uploadTestLength, uploadMovingAverage, uploadHttpOnComplete, uploadHttpOnProgress,
+            uploadHttpOnError, uploadSize, testPlan.maxuploadSize, monitorInterval, isMicrosoftBrowser);
 
-            uploadHttpConcurrentProgress.initiateTest();
-        }
+        uploadHttpConcurrentProgress.initiateTest();
     }
 
 })();

public/index.html

@@ -83,7 +83,6 @@ <h1 class="logo"></h1>
 <script src="lib/uploadHttpConcurrent.js"></script>
 <script src="lib/uploadProbeTest.js"></script>
 <script src="lib/uploadHttpConcurrentProgress.js"></script>
-<script src="lib/uploadHttpMicrosoft.js"></script>
 <script src="uilib/echarts.min.js"></script>
 <script src="speed-testJS.js"></script>
 </body>

public/lib/uploadHttpConcurrentProgress.js

@@ -36,7 +36,7 @@
      * @param monitorInterval - monitor interval.
      */
     function uploadHttpConcurrentProgress(urls, type, concurrentRuns, timeout, testLength, movingAverage, callbackComplete, callbackProgress, callbackError, size, maxuploadSize,
-                                          monitorInterval) {
+                                          monitorInterval, isMicrosoftBrowser) {
         this.urls = urls;
         this.size = size;
         this.type = type;
@@ -70,7 +70,14 @@
         //initializing the random data used for testing upload
         this._payload = null;
         this.uploadResults = [];
-
+        //boolean to see if the client is running the on microsoft browse
+        this.isMicrosoftBrowser = isMicrosoftBrowser;
+        //upload size for low bandwidth clients(microsoft browsers)
+        this.lowBandwidthUploadSize = 50000;
+        //upload size for high bandwidth clients(microsoft browsers)
+        this.highBandwidthUploadSize = 5000000;
+        //upload threshold value
+        this.uploadThresholdValue = 50;
     }
 
     /**
@@ -121,12 +128,29 @@
 
         //store results
         this._storeResults(result);
-        var uploadSize = (this.testLength - result.time) * result.loaded / result.time;
 
-        if (uploadSize > this.size) {
-            this.size = uploadSize;
-            if (this.size > this.maxuploadSize) {
-                this.size = this.maxuploadSize;
+        if (this.isMicrosoftBrowser) {
+
+            if (!this.isMaxUploadSize) {
+                if (this.uploadResults[this.uploadResults.length - 1] > this.uploadThresholdValue) {
+                    //TODO need to dynamically increase the size.. may be look at the requests completed or the uploadSpeed
+                    this.isMaxUploadSize = true;
+                    //upload size used for high bandwidth clients of microsoft browsers
+                    this.size = this.highBandwidthUploadSize;
+                } else {
+                    //upload size used for low bandwidth clients of microsoft browsers
+                    this.size = this.lowBandwidthUploadSize;
+                }
+            }
+
+        } else {
+            var uploadSize = (this.testLength - result.time) * result.loaded / result.time;
+
+            if (uploadSize > this.size) {
+                this.size = uploadSize;
+                if (this.size > this.maxuploadSize) {
+                    this.size = this.maxuploadSize;
+                }
             }
         }