Fix: websocket app

eslint.config.mjs

@@ -24,7 +24,7 @@ export default [...compat.extends("eslint:recommended"), {
             beforeEach: true,
         },
 
-        ecmaVersion: 2018,
+        ecmaVersion: 2020,
         sourceType: "commonjs",
 
         parserOptions: {

examples/websocket.server.js

@@ -1,3 +1,4 @@
+const { debug } = require('@axiosleo/cli-tool');
 const { WebSocketApplication } = require('../src/apps');
 const root = require('./api.router');
 
@@ -11,4 +12,10 @@ const app = new WebSocketApplication({
   }
 });
 
+setInterval(() => {
+  debug.log('send message');
+  const res = app.broadcast('Hello, world!', 'ok', 0, null);
+  debug.log('send message result:', res);
+}, 1000);
+
 app.start();

index.d.ts

@@ -580,6 +580,8 @@ export interface WebSocketContext<
   TBody = any,
   TQuery = any,
 > extends AppContext<TParams, TBody, TQuery> {
+  /** Connection ID */
+  connection_id: string;
   /** Route parameters */
   params?: TParams;
   /** Application configuration */
@@ -1349,6 +1351,29 @@ export declare class WebSocketApplication extends Application {
     code?: number,
     connections?: WebSocket[],
   ): void;
+
+  /**
+   * Send data to a specific connection
+   * @param connection Connection to send to
+   * @param data Data to send
+   * @param msg Message
+   * @param code Status code
+   */
+  send(connection: WebSocket, data?: any, msg?: string, code?: number): boolean;
+
+  /**
+   * Send data to a specific connection by connection ID
+   * @param connection_id Connection ID to send to
+   * @param data Data to send
+   * @param msg Message
+   * @param code Status code
+   */
+  sendByConnectionId(
+    connection_id: string,
+    data?: any,
+    msg?: string,
+    code?: number,
+  ): boolean;
 }
 
 // ========================================

src/apps/websocket.js

@@ -16,16 +16,19 @@ const { _sleep } = require('@axiosleo/cli-tool/src/helper/cmd');
  * @param {{request: import('http').IncomingMessage}} param0 
  * @returns 
  */
-const dispatcher = ({ app, app_id, workflow, connection, request }) => {
+const dispatcher = ({ app, app_id, workflow, connection_id, connection, request }) => {
   return async (ctx) => {
-    const url = new URL(request.url, `ws://localhost:${app.port}`);
+    const host = request.headers.host || `localhost:${app.port}`;
+    const protocol = request.headers['x-forwarded-proto'] === 'https' ? 'wss' : 'ws';
+    const url = new URL(request.url, `${protocol}://${host}`);
     let context = initContext({
       app,
       method: request.method ? request.method.toUpperCase() : 'GET',
       pathinfo: url.pathname,
       app_id,
     });
     context.socket = connection;
+    context.connection_id = connection_id;
     context.query = Object.fromEntries(url.searchParams);
     context.body = ctx || {};
     context.headers = request.headers;
@@ -116,6 +119,7 @@ class WebSocketApplication extends Application {
             app_id: self.app_id,
             workflow: self.workflow,
             connection: ws,
+            connection_id,
             request
           });
           process.nextTick(callback, context);
@@ -168,6 +172,29 @@ class WebSocketApplication extends Application {
       Object.keys(connections).map((id) => connections[id].send(data));
     }
   }
+
+  send(connection = null, data = '', msg = 'ok', code = 0) {
+    data = JSON.stringify({
+      request_id: _uuid_salt(this.app_id),
+      timestamp: (new Date()).getTime(),
+      code,
+      message: msg,
+      data: data
+    });
+    if (connection) {
+      connection.send(data);
+      return true;
+    }
+    return false;
+  }
+
+  sendByConnectionId(connection_id = null, data = '', msg = 'ok', code = 0) {
+    if (connection_id) {
+      this.send(this.connections[connection_id], data, msg, code);
+      return true;
+    }
+    return false;
+  }
 }
 
 module.exports = WebSocketApplication;