Use native Promise

.jshintrc

@@ -84,6 +84,9 @@
     "couch"         : false,    // Enable globals exposed by CouchDB.
     "devel"         : false,    // Allow development statements e.g. `console.log();`.
     "dojo"          : false,    // Enable globals exposed by Dojo Toolkit.
+    "globals"       : {
+        "Promise": true
+    },
     "jquery"        : true,     // Enable globals exposed by jQuery JavaScript library.
     "mootools"      : false,    // Enable globals exposed by MooTools JavaScript framework.
     "node"          : false,    // Enable globals available when code is running inside of the NodeJS runtime environment.

client/js/azure/azure.xhr.upload.handler.js

@@ -59,73 +59,63 @@ qq.azure.XhrUploadHandler = function(spec, proxy) {
         };
 
     function combineChunks(id) {
-        var promise = new qq.Promise();
-
-        getSignedUrl(id).then(function(sasUri) {
-            var mimeType = handler._getMimeType(id),
-                blockIdEntries = handler._getPersistableData(id).blockIdEntries;
-
-            api.putBlockList.send(id, sasUri, blockIdEntries, mimeType, function(xhr) {
-                handler._registerXhr(id, null, xhr, api.putBlockList);
-            })
-                .then(function(xhr) {
-                    log("Success combining chunks for id " + id);
-                    promise.success({}, xhr);
-                }, function(xhr) {
-                    log("Attempt to combine chunks failed for id " + id, "error");
-                    handleFailure(xhr, promise);
-                });
-
-        },
-        promise.failure);
-
-        return promise;
+        return new Promise(function(resolve, reject) {
+            getSignedUrl(id).then(function(sasUri) {
+                var mimeType = handler._getMimeType(id),
+                    blockIdEntries = handler._getPersistableData(id).blockIdEntries;
+
+                api.putBlockList.send(id, sasUri, blockIdEntries, mimeType, function(xhr) {
+                    handler._registerXhr(id, null, xhr, api.putBlockList);
+                })
+                    .then(function(xhr) {
+                        log("Success combining chunks for id " + id);
+                        resolve({response: {}, xhr: xhr});
+                    }, function(xhr) {
+                        log("Attempt to combine chunks failed for id " + id, "error");
+                        reject(buildError(xhr));
+                    });
+            },
+            reject);
+        });
     }
 
     function determineBlobUrl(id) {
-        var containerUrl = endpointStore.get(id),
-            promise = new qq.Promise(),
-            getBlobNameSuccess = function(blobName) {
-                handler._setThirdPartyFileId(id, blobName);
-                promise.success(containerUrl + "/" + blobName);
-            },
-            getBlobNameFailure = function(reason) {
-                promise.failure(reason);
-            };
-
-        onGetBlobName(id).then(getBlobNameSuccess, getBlobNameFailure);
+        var containerUrl = endpointStore.get(id);
 
-        return promise;
+        return new Promise(function(resolve, reject) {
+            onGetBlobName(id).then(function(blobName) {
+                handler._setThirdPartyFileId(id, blobName);
+                resolve(containerUrl + "/" + blobName);
+            }, reject);
+        });
     }
 
     function getSignedUrl(id, optChunkIdx) {
-        // We may have multiple SAS requests in progress for the same file, so we must include the chunk idx
-        // as part of the ID when communicating with the SAS ajax requester to avoid collisions.
-        var getSasId = optChunkIdx == null ? id : id + "." + optChunkIdx,
-
-            promise = new qq.Promise(),
-            getSasSuccess = function(sasUri) {
-                log("GET SAS request succeeded.");
-                promise.success(sasUri);
-            },
-            getSasFailure = function(reason, getSasXhr) {
-                log("GET SAS request failed: " + reason, "error");
-                promise.failure({error: "Problem communicating with local server"}, getSasXhr);
-            },
-            determineBlobUrlSuccess = function(blobUrl) {
-                api.getSasForPutBlobOrBlock.request(getSasId, blobUrl).then(
-                    getSasSuccess,
-                    getSasFailure
-                );
-            },
-            determineBlobUrlFailure = function(reason) {
-                log(qq.format("Failed to determine blob name for ID {} - {}", id, reason), "error");
-                promise.failure({error: reason});
-            };
-
-        determineBlobUrl(id).then(determineBlobUrlSuccess, determineBlobUrlFailure);
+        return new Promise(function(resolve, reject) {
+            // We may have multiple SAS requests in progress for the same file, so we must include the chunk idx
+            // as part of the ID when communicating with the SAS ajax requester to avoid collisions.
+            var getSasId = optChunkIdx == null ? id : id + "." + optChunkIdx,
+                getSasSuccess = function(sasUri) {
+                    log("GET SAS request succeeded.");
+                    resolve(sasUri);
+                },
+                getSasFailure = function(error) {
+                    log("GET SAS request failed: " + error.message, "error");
+                    reject(error);
+                },
+                determineBlobUrlSuccess = function(blobUrl) {
+                    api.getSasForPutBlobOrBlock.request(getSasId, blobUrl).then(
+                        getSasSuccess,
+                        getSasFailure
+                    );
+                },
+                determineBlobUrlFailure = function(error) {
+                    log(qq.format("Failed to determine blob name for ID {} - {}", id, error.message), "error");
+                    reject(error);
+                };
 
-        return promise;
+            determineBlobUrl(id).then(determineBlobUrlSuccess, determineBlobUrlFailure);
+        });
     }
 
     function handleFailure(xhr, promise) {
@@ -138,68 +128,76 @@ qq.azure.XhrUploadHandler = function(spec, proxy) {
         });
     }
 
