@nocobase/server 1.6.0-alpha.14 → 1.6.0-alpha.15

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

@@ -45,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

@@ -172,6 +172,9 @@ const _WSServer = class _WSServer extends import_events.default {
         message
       );
     });
+    app.on("ws:sendToClient", ({ clientId, message }) => {
+      this.sendToClient(clientId, message);
+    });
     app.on("ws:sendToCurrentApp", ({ message }) => {
       this.sendToConnectionsByTag("app", app.name, message);
     });
@@ -179,13 +182,7 @@ const _WSServer = class _WSServer extends import_events.default {
       this.sendToConnectionsByTags(tags, message);
     });
     app.on("ws:authorized", ({ clientId, userId }) => {
-      this.sendToConnectionsByTags(
-        [
-          { tagName: "userId", tagValue: userId },
-          { tagName: "app", tagValue: app.name }
-        ],
-        { type: "authorized" }
-      );
+      this.sendToClient(clientId, { type: "authorized" });
     });
   }
   addNewConnection(ws, request) {
@@ -254,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.14",
+    "version": "1.6.0-alpha.15",
     "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.14",
-        "@nocobase/actions": "1.6.0-alpha.14",
-        "@nocobase/auth": "1.6.0-alpha.14",
-        "@nocobase/cache": "1.6.0-alpha.14",
-        "@nocobase/data-source-manager": "1.6.0-alpha.14",
-        "@nocobase/database": "1.6.0-alpha.14",
-        "@nocobase/evaluators": "1.6.0-alpha.14",
-        "@nocobase/lock-manager": "1.6.0-alpha.14",
-        "@nocobase/logger": "1.6.0-alpha.14",
-        "@nocobase/resourcer": "1.6.0-alpha.14",
-        "@nocobase/sdk": "1.6.0-alpha.14",
-        "@nocobase/telemetry": "1.6.0-alpha.14",
-        "@nocobase/utils": "1.6.0-alpha.14",
+        "@nocobase/acl": "1.6.0-alpha.15",
+        "@nocobase/actions": "1.6.0-alpha.15",
+        "@nocobase/auth": "1.6.0-alpha.15",
+        "@nocobase/cache": "1.6.0-alpha.15",
+        "@nocobase/data-source-manager": "1.6.0-alpha.15",
+        "@nocobase/database": "1.6.0-alpha.15",
+        "@nocobase/evaluators": "1.6.0-alpha.15",
+        "@nocobase/lock-manager": "1.6.0-alpha.15",
+        "@nocobase/logger": "1.6.0-alpha.15",
+        "@nocobase/resourcer": "1.6.0-alpha.15",
+        "@nocobase/sdk": "1.6.0-alpha.15",
+        "@nocobase/telemetry": "1.6.0-alpha.15",
+        "@nocobase/utils": "1.6.0-alpha.15",
         "@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": "1bf7648d7cf62fadef4e31535b4907046a952b4a"
+    "gitHead": "4005cfd4876717aad16e0528513ee682a32d920a"
 }