@nocobase/server 1.9.0-alpha.9 → 1.9.0-beta.10

package/lib/application.d.ts

@@ -37,6 +37,8 @@ import { Environment } from './environment';
 import { ServiceContainer } from './service-container';
 import { EventQueue, EventQueueOptions } from './event-queue';
 import { BackgroundJobManager, BackgroundJobManagerOptions } from './background-job-manager';
+import { RedisConfig, RedisConnectionManager } from './redis-connection-manager';
+import { WorkerIdAllocator } from './worker-id-allocator';
 export type PluginType = string | typeof Plugin;
 export type PluginConfiguration = PluginType | [PluginType, any];
 export interface ResourceManagerOptions {
@@ -57,8 +59,9 @@ export interface AppTelemetryOptions extends TelemetryOptions {
     enabled?: boolean;
 }
 export interface ApplicationOptions {
-    instanceId?: string;
+    instanceId?: number;
     database?: IDatabaseOptions | Database;
+    redisConfig?: RedisConfig;
     cacheManager?: CacheManagerOptions;
     /**
      * this property is deprecated and should not be used.
@@ -131,9 +134,12 @@ export type MaintainingCommandStatus = {
     status: MaintainingStatus;
     error?: Error;
 };
+interface SnowflakeIdGenerator {
+    generate(): number | BigInt;
+}
 export declare class Application<StateT = DefaultState, ContextT = DefaultContext> extends Koa implements AsyncEmitter {
     options: ApplicationOptions;
-    readonly instanceId: string;
+    private _instanceId;
     /**
      * @internal
      */
@@ -168,6 +174,9 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     /**
      * @internal
      */
+    redisConnectionManager: RedisConnectionManager;
+    workerIdAllocator: WorkerIdAllocator;
+    snowflakeIdGenerator: SnowflakeIdGenerator;
     pubSubManager: PubSubManager;
     syncMessageManager: SyncMessageManager;
     requestLogger: Logger;
@@ -186,6 +195,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     private static staticCommands;
     static addCommand(callback: (app: Application) => void): void;
     private _sqlLogger;
+    get instanceId(): number;
     get sqlLogger(): Logger;
     protected _logger: SystemLogger;
     get logger(): SystemLogger;
@@ -309,6 +319,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     actions(handlers: any, options?: ActionsOptions): void;
     command(name: string, desc?: string, opts?: CommandOptions): AppCommand;
     findCommand(name: string): Command;
+    private disposeServices;
     /**
      * @internal
      */

package/lib/application.js

@@ -51,12 +51,12 @@ var import_logger = require("@nocobase/logger");
 var import_telemetry = require("@nocobase/telemetry");
 var import_lock_manager = require("@nocobase/lock-manager");
 var import_utils = require("@nocobase/utils");
+var import_snowflake_id = require("@nocobase/snowflake-id");
 var import_crypto = require("crypto");
 var import_glob = __toESM(require("glob"));
 var import_koa = __toESM(require("koa"));
 var import_koa_compose = __toESM(require("koa-compose"));
 var import_lodash = __toESM(require("lodash"));
-var import_nanoid = require("nanoid");
 var import_path = __toESM(require("path"));
 var import_semver = __toESM(require("semver"));
 var import_acl = require("./acl");
@@ -84,11 +84,13 @@ var import_environment = require("./environment");
 var import_service_container = require("./service-container");
 var import_event_queue = require("./event-queue");
 var import_background_job_manager = require("./background-job-manager");
+var import_redis_connection_manager = require("./redis-connection-manager");
+var import_worker_id_allocator = require("./worker-id-allocator");
+var import_snowflake_id_field = require("./snowflake-id-field");
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
     super();
     this.options = options;
-    this.instanceId = options.instanceId || (0, import_nanoid.nanoid)();
     this.context.reqId = (0, import_crypto.randomUUID)();
     this.rawOptions = this.name == "main" ? import_lodash.default.cloneDeep(options) : {};
     this.init();
@@ -96,7 +98,7 @@ const _Application = class _Application extends import_koa.default {
       this._appSupervisor.addApp(this);
     }
   }
-  instanceId;
+  _instanceId;
   /**
    * @internal
    */
@@ -124,6 +126,9 @@ const _Application = class _Application extends import_koa.default {
   /**
    * @internal
    */
+  redisConnectionManager;
+  workerIdAllocator;
+  snowflakeIdGenerator;
   pubSubManager;
   syncMessageManager;
   requestLogger;
@@ -142,6 +147,9 @@ const _Application = class _Application extends import_koa.default {
     this.staticCommands.push(callback);
   }
   _sqlLogger;
+  get instanceId() {
+    return this._instanceId;
+  }
   get sqlLogger() {
     return this._sqlLogger;
   }
@@ -279,6 +287,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 === "*") {
@@ -389,16 +400,10 @@ const _Application = class _Application extends import_koa.default {
   findCommand(name) {
     return this.cli._findCommand(name);
   }
-  /**
-   * @internal
-   */
-  async reInit() {
-    if (!this._loaded) {
-      return;
+  async disposeServices() {
+    if (this.redisConnectionManager) {
+      await this.redisConnectionManager.close();
     }
-    this.log.info("app reinitializing");
-    await this.emitAsync("beforeStop");
-    await this.emitAsync("afterStop");
     if (this.cacheManager) {
       await this.cacheManager.close();
     }
@@ -408,6 +413,19 @@ const _Application = class _Application extends import_koa.default {
     if (this.telemetry.started) {
       await this.telemetry.shutdown();
     }
+    await this.workerIdAllocator.release();
+  }
+  /**
+   * @internal
+   */
+  async reInit() {
+    if (!this._loaded) {
+      return;
+    }
+    this.log.info("app reinitializing");
+    await this.emitAsync("beforeStop");
+    await this.emitAsync("afterStop");
+    await this.disposeServices();
     this.closeLogger();
     const oldDb = this.db;
     this.init();
@@ -431,12 +449,7 @@ const _Application = class _Application extends import_koa.default {
     if (options == null ? void 0 : options.reload) {
       this.setMaintainingMessage("app reload");
       this.log.info(`app.reload()`, { method: "load" });
-      if (this.cacheManager) {
-        await this.cacheManager.close();
-      }
-      if (this.telemetry.started) {
-        await this.telemetry.shutdown();
-      }
+      await this.disposeServices();
       const oldDb = this.db;
       this.init();
       if (!oldDb.closed()) {
@@ -457,6 +470,15 @@ const _Application = class _Application extends import_koa.default {
     if ((options == null ? void 0 : options.hooks) !== false) {
       await this.emitAsync("beforeLoad", this, options);
     }
+    if (!this._instanceId) {
+      this._instanceId = await this.workerIdAllocator.getWorkerId();
+      this.log.info(`allocate worker id: ${this._instanceId}`, { method: "load" });
+    }
+    if (!this.snowflakeIdGenerator) {
+      this.snowflakeIdGenerator = new import_snowflake_id.Snowflake({
+        workerId: this._instanceId
+      });
+    }
     if (!this.telemetry.started) {
       this.telemetry.init();
       if ((_a = this.options.telemetry) == null ? void 0 : _a.enabled) {
@@ -704,12 +726,7 @@ const _Application = class _Application extends import_koa.default {
     } catch (e) {
       log.error(e.message, { method: "stop", err: e.stack });
     }
-    if (this.cacheManager) {
-      await this.cacheManager.close();
-    }
-    if (this.telemetry.started) {
-      await this.telemetry.shutdown();
-    }
+    await this.disposeServices();
     await this.emitAsync("afterStop", this, options);
     this.emit("__stopped", this, options);
     this.stopped = true;
@@ -873,6 +890,7 @@ const _Application = class _Application extends import_koa.default {
   }
   init() {
     const options = this.options;
+    this._instanceId = options.instanceId;
     this.initLogger(options.logger);
     this.reInitEvents();
     this.middleware = new import_utils.Toposort();
@@ -881,6 +899,11 @@ const _Application = class _Application extends import_koa.default {
       this.db.removeAllListeners();
     }
     this.createMainDataSource(options);
+    this.redisConnectionManager = new import_redis_connection_manager.RedisConnectionManager({
+      redisConfig: options.redisConfig,
+      logger: this._logger.child({ module: "redis-connection-manager" })
+    });
+    this.workerIdAllocator = new import_worker_id_allocator.WorkerIdAllocator();
     this._cronJobManager = new import_cron_job_manager.CronJobManager(this);
     this._env = new import_environment.Environment();
     this._cli = this.createCLI();
@@ -959,6 +982,7 @@ const _Application = class _Application extends import_koa.default {
       app: this
     });
     this.dataSourceManager.dataSources.set("main", mainDataSourceInstance);
+    (0, import_snowflake_id_field.setupSnowflakeIdField)(this);
   }
   createDatabase(options) {
     const logging = /* @__PURE__ */ __name((...args) => {

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/index.d.ts

@@ -47,6 +47,8 @@ export declare class Gateway extends EventEmitter {
     private port;
     private host;
     private socketPath;
+    private terminating;
+    private onTerminate;
     private constructor();
     static getInstance(options?: any): Gateway;
     static getIPCSocketClient(): Promise<false | IPCSocketClient>;

package/lib/gateway/index.js

@@ -86,10 +86,37 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   port = import_node_process.default.env.APP_PORT ? parseInt(import_node_process.default.env.APP_PORT) : null;
   host = "0.0.0.0";
   socketPath = (0, import_path.resolve)(import_node_process.default.cwd(), "storage", "gateway.sock");
+  terminating = false;
+  onTerminate = /* @__PURE__ */ __name(async (signal) => {
+    var _a;
+    if (this.terminating) {
+      return;
+    }
+    this.terminating = true;
+    const supervisor = import_app_supervisor.AppSupervisor.getInstance();
+    const apps = Object.values(supervisor.apps || {});
+    try {
+      for (const app of apps) {
+        try {
+          await app.destroy({ signal });
+        } catch (error) {
+          const logger = (app == null ? void 0 : app.log) ?? console;
+          (_a = logger.error) == null ? void 0 : _a.call(logger, error);
+        }
+      }
+      await supervisor.destroy();
+    } catch (error) {
+      console.error("Failed to shutdown applications gracefully", error);
+    } finally {
+      this.destroy();
+    }
+  }, "onTerminate");
   constructor() {
     super();
     this.reset();
     this.socketPath = getSocketPath();
+    import_node_process.default.once("SIGTERM", this.onTerminate);
+    import_node_process.default.once("SIGINT", this.onTerminate);
   }
   static getInstance(options = {}) {
     if (!_Gateway.instance) {
@@ -106,6 +133,8 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     }
   }
   destroy() {
+    import_node_process.default.off("SIGTERM", this.onTerminate);
+    import_node_process.default.off("SIGINT", this.onTerminate);
     this.reset();
     _Gateway.instance = null;
   }
@@ -137,6 +166,10 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       this.ipcSocketServer.close();
       this.ipcSocketServer = null;
     }
+    if (this.wsServer) {
+      this.wsServer.close();
+      this.wsServer = null;
+    }
   }
   addAppSelectorMiddleware(middleware, options) {
     if (this.selectorMiddlewares.nodes.some((existingFunc) => existingFunc.toString() === middleware.toString())) {

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/index.d.ts

@@ -19,6 +19,8 @@ export * from './plugin-manager';
 export * from './pub-sub-manager';
 export * from './event-queue';
 export * from './background-job-manager';
+export * from './worker-id-allocator';
+export * from './redis-connection-manager';
 export declare const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
 export { appendToBuiltInPlugins, findAllPlugins, findBuiltInPlugins, findLocalPlugins, packageNameTrim, } from './plugin-manager/findPackageNames';
 export { runPluginStaticImports } from './run-plugin-static-imports';

package/lib/index.js

@@ -61,6 +61,8 @@ __reExport(src_exports, require("./plugin-manager"), module.exports);
 __reExport(src_exports, require("./pub-sub-manager"), module.exports);
 __reExport(src_exports, require("./event-queue"), module.exports);
 __reExport(src_exports, require("./background-job-manager"), module.exports);
+__reExport(src_exports, require("./worker-id-allocator"), module.exports);
+__reExport(src_exports, require("./redis-connection-manager"), module.exports);
 var import_findPackageNames = require("./plugin-manager/findPackageNames");
 var import_run_plugin_static_imports = require("./run-plugin-static-imports");
 const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
@@ -84,5 +86,7 @@ const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
   ...require("./plugin-manager"),
   ...require("./pub-sub-manager"),
   ...require("./event-queue"),
-  ...require("./background-job-manager")
+  ...require("./background-job-manager"),
+  ...require("./worker-id-allocator"),
+  ...require("./redis-connection-manager")
 });

package/lib/migrations/20250902230900-update-primary-keys.d.ts

@@ -0,0 +1,14 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { Migration } from '../migration';
+export default class extends Migration {
+    on: string;
+    appVersion: string;
+    up(): Promise<void>;
+}

package/lib/migrations/20250902230900-update-primary-keys.js

@@ -0,0 +1,126 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var update_primary_keys_exports = {};
+__export(update_primary_keys_exports, {
+  default: () => update_primary_keys_default
+});
+module.exports = __toCommonJS(update_primary_keys_exports);
+var import_sequelize = require("sequelize");
+var import_migration = require("../migration");
+const collections = [
+  "departments",
+  "desktopRoutes",
+  "mobileRoutes",
+  "collectionCategories",
+  "dataSourcesRolesResources",
+  "dataSourcesRolesResourcesActions",
+  "dataSourcesRolesResourcesScopes",
+  "storages",
+  "workflows",
+  "flow_nodes",
+  "executions",
+  "userWokrflowTasks",
+  "workflowCategories",
+  "approvalExecutions",
+  "approvalRecords",
+  "approvals",
+  "workflowManualTasks",
+  "workflowCcTasks",
+  "approvalMsgTpls",
+  "mailAccounts",
+  "mailSettings"
+];
+const _update_primary_keys_default = class _update_primary_keys_default extends import_migration.Migration {
+  on = "afterLoad";
+  // 'beforeLoad' or 'afterLoad'
+  appVersion = "<1.9.0";
+  async up() {
+    const repo = this.db.getRepository("fields");
+    if (!repo) {
+      return;
+    }
+    const queryInterface = this.db.sequelize.getQueryInterface();
+    for (const collectionName of collections) {
+      const collection = this.db.getCollection(collectionName);
+      if (collection) {
+        const tableName = collection.getTableNameWithSchema();
+        if (this.db.isPostgresCompatibleDialect()) {
+          await this.db.sequelize.transaction(async (transaction) => {
+            const schema = collection.collectionSchema();
+            const table = collection.model.tableName;
+            const seqName = `"${schema}"."${table}_id_seq"`;
+            await this.db.sequelize.query(`ALTER TABLE "${schema}"."${table}" ALTER COLUMN id DROP DEFAULT;`, {
+              transaction
+            });
+            await this.db.sequelize.query(`DROP SEQUENCE IF EXISTS ${seqName} CASCADE;`, { transaction });
+          });
+        } else {
+          await queryInterface.changeColumn(tableName, "id", {
+            type: import_sequelize.DataTypes.BIGINT,
+            primaryKey: true,
+            allowNull: false,
+            autoIncrement: false
+          });
+        }
+      }
+      const field = await repo.findOne({
+        filter: {
+          collectionName,
+          name: "id"
+        }
+      });
+      if (field) {
+        const options = { ...field.options };
+        delete options["autoIncrement"];
+        await repo.update({
+          filter: { key: field.key },
+          values: {
+            type: "snowflakeId",
+            options
+          }
+        });
+      }
+    }
+    const treeCollections = [...this.db.collections.values()].filter((collection) => collection.options.tree);
+    for (const collection of treeCollections) {
+      const pathCollection = this.db.getCollection(`main_${collection.name}_path`);
+      if (pathCollection) {
+        const nodePk = pathCollection.getField("nodePk").columnName();
+        await queryInterface.changeColumn(pathCollection.getTableNameWithSchema(), nodePk, {
+          type: import_sequelize.DataTypes.BIGINT
+        });
+        const rootPk = pathCollection.getField("rootPk").columnName();
+        await queryInterface.changeColumn(pathCollection.getTableNameWithSchema(), rootPk, {
+          type: import_sequelize.DataTypes.BIGINT
+        });
+      }
+    }
+  }
+};
+__name(_update_primary_keys_default, "default");
+let update_primary_keys_default = _update_primary_keys_default;

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/redis-connection-manager.d.ts

@@ -0,0 +1,28 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import Redis from 'ioredis';
+import { Logger } from '@nocobase/logger';
+export { Redis };
+export interface RedisConfig {
+    connectionString: string;
+}
+export declare class RedisConnectionManager {
+    private logger;
+    private config;
+    private connections;
+    constructor(config: {
+        redisConfig: RedisConfig;
+        logger: Logger;
+    });
+    private bindEvents;
+    private getClient;
+    getConnection(key?: string, config?: RedisConfig): Redis | null;
+    getConnectionSync(key?: string, config?: RedisConfig): Promise<Redis>;
+    close(): Promise<void>;
+}

package/lib/redis-connection-manager.js

@@ -0,0 +1,119 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var redis_connection_manager_exports = {};
+__export(redis_connection_manager_exports, {
+  Redis: () => import_ioredis.default,
+  RedisConnectionManager: () => RedisConnectionManager
+});
+module.exports = __toCommonJS(redis_connection_manager_exports);
+var import_ioredis = __toESM(require("ioredis"));
+const _RedisConnectionManager = class _RedisConnectionManager {
+  logger;
+  config;
+  connections = /* @__PURE__ */ new Map();
+  constructor(config) {
+    this.config = config.redisConfig;
+    this.logger = config.logger;
+  }
+  bindEvents(conn, key, config) {
+    conn.on("connect", () => {
+      this.logger.info(`Redis connected`, {
+        method: "getConnection",
+        key,
+        config
+      });
+    });
+    conn.on("error", (err) => {
+      this.logger.error(err.message, {
+        err,
+        method: "getConnection",
+        key,
+        config
+      });
+    });
+    conn.on("close", () => {
+      this.logger.trace(`Redis closed`, {
+        method: "getConnection",
+        key,
+        config
+      });
+    });
+  }
+  getClient(key = "default", config) {
+    let conn = this.connections.get(key);
+    if (conn) {
+      return conn;
+    }
+    const cfg = config || this.config;
+    if (!cfg.connectionString) {
+      return null;
+    }
+    conn = new import_ioredis.default(cfg.connectionString);
+    this.connections.set(key, conn);
+    this.bindEvents(conn, key, cfg);
+    return conn;
+  }
+  getConnection(key = "default", config) {
+    return this.getClient(key, config);
+  }
+  async getConnectionSync(key = "default", config) {
+    return new Promise((resolve, reject) => {
+      const conn = this.getClient(key, config);
+      if (!conn) {
+        return reject(new Error("Redis connect string is missing"));
+      }
+      conn.once("connect", () => resolve(conn));
+      conn.once("error", reject);
+    });
+  }
+  async close() {
+    for (const conn of this.connections.values()) {
+      if (!(conn == null ? void 0 : conn.status) || conn.status === "close" || conn.status === "end") {
+        continue;
+      }
+      await conn.quit();
+    }
+  }
+};
+__name(_RedisConnectionManager, "RedisConnectionManager");
+let RedisConnectionManager = _RedisConnectionManager;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Redis,
+  RedisConnectionManager
+});

package/lib/snowflake-id-field.d.ts

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import Application from './application';
+export declare function setupSnowflakeIdField(app: Application): void;

package/lib/snowflake-id-field.js

@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var snowflake_id_field_exports = {};
+__export(snowflake_id_field_exports, {
+  setupSnowflakeIdField: () => setupSnowflakeIdField
+});
+module.exports = __toCommonJS(snowflake_id_field_exports);
+var import_database = require("@nocobase/database");
+function setupSnowflakeIdField(app) {
+  const _SnowflakeIdField = class _SnowflakeIdField extends import_database.SnowflakeIdField {
+  };
+  __name(_SnowflakeIdField, "SnowflakeIdField");
+  let SnowflakeIdField = _SnowflakeIdField;
+  SnowflakeIdField.setApp(app);
+  app.db.registerFieldTypes({
+    snowflakeId: SnowflakeIdField
+  });
+}
+__name(setupSnowflakeIdField, "setupSnowflakeIdField");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  setupSnowflakeIdField
+});

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/lib/worker-id-allocator.d.ts

@@ -0,0 +1,18 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export interface WorkerIdAllocatorAdapter {
+    getWorkerId(): Promise<number>;
+    release(): Promise<void>;
+}
+export declare class WorkerIdAllocator {
+    private adapter;
+    setAdapter(adapter: WorkerIdAllocatorAdapter): void;
+    getWorkerId(): Promise<number>;
+    release(): Promise<void>;
+}

package/lib/worker-id-allocator.js

@@ -0,0 +1,56 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var worker_id_allocator_exports = {};
+__export(worker_id_allocator_exports, {
+  WorkerIdAllocator: () => WorkerIdAllocator
+});
+module.exports = __toCommonJS(worker_id_allocator_exports);
+const _WorkerIdAllocator = class _WorkerIdAllocator {
+  adapter;
+  setAdapter(adapter) {
+    this.adapter = adapter;
+  }
+  async getWorkerId() {
+    if (this.adapter) {
+      return this.adapter.getWorkerId();
+    }
+    return Math.floor(Math.random() * 32);
+  }
+  async release() {
+    if (this.adapter) {
+      return this.adapter.release();
+    }
+    return;
+  }
+};
+__name(_WorkerIdAllocator, "WorkerIdAllocator");
+let WorkerIdAllocator = _WorkerIdAllocator;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  WorkerIdAllocator
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.9.0-alpha.9",
+  "version": "1.9.0-beta.10",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,19 +10,20 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "1.9.0-alpha.9",
-    "@nocobase/actions": "1.9.0-alpha.9",
-    "@nocobase/auth": "1.9.0-alpha.9",
-    "@nocobase/cache": "1.9.0-alpha.9",
-    "@nocobase/data-source-manager": "1.9.0-alpha.9",
-    "@nocobase/database": "1.9.0-alpha.9",
-    "@nocobase/evaluators": "1.9.0-alpha.9",
-    "@nocobase/lock-manager": "1.9.0-alpha.9",
-    "@nocobase/logger": "1.9.0-alpha.9",
-    "@nocobase/resourcer": "1.9.0-alpha.9",
-    "@nocobase/sdk": "1.9.0-alpha.9",
-    "@nocobase/telemetry": "1.9.0-alpha.9",
-    "@nocobase/utils": "1.9.0-alpha.9",
+    "@nocobase/acl": "1.9.0-beta.10",
+    "@nocobase/actions": "1.9.0-beta.10",
+    "@nocobase/auth": "1.9.0-beta.10",
+    "@nocobase/cache": "1.9.0-beta.10",
+    "@nocobase/data-source-manager": "1.9.0-beta.10",
+    "@nocobase/database": "1.9.0-beta.10",
+    "@nocobase/evaluators": "1.9.0-beta.10",
+    "@nocobase/lock-manager": "1.9.0-beta.10",
+    "@nocobase/logger": "1.9.0-beta.10",
+    "@nocobase/resourcer": "1.9.0-beta.10",
+    "@nocobase/sdk": "1.9.0-beta.10",
+    "@nocobase/snowflake-id": "1.9.0-beta.10",
+    "@nocobase/telemetry": "1.9.0-beta.10",
+    "@nocobase/utils": "1.9.0-beta.10",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -40,6 +41,7 @@
     "fs-extra": "^11.1.1",
     "i18next": "^22.4.9",
     "ini": "^4.1.1",
+    "ioredis": "^5.7.0",
     "koa": "^2.15.4",
     "koa-bodyparser": "^4.3.0",
     "koa-send": "^5.0.1",
@@ -57,5 +59,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "b2527eb4d2543e211af1bbdc835740fc94338420"
+  "gitHead": "a4a5180d8e9b6bebe9df1a931c2c0f8b5c5d26e6"
 }