@arcblock/ws 1.18.74 → 1.18.76

package/lib/server/index.js

@@ -13,8 +13,8 @@ const sleep = (timeout) =>
     setTimeout(resolve, timeout);
   });
 
-const reply = ({ socket, topic, event, data, status = 'ok', ref = '', joinRef = '' }) => {
-  if (socket.readyState === WebSocket.OPEN && socket.channel[topic]) {
+const reply = ({ socket, topic, event, data = {}, status = 'ok', ref = '', joinRef = '' }) => {
+  if (socket.readyState === WebSocket.OPEN) {
     const res = JSON.stringify([joinRef, ref, topic, event, { status, response: data }]);
     socket.send(res);
   }
@@ -328,13 +328,7 @@ class WsServer extends EventEmitter {
         }
         this.topics[topic].add(socket);
 
-        reply({
-          socket,
-          topic,
-          event: `chan_reply_${ref}`,
-          ref,
-          joinRef,
-        });
+        reply({ socket, topic, event: `chan_reply_${ref}`, ref, joinRef });
         this.emit('channel.join', { socket, topic, event, payload });
 
         // post hook
@@ -371,13 +365,7 @@ class WsServer extends EventEmitter {
 
         // leave
         this._leaveChannel(socket, topic);
-        reply({
-          socket,
-          topic,
-          event: `chan_reply_${ref}`,
-          ref,
-          joinRef,
-        });
+        reply({ socket, topic, event: `chan_reply_${ref}`, ref, joinRef });
 
         // post hook
         try {
@@ -410,14 +398,7 @@ class WsServer extends EventEmitter {
         return;
       }
 
-      reply({
-        socket,
-        topic,
-        event: `chan_reply_${ref}`,
-        data: {},
-        ref,
-        joinRef,
-      });
+      reply({ socket, topic, event: `chan_reply_${ref}`, ref, joinRef });
     });
 
     socket.on('close', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ws",
-  "version": "1.18.74",
+  "version": "1.18.76",
   "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.18.74",
+    "@arcblock/event-hub": "1.18.76",
     "debug": "^4.3.4",
     "eventemitter3": "^4.0.7",
     "lodash": "^4.17.21",
@@ -45,5 +45,5 @@
   "devDependencies": {
     "get-port": "^5.1.1"
   },
-  "gitHead": "87ab9471b0de6669100b56138193ec1705a97fb2"
+  "gitHead": "5a69ad290c7b3e1c0b498e7f733a317ea400a578"
 }