Added coroutine middleware support.

hprose · Dec 5, 2016 · 48e7925 · 48e7925
1 parent 1c11d24
commit 48e7925
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 37 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.30",
+    "version": "2.0.31",
     "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.30
+// Hprose for HTML5 v2.0.31
 // Copyright (c) 2008-2016 http://hprose.com
 // Hprose is freely distributable under the MIT license.
 // For all details and documentation:
@@ -1098,7 +1098,7 @@ hprose.global = (
  *                                                        *
  * hprose Future for HTML5.                               *
  *                                                        *
- * LastModified: Nov 24, 2016                             *
+ * LastModified: Dec 5, 2016                              *
  * Author: Ma Bingyao <andot@hprose.com>                  *
  *                                                        *
 \**********************************************************/
@@ -1398,7 +1398,7 @@ hprose.global = (
         }
 
         if (!gen || typeof gen.next !== 'function') {
-            return toPromise(gen);
+            return toFuture(gen);
         }
 
         var future = new Future();
@@ -4061,7 +4061,7 @@ hprose.global = (
  *                                                        *
  * hprose client for HTML5.                               *
  *                                                        *
- * LastModified: Nov 18, 2016                             *
+ * LastModified: Dec 5, 2016                              *
  * Author: Ma Bingyao <andot@hprose.com>                  *
  *                                                        *
 \**********************************************************/
@@ -5099,9 +5099,7 @@ hprose.global = (
             _invokeHandler = _invokeHandlers.reduceRight(
             function(next, handler) {
                 return function(name, args, context) {
-                    return Future.sync(function() {
-                        return handler(name, args, context, next);
-                    });
+                    return Future.toPromise(handler(name, args, context, next));
                 };
             }, invokeHandler);
         }
@@ -5110,9 +5108,7 @@ hprose.global = (
             _batchInvokeHandler = _batchInvokeHandlers.reduceRight(
             function(next, handler) {
                 return function(batches, context) {
-                    return Future.sync(function() {
-                        return handler(batches, context, next);
-                    });
+                    return Future.toPromise(handler(batches, context, next));
                 };
             }, batchInvokeHandler);
         }
@@ -5121,9 +5117,7 @@ hprose.global = (
             _beforeFilterHandler = _beforeFilterHandlers.reduceRight(
             function(next, handler) {
                 return function(request, context) {
-                    return Future.sync(function() {
-                        return handler(request, context, next);
-                    });
+                    return Future.toPromise(handler(request, context, next));
                 };
             }, beforeFilterHandler);
         }
@@ -5132,9 +5126,7 @@ hprose.global = (
             _afterFilterHandler = _afterFilterHandlers.reduceRight(
             function(next, handler) {
                 return function(request, context) {
-                    return Future.sync(function() {
-                        return handler(request, context, next);
-                    });
+                    return Future.toPromise(handler(request, context, next));
                 };
             }, afterFilterHandler);
         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hprose-html5",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Hprose is a High Performance Remote Object Service Engine.",
   "homepage": "https://github.com/hprose/hprose-html5",
   "keywords": [

diff --git a/src/Client.js b/src/Client.js
@@ -12,7 +12,7 @@
  *                                                        *
  * hprose client for HTML5.                               *
  *                                                        *
- * LastModified: Nov 18, 2016                             *
+ * LastModified: Dec 5, 2016                              *
  * Author: Ma Bingyao <andot@hprose.com>                  *
  *                                                        *
 \**********************************************************/
@@ -1050,9 +1050,7 @@
             _invokeHandler = _invokeHandlers.reduceRight(
             function(next, handler) {
                 return function(name, args, context) {
-                    return Future.sync(function() {
-                        return handler(name, args, context, next);
-                    });
+                    return Future.toPromise(handler(name, args, context, next));
                 };
             }, invokeHandler);
         }
@@ -1061,9 +1059,7 @@
             _batchInvokeHandler = _batchInvokeHandlers.reduceRight(
             function(next, handler) {
                 return function(batches, context) {
-                    return Future.sync(function() {
-                        return handler(batches, context, next);
-                    });
+                    return Future.toPromise(handler(batches, context, next));
                 };
             }, batchInvokeHandler);
         }
@@ -1072,9 +1068,7 @@
             _beforeFilterHandler = _beforeFilterHandlers.reduceRight(
             function(next, handler) {
                 return function(request, context) {
-                    return Future.sync(function() {
-                        return handler(request, context, next);
-                    });
+                    return Future.toPromise(handler(request, context, next));
                 };
             }, beforeFilterHandler);
         }
@@ -1083,9 +1077,7 @@
             _afterFilterHandler = _afterFilterHandlers.reduceRight(
             function(next, handler) {
                 return function(request, context) {
-                    return Future.sync(function() {
-                        return handler(request, context, next);
-                    });
+                    return Future.toPromise(handler(request, context, next));
                 };
             }, afterFilterHandler);
         }

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