Improved WebSocketClient

hprose · Nov 17, 2016 · 0245b17 · 0245b17
1 parent fba04a4
commit 0245b17
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 24 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.24",
+    "version": "2.0.25",
     "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.24
+// Hprose for HTML5 v2.0.25
 // Copyright (c) 2008-2016 http://hprose.com
 // Hprose is freely distributable under the MIT license.
 // For all details and documentation:
@@ -5475,7 +5475,7 @@
  *                                                        *
  * hprose websocket client for HTML5.                     *
  *                                                        *
- * LastModified: Sep 29, 2016                             *
+ * LastModified: Nov 18, 2016                             *
  * Author: Ma Bingyao <andot@hprose.com>                  *
  *                                                        *
 \**********************************************************/
@@ -5573,11 +5573,6 @@
             ws.onclose = onclose;
         }
         function sendAndReceive(request, env) {
-            if (ws === null ||
-                ws.readyState === WebSocket.CLOSING ||
-                ws.readyState === WebSocket.CLOSED) {
-                connect();
-            }
             var id = getNextId();
             var future = new Future();
             _futures[id] = future;
@@ -5591,6 +5586,11 @@
                     return e instanceof TimeoutError;
                 });
             }
+            if (ws === null ||
+                ws.readyState === WebSocket.CLOSING ||
+                ws.readyState === WebSocket.CLOSED) {
+                connect();
+            }
             if (_count < 100) {
                 ++_count;
                 _ready.then(function() { send(id, request); });

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hprose-html5",
   "filename": "hprose-html5.js",
-  "version": "2.0.24",
+  "version": "2.0.25",
   "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.24
+// Hprose for HTML5 v2.0.25
 // Copyright (c) 2008-2016 http://hprose.com
 // Hprose is freely distributable under the MIT license.
 // For all details and documentation:

diff --git a/src/WebSocketClient.js b/src/WebSocketClient.js
@@ -12,7 +12,7 @@
  *                                                        *
  * hprose websocket client for HTML5.                     *
  *                                                        *
- * LastModified: Nov 16, 2016                             *
+ * LastModified: Nov 18, 2016                             *
  * Author: Ma Bingyao <andot@hprose.com>                  *
  *                                                        *
 \**********************************************************/
@@ -101,6 +101,7 @@
             ws = null;
         }
         function connect() {
+            _ready = new Future();
             ws = new WebSocket(self.uri);
             ws.binaryType = 'arraybuffer';
             ws.onopen = onopen;
@@ -109,11 +110,6 @@
             ws.onclose = onclose;
         }
         function sendAndReceive(request, env) {
-            if (ws === null ||
-                ws.readyState === WebSocket.CLOSING ||
-                ws.readyState === WebSocket.CLOSED) {
-                _ready = new Future();
-            }
             var id = getNextId();
             var future = new Future();
             _futures[id] = future;
@@ -127,18 +123,18 @@
                     return e instanceof TimeoutError;
                 });
             }
+            if (ws === null ||
+                ws.readyState === WebSocket.CLOSING ||
+                ws.readyState === WebSocket.CLOSED) {
+                connect();
+            }
             if (_count < 100) {
                 ++_count;
                 _ready.then(function() { send(id, request); });
             }
             else {
                 _requests.push([id, request]);
             }
-            if (ws === null ||
-                ws.readyState === WebSocket.CLOSING ||
-                ws.readyState === WebSocket.CLOSED) {
-                connect();
-            }
             if (env.oneway) { future.resolve(); }
             return future;
         }