@nocobase/server 1.6.0-alpha.30 → 1.6.0-alpha.31

package/lib/gateway/index.d.ts

@@ -15,6 +15,7 @@ import http, { IncomingMessage, ServerResponse } from 'http';
 import { ApplicationOptions } from '../application';
 import { IPCSocketClient } from './ipc-socket-client';
 import { IPCSocketServer } from './ipc-socket-server';
+import { WSServer } from './ws-server';
 export interface IncomingRequest {
     url: string;
     headers: any;
@@ -41,10 +42,10 @@ export declare class Gateway extends EventEmitter {
     selectorMiddlewares: Toposort<AppSelectorMiddleware>;
     server: http.Server | null;
     ipcSocketServer: IPCSocketServer | null;
+    wsServer: WSServer;
     loggers: Registry<SystemLogger>;
     private port;
     private host;
-    private wsServer;
     private socketPath;
     private constructor();
     static getInstance(options?: any): Gateway;

package/lib/gateway/index.js

@@ -81,10 +81,10 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   selectorMiddlewares = new import_utils.Toposort();
   server = null;
   ipcSocketServer = null;
+  wsServer;
   loggers = new import_utils.Registry();
   port = import_node_process.default.env.APP_PORT ? parseInt(import_node_process.default.env.APP_PORT) : null;
   host = "0.0.0.0";
-  wsServer;
   socketPath = (0, import_path.resolve)(import_node_process.default.cwd(), "storage", "gateway.sock");
   constructor() {
     super();

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

@@ -46,6 +46,7 @@ export declare class WSServer extends EventEmitter {
         tagValue: string;
     }>, sendMessage: object): void;
     sendToClient(clientId: string, sendMessage: object): void;
+    sendToAppUser(appName: string, userId: string, message: object): void;
     loopThroughConnections(callback: (client: WebSocketClient) => void): void;
     close(): void;
 }

package/lib/gateway/ws-server.js

@@ -209,7 +209,7 @@ const _WSServer = class _WSServer extends import_events.default {
   removeClientTag(clientId, tagKey) {
     const client = this.webSocketClients.get(clientId);
     client.tags.forEach((tag) => {
-      if (tag.startsWith(tagKey)) {
+      if (tag.startsWith(`${tagKey}#`)) {
         client.tags.delete(tag);
       }
     });
@@ -257,6 +257,15 @@ const _WSServer = class _WSServer extends import_events.default {
       this.sendMessageToConnection(client, sendMessage);
     }
   }
+  sendToAppUser(appName, userId, message) {
+    this.sendToConnectionsByTags(
+      [
+        { tagName: "userId", tagValue: `${userId}` },
+        { tagName: "app", tagValue: appName }
+      ],
+      message
+    );
+  }
   loopThroughConnections(callback) {
     this.webSocketClients.forEach((client) => {
       callback(client);

package/lib/plugin-manager/options/resource.js

@@ -164,7 +164,14 @@ var resource_default = {
         const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, item.packageName);
         const r = await import_fs_extra.default.exists(pkgPath);
         if (r) {
-          const url = `${process.env.APP_SERVER_BASE_URL}${process.env.PLUGIN_STATICS_PATH}${item.packageName}/${PLUGIN_CLIENT_ENTRY_FILE}?version=${item.version}`;
+          let t = "";
+          const dist = import_path.default.resolve(pkgPath, PLUGIN_CLIENT_ENTRY_FILE);
+          const distExists = await import_fs_extra.default.exists(dist);
+          if (distExists) {
+            const fsState = await import_fs_extra.default.stat(distExists ? dist : pkgPath);
+            t = `&t=${fsState.mtime.getTime()}`;
+          }
+          const url = `${process.env.APP_SERVER_BASE_URL}${process.env.PLUGIN_STATICS_PATH}${item.packageName}/${PLUGIN_CLIENT_ENTRY_FILE}?version=${item.version}${t}`;
           arr.push({
             ...item.toJSON(),
             url

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.6.0-alpha.30",
+  "version": "1.6.0-alpha.31",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,19 +10,19 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.0.2",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "1.6.0-alpha.30",
-    "@nocobase/actions": "1.6.0-alpha.30",
-    "@nocobase/auth": "1.6.0-alpha.30",
-    "@nocobase/cache": "1.6.0-alpha.30",
-    "@nocobase/data-source-manager": "1.6.0-alpha.30",
-    "@nocobase/database": "1.6.0-alpha.30",
-    "@nocobase/evaluators": "1.6.0-alpha.30",
-    "@nocobase/lock-manager": "1.6.0-alpha.30",
-    "@nocobase/logger": "1.6.0-alpha.30",
-    "@nocobase/resourcer": "1.6.0-alpha.30",
-    "@nocobase/sdk": "1.6.0-alpha.30",
-    "@nocobase/telemetry": "1.6.0-alpha.30",
-    "@nocobase/utils": "1.6.0-alpha.30",
+    "@nocobase/acl": "1.6.0-alpha.31",
+    "@nocobase/actions": "1.6.0-alpha.31",
+    "@nocobase/auth": "1.6.0-alpha.31",
+    "@nocobase/cache": "1.6.0-alpha.31",
+    "@nocobase/data-source-manager": "1.6.0-alpha.31",
+    "@nocobase/database": "1.6.0-alpha.31",
+    "@nocobase/evaluators": "1.6.0-alpha.31",
+    "@nocobase/lock-manager": "1.6.0-alpha.31",
+    "@nocobase/logger": "1.6.0-alpha.31",
+    "@nocobase/resourcer": "1.6.0-alpha.31",
+    "@nocobase/sdk": "1.6.0-alpha.31",
+    "@nocobase/telemetry": "1.6.0-alpha.31",
+    "@nocobase/utils": "1.6.0-alpha.31",
     "@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": "4d092cae372fada3df9b57c55705ea3b7dfa6786"
+  "gitHead": "2f118f0a0691dd51c437f208b1166258a615b6a8"
 }