@nocobase/server 1.9.0-beta.8 → 2.0.0-alpha.10

package/lib/aes-encryptor.js

@@ -53,25 +53,25 @@ const _AesEncryptor = class _AesEncryptor {
     this.key = key;
   }
   async encrypt(text) {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       try {
         const iv = import_crypto.default.randomBytes(16);
         const cipher = import_crypto.default.createCipheriv("aes-256-cbc", this.key, iv);
         const encrypted = Buffer.concat([cipher.update(Buffer.from(text, "utf8")), cipher.final()]);
-        resolve(iv.toString("hex") + encrypted.toString("hex"));
+        resolve2(iv.toString("hex") + encrypted.toString("hex"));
       } catch (error) {
         reject(error);
       }
     });
   }
   async decrypt(encryptedText) {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       try {
         const iv = Buffer.from(encryptedText.slice(0, 32), "hex");
         const encrypted = Buffer.from(encryptedText.slice(32), "hex");
         const decipher = import_crypto.default.createDecipheriv("aes-256-cbc", this.key, iv);
         const decrypted = Buffer.concat([decipher.update(encrypted), decipher.final()]);
-        resolve(decrypted.toString("utf8"));
+        resolve2(decrypted.toString("utf8"));
       } catch (error) {
         reject(error);
       }
@@ -109,11 +109,9 @@ const _AesEncryptor = class _AesEncryptor {
     return appKeyPath;
   }
   static async create(app) {
-    let key = process.env.APP_AES_SECRET_KEY;
-    if (!key) {
-      const keyPath = await this.getKeyPath(app.name);
-      key = await _AesEncryptor.getOrGenerateKey(keyPath);
-    }
+    const KEY_PATH = process.env.APP_AES_SECRET_KEY_PATH;
+    const keyPath = KEY_PATH ? (0, import_path.resolve)(process.cwd(), KEY_PATH) : await this.getKeyPath(app.name);
+    const key = await _AesEncryptor.getOrGenerateKey(keyPath);
     return new _AesEncryptor(key);
   }
 };

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;
   }
@@ -392,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();
     }
@@ -411,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();
@@ -434,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()) {
@@ -460,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) {
@@ -707,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;
@@ -876,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();
@@ -884,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();
@@ -962,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/gateway/index.d.ts

@@ -8,14 +8,17 @@
  */
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { SystemLogger } from '@nocobase/logger';
 import { Registry, Toposort, ToposortOptions } from '@nocobase/utils';
 import { EventEmitter } from 'events';
 import http, { IncomingMessage, ServerResponse } from 'http';
-import { ApplicationOptions } from '../application';
+import { ApplicationOptions, Application } from '../application';
 import { IPCSocketClient } from './ipc-socket-client';
 import { IPCSocketServer } from './ipc-socket-server';
 import { WSServer } from './ws-server';
+import { Duplex } from 'node:stream';
 export interface IncomingRequest {
     url: string;
     headers: any;
@@ -47,6 +50,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>;
@@ -76,5 +81,11 @@ export declare class Gateway extends EventEmitter {
     tryConnectToIPCServer(): Promise<false | IPCSocketClient>;
     getIPCSocketClient(): Promise<IPCSocketClient>;
     close(): void;
+    private static requestHandlers;
+    static registerRequestHandler(handler: (req: IncomingRequest, res: ServerResponse, app: Application) => boolean | void): void;
+    static unregisterRequestHandler(handler: (req: IncomingRequest, res: ServerResponse, app: Application) => boolean | void): void;
+    private static wsServers;
+    static registerWsHandler(wsServer: (req: IncomingMessage, socket: Duplex, head: Buffer, app: Application) => boolean | void): void;
+    static unregisterWsHandler(wsServer: (req: IncomingMessage, socket: Duplex, head: Buffer, app: Application) => boolean | void): void;
 }
 export {};

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())) {
@@ -360,9 +393,29 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       console.log("gateway port is not set, http server will not start");
       return;
     }
-    this.server = import_http.default.createServer(this.getCallback());
+    this.server = import_http.default.createServer(async (req, res) => {
+      const appInstance = await import_app_supervisor.AppSupervisor.getInstance().getApp("main");
+      for (const handler2 of _Gateway.requestHandlers) {
+        try {
+          const result = await handler2(req, res, appInstance);
+          if (result !== false) {
+            return;
+          }
+        } catch (error) {
+          console.error("gateway request handler error:", error);
+        }
+      }
+      this.getCallback()(req, res);
+    });
     this.wsServer = new import_ws_server.WSServer();
