@nocobase/server 2.0.0-alpha.51 → 2.0.0-alpha.52

package/lib/event-queue.d.ts

@@ -23,6 +23,12 @@ export type QueueEventOptions = {
      */
     interval?: number;
     concurrency?: number;
+    /**
+     * Shared across multiple applications.
+     * Will not use app prefix for channel name.
+     * @experimental
+     */
+    shared?: boolean;
     idle(): boolean;
     process: QueueCallback;
 };
@@ -84,7 +90,7 @@ export declare class EventQueue {
     protected events: Map<string, QueueEventOptions>;
     get channelPrefix(): string;
     constructor(app: Application, options?: EventQueueOptions);
-    getFullChannel(channel: string): string;
+    getFullChannel(channel: string, shared?: boolean): string;
     setAdapter<A extends IEventQueueAdapter>(adapter: A): void;
     isConnected(): boolean;
     connect(): Promise<void>;

package/lib/event-queue.js

@@ -270,16 +270,14 @@ const _EventQueue = class _EventQueue {
   constructor(app, options = {}) {
     this.app = app;
     this.options = options;
-    if (app.serving()) {
-      this.setAdapter(new MemoryEventQueueAdapter({ appName: this.app.name, logger: this.app.logger }));
-      app.on("afterStart", async () => {
-        await this.connect();
-      });
-      app.on("beforeStop", async () => {
-        app.logger.info("[queue] gracefully shutting down...");
-        await this.close();
-      });
-    }
+    this.setAdapter(new MemoryEventQueueAdapter({ appName: this.app.name, logger: this.app.logger }));
+    app.on("afterStart", async () => {
+      await this.connect();
+    });
+    app.on("afterStop", async () => {
+      app.logger.info("[queue] gracefully shutting down...");
+      await this.close();
+    });
   }
   adapter;
   events = /* @__PURE__ */ new Map();
@@ -287,7 +285,10 @@ const _EventQueue = class _EventQueue {
     var _a;
     return (_a = this.options) == null ? void 0 : _a.channelPrefix;
   }
-  getFullChannel(channel) {
+  getFullChannel(channel, shared = false) {
+    if (shared) {
+      return [this.channelPrefix, channel].filter(Boolean).join(".");
+    }
     return [this.app.name, this.channelPrefix, channel].filter(Boolean).join(".");
   }
   setAdapter(adapter) {
@@ -300,17 +301,13 @@ const _EventQueue = class _EventQueue {
     return this.adapter.isConnected();
   }
   async 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()) {
-      this.adapter.subscribe(this.getFullChannel(channel), event);
+      this.adapter.subscribe(this.getFullChannel(channel, event.shared), event);
     }
   }
   async close() {
@@ -318,8 +315,8 @@ const _EventQueue = class _EventQueue {
       return;
     }
     await this.adapter.close();
-    for (const channel of this.events.keys()) {
-      this.adapter.unsubscribe(this.getFullChannel(channel));
+    for (const [channel, event] of this.events.entries()) {
+      this.adapter.unsubscribe(this.getFullChannel(channel, event.shared));
     }
   }
   subscribe(channel, options) {
@@ -329,30 +326,31 @@ const _EventQueue = class _EventQueue {
     }
     this.events.set(channel, options);
     if (this.isConnected()) {
-      this.adapter.subscribe(this.getFullChannel(channel), options);
+      this.adapter.subscribe(this.getFullChannel(channel, options.shared), this.events.get(channel));
     }
   }
   unsubscribe(channel) {
+    var _a;
     if (!this.events.has(channel)) {
       return;
     }
     this.events.delete(channel);
     if (this.isConnected()) {
-      this.adapter.unsubscribe(this.getFullChannel(channel));
+      this.adapter.unsubscribe(this.getFullChannel(channel, (_a = this.events.get(channel)) == null ? void 0 : _a.shared));
     }
   }
   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");
     }
     if (!this.isConnected()) {
       throw new Error("event queue not connected, cannot publish");
     }
-    const c = this.getFullChannel(channel);
+    const event = this.events.get(channel);
+    if (!event) {
+      throw new Error(`event queue not subscribed on channel "${channel}", cannot publish`);
+    }
+    const c = this.getFullChannel(channel, event.shared);
     this.app.logger.debug(`event queue publishing to channel(${c})`, { message });
     await this.adapter.publish(c, message, {
       timeout: QUEUE_DEFAULT_ACK_TIMEOUT,

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

@@ -35,14 +35,12 @@ var import_utils = require("@nocobase/utils");
 var import_handler_manager = require("./handler-manager");
 const createPubSubManager = /* @__PURE__ */ __name((app, options) => {
   const pubSubManager = new PubSubManager(app, options);
-  if (app.serving()) {
-    app.on("afterStart", async () => {
-      await pubSubManager.connect();
-    });
-    app.on("afterStop", async () => {
-      await pubSubManager.close();
-    });
-  }
+  app.on("afterStart", async () => {
+    await pubSubManager.connect();
+  });
+  app.on("afterStop", async () => {
+    await pubSubManager.close();
+  });
   return pubSubManager;
 }, "createPubSubManager");
 const _PubSubManager = class _PubSubManager {
@@ -72,10 +70,6 @@ const _PubSubManager = class _PubSubManager {
     if (!this.adapter) {
       return;
     }
-    if (!this.app.serving()) {
-      this.app.logger.warn("app is not serving, will not connect to event queue");
-      return;
-    }
     await this.adapter.connect();
     await this.handlerManager.each(async (channel, headler) => {
       this.app.logger.debug(`[PubSubManager] subscribe ${channel} added before connected`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.0.0-alpha.51",
+  "version": "2.0.0-alpha.52",
   "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": "2.0.0-alpha.51",
-    "@nocobase/actions": "2.0.0-alpha.51",
-    "@nocobase/auth": "2.0.0-alpha.51",
-    "@nocobase/cache": "2.0.0-alpha.51",
-    "@nocobase/data-source-manager": "2.0.0-alpha.51",
-    "@nocobase/database": "2.0.0-alpha.51",
-    "@nocobase/evaluators": "2.0.0-alpha.51",
-    "@nocobase/lock-manager": "2.0.0-alpha.51",
-    "@nocobase/logger": "2.0.0-alpha.51",
-    "@nocobase/resourcer": "2.0.0-alpha.51",
-    "@nocobase/sdk": "2.0.0-alpha.51",
-    "@nocobase/snowflake-id": "2.0.0-alpha.51",
-    "@nocobase/telemetry": "2.0.0-alpha.51",
-    "@nocobase/utils": "2.0.0-alpha.51",
+    "@nocobase/acl": "2.0.0-alpha.52",
+    "@nocobase/actions": "2.0.0-alpha.52",
+    "@nocobase/auth": "2.0.0-alpha.52",
+    "@nocobase/cache": "2.0.0-alpha.52",
+    "@nocobase/data-source-manager": "2.0.0-alpha.52",
+    "@nocobase/database": "2.0.0-alpha.52",
+    "@nocobase/evaluators": "2.0.0-alpha.52",
+    "@nocobase/lock-manager": "2.0.0-alpha.52",
+    "@nocobase/logger": "2.0.0-alpha.52",
+    "@nocobase/resourcer": "2.0.0-alpha.52",
+    "@nocobase/sdk": "2.0.0-alpha.52",
+    "@nocobase/snowflake-id": "2.0.0-alpha.52",
+    "@nocobase/telemetry": "2.0.0-alpha.52",
+    "@nocobase/utils": "2.0.0-alpha.52",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -60,5 +60,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "a1e34dd97f370d54f3d80a6b83ab7ddb9c72dc18"
+  "gitHead": "b32992d8baeb4ca6616d839ca2f9c023d49476a9"
 }