@nocobase/server 1.8.23 → 1.8.24

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) {
@@ -203,7 +204,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 +229,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 +239,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 +258,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,7 +269,7 @@ const _EventQueue = class _EventQueue {
   constructor(app, options = {}) {
     this.app = app;
     this.options = options;
-    this.setAdapter(new MemoryEventQueueAdapter({ appName: this.app.name }));
+    this.setAdapter(new MemoryEventQueueAdapter({ appName: this.app.name, logger: this.app.logger }));
     app.on("afterStart", async () => {
       await this.connect();
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.8.23",
+  "version": "1.8.24",
   "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.8.23",
-    "@nocobase/actions": "1.8.23",
-    "@nocobase/auth": "1.8.23",
-    "@nocobase/cache": "1.8.23",
-    "@nocobase/data-source-manager": "1.8.23",
-    "@nocobase/database": "1.8.23",
-    "@nocobase/evaluators": "1.8.23",
-    "@nocobase/lock-manager": "1.8.23",
-    "@nocobase/logger": "1.8.23",
-    "@nocobase/resourcer": "1.8.23",
-    "@nocobase/sdk": "1.8.23",
-    "@nocobase/telemetry": "1.8.23",
-    "@nocobase/utils": "1.8.23",
+    "@nocobase/acl": "1.8.24",
+    "@nocobase/actions": "1.8.24",
+    "@nocobase/auth": "1.8.24",
+    "@nocobase/cache": "1.8.24",
+    "@nocobase/data-source-manager": "1.8.24",
+    "@nocobase/database": "1.8.24",
+    "@nocobase/evaluators": "1.8.24",
+    "@nocobase/lock-manager": "1.8.24",
+    "@nocobase/logger": "1.8.24",
+    "@nocobase/resourcer": "1.8.24",
+    "@nocobase/sdk": "1.8.24",
+    "@nocobase/telemetry": "1.8.24",
+    "@nocobase/utils": "1.8.24",
     "@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": "e5d7668cd760e281f9d1eeca6828ea2bc866bbae"
+  "gitHead": "e3907742d0f42d21943f7807bb254838fafd5fff"
 }