-    this.server.on("upgrade", (request, socket, head) => {
+    this.server.on("upgrade", async (request, socket, head) => {
+      const appInstance = await import_app_supervisor.AppSupervisor.getInstance().getApp("main");
+      for (const handle of _Gateway.wsServers) {
+        const result = await handle(request, socket, head, appInstance);
+        if (result !== false) {
+          return;
+        }
+      }
       const { pathname } = (0, import_url.parse)(request.url);
       if (pathname === import_node_process.default.env.WS_PATH) {
         this.wsServer.wss.handleUpgrade(request, socket, head, (ws) => {
@@ -395,9 +448,23 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     (_a = this.server) == null ? void 0 : _a.close();
     (_b = this.wsServer) == null ? void 0 : _b.close();
   }
+  static registerRequestHandler(handler2) {
+    _Gateway.requestHandlers.push(handler2);
+  }
+  static unregisterRequestHandler(handler2) {
+    _Gateway.requestHandlers = _Gateway.requestHandlers.filter((h) => h !== handler2);
+  }
+  static registerWsHandler(wsServer) {
+    _Gateway.wsServers.push(wsServer);
+  }
+  static unregisterWsHandler(wsServer) {
+    _Gateway.wsServers = _Gateway.wsServers.filter((ws) => ws !== wsServer);
+  }
 };
 __name(_Gateway, "Gateway");
 __publicField(_Gateway, "instance");
+__publicField(_Gateway, "requestHandlers", []);
+__publicField(_Gateway, "wsServers", []);
 let Gateway = _Gateway;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/index.d.ts

@@ -9,6 +9,7 @@
 export * from './aes-encryptor';
 export * from './app-supervisor';
 export * from './application';
+export * from './gateway/ws-server';
 export { Application as default } from './application';
 export * from './audit-manager';
 export * from './gateway';
@@ -19,6 +20,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

@@ -51,6 +51,7 @@ module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./aes-encryptor"), module.exports);
 __reExport(src_exports, require("./app-supervisor"), module.exports);
 __reExport(src_exports, require("./application"), module.exports);
+__reExport(src_exports, require("./gateway/ws-server"), module.exports);
 var import_application = require("./application");
 __reExport(src_exports, require("./audit-manager"), module.exports);
 __reExport(src_exports, require("./gateway"), module.exports);
@@ -61,6 +62,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-";
@@ -77,6 +80,7 @@ const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
   ...require("./aes-encryptor"),
   ...require("./app-supervisor"),
   ...require("./application"),
+  ...require("./gateway/ws-server"),
   ...require("./audit-manager"),
   ...require("./gateway"),
   ...require("./migration"),
@@ -84,5 +88,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/locale/resource.js

@@ -59,6 +59,13 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
       }
     } catch (error) {
     }
+    try {
+      require.resolve("@nocobase/flow-engine/src");
+      if (packageName === "@nocobase/plugin-flow-engine") {
+        packageName = "@nocobase/flow-engine";
+      }
+    } catch (error) {
+    }
     prefixes.unshift("src");
   }
   for (const prefix of prefixes) {

package/lib/middlewares/data-template.js

@@ -126,12 +126,7 @@ const traverseJSON = /* @__PURE__ */ __name((data, options) => {
         include: subInclude
       });
     } else if (field.type === "belongsTo") {
-      result[key] = traverseJSON(data[key], {
-        collection: collection.db.getCollection(field.target),
-        // exclude: [field.foreignKey],
-        include: subInclude,
-        excludePk: false
-      });
+      result[key] = data[key];
     } else if (field.type === "belongsToMany") {
       result[key] = traverseBelongsToMany(data[key], {
         collection: collection.db.getCollection(field.target),

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,124 @@
+/**
+ * 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,
+            allowNull: 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/plugin.js

@@ -130,7 +130,11 @@ const _Plugin = class _Plugin {
     if (!this.name) {
       throw new Error(`plugin name invalid`);
     }
-    await this.app.syncMessageManager.publish(this.name, message, options);
+    try {
+      await this.app.syncMessageManager.publish(this.name, message, options);
+    } catch (err) {
+      this.log.error(err);
+    }
   }
   /**
    * @deprecated

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/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-beta.8",
+  "version": "2.0.0-alpha.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-beta.8",
-    "@nocobase/actions": "1.9.0-beta.8",
-    "@nocobase/auth": "1.9.0-beta.8",
-    "@nocobase/cache": "1.9.0-beta.8",
-    "@nocobase/data-source-manager": "1.9.0-beta.8",
-    "@nocobase/database": "1.9.0-beta.8",
-    "@nocobase/evaluators": "1.9.0-beta.8",
-    "@nocobase/lock-manager": "1.9.0-beta.8",
-    "@nocobase/logger": "1.9.0-beta.8",
-    "@nocobase/resourcer": "1.9.0-beta.8",
-    "@nocobase/sdk": "1.9.0-beta.8",
-    "@nocobase/telemetry": "1.9.0-beta.8",
-    "@nocobase/utils": "1.9.0-beta.8",
+    "@nocobase/acl": "2.0.0-alpha.10",
+    "@nocobase/actions": "2.0.0-alpha.10",
+    "@nocobase/auth": "2.0.0-alpha.10",
+    "@nocobase/cache": "2.0.0-alpha.10",
+    "@nocobase/data-source-manager": "2.0.0-alpha.10",
+    "@nocobase/database": "2.0.0-alpha.10",
+    "@nocobase/evaluators": "2.0.0-alpha.10",
+    "@nocobase/lock-manager": "2.0.0-alpha.10",
+    "@nocobase/logger": "2.0.0-alpha.10",
+    "@nocobase/resourcer": "2.0.0-alpha.10",
+    "@nocobase/sdk": "2.0.0-alpha.10",
+    "@nocobase/snowflake-id": "2.0.0-alpha.10",
+    "@nocobase/telemetry": "2.0.0-alpha.10",
+    "@nocobase/utils": "2.0.0-alpha.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": "f3d4f3d1ba7adbf4d4c60e656c23da45565769c8"
+  "gitHead": "6422cfb6fa6c8450de2efa3294fd29a28b228990"
 }