Changeset 679

Timestamp:

10/12/09 15:38:13 (1 month ago)

Author:

jdecq

Message:

- adding timeout for the response of the upload POST in the mozilla based implementation

Files:

• branches/uploadr/3.2/MacUploadr.app/Contents/Resources/chrome/content/uploadr/upload.js (modified) (9 diffs)

branches/uploadr/3.2/MacUploadr.app/Contents/Resources/chrome/content/uploadr/upload.js

@@ -61 +61 @@
-
-    startTime : 0,
+    
+    transport: 0, 
+    timeoutID: 0,
-    
-    // Generate general error XML document element
@@ -681 +684 @@
-                wrap.photosets.getList(users.token, users.nsid);
-                wrap.people.getUploadStatus(users.token);
+                //wrap.tags.getListUserRaw(users.token);
-
-                // Send stats to the site
@@ -877 +881 @@
-                                Cc['@mozilla.org/network/socket-transport-service;1']
-                                .getService(Ci.nsISocketTransportService);
-var 
+upload.
-                                UPLOAD_HOST, 80, null);
-
+
+
+
+
+
+
+
-//                              Ci.nsITransport.OPEN_BLOCKING, 0, 0);
-                                Ci.nsITransport.OPEN_BLOCKING, 2520, 128);
-                        if (conf.console.upload) {
-                            var connectTimeout, readWriteTimeout;
-
-
+upload.
+upload.
-                            logStringMessage('UPLOAD: connect timeout = ' + connectTimeout + ' R/W timeout = ' + readWriteTimeout);
-                        }
@@ -919 +929 @@
-                               return; // we are done
-                         }
-
+upload.
-                        var istream = Cc['@mozilla.org/scriptableinputstream;1']
-                                .createInstance(Ci.nsIScriptableInputStream);
-                        istream.init(_istream);
+
+// Need huge time out for edge servers to answer, but still timeout
+// heuristic for time out proportional to file size and at least 2 minutes 30 seconds by conservatism   
+            var heuristicTimeout = Math.max(150000,4*mstream.available()/1024); 
+      
+            threads.main.dispatch(new UploadAboutDoneCallback(
+                            this.id, heuristicTimeout), threads.main.DISPATCH_NORMAL);
+
-                        var pump = Cc['@mozilla.org/network/input-stream-pump;1']
-                                .createInstance(Ci.nsIInputStreamPump);
@@ -929 +947 @@
-                            logStringMessage('UPLOAD: Waiting for response');
-                    }
+
-                        pump.asyncRead({
-                                id: this.id,
@@ -934 +953 @@
-                                raw: '',
-                                onStartRequest: function(request, context) {
+                                    window.clearTimeout(upload.timeoutID);
-                                    if (conf.console.upload) {
-                                    logStringMessage('UPLOAD response: onStartRequest');
@@ -951 +971 @@
-                                onDataAvailable: function(request, context,
-                                        stream, offset, count) {
+                                        if (conf.console.upload) {
+                                    logStringMessage('UPLOAD response: onDataAvailable');
+                                }
-                                        this.raw += istream.read(count);
-
@@ -975 +998 @@
-                                        threads.main.dispatch(new UploadDoneCallback(
-                                                this.raw, this.id), threads.main.DISPATCH_NORMAL);
-transport.close(0); // reason is supposed to be passed as parameter!?
+upload.transport.close(0); // reason is supposed to be passed as parameter!? OnStopRequest is coming after this, maybe as a result actually
-
-                                },
@@ -1080 +1103 @@
-        }
-};
+
+var UploadAboutDoneCallback = function(id, timeOut) {
+        this.id = id;
+        this.timeOut = timeOut;
+}
+UploadAboutDoneCallback.prototype = {
+        run: function() {
+                if (conf.console.upload) {
+                        logStringMessage('UPLOAD AboutDone ');
+                }
+                upload.timeoutID = window.setTimeout(abortPOST,this.timeOut,this.id);
+        },
+        QueryInterface: function(iid) {
+                if (iid.equals(Ci.nsIRunnable) || iid.equals(Ci.nsISupports)) {
+                        return this;
+                }
+                throw Components.results.NS_ERROR_NO_INTERFACE;
+        }
+};
+
+var abortPOST = function(id) {
+    // We timeout the transaction
+    upload.transport.close(Ci.nsIRequest.NS_BINDING_ABORTED);
+    // We handle this case => retry, or give up.
+    upload._start("", id);    
+}