Improved thunk & promisify

hprose · Nov 19, 2016 · 715bdcc · 715bdcc
1 parent 181424d
commit 715bdcc
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 75 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "author": "Ma Bingyao <andot@hprose.com>",
     "name": "hprose-html5",
-    "version": "2.0.27",
+    "version": "2.0.28",
     "description": "Hprose is a High Performance Remote Object Service Engine.",
     "keywords": [
         "hprose",

diff --git a/dist/hprose-html5.js b/dist/hprose-html5.js
diff --git a/dist/hprose-html5.min.js b/dist/hprose-html5.min.js
diff --git a/dist/hprose-html5.src.js b/dist/hprose-html5.src.js
@@ -1,4 +1,4 @@
-// Hprose for HTML5 v2.0.27
+// Hprose for HTML5 v2.0.28
 // Copyright (c) 2008-2016 http://hprose.com
 // Hprose is freely distributable under the MIT license.
 // For all details and documentation:
@@ -1309,27 +1309,36 @@ hprose.global = (
         return isGenerator(constructor.prototype);
     }
 
+    function getThunkCallback(future) {
+        return function(err, res) {
+            if (err instanceof Error) {
+                return future.reject(err);
+            }
+            if (arguments.length < 2) {
+                return future.resolve(err);
+            }
+            if (err === null || err === undefined) {
+                res = Array.slice(arguments, 1);
+            }
+            else {
+                res = Array.slice(arguments, 0);
+            }
+            if (res.length == 1) {
+                future.resolve(res[0]);
+            }
+            else {
+                future.resolve(res);
+            }
+        };
+    }
+
     function thunkToPromise(fn) {
         if (isGeneratorFunction(fn) || isGenerator(fn)) {
             return co(fn);
         }
         var thisArg = (function() { return this; })();
         var future = new Future();
-        fn.call(thisArg, function(err, res) {
-            if (arguments.length < 2) {
-                if (err instanceof Error) {
-                    return future.reject(err);
-                }
-                return future.resolve(err);
-            }
-            if (err) {
-                return future.reject(err);
-            }
-            if (arguments.length > 2) {
-                res = Array.slice(arguments, 1);
-            }
-            future.resolve(res);
-        });
+        fn.call(thisArg, getThunkCallback(future));
         return future;
     }
 
@@ -1359,29 +1368,15 @@ hprose.global = (
     function promisify(fn) {
         return function() {
             var args = Array.slice(arguments, 0);
-            var results = new Future();
-            args.push(function(err, res) {
-                if (arguments.length < 2) {
-                    if (err instanceof Error) {
-                        return results.reject(err);
-                    }
-                    return results.resolve(err);
-                }
-                if (err) {
-                    return results.reject(err);
-                }
-                if (arguments.length > 2) {
-                    res = Array.slice(arguments, 1);
-                }
-                results.resolve(res);
-            });
+            var future = new Future();
+            args.push(getThunkCallback(future));
             try {
                 fn.apply(this, args);
             }
             catch (err) {
-                results.reject(err);
+                future.reject(err);
             }
-            return results;
+            return future;
         };
     }
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hprose-html5",
   "filename": "hprose-html5.js",
-  "version": "2.0.27",
+  "version": "2.0.28",
   "description": "Hprose is a High Performance Remote Object Service Engine.",
   "homepage": "https://github.com/andot/hprose",
   "keywords": [

diff --git a/src/CopyRight.js b/src/CopyRight.js
@@ -1,4 +1,4 @@
-// Hprose for HTML5 v2.0.27
+// Hprose for HTML5 v2.0.28
 // Copyright (c) 2008-2016 http://hprose.com
 // Hprose is freely distributable under the MIT license.
 // For all details and documentation:

diff --git a/src/Future.js b/src/Future.js
@@ -224,27 +224,36 @@
         return isGenerator(constructor.prototype);
     }
 
+    function getThunkCallback(future) {
+        return function(err, res) {
+            if (err instanceof Error) {
+                return future.reject(err);
+            }
+            if (arguments.length < 2) {
+                return future.resolve(err);
+            }
+            if (err === null || err === undefined) {
+                res = Array.slice(arguments, 1);
+            }
+            else {
+                res = Array.slice(arguments, 0);
+            }
+            if (res.length == 1) {
+                future.resolve(res[0]);
+            }
+            else {
+                future.resolve(res);
+            }
+        };
+    }
+
     function thunkToPromise(fn) {
         if (isGeneratorFunction(fn) || isGenerator(fn)) {
             return co(fn);
         }
         var thisArg = (function() { return this; })();
         var future = new Future();
-        fn.call(thisArg, function(err, res) {
-            if (arguments.length < 2) {
-                if (err instanceof Error) {
-                    return future.reject(err);
-                }
-                return future.resolve(err);
-            }
-            if (err) {
-                return future.reject(err);
-            }
-            if (arguments.length > 2) {
-                res = Array.slice(arguments, 1);
-            }
-            future.resolve(res);
-        });
+        fn.call(thisArg, getThunkCallback(future));
         return future;
     }
 
@@ -274,29 +283,15 @@
     function promisify(fn) {
         return function() {
             var args = Array.slice(arguments, 0);
-            var results = new Future();
-            args.push(function(err, res) {
-                if (arguments.length < 2) {
-                    if (err instanceof Error) {
-                        return results.reject(err);
-                    }
-                    return results.resolve(err);
-                }
-                if (err) {
-                    return results.reject(err);
-                }
-                if (arguments.length > 2) {
-                    res = Array.slice(arguments, 1);
-                }
-                results.resolve(res);
-            });
+            var future = new Future();
+            args.push(getThunkCallback(future));
             try {
                 fn.apply(this, args);
             }
             catch (err) {
-                results.reject(err);
+                future.reject(err);
             }
-            return results;
+            return future;
         };
     }