@nocobase/server 2.0.0-alpha.4 → 2.0.0-alpha.40

package/lib/acl/available-action.js

@@ -56,7 +56,7 @@ const availableActions = {
   update: {
     displayName: '{{t("Edit")}}',
     type: "old-data",
-    aliases: ["update", "move", "add", "set", "remove", "toggle"],
+    aliases: ["update", "move"],
     allowConfigureFields: true
   },
   destroy: {

package/lib/aes-encryptor.js

@@ -109,6 +109,10 @@ const _AesEncryptor = class _AesEncryptor {
     return appKeyPath;
   }
   static async create(app) {
+    if (process.env.APP_AES_SECRET_KEY) {
+      const key2 = Buffer.from(process.env.APP_AES_SECRET_KEY, "hex");
+      return new _AesEncryptor(key2);
+    }
     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);

package/lib/app-command.d.ts

@@ -14,6 +14,7 @@ export declare class AppCommand extends Command {
     auth(): this;
     preload(): this;
     hasCommand(name: string): boolean;
+    findCommand(name: string): any;
     isHandleByIPCServer(): boolean;
     createCommand(name?: string): AppCommand;
     parseHandleByIPCServer(argv: any, parseOptions?: any): Boolean;

package/lib/app-command.js

@@ -51,6 +51,9 @@ const _AppCommand = class _AppCommand extends import_commander.Command {
     const names = this.commands.map((c) => c.name());
     return names.includes(name);
   }
+  findCommand(name) {
+    return this._findCommand(name);
+  }
   isHandleByIPCServer() {
     return this._handleByIPCServer;
   }

package/lib/app-supervisor.d.ts

@@ -8,6 +8,7 @@
  */
 /// <reference types="node" />
 import { AsyncEmitter } from '@nocobase/utils';
+import { Mutex } from 'async-mutex';
 import { EventEmitter } from 'events';
 import Application, { ApplicationOptions } from './application';
 type BootOptions = {
@@ -16,9 +17,10 @@ type BootOptions = {
     appSupervisor: AppSupervisor;
 };
 type AppBootstrapper = (bootOptions: BootOptions) => Promise<void>;
-type AppStatus = 'initializing' | 'initialized' | 'running' | 'commanding' | 'stopped' | 'error' | 'not_found';
+export type AppStatus = 'preparing' | 'initializing' | 'initialized' | 'running' | 'commanding' | 'stopped' | 'error' | 'not_found';
 export declare class AppSupervisor extends EventEmitter implements AsyncEmitter {
     private static instance;
+    private bootstrapQueue;
     runningMode: 'single' | 'multiple';
     singleAppName: string | null;
     emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
@@ -48,7 +50,8 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     reset(): Promise<void>;
     destroy(): Promise<void>;
     setAppStatus(appName: string, status: AppStatus, options?: {}): void;
-    getMutexOfApp(appName: string): any;
+    getMutexOfApp(appName: string): Mutex;
+    private _bootStrapApp;
     bootStrapApp(appName: string, options?: {}): Promise<void>;
     getApp(appName: string, options?: {
         withOutBootStrap?: boolean;
@@ -61,6 +64,8 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     touchApp(appName: string): void;
     addApp(app: Application): Application<import("./application").DefaultState, import("./application").DefaultContext>;
     getAppsNames(): Promise<string[]>;
+    startApp(appName: string): Promise<void>;
+    stopApp(appName: string): Promise<void>;
     removeApp(appName: string): Promise<void>;
     subApps(): Application<import("./application").DefaultState, import("./application").DefaultContext>[];
     on(eventName: string | symbol, listener: (...args: any[]) => void): this;

package/lib/app-supervisor.js

@@ -47,7 +47,9 @@ var import_async_mutex = require("async-mutex");
 var import_events = require("events");
 var import_application = __toESM(require("./application"));
 var import_handler = require("./errors/handler");
+var import_p_queue = __toESM(require("p-queue"));
 const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
+  bootstrapQueue;
   runningMode = "multiple";
   singleAppName = null;
   apps = {};
@@ -64,6 +66,12 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
       this.runningMode = "single";
       this.singleAppName = process.env.STARTUP_SUBAPP;
     }
+    this.bootstrapQueue = new import_p_queue.default({
+      concurrency: process.env.SUBAPP_BOOTSTRAP_CONCURRENCY ? parseInt(process.env.SUBAPP_BOOTSTRAP_CONCURRENCY) : Infinity,
+      intervalCap: process.env.SUBAPP_BOOTSTRAP_INTERVAL_CAP ? parseInt(process.env.SUBAPP_BOOTSTRAP_INTERVAL_CAP) : Infinity,
+      interval: process.env.SUBAPP_BOOTSTRAP_INTERVAL ? parseInt(process.env.SUBAPP_BOOTSTRAP_INTERVAL) : 0,
+      timeout: 1 * 60 * 1e3
+    });
   }
   static getInstance() {
     if (!_AppSupervisor.instance) {
@@ -113,24 +121,42 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     }
     return this.appMutexes[appName];
   }
+  async _bootStrapApp(appName, options = {}) {
+    this.setAppStatus(appName, "initializing");
+    if (this.appBootstrapper) {
+      await this.appBootstrapper({
+        appSupervisor: this,
+        appName,
+        options
+      });
+    }
+    if (!this.hasApp(appName)) {
+      this.setAppStatus(appName, "not_found");
+    } else if (!this.getAppStatus(appName) || this.getAppStatus(appName) === "initializing") {
+      this.setAppStatus(appName, "initialized");
+    }
+  }
   async bootStrapApp(appName, options = {}) {
-    await this.getMutexOfApp(appName).runExclusive(async () => {
-      if (!this.hasApp(appName)) {
-        this.setAppStatus(appName, "initializing");
-        if (this.appBootstrapper) {
-          await this.appBootstrapper({
-            appSupervisor: this,
-            appName,
-            options
-          });
+    const mutex = this.getMutexOfApp(appName);
+    try {
+      await (0, import_async_mutex.tryAcquire)(mutex).runExclusive(async () => {
+        if (this.hasApp(appName) && this.getAppStatus(appName) !== "preparing") {
+          return;
         }
-        if (!this.hasApp(appName)) {
-          this.setAppStatus(appName, "not_found");
-        } else if (!this.getAppStatus(appName) || this.getAppStatus(appName) == "initializing") {
-          this.setAppStatus(appName, "initialized");
+        if (appName === "main") {
+          return this._bootStrapApp(appName, options);
         }
+        this.setAppStatus(appName, "preparing");
+        await this.bootstrapQueue.add(async () => {
+          await this._bootStrapApp(appName, options);
+        });
+      });
+    } catch (e) {
+      console.log(e);
+      if (e === import_async_mutex.E_ALREADY_LOCKED) {
+        return;
       }
-    });
+    }
   }
   async getApp(appName, options = {}) {
     if (!options.withOutBootStrap) {
@@ -170,7 +196,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     this.apps[app.name] = app;
     this.emit("afterAppAdded", app);
     if (!this.getAppStatus(app.name) || this.getAppStatus(app.name) == "not_found") {
-      this.setAppStatus(app.name, "initialized");
+      this.setAppStatus(app.name, "preparing");
     }
     return app;
   }
@@ -179,12 +205,25 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     const apps = Object.values(this.apps);
     return apps.map((app) => app.name);
   }
+  async startApp(appName) {
+    const appInstance = await _AppSupervisor.getInstance().getApp(appName);
+    await appInstance.runCommand("start", "--quickstart");
+  }
+  async stopApp(appName) {
+    if (!this.apps[appName]) {
+      console.log(`app ${appName} not exists`);
+      return;
+    }
+    await this.apps[appName].runCommand("stop");
+    this.apps[appName] = null;
+  }
   async removeApp(appName) {
     if (!this.apps[appName]) {
       console.log(`app ${appName} not exists`);
       return;
     }
     await this.apps[appName].runCommand("destroy");
+    this.apps[appName] = null;
   }
   subApps() {
     return Object.values(this.apps).filter((app) => app.name !== "main");

package/lib/application.d.ts

@@ -33,11 +33,11 @@ import { PubSubManager, PubSubManagerOptions } from './pub-sub-manager';
 import { SyncMessageManager } from './sync-message-manager';
 import AesEncryptor from './aes-encryptor';
 import { AuditManager } from './audit-manager';
+import { BackgroundJobManager, BackgroundJobManagerOptions } from './background-job-manager';
 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 { ServiceContainer } from './service-container';
 import { WorkerIdAllocator } from './worker-id-allocator';
 export type PluginType = string | typeof Plugin;
 export type PluginConfiguration = PluginType | [PluginType, any];
@@ -193,6 +193,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     backgroundJobManager: BackgroundJobManager;
     constructor(options: ApplicationOptions);
     private static staticCommands;
+    static registerStaticCommand(callback: (app: Application) => void): void;
     static addCommand(callback: (app: Application) => void): void;
     private _sqlLogger;
     get instanceId(): number;
@@ -219,7 +220,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get environment(): Environment;
     protected _cronJobManager: CronJobManager;
     get cronJobManager(): CronJobManager;
-    get mainDataSource(): SequelizeDataSource;
+    get mainDataSource(): SequelizeDataSource<import("@nocobase/data-source-manager").DatabaseIntrospector>;
     get db(): Database;
     get resourceManager(): import("@nocobase/resourcer").ResourceManager;
     /**
@@ -283,7 +284,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     setMaintainingMessage(message: string): void;
     /**
      * This method is deprecated and should not be used.
-     * Use {@link #this.version.get()} instead.
+     * Use {@link #this.getPackageVersion} instead.
      * @deprecated
      */
     getVersion(): string;

package/lib/application.js

@@ -50,8 +50,8 @@ var import_database = __toESM(require("@nocobase/database"));
 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_utils = require("@nocobase/utils");
 var import_crypto = require("crypto");
 var import_glob = __toESM(require("glob"));
 var import_koa = __toESM(require("koa"));
@@ -80,13 +80,13 @@ var import_package = __toESM(require("../package.json"));
 var import_available_action = require("./acl/available-action");
 var import_aes_encryptor = __toESM(require("./aes-encryptor"));
 var import_audit_manager = require("./audit-manager");
+var import_background_job_manager = require("./background-job-manager");
 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_service_container = require("./service-container");
 var import_snowflake_id_field = require("./snowflake-id-field");
+var import_worker_id_allocator = require("./worker-id-allocator");
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
     super();
@@ -143,6 +143,9 @@ const _Application = class _Application extends import_koa.default {
   lockManager;
   eventQueue;
   backgroundJobManager;
+  static registerStaticCommand(callback) {
+    this.staticCommands.push(callback);
+  }
   static addCommand(callback) {
     this.staticCommands.push(callback);
   }
@@ -336,7 +339,7 @@ const _Application = class _Application extends import_koa.default {
   }
   /**
    * This method is deprecated and should not be used.
-   * Use {@link #this.version.get()} instead.
+   * Use {@link #this.getPackageVersion} instead.
    * @deprecated
    */
   getVersion() {
@@ -777,6 +780,12 @@ const _Application = class _Application extends import_koa.default {
   }
   async upgrade(options = {}) {
     this.log.info("upgrading...");
+    const pkgVersion = this.getPackageVersion();
+    const appVersion = await this.version.get();
+    if (process.env.SKIP_SAME_VERSION_UPGRADE === "true" && pkgVersion === appVersion) {
+      this.log.info(`app is already the latest version (${appVersion})`);
+      return;
+    }
     await this.reInit();
     const migrator1 = await this.loadCoreMigrations();
     await migrator1.beforeLoad.up();
@@ -800,7 +809,9 @@ const _Application = class _Application extends import_koa.default {
     await migrator3.afterLoad.up();
     await this.pm.repository.updateVersions();
     await this.version.update();
-    await this.emitAsync("afterUpgrade", this, options);
+    if (!options.quickstart) {
+      await this.emitAsync("afterUpgrade", this, options);
+    }
     await this.restart();
   }
   toJSON() {
@@ -927,8 +938,8 @@ const _Application = class _Application extends import_koa.default {
       plugins: plugins || []
     });
     this._telemetry = new import_telemetry.Telemetry({
-      serviceName: `nocobase-${this.name}`,
-      version: this.getVersion(),
+      appName: this.name,
+      version: this.getPackageVersion(),
       ...options.telemetry
     });
     this._authManager = new import_auth.AuthManager({
@@ -948,7 +959,7 @@ const _Application = class _Application extends import_koa.default {
         }
       }
     });
-    this._dataSourceManager.use(this._authManager.middleware(), { tag: "auth" });
+    this._dataSourceManager.use(this._authManager.middleware(), { tag: "auth", before: "default" });
     this._dataSourceManager.use(import_validate_filter_params.default, { tag: "validate-filter-params", before: ["auth"] });
     this._dataSourceManager.use(import_middlewares.parseVariables, {
       group: "parseVariables",

package/lib/commands/pm.js

@@ -38,6 +38,17 @@ var pm_default = /* @__PURE__ */ __name((app) => {
   pm.command("create").argument("plugin").option("--force-recreate").action(async (plugin, options) => {
     await app.pm.create(plugin, options);
   });
+  pm.command("pull").arguments("<packageNames...>").option("--registry [registry]").option("--auth-token [authToken]").option("--version [version]").action(async (packageNames, options, cli) => {
+    try {
+      let name = packageNames;
+      if (Array.isArray(packageNames) && packageNames.length === 1) {
+        name = packageNames[0];
+      }
+      await app.pm.pull(name, { ...options });
+    } catch (error) {
+      throw new import_plugin_command_error.PluginCommandError(`Failed to pull plugin`, { cause: error });
+    }
+  });
   pm.command("add").ipc().preload().arguments("<packageNames...>").option("--registry [registry]").option("--auth-token [authToken]").option("--version [version]").action(async (packageNames, options, cli) => {
     try {
       let name = packageNames;

package/lib/commands/start.js

@@ -61,7 +61,7 @@ var start_default = /* @__PURE__ */ __name((app) => {
       }
     } else if (options.quickstart) {
       if (await app.isInstalled()) {
-        await app.upgrade();
+        await app.upgrade({ quickstart: true });
       } else {
         await app.install();
       }

package/lib/event-queue.js

@@ -300,13 +300,13 @@ const _EventQueue = class _EventQueue {
     return this.adapter.isConnected();
   }
   async connect() {
-    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;
     }
+    if (!this.adapter) {
+      throw new Error("no adapter set, cannot connect");
+    }
     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()) {
@@ -342,6 +342,10 @@ const _EventQueue = class _EventQueue {
     }
   }
   async publish(channel, message, options = {}) {
+    if (!this.app.serving()) {
+      this.app.logger.warn("app is not serving, will not publish message to event queue");
+      return;
+    }
     if (!this.adapter) {
       throw new Error("no adapter set, cannot publish");
     }

package/lib/gateway/errors.js

@@ -53,7 +53,7 @@ const errors = {
   APP_ERROR: {
     status: 503,
     message: /* @__PURE__ */ __name(({ app }) => {
-      const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name];
+      const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app == null ? void 0 : app.name];
       if (!error) {
         return "";
       }
@@ -64,12 +64,17 @@ const errors = {
       return message;
     }, "message"),
     code: /* @__PURE__ */ __name(({ app }) => {
-      const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name];
+      const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app == null ? void 0 : app.name];
       return error["code"] || "APP_ERROR";
     }, "code"),
     command: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().command, "command"),
     maintaining: true
   },
+  APP_PREPARING: {
+    status: 503,
+    message: /* @__PURE__ */ __name(({ appName }) => `application ${appName} is preparing, please wait patiently`, "message"),
+    maintaining: true
+  },
   APP_STARTING: {
     status: 503,
     message: /* @__PURE__ */ __name(({ app }) => app.maintainingMessage, "message"),
@@ -77,12 +82,12 @@ const errors = {
   },
   APP_STOPPED: {
     status: 503,
-    message: /* @__PURE__ */ __name(({ app }) => `application ${app.name} is stopped`, "message"),
+    message: /* @__PURE__ */ __name(({ app }) => `application ${app == null ? void 0 : app.name} is stopped`, "message"),
     maintaining: true
   },
   APP_INITIALIZED: {
     status: 503,
-    message: /* @__PURE__ */ __name(({ app }) => `application ${app.name} is initialized, waiting for command`, "message"),
+    message: /* @__PURE__ */ __name(({ app }) => `application ${app == null ? void 0 : app.name} is initialized, please refresh the page`, "message"),
     maintaining: true
   },
   APP_INITIALIZING: {
@@ -111,7 +116,7 @@ const errors = {
   APP_RUNNING: {
     status: 200,
     maintaining: false,
-    message: /* @__PURE__ */ __name(({ message, app }) => message || `application ${app.name} is running`, "message")
+    message: /* @__PURE__ */ __name(({ message, app }) => message || `application ${app == null ? void 0 : app.name} is running`, "message")
   },
   UNKNOWN_ERROR: {
     status: 500,

package/lib/gateway/index.d.ts

@@ -23,6 +23,12 @@ export interface IncomingRequest {
     url: string;
     headers: any;
 }
+export interface GatewayRequestContext {
+    req: IncomingMessage;
+    res: ServerResponse;
+    appName: string;
+}
+type GatewayMiddleware = (ctx: GatewayRequestContext, next: () => Promise<void>) => Promise<void> | void;
 export type AppSelector = (req: IncomingRequest) => string | Promise<string>;
 export type AppSelectorMiddleware = (ctx: AppSelectorMiddlewareContext, next: () => Promise<void>) => void;
 interface StartHttpServerOptions {
@@ -39,6 +45,7 @@ export interface AppSelectorMiddlewareContext {
 }
 export declare class Gateway extends EventEmitter {
     private static instance;
+    middlewares: Toposort<GatewayMiddleware>;
     /**
      * use main app as default app to handle request
      */
@@ -54,6 +61,7 @@ export declare class Gateway extends EventEmitter {
     private onTerminate;
     private constructor();
     static getInstance(options?: any): Gateway;
+    use(middleware: GatewayMiddleware, options?: ToposortOptions): void;
     static getIPCSocketClient(): Promise<false | IPCSocketClient>;
     destroy(): void;
     reset(): void;

package/lib/gateway/index.js

@@ -75,6 +75,7 @@ function getSocketPath() {
 }
 __name(getSocketPath, "getSocketPath");
 const _Gateway = class _Gateway extends import_events.EventEmitter {
+  middlewares;
   /**
    * use main app as default app to handle request
    */
@@ -124,6 +125,9 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     }
     return _Gateway.instance;
   }
+  use(middleware, options) {
+    this.middlewares.add(middleware, options);
+  }
   static async getIPCSocketClient() {
     const socketPath = getSocketPath();
     try {
@@ -139,6 +143,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     _Gateway.instance = null;
   }
   reset() {
+    this.middlewares = new import_utils.Toposort();
     this.selectorMiddlewares = new import_utils.Toposort();
     this.addAppSelectorMiddleware(
       async (ctx, next) => {
@@ -202,7 +207,15 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     res.end(JSON.stringify({ error }));
   }
   responseErrorWithCode(code, res, options) {
+    const log = this.getLogger(options.appName, res);
     const error = (0, import_errors.applyErrorWithArgs)((0, import_errors.getErrorWithCode)(code), options);
+    log.error(error.message, {
+      method: "responseErrorWithCode",
+      code,
+      error,
+      statusCode: res.statusCode,
+      appName: options.appName
+    });
     this.responseError(res, error);
   }
   async requestHandler(req, res) {
@@ -256,11 +269,15 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     if (!hasApp) {
       void import_app_supervisor.AppSupervisor.getInstance().bootStrapApp(handleApp);
     }
-    let appStatus = import_app_supervisor.AppSupervisor.getInstance().getAppStatus(handleApp, "initializing");
+    let appStatus = import_app_supervisor.AppSupervisor.getInstance().getAppStatus(handleApp, "preparing");
     if (appStatus === "not_found") {
       this.responseErrorWithCode("APP_NOT_FOUND", res, { appName: handleApp });
       return;
     }
+    if (appStatus === "preparing") {
+      this.responseErrorWithCode("APP_PREPARING", res, { appName: handleApp });
+      return;
+    }
     if (appStatus === "initializing") {
       this.responseErrorWithCode("APP_INITIALIZING", res, { appName: handleApp });
       return;
@@ -283,7 +300,14 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     if (handleApp !== "main") {
       import_app_supervisor.AppSupervisor.getInstance().touchApp(handleApp);
     }
-    app.callback()(req, res);
+    const ctx = { req, res, appName: handleApp };
+    const fn = (0, import_koa_compose.default)([
+      ...this.middlewares.nodes,
+      async (_ctx) => {
+        await app.callback()(req, res);
+      }
+    ]);
+    await fn(ctx);
   }
   getAppSelectorMiddlewares() {
     return this.selectorMiddlewares;

package/lib/index.d.ts

@@ -22,6 +22,7 @@ export * from './event-queue';
 export * from './background-job-manager';
 export * from './worker-id-allocator';
 export * from './redis-connection-manager';
+export * from './main-data-source';
 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

@@ -64,6 +64,7 @@ __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);
+__reExport(src_exports, require("./main-data-source"), 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-";
@@ -90,5 +91,6 @@ const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
   ...require("./event-queue"),
   ...require("./background-job-manager"),
   ...require("./worker-id-allocator"),
-  ...require("./redis-connection-manager")
+  ...require("./redis-connection-manager"),
+  ...require("./main-data-source")
 });

package/lib/locale/locale.js

@@ -138,7 +138,7 @@ const _Locale = class _Locale {
         if (!packageName) {
           continue;
         }
-        const res = (0, import_resource.getResource)(packageName, lang);
+        const res = await (0, import_resource.getResource)(packageName, lang);
         if (res) {
           resources[packageName] = { ...res };
           if (packageName.includes(import__.OFFICIAL_PLUGIN_PREFIX)) {

package/lib/locale/resource.js

@@ -40,7 +40,7 @@ __export(resource_exports, {
   getResource: () => getResource
 });
 module.exports = __toCommonJS(resource_exports);
-var import_utils = require("@nocobase/utils");
+var import_promises = __toESM(require("fs/promises"));
 const arr2obj = /* @__PURE__ */ __name((items) => {
   const obj = {};
   for (const item of items) {
@@ -48,7 +48,7 @@ const arr2obj = /* @__PURE__ */ __name((items) => {
   }
   return obj;
 }, "arr2obj");
-const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true) => {
+const getResource = /* @__PURE__ */ __name(async (packageName, lang, isPlugin = true) => {
   const resources = [];
   const prefixes = [isPlugin ? "dist" : "lib"];
   if (process.env.APP_ENV !== "production") {
@@ -70,13 +70,10 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
   }
   for (const prefix of prefixes) {
     try {
-      const file = `${packageName}/${prefix}/locale/${lang}`;
+      const file = `${packageName}/${prefix}/locale/${lang}.json`;
       const f = require.resolve(file);
-      if (process.env.APP_ENV !== "production") {
-        delete require.cache[f];
-      }
-      const resource = (0, import_utils.requireModule)(file);
-      resources.push(resource);
+      const resource = await import_promises.default.readFile(f, "utf8");
+      resources.push(JSON.parse(resource));
     } catch (error) {
     }
     if (resources.length) {
@@ -84,7 +81,7 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
     }
   }
   if (resources.length === 0 && lang.replace("-", "_") !== lang) {
-    return getResource(packageName, lang.replace("-", "_"));
+    return await getResource(packageName, lang.replace("-", "_"));
   }
   return arr2obj(resources);
 }, "getResource");

package/lib/main-data-source.d.ts

@@ -6,7 +6,18 @@
  * 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 { Context } from '@nocobase/actions';
 import { DataSourceOptions, SequelizeDataSource } from '@nocobase/data-source-manager';
+type MainDataSourceStatus = 'loaded' | 'loading';
 export declare class MainDataSource extends SequelizeDataSource {
+    status: MainDataSourceStatus;
     init(options?: DataSourceOptions): void;
+    readTables(): Promise<{
+        name: string;
+    }[]>;
+    private tables2Collections;
+    loadTables(ctx: Context, tables: string[]): Promise<void>;
+    private getLoadedCollections;
+    syncFieldsFromDatabase(ctx: any, collectionNames?: string[]): Promise<void>;
 }
+export {};

package/lib/main-data-source.js

@@ -32,6 +32,7 @@ __export(main_data_source_exports, {
 module.exports = __toCommonJS(main_data_source_exports);
 var import_data_source_manager = require("@nocobase/data-source-manager");
 const _MainDataSource = class _MainDataSource extends import_data_source_manager.SequelizeDataSource {
+  status = "loaded";
   init(options = {}) {
     const { acl, resourceManager, database } = options;
     this.acl = acl;
@@ -48,6 +49,133 @@ const _MainDataSource = class _MainDataSource extends import_data_source_manager
       this.resourceManager.use(this.acl.middleware(), { group: "acl", after: "auth" });
     }
   }
+  async readTables() {
+    const allTables = await this.introspector.getTableList();
+    const existsCollections = this.collectionManager.db.collections;
+    const existsTables = Array.from(existsCollections.values()).map(
+      (collection) => collection.model.tableName
+    );
+    const diffTables = allTables.filter((table) => !existsTables.includes(table));
+    return diffTables.map((name) => ({ name }));
+  }
+  async tables2Collections(tableNames) {
+    const db = this.collectionManager.db;
+    const results = await Promise.all(
+      tableNames.map(async (tableName) => {
+        let tableInfo;
+        if (typeof tableName === "string") {
+          tableInfo = { tableName };
+          if (db.options.schema) {
+            tableInfo.schema = db.options.schema;
+          }
+        } else {
+          tableInfo = tableName;
+        }
+        try {
+          return await this.introspector.getCollection({ tableInfo });
+        } catch (e) {
+          if (e.message.includes("No description found for")) {
+            return null;
+          }
+          throw e;
+        }
+      })
+    );
+    return results.filter(Boolean);
+  }
+  async loadTables(ctx, tables) {
+    const repo = this.collectionManager.db.getRepository("collections");
+    const existsCollections = this.collectionManager.db.collections;
+    const existsTables = Array.from(existsCollections.values()).map(
+      (collection) => collection.model.tableName
+    );
+    const toAddTables = tables.filter((table) => !existsTables.includes(table));
+    if (toAddTables.length) {
+      try {
+        this.status = "loading";
+        const results = await this.tables2Collections(toAddTables);
+        const values = results.map((result) => ({
+          ...result,
+          underscored: false
+        }));
+        await repo.create({ values, context: ctx });
+      } catch (e) {
+        throw e;
+      } finally {
+        this.status = "loaded";
+      }
+    }
+  }
+  async getLoadedCollections(filter) {
+    const db = this.collectionManager.db;
+    const loadedCollections = await db.getRepository("collections").find({
+      appends: ["fields"],
+      filter: {
+        hidden: false,
+        ...filter
+      }
+    });
+    const collections = loadedCollections.filter((collection) => {
+      var _a;
+      return ((_a = collection.options) == null ? void 0 : _a.from) !== "db2cm";
+    });
+    const loadedData = {};
+    for (const collection of collections) {
+      const c = db.getCollection(collection.name);
+      loadedData[c.tableName()] = {
+        ...collection.toJSON(),
+        fields: collection.fields.map((field) => {
+          const f = c.getField(field.name);
+          return {
+            columnName: f == null ? void 0 : f.columnName(),
+            ...field.toJSON()
+          };
+        })
+      };
+    }
+    return loadedData;
+  }
+  async syncFieldsFromDatabase(ctx, collectionNames) {
+    let filter = {};
+    if (collectionNames == null ? void 0 : collectionNames.length) {
+      filter = {
+        name: collectionNames
+      };
+    }
+    const db = this.collectionManager.db;
+    const loadedCollections = await this.getLoadedCollections(filter);
+    const tableNames = Object.values(loadedCollections).map(({ name }) => {
+      const collection = db.getCollection(name);
+      return collection.getTableNameWithSchema();
+    });
+    let collections = [];
+    try {
+      collections = await this.tables2Collections(tableNames);
+    } catch (err) {
+      ctx.log.error(err);
+    }
+    const toLoadCollections = this.mergeWithLoadedCollections(collections, loadedCollections);
+    for (const values of toLoadCollections) {
+      const existsFields = loadedCollections[values.tableName].fields;
+      const deletedFields = existsFields.filter((field) => !values.fields.find((f) => f.name === field.name));
+      await db.sequelize.transaction(async (transaction) => {
+        for (const field of deletedFields) {
+          await db.getRepository("fields").destroy({
+            filterByTk: field.key,
+            context: ctx,
+            transaction
+          });
+        }
+        await db.getRepository("collections").update({
+          filterByTk: values.name,
+          values,
+          updateAssociationValues: ["fields"],
+          context: ctx,
+          transaction
+        });
+      });
+    }
+  }
 };
 __name(_MainDataSource, "MainDataSource");
 let MainDataSource = _MainDataSource;

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.js

@@ -82,9 +82,7 @@ const _update_primary_keys_default = class _update_primary_keys_default extends
         } else {
           await queryInterface.changeColumn(tableName, "id", {
             type: import_sequelize.DataTypes.BIGINT,
-            primaryKey: true,
-            allowNull: false,
-            autoIncrement: false
+            allowNull: false
           });
         }
       }

package/lib/plugin-manager/options/resource.js

@@ -13,6 +13,8 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+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 });
@@ -34,6 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var resource_exports = {};
 __export(resource_exports, {
   default: () => resource_default
@@ -43,6 +46,33 @@ var import_utils = require("@nocobase/utils");
 var import_fs = __toESM(require("fs"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
+const _PackageUrls = class _PackageUrls {
+  static async get(packageName, version) {
+    if (!this.items[packageName]) {
+      this.items[packageName] = await this.fetch(packageName, version);
+    }
+    return this.items[packageName];
+  }
+  static async fetch(packageName, version) {
+    const PLUGIN_CLIENT_ENTRY_FILE = "dist/client/index.js";
+    const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, packageName);
+    const r = await import_fs_extra.default.exists(pkgPath);
+    if (r) {
+      let t = "";
+      const dist = import_path.default.resolve(pkgPath, PLUGIN_CLIENT_ENTRY_FILE);
+      const distExists = await import_fs_extra.default.exists(dist);
+      if (distExists) {
+        const fsState = await import_fs_extra.default.stat(distExists ? dist : pkgPath);
+        t = `&t=${fsState.mtime.getTime()}`;
+      }
+      const url = `${process.env.APP_SERVER_BASE_URL}${process.env.PLUGIN_STATICS_PATH}${packageName}/${PLUGIN_CLIENT_ENTRY_FILE}?version=${version}${t}`;
+      return url;
+    }
+  }
+};
+__name(_PackageUrls, "PackageUrls");
+__publicField(_PackageUrls, "items", {});
+let PackageUrls = _PackageUrls;
 var resource_default = {
   name: "pm",
   actions: {
@@ -152,33 +182,26 @@ var resource_default = {
       await next();
     },
     async listEnabled(ctx, next) {
-      const pm = ctx.db.getRepository("applicationPlugins");
-      const PLUGIN_CLIENT_ENTRY_FILE = "dist/client/index.js";
-      const items = await pm.find({
-        filter: {
-          enabled: true
-        }
-      });
-      const arr = [];
-      for (const item of items) {
-        const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, item.packageName);
-        const r = await import_fs_extra.default.exists(pkgPath);
-        if (r) {
-          let t = "";
-          const dist = import_path.default.resolve(pkgPath, PLUGIN_CLIENT_ENTRY_FILE);
-          const distExists = await import_fs_extra.default.exists(dist);
-          if (distExists) {
-            const fsState = await import_fs_extra.default.stat(distExists ? dist : pkgPath);
-            t = `&t=${fsState.mtime.getTime()}`;
+      const toArr = /* @__PURE__ */ __name(async () => {
+        const pm = ctx.db.getRepository("applicationPlugins");
+        const items = await pm.find({
+          filter: {
+            enabled: true
+          }
+        });
+        const arr = [];
+        for (const item of items) {
+          const url = await PackageUrls.get(item.packageName, item.version);
+          if (url) {
+            arr.push({
+              ...item.toJSON(),
+              url
+            });
           }
-          const url = `${process.env.APP_SERVER_BASE_URL}${process.env.PLUGIN_STATICS_PATH}${item.packageName}/${PLUGIN_CLIENT_ENTRY_FILE}?version=${item.version}${t}`;
-          arr.push({
-            ...item.toJSON(),
-            url
-          });
         }
-      }
-      ctx.body = arr;
+        return arr;
+      }, "toArr");
+      ctx.body = await toArr();
       await next();
     },
     async get(ctx, next) {

package/lib/plugin-manager/plugin-manager.d.ts

@@ -112,6 +112,7 @@ export declare class PluginManager {
         removeDir?: boolean;
         force?: boolean;
     }): Promise<void>;
+    pull(urlOrName: string | string[], options?: PluginData, emitStartedEvent?: boolean): Promise<void>;
     /**
      * @internal
      */

package/lib/plugin-manager/plugin-manager.js

@@ -90,7 +90,7 @@ const _PluginManager = class _PluginManager {
       namespace: "core/pm",
       directory: (0, import_path.resolve)(__dirname, "../migrations")
     });
-    this.app.resourcer.use(import_middleware.uploadMiddleware);
+    this.app.resourceManager.use(import_middleware.uploadMiddleware, { tag: "upload", after: "acl" });
   }
   /**
    * @internal
@@ -718,6 +718,41 @@ const _PluginManager = class _PluginManager {
       await removeDir();
     }
   }
+  async pull(urlOrName, options, emitStartedEvent = true) {
+    if (Array.isArray(urlOrName)) {
+      for (const packageName of urlOrName) {
+        await this.addViaCLI(packageName, import_lodash.default.omit(options, "name"), false);
+      }
+      return;
+    }
+    if ((0, import_utils.isURL)(urlOrName)) {
+      await this.addByCompressedFileUrl(
+        {
+          ...options,
+          compressedFileUrl: urlOrName
+        },
+        emitStartedEvent
+      );
+    } else if (await import_fs_extra.default.exists(urlOrName)) {
+      await this.addByCompressedFileUrl(
+        {
+          ...options,
+          compressedFileUrl: urlOrName
+        },
+        emitStartedEvent
+      );
+    } else if (options == null ? void 0 : options.registry) {
+      const { name, packageName } = await _PluginManager.parseName(urlOrName);
+      options["name"] = name;
+      await this.addByNpm(
+        {
+          ...options,
+          packageName
+        },
+        emitStartedEvent
+      );
+    }
+  }
   /**
    * @internal
    */

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

@@ -17,8 +17,8 @@ export declare class PubSubManager {
     protected adapter: IPubSubAdapter;
     protected handlerManager: HandlerManager;
     constructor(app: Application, options?: PubSubManagerOptions);
-    get channelPrefix(): string;
     setAdapter(adapter: IPubSubAdapter): void;
+    getFullChannel(channel: string): string;
     isConnected(): Promise<boolean>;
     connect(): Promise<void>;
     close(): Promise<any>;

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

@@ -55,13 +55,13 @@ const _PubSubManager = class _PubSubManager {
   publisherId;
   adapter;
   handlerManager;
-  get channelPrefix() {
-    var _a;
-    return ((_a = this.options) == null ? void 0 : _a.channelPrefix) ? `${this.options.channelPrefix}.` : "";
-  }
   setAdapter(adapter) {
     this.adapter = adapter;
   }
+  getFullChannel(channel) {
+    var _a;
+    return [this.app.name, (_a = this.options) == null ? void 0 : _a.channelPrefix, channel].filter(Boolean).join(".");
+  }
   async isConnected() {
     if (this.adapter) {
       return this.adapter.isConnected();
@@ -79,7 +79,7 @@ const _PubSubManager = class _PubSubManager {
     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);
+      await this.adapter.subscribe(this.getFullChannel(channel), headler);
     });
   }
   async close() {
@@ -93,7 +93,7 @@ const _PubSubManager = class _PubSubManager {
     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);
+      await this.adapter.subscribe(this.getFullChannel(channel), handler);
     }
   }
   async unsubscribe(channel, callback) {
@@ -101,7 +101,7 @@ const _PubSubManager = class _PubSubManager {
     if (!this.adapter || !handler) {
       return;
     }
-    return this.adapter.unsubscribe(`${this.channelPrefix}${channel}`, handler);
+    return this.adapter.unsubscribe(this.getFullChannel(channel), handler);
   }
   async publish(channel, message, options) {
     var _a;
@@ -116,7 +116,7 @@ const _PubSubManager = class _PubSubManager {
       ...options,
       message
     });
-    await this.adapter.publish(`${this.channelPrefix}${channel}`, wrappedMessage);
+    await this.adapter.publish(this.getFullChannel(channel), wrappedMessage);
     this.app.logger.trace(`[PubSubManager] published message to channel ${channel}`);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0-alpha.40",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,20 +10,20 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.0.0-alpha.4",
-    "@nocobase/actions": "2.0.0-alpha.4",
-    "@nocobase/auth": "2.0.0-alpha.4",
-    "@nocobase/cache": "2.0.0-alpha.4",
-    "@nocobase/data-source-manager": "2.0.0-alpha.4",
-    "@nocobase/database": "2.0.0-alpha.4",
-    "@nocobase/evaluators": "2.0.0-alpha.4",
-    "@nocobase/lock-manager": "2.0.0-alpha.4",
-    "@nocobase/logger": "2.0.0-alpha.4",
-    "@nocobase/resourcer": "2.0.0-alpha.4",
-    "@nocobase/sdk": "2.0.0-alpha.4",
-    "@nocobase/snowflake-id": "2.0.0-alpha.4",
-    "@nocobase/telemetry": "2.0.0-alpha.4",
-    "@nocobase/utils": "2.0.0-alpha.4",
+    "@nocobase/acl": "2.0.0-alpha.40",
+    "@nocobase/actions": "2.0.0-alpha.40",
+    "@nocobase/auth": "2.0.0-alpha.40",
+    "@nocobase/cache": "2.0.0-alpha.40",
+    "@nocobase/data-source-manager": "2.0.0-alpha.40",
+    "@nocobase/database": "2.0.0-alpha.40",
+    "@nocobase/evaluators": "2.0.0-alpha.40",
+    "@nocobase/lock-manager": "2.0.0-alpha.40",
+    "@nocobase/logger": "2.0.0-alpha.40",
+    "@nocobase/resourcer": "2.0.0-alpha.40",
+    "@nocobase/sdk": "2.0.0-alpha.40",
+    "@nocobase/snowflake-id": "2.0.0-alpha.40",
+    "@nocobase/telemetry": "2.0.0-alpha.40",
+    "@nocobase/utils": "2.0.0-alpha.40",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -49,6 +49,7 @@
     "lodash": "^4.17.21",
     "multer": "^1.4.5-lts.2",
     "nanoid": "^3.3.11",
+    "p-queue": "^6.6.2",
     "semver": "^7.7.1",
     "serve-handler": "^6.1.6",
     "ws": "^8.13.0",
@@ -59,5 +60,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "54f3cab47e7efbdc73377014d05f5fc66a4affbb"
+  "gitHead": "dfb9fd33f43e91e676ae7b1f1a595bc38b7c20d2"
 }