@nocobase/server 2.1.29 → 2.1.31

package/lib/event-queue.d.ts

@@ -53,17 +53,18 @@ export interface EventQueueOptions {
 export declare class MemoryEventQueueAdapter implements IEventQueueAdapter {
     private options;
     private connected;
-    private emitter;
     private reading;
+    private scheduledChannels;
     protected events: Map<string, QueueEventOptions>;
     protected queues: Map<string, {
         id: string;
         content: any;
         options?: QueueMessageOptions;
     }[]>;
-    get processing(): Promise<Promise<void>[][]>;
+    get processing(): Promise<void[]>;
     private get storagePath();
     listen: (channel: string) => void;
+    private scheduleListen;
     constructor(options: {
         appName: string;
         logger: SystemLogger;

package/lib/event-queue.js

@@ -46,7 +46,6 @@ __export(event_queue_exports, {
 });
 module.exports = __toCommonJS(event_queue_exports);
 var import_crypto = require("crypto");
-var import_events = require("events");
 var import_path = __toESM(require("path"));
 var import_promises = __toESM(require("fs/promises"));
 var import_utils = require("@nocobase/utils");
@@ -56,15 +55,14 @@ const QUEUE_DEFAULT_ACK_TIMEOUT = 15e3;
 const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
   constructor(options) {
     this.options = options;
-    this.emitter.setMaxListeners(0);
   }
   connected = false;
-  emitter = new import_events.EventEmitter();
   reading = /* @__PURE__ */ new Map();
+  scheduledChannels = /* @__PURE__ */ new Set();
   events = /* @__PURE__ */ new Map();
   queues = /* @__PURE__ */ new Map();
   get processing() {
-    const processing = Array.from(this.reading.values());
+    const processing = Array.from(this.reading.values()).flat();
     if (processing.length > 0) {
       return Promise.all(processing);
     }
@@ -80,7 +78,6 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     const { logger } = this.options;
     const event = this.events.get(channel);
     if (!event) {
-      logger.warn(`memory queue (${channel}) not found, skipping...`);
       return;
     }
     if (!event.idle()) {
@@ -99,10 +96,24 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
         if (index > -1) {
           reading.splice(index, 1);
         }
+        this.scheduleListen(channel);
       });
     });
     this.reading.set(channel, reading);
   }, "listen");
+  scheduleListen(channel) {
+    if (this.scheduledChannels.has(channel)) {
+      return;
+    }
+    this.scheduledChannels.add(channel);
+    setImmediate(() => {
+      this.scheduledChannels.delete(channel);
+      if (!this.events.has(channel)) {
+        return;
+      }
+      this.listen(channel);
+    });
+  }
   isConnected() {
     return this.connected;
   }
@@ -181,7 +192,6 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     if (!this.queues.has(channel)) {
       this.queues.set(channel, []);
     }
-    this.emitter.on(channel, this.listen);
     if (this.connected) {
       this.consume(channel);
     }
@@ -191,12 +201,12 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
       return;
     }
     this.events.delete(channel);
-    this.emitter.off(channel, this.listen);
   }
   publish(channel, content, options = { timestamp: Date.now() }) {
+    const { logger } = this.options;
     const event = this.events.get(channel);
     if (!event) {
-      console.debug(`memory queue (${channel}) not subscribed, skip`);
+      logger.debug(`memory queue (${channel}) not subscribed, skip`);
       return;
     }
     if (!this.queues.get(channel)) {
@@ -205,11 +215,8 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     const queue = this.queues.get(channel);
     const message = { id: (0, import_crypto.randomUUID)(), content, options };
     queue.push(message);
-    const { logger } = this.options;
     logger.debug(`memory queue (${channel}) published message`, content);
-    setImmediate(() => {
-      this.emitter.emit(channel, channel);
-    });
+    this.scheduleListen(channel);
   }
   async consume(channel, once = false) {
     while (this.connected && this.events.get(channel)) {

package/lib/helper.d.ts

@@ -11,6 +11,7 @@ import { Command } from 'commander';
 import Application, { ApplicationOptions } from './application';
 export declare function createI18n(options: ApplicationOptions): import("i18next").i18n;
 export declare function createResourcer(options: ApplicationOptions): Resourcer;
+export declare function resolveCorsOrigin(ctx: any): any;
 export declare function registerMiddlewares(app: Application, options: ApplicationOptions): void;
 export declare const createAppProxy: (app: Application) => Application<import("./application").DefaultState, import("./application").DefaultContext>;
 export declare const getCommandFullName: (command: Command) => string;

package/lib/helper.js

@@ -45,6 +45,7 @@ __export(helper_exports, {
   getBodyLimit: () => getBodyLimit,
   getCommandFullName: () => getCommandFullName,
   registerMiddlewares: () => registerMiddlewares,
+  resolveCorsOrigin: () => resolveCorsOrigin,
   tsxRerunning: () => tsxRerunning
 });
 module.exports = __toCommonJS(helper_exports);
@@ -89,7 +90,7 @@ function resolveCorsOrigin(ctx) {
   const whitelist = new Set(
     whitelistString.split(",").map((item) => item.trim()).filter(Boolean)
   );
-  if (whitelist.has(origin)) {
+  if (whitelist.has("*") || whitelist.has(origin)) {
     return origin;
   }
   return false;
@@ -309,5 +310,6 @@ __name(createContextVariablesScope, "createContextVariablesScope");
   getBodyLimit,
   getCommandFullName,
   registerMiddlewares,
+  resolveCorsOrigin,
   tsxRerunning
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.1.29",
+  "version": "2.1.31",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,21 +10,21 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.1.29",
-    "@nocobase/actions": "2.1.29",
-    "@nocobase/ai": "2.1.29",
-    "@nocobase/auth": "2.1.29",
-    "@nocobase/cache": "2.1.29",
-    "@nocobase/data-source-manager": "2.1.29",
-    "@nocobase/database": "2.1.29",
-    "@nocobase/evaluators": "2.1.29",
-    "@nocobase/lock-manager": "2.1.29",
-    "@nocobase/logger": "2.1.29",
-    "@nocobase/resourcer": "2.1.29",
-    "@nocobase/sdk": "2.1.29",
-    "@nocobase/snowflake-id": "2.1.29",
-    "@nocobase/telemetry": "2.1.29",
-    "@nocobase/utils": "2.1.29",
+    "@nocobase/acl": "2.1.31",
+    "@nocobase/actions": "2.1.31",
+    "@nocobase/ai": "2.1.31",
+    "@nocobase/auth": "2.1.31",
+    "@nocobase/cache": "2.1.31",
+    "@nocobase/data-source-manager": "2.1.31",
+    "@nocobase/database": "2.1.31",
+    "@nocobase/evaluators": "2.1.31",
+    "@nocobase/lock-manager": "2.1.31",
+    "@nocobase/logger": "2.1.31",
+    "@nocobase/resourcer": "2.1.31",
+    "@nocobase/sdk": "2.1.31",
+    "@nocobase/snowflake-id": "2.1.31",
+    "@nocobase/telemetry": "2.1.31",
+    "@nocobase/utils": "2.1.31",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -61,5 +61,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "d9848c5df07cef806cb938bb14b3f4ef5f3d0129"
+  "gitHead": "b5d46b76adb72b4fa736dd0e6c89d8a0bc83bfe8"
 }