+    function buildError(xhr) {
+        var azureError = qq.azure.util.parseAzureError(xhr.responseText, log),
+            errorMsg = "Problem sending file to Azure",
+            error = new Error(errorMsg);
+
+        error.error = errorMsg;
+        error.azureError = azureError && azureError.message;
+        error.reset = xhr.status === 403;
+
+        return error;
+    }
+
     qq.extend(this, {
         uploadChunk: function(params) {
             var chunkIdx = params.chunkIdx;
             var id = params.id;
 
-            var promise = new qq.Promise();
+            return new Promise(function(resolve, reject) {
+                getSignedUrl(id, chunkIdx).then(
+                    function(sasUri) {
+                        var xhr = handler._createXhr(id, chunkIdx),
+                        chunkData = handler._getChunkData(id, chunkIdx);
+
+                        handler._registerProgressHandler(id, chunkIdx, chunkData.size);
+                        handler._registerXhr(id, chunkIdx, xhr, api.putBlock);
+
+                        // We may have multiple put block requests in progress for the same file, so we must include the chunk idx
+                        // as part of the ID when communicating with the put block ajax requester to avoid collisions.
+                        api.putBlock.upload(id + "." + chunkIdx, xhr, sasUri, chunkIdx, chunkData.blob).then(
+                            function(blockIdEntry) {
+                                if (!handler._getPersistableData(id).blockIdEntries) {
+                                    handler._getPersistableData(id).blockIdEntries = [];
+                                }
+
+                                handler._getPersistableData(id).blockIdEntries.push(blockIdEntry);
+                                log("Put Block call succeeded for " + id);
+                                resolve({response: {}, xhr: xhr});
+                            },
+                            function() {
+                                log(qq.format("Put Block call failed for ID {} on part {}", id, chunkIdx), "error");
+                                reject(buildError(xhr));
+                            }
+                        );
+                    },
+                    reject
+                );
+            });
+        },
 
-            getSignedUrl(id, chunkIdx).then(
-                function(sasUri) {
-                    var xhr = handler._createXhr(id, chunkIdx),
-                    chunkData = handler._getChunkData(id, chunkIdx);
+        uploadFile: function(id) {
+            var fileOrBlob = handler.getFile(id);
 
-                    handler._registerProgressHandler(id, chunkIdx, chunkData.size);
-                    handler._registerXhr(id, chunkIdx, xhr, api.putBlock);
+            return new Promise(function(resolve, reject) {
+                getSignedUrl(id).then(function(sasUri) {
+                    var xhr = handler._createXhr(id);
 
-                    // We may have multiple put block requests in progress for the same file, so we must include the chunk idx
-                    // as part of the ID when communicating with the put block ajax requester to avoid collisions.
-                    api.putBlock.upload(id + "." + chunkIdx, xhr, sasUri, chunkIdx, chunkData.blob).then(
-                        function(blockIdEntry) {
-                            if (!handler._getPersistableData(id).blockIdEntries) {
-                                handler._getPersistableData(id).blockIdEntries = [];
-                            }
+                    handler._registerProgressHandler(id);
 
-                            handler._getPersistableData(id).blockIdEntries.push(blockIdEntry);
-                            log("Put Block call succeeded for " + id);
-                            promise.success({}, xhr);
+                    api.putBlob.upload(id, xhr, sasUri, fileOrBlob).then(
+                        function() {
+                            log("Put Blob call succeeded for " + id);
+                            resolve({response: {}, xhr: xhr});
                         },
                         function() {
-                            log(qq.format("Put Block call failed for ID {} on part {}", id, chunkIdx), "error");
-                            handleFailure(xhr, promise);
+                            log("Put Blob call failed for " + id, "error");
+                            reject(buildError(xhr));
                         }
                     );
-                },
-                promise.failure
-            );
-
-            return promise;
-        },
-
-        uploadFile: function(id) {
-            var promise = new qq.Promise(),
-                fileOrBlob = handler.getFile(id);
-
-            getSignedUrl(id).then(function(sasUri) {
-                var xhr = handler._createXhr(id);
-
-                handler._registerProgressHandler(id);
-
-                api.putBlob.upload(id, xhr, sasUri, fileOrBlob).then(
-                    function() {
-                        log("Put Blob call succeeded for " + id);
-                        promise.success({}, xhr);
-                    },
-                    function() {
-                        log("Put Blob call failed for " + id, "error");
-                        handleFailure(xhr, promise);
-                    }
-                );
-            },
-            promise.failure);
-
-            return promise;
+                }, reject);
+            });
         }
     });
 

client/js/azure/get-sas.js

@@ -22,17 +22,22 @@ qq.azure.GetSas = function(o) {
     qq.extend(options, o);
 
     function sasResponseReceived(id, xhr, isError) {
-        var promise = requestPromises[id];
+        var promise = requestPromises[id],
+            error;
 
         if (isError) {
-            promise.failure("Received response code " + xhr.status, xhr);
+            error = new Error("Received response code " + xhr.status);
+            error.xhr = xhr;
+            promise.reject(error);
         }
         else {
             if (xhr.responseText.length) {
-                promise.success(xhr.responseText);
+                promise.resolve(xhr.responseText);
             }
             else {
-                promise.failure("Empty response.", xhr);
+                error = new Error("Empty response.");
+                error.xhr = xhr;
+                promise.reject(error);
             }
         }
 
@@ -56,22 +61,21 @@ qq.azure.GetSas = function(o) {
 
     qq.extend(this, {
         request: function(id, blobUri) {
-            var requestPromise = new qq.Promise(),
-                restVerb = options.restRequestVerb;
+            return new Promise(function(resolve, reject) {
+                var restVerb = options.restRequestVerb;
 
-            options.log(qq.format("Submitting GET SAS request for a {} REST request related to file ID {}.", restVerb, id));
+                options.log(qq.format("Submitting GET SAS request for a {} REST request related to file ID {}.", restVerb, id));
 
-            requestPromises[id] = requestPromise;
+                requestPromises[id] = {resolve: resolve, reject: reject};
 
-            requester.initTransport(id)
-                .withParams({
-                    bloburi: blobUri,
-                    _method: restVerb
-                })
-                .withCacheBuster()
-                .send();
-
-            return requestPromise;
+                requester.initTransport(id)
+                    .withParams({
+                        bloburi: blobUri,
+                        _method: restVerb
+                    })
+                    .withCacheBuster()
+                    .send();
+            });
         }
     });
 };

client/js/azure/rest/put-blob.js

@@ -51,30 +51,28 @@ qq.azure.PutBlob = function(o) {
             delete promises[id];
 
             if (isError) {
-                promise.failure();
+                promise.reject();
             }
             else {
-                promise.success();
+                promise.resolve();
             }
         }
     }));
 
     qq.extend(this, {
         method: method,
         upload: function(id, xhr, url, file) {
-            var promise = new qq.Promise();
+            return new Promise(function(resolve, reject) {
+                options.log("Submitting Put Blob request for " + id);
 
-            options.log("Submitting Put Blob request for " + id);
+                promises[id] = {resolve: resolve, reject: reject};
+                endpoints[id] = url;
 
-            promises[id] = promise;
-            endpoints[id] = url;
-
-            requester.initTransport(id)
-                .withPayload(file)
-                .withHeaders({"Content-Type": file.type})
-                .send(xhr);
-
-            return promise;
+                requester.initTransport(id)
+                    .withPayload(file)
+                    .withHeaders({"Content-Type": file.type})
+                    .send(xhr);
+            });
         }
     });
 };