@arcblock/ws 1.16.15 → 1.17.0

package/lib/server/index.js

@@ -1,13 +1,16 @@
 const EventEmitter = require('events');
 const cluster = require('cluster');
 
-const uuid = require('uuid');
+const { nanoid } = require('nanoid');
 const WebSocket = require('ws');
 const eventHub = cluster.isMaster ? require('@arcblock/event-hub/single') : require('@arcblock/event-hub');
 
 const createLogger = require('../logger');
 
-const sleep = (timeout) => new Promise((resolve) => setTimeout(resolve, timeout));
+const sleep = (timeout) =>
+  new Promise((resolve) => {
+    setTimeout(resolve, timeout);
+  });
 
 const reply = (socket, topic, event, response, status = 'ok') => {
   if (socket.readyState === WebSocket.OPEN) {
@@ -74,6 +77,7 @@ class WsServer extends EventEmitter {
     const { pathname } = new URL(request.url, `http://${request.headers.host || 'unknown'}`);
     this.logger.debug('connect attempt', { pathname });
     if (this.pathname && pathname !== this.pathname) {
+      socket.write('HTTP/1.1 404 Pathname mismatch\r\n\r\n');
       socket.destroy();
       return;
     }
@@ -128,7 +132,7 @@ class WsServer extends EventEmitter {
     }
 
     const enableLog = options.enableLog !== undefined ? !!options.enableLog : true;
-    const replyId = uuid.v4();
+    const replyId = nanoid();
 
     // Count of clients what will receive the message
     // The count is NOT reliable
@@ -239,7 +243,7 @@ class WsServer extends EventEmitter {
    * @param {socket} socket
    */
   async onWssConnection(socket) {
-    socket.id = uuid.v4();
+    socket.id = nanoid();
     refreshHeartbeat(socket);
     this.logger.debug('socket connected', { id: socket.id });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ws",
-  "version": "1.16.15",
+  "version": "1.17.0",
   "description": "OCAP Chain websocket server and client",
   "keywords": [
     "websocket"
@@ -34,15 +34,15 @@
     "url": "https://github.com/ArcBlock/asset-chain/issues"
   },
   "dependencies": {
-    "@arcblock/event-hub": "1.16.15",
+    "@arcblock/event-hub": "1.17.0",
     "debug": "^4.3.3",
     "eventemitter3": "^4.0.4",
+    "nanoid": "3.x",
     "phoenix": "1.5.12",
-    "uuid": "^8.3.0",
     "ws": "^8.2.2"
   },
   "devDependencies": {
     "get-port": "^5.1.1"
   },
-  "gitHead": "dac591c5ba14e0cac5cc7b2e9c015ea9fa8333d7"
+  "gitHead": "f0944b60a5fb4115e1a3727bb07f68174bc56c5c"
 }