@nocobase/server 1.9.2 → 1.9.4

package/lib/acl/available-action.js

@@ -56,7 +56,7 @@ const availableActions = {
   update: {
     displayName: '{{t("Edit")}}',
     type: "old-data",
-    aliases: ["update", "move", "add", "set", "remove", "toggle"],
+    aliases: ["update", "move"],
     allowConfigureFields: true
   },
   destroy: {

package/lib/event-queue.js

@@ -300,13 +300,13 @@ const _EventQueue = class _EventQueue {
     return this.adapter.isConnected();
   }
   async connect() {
-    if (!this.adapter) {
-      throw new Error("no adapter set, cannot connect");
-    }
     if (!this.app.serving()) {
       this.app.logger.warn("app is not serving, will not connect to event queue");
       return;
     }
+    if (!this.adapter) {
+      throw new Error("no adapter set, cannot connect");
+    }
     await this.adapter.connect();
     this.app.logger.debug(`connected to adapter, using memory? ${this.adapter instanceof MemoryEventQueueAdapter}`);
     for (const [channel, event] of this.events.entries()) {
@@ -342,6 +342,10 @@ const _EventQueue = class _EventQueue {
     }
   }
   async publish(channel, message, options = {}) {
+    if (!this.app.serving()) {
+      this.app.logger.warn("app is not serving, will not publish message to event queue");
+      return;
+    }
     if (!this.adapter) {
       throw new Error("no adapter set, cannot publish");
     }

package/lib/pub-sub-manager/pub-sub-manager.d.ts

@@ -17,8 +17,8 @@ export declare class PubSubManager {
     protected adapter: IPubSubAdapter;
     protected handlerManager: HandlerManager;
     constructor(app: Application, options?: PubSubManagerOptions);
-    get channelPrefix(): string;
     setAdapter(adapter: IPubSubAdapter): void;
+    getFullChannel(channel: string): string;
     isConnected(): Promise<boolean>;
     connect(): Promise<void>;
     close(): Promise<any>;

package/lib/pub-sub-manager/pub-sub-manager.js

@@ -55,13 +55,13 @@ const _PubSubManager = class _PubSubManager {
   publisherId;
   adapter;
   handlerManager;
-  get channelPrefix() {
-    var _a;
-    return ((_a = this.options) == null ? void 0 : _a.channelPrefix) ? `${this.options.channelPrefix}.` : "";
-  }
   setAdapter(adapter) {
     this.adapter = adapter;
   }
+  getFullChannel(channel) {
+    var _a;
+    return [this.app.name, (_a = this.options) == null ? void 0 : _a.channelPrefix, channel].filter(Boolean).join(".");
+  }
   async isConnected() {
     if (this.adapter) {
       return this.adapter.isConnected();
@@ -79,7 +79,7 @@ const _PubSubManager = class _PubSubManager {
     await this.adapter.connect();
     await this.handlerManager.each(async (channel, headler) => {
       this.app.logger.debug(`[PubSubManager] subscribe ${channel} added before connected`);
-      await this.adapter.subscribe(`${this.channelPrefix}${channel}`, headler);
+      await this.adapter.subscribe(this.getFullChannel(channel), headler);
     });
   }
   async close() {
@@ -93,7 +93,7 @@ const _PubSubManager = class _PubSubManager {
     const handler = this.handlerManager.set(channel, callback, options);
     if (await this.isConnected()) {
       this.app.logger.debug(`[PubSubManager] subscribe ${channel} added after connected`);
-      await this.adapter.subscribe(`${this.channelPrefix}${channel}`, handler);
+      await this.adapter.subscribe(this.getFullChannel(channel), handler);
     }
   }
   async unsubscribe(channel, callback) {
@@ -101,7 +101,7 @@ const _PubSubManager = class _PubSubManager {
     if (!this.adapter || !handler) {
       return;
     }
-    return this.adapter.unsubscribe(`${this.channelPrefix}${channel}`, handler);
+    return this.adapter.unsubscribe(this.getFullChannel(channel), handler);
   }
   async publish(channel, message, options) {
     var _a;
@@ -116,7 +116,7 @@ const _PubSubManager = class _PubSubManager {
       ...options,
       message
     });
-    await this.adapter.publish(`${this.channelPrefix}${channel}`, wrappedMessage);
+    await this.adapter.publish(this.getFullChannel(channel), wrappedMessage);
     this.app.logger.trace(`[PubSubManager] published message to channel ${channel}`);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.9.2",
+  "version": "1.9.4",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,20 +10,20 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "1.9.2",
-    "@nocobase/actions": "1.9.2",
-    "@nocobase/auth": "1.9.2",
-    "@nocobase/cache": "1.9.2",
-    "@nocobase/data-source-manager": "1.9.2",
-    "@nocobase/database": "1.9.2",
-    "@nocobase/evaluators": "1.9.2",
-    "@nocobase/lock-manager": "1.9.2",
-    "@nocobase/logger": "1.9.2",
-    "@nocobase/resourcer": "1.9.2",
-    "@nocobase/sdk": "1.9.2",
-    "@nocobase/snowflake-id": "1.9.2",
-    "@nocobase/telemetry": "1.9.2",
-    "@nocobase/utils": "1.9.2",
+    "@nocobase/acl": "1.9.4",
+    "@nocobase/actions": "1.9.4",
+    "@nocobase/auth": "1.9.4",
+    "@nocobase/cache": "1.9.4",
+    "@nocobase/data-source-manager": "1.9.4",
+    "@nocobase/database": "1.9.4",
+    "@nocobase/evaluators": "1.9.4",
+    "@nocobase/lock-manager": "1.9.4",
+    "@nocobase/logger": "1.9.4",
+    "@nocobase/resourcer": "1.9.4",
+    "@nocobase/sdk": "1.9.4",
+    "@nocobase/snowflake-id": "1.9.4",
+    "@nocobase/telemetry": "1.9.4",
+    "@nocobase/utils": "1.9.4",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -59,5 +59,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "2a511560ce123d02a20b2a7757133e25ac664614"
+  "gitHead": "7431e8b3b3b9e06c21b05dc0af68349f7cfbe04f"
 }