@nocobase/server 1.6.0-alpha.9 → 1.6.0-beta.2

package/lib/application.js

@@ -373,10 +373,7 @@ const _Application = class _Application extends import_koa.default {
     this._loaded = false;
   }
   async createCacheManager() {
-    this._cacheManager = await (0, import_cache2.createCacheManager)(this, {
-      prefix: this.name,
-      ...this.options.cacheManager
-    });
+    this._cacheManager = await (0, import_cache2.createCacheManager)(this, this.options.cacheManager);
     return this._cacheManager;
   }
   async load(options) {

package/lib/gateway/index.js

@@ -66,6 +66,14 @@ var import_ws_server = require("./ws-server");
 var import_node_worker_threads = require("node:worker_threads");
 var import_node_process = __toESM(require("node:process"));
 const compress = (0, import_node_util.promisify)((0, import_compression.default)());
+function getSocketPath() {
+  const { SOCKET_PATH } = import_node_process.default.env;
+  if ((0, import_path.isAbsolute)(SOCKET_PATH)) {
+    return SOCKET_PATH;
+  }
+  return (0, import_path.resolve)(import_node_process.default.cwd(), SOCKET_PATH);
+}
+__name(getSocketPath, "getSocketPath");
 const _Gateway = class _Gateway extends import_events.EventEmitter {
   /**
    * use main app as default app to handle request
@@ -81,9 +89,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   constructor() {
     super();
     this.reset();
-    if (import_node_process.default.env.SOCKET_PATH) {
-      this.socketPath = (0, import_path.resolve)(import_node_process.default.cwd(), import_node_process.default.env.SOCKET_PATH);
-    }
+    this.socketPath = getSocketPath();
   }
   static getInstance(options = {}) {
     if (!_Gateway.instance) {
@@ -92,7 +98,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     return _Gateway.instance;
   }
   static async getIPCSocketClient() {
-    const socketPath = (0, import_path.resolve)(import_node_process.default.cwd(), import_node_process.default.env.SOCKET_PATH || "storage/gateway.sock");
+    const socketPath = getSocketPath();
     try {
       return await import_ipc_socket_client.IPCSocketClient.getConnection(socketPath);
     } catch (error) {
@@ -355,51 +361,6 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     }
     this.server = import_http.default.createServer(this.getCallback());
     this.wsServer = new import_ws_server.WSServer();
-    this.wsServer.on("message", async ({ client, message }) => {
-      const app = await import_app_supervisor.AppSupervisor.getInstance().getApp(client.app);
-      if (!app) {
-        return;
-      }
-      const parsedMessage = JSON.parse(message.toString());
-      if (!parsedMessage.type) {
-        return;
-      }
-      if (!app.listenerCount(`ws:setTag`)) {
-        app.on("ws:setTag", ({ clientId, tagKey, tagValue }) => {
-          this.wsServer.setClientTag(clientId, tagKey, tagValue);
-        });
-        app.on("ws:removeTag", ({ clientId, tagKey }) => {
-          this.wsServer.removeClientTag(clientId, tagKey);
-        });
-        app.on("ws:sendToTag", ({ tagKey, tagValue, message: message2 }) => {
-          this.wsServer.sendToConnectionsByTags(
-            [
-              { tagName: tagKey, tagValue },
-              { tagName: "app", tagValue: app.name }
-            ],
-            message2
-          );
-        });
-        app.on("ws:sendToTags", ({ tags, message: message2 }) => {
-          this.wsServer.sendToConnectionsByTags(tags, message2);
-        });
-        app.on("ws:authorized", ({ clientId, userId }) => {
-          this.wsServer.sendToConnectionsByTags(
-            [
-              { tagName: "userId", tagValue: userId },
-              { tagName: "app", tagValue: app.name }
-            ],
-            { type: "authorized" }
-          );
-        });
-      }
-      const eventName = `ws:message:${parsedMessage.type}`;
-      app.emit(eventName, {
-        clientId: client.id,
-        tags: [...client.tags],
-        payload: parsedMessage.payload
-      });
-    });
     this.server.on("upgrade", (request, socket, head) => {
       const { pathname } = (0, import_url.parse)(request.url);
       if (pathname === import_node_process.default.env.WS_PATH) {

package/lib/gateway/ws-server.d.ts

@@ -28,6 +28,7 @@ export declare class WSServer extends EventEmitter {
     webSocketClients: Map<string, WebSocketClient>;
     logger: Logger;
     constructor();
+    bindAppWSEvents(app: any): void;
     addNewConnection(ws: WebSocketWithId, request: IncomingMessage): WebSocketClient;
     setClientTag(clientId: string, tagKey: string, tagValue: string): void;
     removeClientTag(clientId: string, tagKey: string): void;
@@ -44,6 +45,7 @@ export declare class WSServer extends EventEmitter {
         tagName: string;
         tagValue: string;
     }>, sendMessage: object): void;
+    sendToClient(clientId: string, sendMessage: object): void;
     loopThroughConnections(callback: (client: WebSocketClient) => void): void;
     close(): void;
 }

package/lib/gateway/ws-server.js

@@ -133,6 +133,57 @@ const _WSServer = class _WSServer extends import_events.default {
         }
       });
     });
+    import_app_supervisor.AppSupervisor.getInstance().on("afterAppAdded", (app) => {
+      this.bindAppWSEvents(app);
+    });
+    this.on("message", async ({ client, message }) => {
+      const app = await import_app_supervisor.AppSupervisor.getInstance().getApp(client.app);
+      if (!app) {
+        return;
+      }
+      const parsedMessage = JSON.parse(message.toString());
+      if (!parsedMessage.type) {
+        return;
+      }
+      const eventName = `ws:message:${parsedMessage.type}`;
+      app.emit(eventName, {
+        clientId: client.id,
+        tags: [...client.tags],
+        payload: parsedMessage.payload
+      });
+    });
+  }
+  bindAppWSEvents(app) {
+    if (app.listenerCount("ws:setTag") > 0) {
+      return;
+    }
+    app.on("ws:setTag", ({ clientId, tagKey, tagValue }) => {
+      this.setClientTag(clientId, tagKey, tagValue);
+    });
+    app.on("ws:removeTag", ({ clientId, tagKey }) => {
+      this.removeClientTag(clientId, tagKey);
+    });
+    app.on("ws:sendToTag", ({ tagKey, tagValue, message }) => {
+      this.sendToConnectionsByTags(
+        [
+          { tagName: tagKey, tagValue },
+          { tagName: "app", tagValue: app.name }
+        ],
+        message
+      );
+    });
+    app.on("ws:sendToClient", ({ clientId, message }) => {
+      this.sendToClient(clientId, message);
+    });
+    app.on("ws:sendToCurrentApp", ({ message }) => {
+      this.sendToConnectionsByTag("app", app.name, message);
+    });
+    app.on("ws:sendToTags", ({ tags, message }) => {
+      this.sendToConnectionsByTags(tags, message);
+    });
+    app.on("ws:authorized", ({ clientId, userId }) => {
+      this.sendToClient(clientId, { type: "authorized" });
+    });
   }
   addNewConnection(ws, request) {
     const id = (0, import_nanoid.nanoid)();
@@ -149,6 +200,9 @@ const _WSServer = class _WSServer extends import_events.default {
   }
   setClientTag(clientId, tagKey, tagValue) {
     const client = this.webSocketClients.get(clientId);
+    if (!client) {
+      return;
+    }
     client.tags.add(`${tagKey}#${tagValue}`);
     console.log(`client tags: ${Array.from(client.tags)}`);
   }
@@ -173,26 +227,6 @@ const _WSServer = class _WSServer extends import_events.default {
     if (!hasApp) {
       import_app_supervisor.AppSupervisor.getInstance().bootStrapApp(handleAppName);
     }
-    const appStatus = import_app_supervisor.AppSupervisor.getInstance().getAppStatus(handleAppName, "initializing");
-    if (appStatus === "not_found") {
-      this.sendMessageToConnection(client, {
-        type: "maintaining",
-        payload: getPayloadByErrorCode("APP_NOT_FOUND", { appName: handleAppName })
-      });
-      return;
-    }
-    if (appStatus === "initializing") {
-      this.sendMessageToConnection(client, {
-        type: "maintaining",
-        payload: getPayloadByErrorCode("APP_INITIALIZING", { appName: handleAppName })
-      });
-      return;
-    }
-    const app = await import_app_supervisor.AppSupervisor.getInstance().getApp(handleAppName);
-    this.sendMessageToConnection(client, {
-      type: "maintaining",
-      payload: getPayloadByErrorCode(appStatus, { app })
-    });
   }
   removeConnection(id) {
     console.log(`client disconnected ${id}`);
@@ -217,6 +251,12 @@ const _WSServer = class _WSServer extends import_events.default {
       }
     });
   }
+  sendToClient(clientId, sendMessage) {
+    const client = this.webSocketClients.get(clientId);
+    if (client) {
+      this.sendMessageToConnection(client, sendMessage);
+    }
+  }
   loopThroughConnections(callback) {
     this.webSocketClients.forEach((client) => {
       callback(client);

package/lib/plugin-manager/plugin-manager.d.ts

@@ -89,9 +89,9 @@ export declare class PluginManager {
     addPreset(plugin: string | typeof Plugin, options?: any): void;
     getPlugins(): Map<typeof Plugin, Plugin<any>>;
     getAliases(): IterableIterator<string>;
-    get(name: string | typeof Plugin): Plugin<any>;
+    get<T extends Plugin>(name: string | typeof Plugin | (new () => T)): T;
     has(name: string | typeof Plugin): boolean;
-    del(name: string | typeof Plugin): void;
+    del(name: any): void;
     create(pluginName: string, options?: {
         forceRecreate?: boolean;
     }): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.6.0-alpha.9",
+    "version": "1.6.0-beta.2",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
@@ -10,19 +10,19 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.6.0-alpha.9",
-        "@nocobase/actions": "1.6.0-alpha.9",
-        "@nocobase/auth": "1.6.0-alpha.9",
-        "@nocobase/cache": "1.6.0-alpha.9",
-        "@nocobase/data-source-manager": "1.6.0-alpha.9",
-        "@nocobase/database": "1.6.0-alpha.9",
-        "@nocobase/evaluators": "1.6.0-alpha.9",
-        "@nocobase/lock-manager": "1.6.0-alpha.9",
-        "@nocobase/logger": "1.6.0-alpha.9",
-        "@nocobase/resourcer": "1.6.0-alpha.9",
-        "@nocobase/sdk": "1.6.0-alpha.9",
-        "@nocobase/telemetry": "1.6.0-alpha.9",
-        "@nocobase/utils": "1.6.0-alpha.9",
+        "@nocobase/acl": "1.6.0-beta.2",
+        "@nocobase/actions": "1.6.0-beta.2",
+        "@nocobase/auth": "1.6.0-beta.2",
+        "@nocobase/cache": "1.6.0-beta.2",
+        "@nocobase/data-source-manager": "1.6.0-beta.2",
+        "@nocobase/database": "1.6.0-beta.2",
+        "@nocobase/evaluators": "1.6.0-beta.2",
+        "@nocobase/lock-manager": "1.6.0-beta.2",
+        "@nocobase/logger": "1.6.0-beta.2",
+        "@nocobase/resourcer": "1.6.0-beta.2",
+        "@nocobase/sdk": "1.6.0-beta.2",
+        "@nocobase/telemetry": "1.6.0-beta.2",
+        "@nocobase/utils": "1.6.0-beta.2",
         "@types/decompress": "4.2.7",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -56,5 +56,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "c6136fc6c9a2daab33fb1a20716cd9768e9a147f"
+    "gitHead": "476ab2f424d86f585c8fba1459568c8aec49a5c6"
 }