Merge pull request #9 from imagekit-developer/feature/timeout

authentication endpoint timeout and URLSearchParams bug in react native

Author: imagekitio

dist/imagekit-min.js

@@ -190,10 +190,10 @@ module.exports.buildURL = function(opts) {
 
     var queryParameters = new URLSearchParams(parsedURL.query || "");
     if(opts.sdkVersion && opts.sdkVersion.trim() != "") {
-        queryParameters.set("ik-sdk-version", opts.sdkVersion.trim());
+        queryParameters.append("ik-sdk-version", opts.sdkVersion.trim());
     }
     for(var i in opts.queryParameters) {
-        queryParameters.set(i, opts.queryParameters[i]);
+        queryParameters.append(i, opts.queryParameters[i]);
     }
 
     //Initial URL Construction Object
@@ -213,7 +213,7 @@ module.exports.buildURL = function(opts) {
         //force that if src parameter is being used for URL construction then the transformation
         //string should be added only as a query parameter
         if(transformationUtils.addAsQueryParameter(opts) || isSrcParameterUsedForURL) {
-            queryParameters.set(TRANSFORMATION_PARAMETER, transformationString);   
+            queryParameters.append(TRANSFORMATION_PARAMETER, transformationString);   
         } else {
             urlObject.pathname = path.join(
                                     [TRANSFORMATION_PARAMETER, transformationString].join(transformationUtils.getChainTransformDelimiter()),
@@ -3709,7 +3709,12 @@ function request (formData, defaultOptions, callback) {
 
 function _generateSignatureToken(defaultOptions, callback) {
     var xhr = new XMLHttpRequest();
+    xhr.timeout = 60000;
     xhr.open('GET', defaultOptions.authenticationEndpoint);
+    xhr.ontimeout = function (e) {
+        if(typeof callback != "function") return;
+        callback("The authenticationEndpoint you provided timed out in 60 seconds");
+    };
     xhr.onload = function() {
         if (xhr.status === 200) {
             try {

dist/imagekit.js

@@ -31,10 +31,10 @@ module.exports.buildURL = function(opts) {
 
     var queryParameters = new URLSearchParams(parsedURL.query || "");
     if(opts.sdkVersion && opts.sdkVersion.trim() != "") {
-        queryParameters.set("ik-sdk-version", opts.sdkVersion.trim());
+        queryParameters.append("ik-sdk-version", opts.sdkVersion.trim());
     }
     for(var i in opts.queryParameters) {
-        queryParameters.set(i, opts.queryParameters[i]);
+        queryParameters.append(i, opts.queryParameters[i]);
     }
 
     //Initial URL Construction Object
@@ -54,7 +54,7 @@ module.exports.buildURL = function(opts) {
         //force that if src parameter is being used for URL construction then the transformation
         //string should be added only as a query parameter
         if(transformationUtils.addAsQueryParameter(opts) || isSrcParameterUsedForURL) {
-            queryParameters.set(TRANSFORMATION_PARAMETER, transformationString);   
+            queryParameters.append(TRANSFORMATION_PARAMETER, transformationString);   
         } else {
             urlObject.pathname = path.join(
                                     [TRANSFORMATION_PARAMETER, transformationString].join(transformationUtils.getChainTransformDelimiter()),

libs/url/builder.js

@@ -1,6 +1,6 @@
 {
     "name": "imagekit-javascript",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "description": "Javascript SDK for using ImageKit.io in the browser",
     "main": "dist/imagekit-min.js",
     "dependencies": {

package.json

@@ -25,7 +25,12 @@ function request (formData, defaultOptions, callback) {
 
 function _generateSignatureToken(defaultOptions, callback) {
     var xhr = new XMLHttpRequest();
+    xhr.timeout = 60000;
     xhr.open('GET', defaultOptions.authenticationEndpoint);
+    xhr.ontimeout = function (e) {
+        if(typeof callback != "function") return;
+        callback("The authenticationEndpoint you provided timed out in 60 seconds");
+    };
     xhr.onload = function() {
         if (xhr.status === 200) {
             try {