@arcblock/ws 1.18.73 → 1.18.74

package/lib/server/index.js

@@ -13,9 +13,9 @@ const sleep = (timeout) =>
     setTimeout(resolve, timeout);
   });
 
-const reply = (socket, topic, event, response, status = 'ok') => {
-  if (socket.readyState === WebSocket.OPEN) {
-    const res = JSON.stringify([socket.joinRef, socket.ref, topic, event, { status, response }]);
+const reply = ({ socket, topic, event, data, status = 'ok', ref = '', joinRef = '' }) => {
+  if (socket.readyState === WebSocket.OPEN && socket.channel[topic]) {
+    const res = JSON.stringify([joinRef, ref, topic, event, { status, response: data }]);
     socket.send(res);
   }
 };
@@ -199,7 +199,7 @@ class WsServer extends EventEmitter {
           if (enableLog) {
             this.logger.info('broadcast message to', { topic, event, id: socket.id });
           }
-          reply(socket, topic, event, data);
+          reply({ socket, topic, event, data });
         });
       }
 
@@ -253,7 +253,7 @@ class WsServer extends EventEmitter {
       this.logger.info('send message to', { topic, event, id: socket.id });
     }
 
-    reply(socket, topic, event, data);
+    reply({ socket, topic, event, data });
 
     try {
       await this.hooks.postSend({ topic, event, data, options });
@@ -269,13 +269,13 @@ class WsServer extends EventEmitter {
    */
   async onWssConnection(socket) {
     socket.id = nanoid();
-    socket.channel = {};
+    socket.channel = {}; // This should be renamed to channels
 
     refreshHeartbeat(socket);
     this.logger.debug('socket connected', { id: socket.id });
 
     socket.on('message', async (msg) => {
-      this.logger.debug('socket onmessage', { msg });
+      this.logger.debug('socket onmessage', msg.toString());
       let joinRef;
       let ref;
       let topic;
@@ -293,12 +293,9 @@ class WsServer extends EventEmitter {
         return;
       }
 
-      socket.joinRef = joinRef;
-      socket.ref = ref;
-
       if (topic === 'phoenix' && event === 'heartbeat') {
         // heartbeat
-        reply(socket, topic, event);
+        reply({ socket, topic, event, ref });
         refreshHeartbeat(socket);
         return;
       }
@@ -308,14 +305,20 @@ class WsServer extends EventEmitter {
         try {
           const authInfo = await this.hooks.authenticateJoinChannel({ socket, joinRef, ref, topic, event, payload });
           await this.hooks.preJoinChannel({ socket, joinRef, ref, topic, event, payload });
-
-          socket.channel[topic] = {};
-          socket.channel[topic].authInfo = authInfo;
+          socket.channel[topic] = { authInfo };
         } catch (error) {
           if (!this.skipLogOnHookError) {
             this.logger.error('preJoinChannel error', { error });
           }
-          reply(socket, topic, `chan_reply_${ref}`, { message: error.message }, 'error');
+          reply({
+            socket,
+            topic,
+            event: `chan_reply_${ref}`,
+            data: { message: error.message },
+            status: 'error',
+            ref,
+            joinRef,
+          });
           return;
         }
 
@@ -325,7 +328,13 @@ class WsServer extends EventEmitter {
         }
         this.topics[topic].add(socket);
 
-        reply(socket, topic, `chan_reply_${ref}`);
+        reply({
+          socket,
+          topic,
+          event: `chan_reply_${ref}`,
+          ref,
+          joinRef,
+        });
         this.emit('channel.join', { socket, topic, event, payload });
 
         // post hook
@@ -348,13 +357,27 @@ class WsServer extends EventEmitter {
           if (!this.skipLogOnHookError) {
             this.logger.error('preLeaveChannel error', { error });
           }
-          reply(socket, topic, `chan_reply_${ref}`, { message: error.message }, 'error');
+          reply({
+            socket,
+            topic,
+            event: `chan_reply_${ref}`,
+            data: { message: error.message },
+            status: 'error',
+            ref,
+            joinRef,
+          });
           return;
         }
 
         // leave
         this._leaveChannel(socket, topic);
-        reply(socket, topic, `chan_reply_${ref}`);
+        reply({
+          socket,
+          topic,
+          event: `chan_reply_${ref}`,
+          ref,
+          joinRef,
+        });
 
         // post hook
         try {
@@ -375,11 +398,26 @@ class WsServer extends EventEmitter {
         if (!this.skipLogOnHookError) {
           this.logger.error('receiveMessage error', { error });
         }
-        reply(socket, topic, `chan_reply_${ref}`, { message: error.message }, 'error');
+        reply({
+          socket,
+          topic,
+          event: `chan_reply_${ref}`,
+          data: { message: error.message },
+          status: 'error',
+          ref,
+          joinRef,
+        });
         return;
       }
 
-      reply(socket, topic, `chan_reply_${ref}`, {});
+      reply({
+        socket,
+        topic,
+        event: `chan_reply_${ref}`,
+        data: {},
+        ref,
+        joinRef,
+      });
     });
 
     socket.on('close', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ws",
-  "version": "1.18.73",
+  "version": "1.18.74",
   "description": "OCAP Chain websocket server and client",
   "keywords": [
     "websocket"
@@ -34,16 +34,16 @@
     "url": "https://github.com/ArcBlock/asset-chain/issues"
   },
   "dependencies": {
-    "@arcblock/event-hub": "1.18.73",
+    "@arcblock/event-hub": "1.18.74",
     "debug": "^4.3.4",
     "eventemitter3": "^4.0.7",
     "lodash": "^4.17.21",
     "nanoid": "~3.3.4",
-    "phoenix": "1.5.12",
+    "phoenix": "1.7.2",
     "ws": "^8.9.0"
   },
   "devDependencies": {
     "get-port": "^5.1.1"
   },
-  "gitHead": "d33cc33687903ca7d473547c04fe6c6363c60609"
+  "gitHead": "87ab9471b0de6669100b56138193ec1705a97fb2"
 }