@nocobase/server 1.9.0-beta.5 → 1.9.0-beta.7

package/lib/application.js

@@ -279,6 +279,9 @@ const _Application = class _Application extends import_koa.default {
     if (!WORKER_MODE) {
       return true;
     }
+    if (WORKER_MODE === "-") {
+      return false;
+    }
     const topics = WORKER_MODE.trim().split(",");
     if (key) {
       if (WORKER_MODE === "*") {

package/lib/audit-manager/index.js

@@ -252,6 +252,9 @@ const _AuditManager = class _AuditManager {
   async output(ctx, reqId, metadata) {
     var _a;
     try {
+      if (!ctx.action) {
+        return;
+      }
       const { resourceName, actionName } = ctx.action;
       const action = this.getAction(actionName, resourceName);
       if (!action) {

package/lib/event-queue.d.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import Application from './application';
+import { SystemLogger } from '@nocobase/logger';
 export declare const QUEUE_DEFAULT_INTERVAL = 250;
 export declare const QUEUE_DEFAULT_CONCURRENCY = 1;
 export declare const QUEUE_DEFAULT_ACK_TIMEOUT = 15000;
@@ -58,6 +59,7 @@ export declare class MemoryEventQueueAdapter implements IEventQueueAdapter {
     listen: (channel: string) => void;
     constructor(options: {
         appName: string;
+        logger: SystemLogger;
     });
     isConnected(): boolean;
     setConnected(connected: boolean): void;

package/lib/event-queue.js

@@ -77,9 +77,10 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     if (!this.connected) {
       return;
     }
+    const { logger } = this.options;
     const event = this.events.get(channel);
     if (!event) {
-      console.warn(`memory queue (${channel}) not found, skipping...`);
+      logger.warn(`memory queue (${channel}) not found, skipping...`);
       return;
     }
     if (!event.idle()) {
@@ -88,12 +89,9 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     const reading = this.reading.get(channel) || [];
     const count = (event.concurrency || QUEUE_DEFAULT_CONCURRENCY) - reading.length;
     if (count <= 0) {
-      console.debug(
-        `memory queue (${channel}) is already reading as max concurrency (${reading.length}), waiting last reading to end...`
-      );
       return;
     }
-    console.debug(`reading more from queue (${channel}), count: ${count}`);
+    logger.debug(`reading more from queue (${channel}), count: ${count}`);
     this.read(channel, count).forEach((promise) => {
       reading.push(promise);
       promise.finally(() => {
@@ -114,20 +112,21 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
   async loadFromStorage() {
     let queues = {};
     let exists = false;
+    const { logger } = this.options;
     try {
       await import_promises.default.stat(this.storagePath);
       exists = true;
     } catch (ex) {
-      console.info(`memory queue storage file not found, skip`);
+      logger.info(`memory queue storage file not found, skip`);
     }
     if (exists) {
       try {
         const queueJson = await import_promises.default.readFile(this.storagePath);
         queues = JSON.parse(queueJson.toString());
-        console.debug("memory queue loaded from storage", queues);
+        logger.debug("memory queue loaded from storage", queues);
         await import_promises.default.unlink(this.storagePath);
       } catch (ex) {
-        console.error("failed to load queue from storage", ex);
+        logger.error("failed to load queue from storage", ex);
       }
     }
     this.queues = new Map(Object.entries(queues));
@@ -139,12 +138,13 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
       }
       return acc;
     }, {});
+    const { logger } = this.options;
     if (Object.keys(queues).length) {
       await import_promises.default.mkdir(import_path.default.dirname(this.storagePath), { recursive: true });
       await import_promises.default.writeFile(this.storagePath, JSON.stringify(queues));
-      console.debug("memory queue saved to storage", queues);
+      logger.debug("memory queue saved to storage", queues);
     } else {
-      console.debug("memory queue empty, no need to save to storage");
+      logger.debug("memory queue empty, no need to save to storage");
     }
   }
   async connect() {
@@ -163,13 +163,14 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     if (!this.connected) {
       return;
     }
+    const { logger } = this.options;
     this.connected = false;
     if (this.processing) {
-      console.info("memory queue waiting for processing job...");
+      logger.info("memory queue waiting for processing job...");
       await this.processing;
-      console.info("memory queue job cleaned");
+      logger.info("memory queue job cleaned");
     }
-    console.log("memory queue gracefully shutting down...");
+    logger.info("memory queue gracefully shutting down...");
     await this.saveToStorage();
   }
   subscribe(channel, options) {
@@ -195,6 +196,7 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
   publish(channel, content, options = { timestamp: Date.now() }) {
     const event = this.events.get(channel);
     if (!event) {
+      console.debug(`memory queue (${channel}) not subscribed, skip`);
       return;
     }
     if (!this.queues.get(channel)) {
@@ -203,7 +205,8 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     const queue = this.queues.get(channel);
     const message = { id: (0, import_crypto.randomUUID)(), content, options };
     queue.push(message);
-    console.debug(`memory queue (${channel}) published message`, content);
+    const { logger } = this.options;
+    logger.debug(`memory queue (${channel}) published message`, content);
     setImmediate(() => {
       this.emitter.emit(channel, channel);
     });
@@ -227,8 +230,9 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     if (!(queue == null ? void 0 : queue.length)) {
       return [];
     }
+    const { logger } = this.options;
     const messages = queue.slice(0, n);
-    console.debug(`memory queue (${channel}) read ${messages.length} messages`, messages);
+    logger.debug(`memory queue (${channel}) read ${messages.length} messages`, messages);
     queue.splice(0, messages.length);
     const batch = messages.map(({ id, ...message }) => this.process(channel, { id, message }));
     return batch;
@@ -236,17 +240,18 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
   async process(channel, { id, message }) {
     const event = this.events.get(channel);
     const { content, options: { timeout = QUEUE_DEFAULT_ACK_TIMEOUT, maxRetries = 0, retried = 0 } = {} } = message;
-    console.debug(`memory queue (${channel}) processing message (${id})...`, content);
+    const { logger } = this.options;
+    logger.debug(`memory queue (${channel}) processing message (${id})...`, content);
     return (async () => event.process(content, {
       id,
       retried,
       signal: AbortSignal.timeout(timeout)
     }))().then(() => {
-      console.debug(`memory queue (${channel}) consumed message (${id})`);
+      logger.debug(`memory queue (${channel}) consumed message (${id})`);
     }).catch((ex) => {
       if (maxRetries > 0 && retried < maxRetries) {
         const currentRetry = retried + 1;
-        console.warn(
+        logger.warn(
           `memory queue (${channel}) consum message (${id}) failed, retrying (${currentRetry} / ${maxRetries})...`,
           ex
         );
@@ -254,7 +259,7 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
           this.publish(channel, content, { timeout, maxRetries, retried: currentRetry, timestamp: Date.now() });
         }, 500);
       } else {
-        console.error(ex);
+        logger.error(ex);
       }
     });
   }
@@ -265,14 +270,16 @@ const _EventQueue = class _EventQueue {
   constructor(app, options = {}) {
     this.app = app;
     this.options = options;
-    this.setAdapter(new MemoryEventQueueAdapter({ appName: this.app.name }));
-    app.on("afterStart", async () => {
-      await this.connect();
-    });
-    app.on("beforeStop", async () => {
-      app.logger.info("[queue] gracefully shutting down...");
-      await this.close();
-    });
+    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();
+      });
+    }
   }
   adapter;
   events = /* @__PURE__ */ new Map();
@@ -296,7 +303,12 @@ const _EventQueue = class _EventQueue {
     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;
+    }
     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);
     }
@@ -337,7 +349,7 @@ const _EventQueue = class _EventQueue {
       throw new Error("event queue not connected, cannot publish");
     }
     const c = this.getFullChannel(channel);
-    this.app.logger.debug("event queue publishing:", { channel: c, message });
+    this.app.logger.debug(`event queue publishing to channel(${c})`, { message });
     await this.adapter.publish(c, message, {
       timeout: QUEUE_DEFAULT_ACK_TIMEOUT,
       ...options,

package/lib/gateway/ws-server.js

@@ -172,6 +172,20 @@ const _WSServer = class _WSServer extends import_events.default {
         message
       );
     });
+    app.on("ws:sendToUser", ({ userId, message }) => {
+      this.sendToAppUser(app.name, userId, message);
+      app.logger.trace(`[broadcasting message] ws:sendToUser for user ${userId}`, { message });
+      app.pubSubManager.publish(
+        "ws:sendToUser",
+        {
+          userId,
+          message
+        },
+        {
+          skipSelf: true
+        }
+      );
+    });
     app.on("ws:sendToClient", ({ clientId, message }) => {
       this.sendToClient(clientId, message);
     });
@@ -184,6 +198,12 @@ const _WSServer = class _WSServer extends import_events.default {
     app.on("ws:authorized", ({ clientId, userId }) => {
       this.sendToClient(clientId, { type: "authorized" });
     });
+    app.on("afterLoad", () => {
+      app.pubSubManager.subscribe("ws:sendToUser", ({ userId, message }) => {
+        app.logger.debug(`[receive broadcasting message] ws:sendToUser for user ${userId}`, { message });
+        this.sendToAppUser(app.name, userId, message);
+      });
+    });
   }
   addNewConnection(ws, request) {
     const id = (0, import_nanoid.nanoid)();

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

@@ -11,11 +11,12 @@ import { HandlerManager } from './handler-manager';
 import { PubSubCallback, type IPubSubAdapter, type PubSubManagerOptions, type PubSubManagerPublishOptions, type PubSubManagerSubscribeOptions } from './types';
 export declare const createPubSubManager: (app: Application, options: PubSubManagerOptions) => PubSubManager;
 export declare class PubSubManager {
+    protected app: Application;
     protected options: PubSubManagerOptions;
     protected publisherId: string;
     protected adapter: IPubSubAdapter;
     protected handlerManager: HandlerManager;
-    constructor(options?: PubSubManagerOptions);
+    constructor(app: Application, options?: PubSubManagerOptions);
     get channelPrefix(): string;
     setAdapter(adapter: IPubSubAdapter): void;
     isConnected(): Promise<boolean>;
@@ -23,5 +24,5 @@ export declare class PubSubManager {
     close(): Promise<any>;
     subscribe(channel: string, callback: PubSubCallback, options?: PubSubManagerSubscribeOptions): Promise<void>;
     unsubscribe(channel: string, callback: PubSubCallback): Promise<any>;
-    publish(channel: string, message: any, options?: PubSubManagerPublishOptions): Promise<any>;
+    publish(channel: string, message: any, options?: PubSubManagerPublishOptions): Promise<void>;
 }

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

@@ -34,17 +34,20 @@ module.exports = __toCommonJS(pub_sub_manager_exports);
 var import_utils = require("@nocobase/utils");
 var import_handler_manager = require("./handler-manager");
 const createPubSubManager = /* @__PURE__ */ __name((app, options) => {
-  const pubSubManager = new PubSubManager(options);
-  app.on("afterStart", async () => {
-    await pubSubManager.connect();
-  });
-  app.on("afterStop", async () => {
-    await pubSubManager.close();
-  });
+  const pubSubManager = new PubSubManager(app, options);
+  if (app.serving()) {
+    app.on("afterStart", async () => {
+      await pubSubManager.connect();
+    });
+    app.on("afterStop", async () => {
+      await pubSubManager.close();
+    });
+  }
   return pubSubManager;
 }, "createPubSubManager");
 const _PubSubManager = class _PubSubManager {
-  constructor(options = {}) {
+  constructor(app, options = {}) {
+    this.app = app;
     this.options = options;
     this.publisherId = (0, import_utils.uid)();
     this.handlerManager = new import_handler_manager.HandlerManager(this.publisherId);
@@ -69,8 +72,13 @@ 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`);
       await this.adapter.subscribe(`${this.channelPrefix}${channel}`, headler);
     });
   }
@@ -84,6 +92,7 @@ const _PubSubManager = class _PubSubManager {
     await this.unsubscribe(channel, callback);
     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);
     }
   }
@@ -97,6 +106,9 @@ const _PubSubManager = class _PubSubManager {
   async publish(channel, message, options) {
     var _a;
     if (!((_a = this.adapter) == null ? void 0 : _a.isConnected())) {
+      this.app.logger.warn(
+        `[PubSubManager] adapter is not exist or not connected, cannot publish message to channel ${channel}`
+      );
       return;
     }
     const wrappedMessage = JSON.stringify({
@@ -104,7 +116,8 @@ const _PubSubManager = class _PubSubManager {
       ...options,
       message
     });
-    return this.adapter.publish(`${this.channelPrefix}${channel}`, wrappedMessage);
+    await this.adapter.publish(`${this.channelPrefix}${channel}`, wrappedMessage);
+    this.app.logger.trace(`[PubSubManager] published message to channel ${channel}`);
   }
 };
 __name(_PubSubManager, "PubSubManager");

package/lib/sync-message-manager.d.ts

@@ -16,7 +16,7 @@ export declare class SyncMessageManager {
     protected pubSubManager: PubSubManager;
     constructor(app: Application, options?: any);
     get debounce(): any;
-    publish(channel: string, message: any, options?: PubSubManagerPublishOptions & Transactionable): Promise<any>;
+    publish(channel: string, message: any, options?: PubSubManagerPublishOptions & Transactionable): Promise<unknown>;
     subscribe(channel: string, callback: PubSubCallback): Promise<void>;
     unsubscribe(channel: string, callback: PubSubCallback): Promise<any>;
     sync(): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.9.0-beta.5",
+  "version": "1.9.0-beta.7",
   "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.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "1.9.0-beta.5",
-    "@nocobase/actions": "1.9.0-beta.5",
-    "@nocobase/auth": "1.9.0-beta.5",
-    "@nocobase/cache": "1.9.0-beta.5",
-    "@nocobase/data-source-manager": "1.9.0-beta.5",
-    "@nocobase/database": "1.9.0-beta.5",
-    "@nocobase/evaluators": "1.9.0-beta.5",
-    "@nocobase/lock-manager": "1.9.0-beta.5",
-    "@nocobase/logger": "1.9.0-beta.5",
-    "@nocobase/resourcer": "1.9.0-beta.5",
-    "@nocobase/sdk": "1.9.0-beta.5",
-    "@nocobase/telemetry": "1.9.0-beta.5",
-    "@nocobase/utils": "1.9.0-beta.5",
+    "@nocobase/acl": "1.9.0-beta.7",
+    "@nocobase/actions": "1.9.0-beta.7",
+    "@nocobase/auth": "1.9.0-beta.7",
+    "@nocobase/cache": "1.9.0-beta.7",
+    "@nocobase/data-source-manager": "1.9.0-beta.7",
+    "@nocobase/database": "1.9.0-beta.7",
+    "@nocobase/evaluators": "1.9.0-beta.7",
+    "@nocobase/lock-manager": "1.9.0-beta.7",
+    "@nocobase/logger": "1.9.0-beta.7",
+    "@nocobase/resourcer": "1.9.0-beta.7",
+    "@nocobase/sdk": "1.9.0-beta.7",
+    "@nocobase/telemetry": "1.9.0-beta.7",
+    "@nocobase/utils": "1.9.0-beta.7",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -57,5 +57,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "9a61c60dd3db5af64244e82447309b0cb17aabb6"
+  "gitHead": "4a5055c973b51611d5db1604aaaf6c1b73b4733c"
 }