@arcblock/ws 1.17.18 → 1.17.20

package/lib/server/index.js

@@ -134,23 +134,29 @@ class WsServer extends EventEmitter {
     }
 
     const enableLog = options.enableLog !== undefined ? !!options.enableLog : true;
-    const { socketFilters } = options;
+    const { socketFilters, noCluster } = options;
     const replyId = nanoid();
 
     // Count of clients what will receive the message
     // The count is NOT reliable
     let count = 0;
-    eventHub.on(replyId, ({ count: c } = {}) => {
-      if (c) {
-        count += c;
-      }
-    });
 
-    eventHub.broadcast(this.broadcastEventName, { topic, event, data, options, enableLog, replyId, socketFilters });
+    if (noCluster) {
+      const { count: c } = this._doBroadCast({ topic, event, data, enableLog, socketFilters });
+      count = c;
+    } else {
+      eventHub.on(replyId, ({ count: c } = {}) => {
+        if (c) {
+          count += c;
+        }
+      });
+
+      eventHub.broadcast(this.broadcastEventName, { topic, event, data, options, enableLog, replyId, socketFilters });
 
-    // wait 600ms for message sending by each process
-    await sleep(600);
-    eventHub.off(replyId);
+      // wait 600ms for message sending by each process
+      await sleep(600);
+      eventHub.off(replyId);
+    }
 
     const opts = { count, topic, event, data, options };
     cb(opts);
@@ -201,8 +207,11 @@ class WsServer extends EventEmitter {
       if (count > 0 && replyId) {
         eventHub.broadcast(replyId, { count });
       }
+
+      return { count };
     } catch (error) {
       this.logger.error('_doBroadcast error', { error });
+      return { error };
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ws",
-  "version": "1.17.18",
+  "version": "1.17.20",
   "description": "OCAP Chain websocket server and client",
   "keywords": [
     "websocket"
@@ -34,7 +34,7 @@
     "url": "https://github.com/ArcBlock/asset-chain/issues"
   },
   "dependencies": {
-    "@arcblock/event-hub": "1.17.18",
+    "@arcblock/event-hub": "1.17.20",
     "debug": "^4.3.4",
     "eventemitter3": "^4.0.7",
     "lodash": "^4.17.21",
@@ -45,5 +45,5 @@
   "devDependencies": {
     "get-port": "^5.1.1"
   },
-  "gitHead": "103fab8c32e816f494b9a486e27804b91ca290b4"
+  "gitHead": "daa53f1bec6b2f06f73b50fc8de91caa1d625611"
 }