@nocobase/server 1.3.39-beta → 1.4.0-alpha

package/lib/application.d.ts

@@ -149,28 +149,28 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
      * @internal
      */
     perfHistograms: Map<string, RecordableHistogram>;
+    /**
+     * @internal
+     */
+    syncManager: SyncManager;
+    requestLogger: Logger;
     protected plugins: Map<string, Plugin<any>>;
     protected _appSupervisor: AppSupervisor;
-    protected _started: Date | null;
     private _authenticated;
     private _maintaining;
     private _maintainingCommandStatus;
     private _maintainingStatusBeforeCommand;
     private _actionCommand;
-    /**
-     * @internal
-     */
-    syncManager: SyncManager;
-    requestLogger: Logger;
+    constructor(options: ApplicationOptions);
     private _sqlLogger;
+    get sqlLogger(): Logger;
     protected _logger: SystemLogger;
-    constructor(options: ApplicationOptions);
+    get logger(): SystemLogger;
+    protected _started: Date | null;
     /**
      * @experimental
      */
     get started(): Date;
-    get logger(): SystemLogger;
-    get sqlLogger(): Logger;
     get log(): SystemLogger;
     protected _loaded: boolean;
     /**

package/lib/application.js

@@ -107,33 +107,33 @@ const _Application = class _Application extends import_koa.default {
    * @internal
    */
   perfHistograms = /* @__PURE__ */ new Map();
+  /**
+   * @internal
+   */
+  syncManager;
+  requestLogger;
   plugins = /* @__PURE__ */ new Map();
   _appSupervisor = import_app_supervisor.AppSupervisor.getInstance();
-  _started = null;
   _authenticated = false;
   _maintaining = false;
   _maintainingCommandStatus;
   _maintainingStatusBeforeCommand;
   _actionCommand;
-  /**
-   * @internal
-   */
-  syncManager;
-  requestLogger;
   _sqlLogger;
+  get sqlLogger() {
+    return this._sqlLogger;
+  }
   _logger;
+  get logger() {
+    return this._logger;
+  }
+  _started = null;
   /**
    * @experimental
    */
   get started() {
     return this._started;
   }
-  get logger() {
-    return this._logger;
-  }
-  get sqlLogger() {
-    return this._sqlLogger;
-  }
   get log() {
     return this._logger;
   }
@@ -369,6 +369,9 @@ const _Application = class _Application extends import_koa.default {
         await oldDb.close();
       }
     }
+    if (this.cacheManager) {
+      await this.cacheManager.close();
+    }
     this._cacheManager = await (0, import_cache2.createCacheManager)(this, this.options.cacheManager);
     this.log.debug("init plugins");
     this.setMaintainingMessage("init plugins");
@@ -379,9 +382,11 @@ const _Application = class _Application extends import_koa.default {
     if ((options == null ? void 0 : options.hooks) !== false) {
       await this.emitAsync("beforeLoad", this, options);
     }
-    this.telemetry.init();
-    if ((_a = this.options.telemetry) == null ? void 0 : _a.enabled) {
-      this.telemetry.start();
+    if (!this.telemetry.started) {
+      this.telemetry.init();
+      if ((_a = this.options.telemetry) == null ? void 0 : _a.enabled) {
+        this.telemetry.start();
+      }
     }
     await this.pm.load(options);
     if (options == null ? void 0 : options.sync) {
@@ -661,6 +666,7 @@ const _Application = class _Application extends import_koa.default {
     await this.reInit();
     await this.db.sync();
     await this.load({ hooks: false });
+    this._loaded = false;
     this.log.debug("emit beforeInstall", { method: "install" });
     this.setMaintainingMessage("call beforeInstall hook...");
     await this.emitAsync("beforeInstall", this, options);

package/lib/commands/start.js

@@ -40,20 +40,23 @@ __export(start_exports, {
   default: () => start_default
 });
 module.exports = __toCommonJS(start_exports);
-var import_utils = require("@nocobase/utils");
-var import_fs = __toESM(require("fs"));
+var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = require("path");
 var import_application_not_install = require("../errors/application-not-install");
 /* istanbul ignore file -- @preserve */
 var start_default = /* @__PURE__ */ __name((app) => {
   app.command("start").auth().option("--db-sync").option("--quickstart").action(async (...cliArgs) => {
     const [options] = cliArgs;
-    const file = (0, import_path.resolve)(process.cwd(), "storage/app-upgrading");
-    const upgrading = await (0, import_utils.fsExists)(file);
+    const file = (0, import_path.resolve)(process.cwd(), "storage/.upgrading");
+    const upgrading = await import_fs_extra.default.exists(file);
     if (upgrading) {
-      await app.upgrade();
+      if (!process.env.VITEST) {
+        if (await app.isInstalled()) {
+          await app.upgrade();
+        }
+      }
       try {
-        await import_fs.default.promises.rm(file);
+        await import_fs_extra.default.rm(file, { recursive: true, force: true });
       } catch (error) {
       }
     } else if (options.quickstart) {

package/lib/index.d.ts

@@ -6,13 +6,15 @@
  * 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 * from './app-supervisor';
 export * from './application';
 export { Application as default } from './application';
+export * from './gateway';
 export * as middlewares from './middlewares';
 export * from './migration';
 export * from './plugin';
 export * from './plugin-manager';
-export * from './gateway';
-export * from './app-supervisor';
 export * from './sync-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

@@ -38,29 +38,43 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   OFFICIAL_PLUGIN_PREFIX: () => OFFICIAL_PLUGIN_PREFIX,
+  appendToBuiltInPlugins: () => import_findPackageNames.appendToBuiltInPlugins,
   default: () => import_application.Application,
-  middlewares: () => middlewares
+  findAllPlugins: () => import_findPackageNames.findAllPlugins,
+  findBuiltInPlugins: () => import_findPackageNames.findBuiltInPlugins,
+  findLocalPlugins: () => import_findPackageNames.findLocalPlugins,
+  middlewares: () => middlewares,
+  packageNameTrim: () => import_findPackageNames.packageNameTrim,
+  runPluginStaticImports: () => import_run_plugin_static_imports.runPluginStaticImports
 });
 module.exports = __toCommonJS(src_exports);
+__reExport(src_exports, require("./app-supervisor"), module.exports);
 __reExport(src_exports, require("./application"), module.exports);
 var import_application = require("./application");
+__reExport(src_exports, require("./gateway"), module.exports);
 var middlewares = __toESM(require("./middlewares"));
 __reExport(src_exports, require("./migration"), module.exports);
 __reExport(src_exports, require("./plugin"), module.exports);
 __reExport(src_exports, require("./plugin-manager"), module.exports);
-__reExport(src_exports, require("./gateway"), module.exports);
-__reExport(src_exports, require("./app-supervisor"), module.exports);
 __reExport(src_exports, require("./sync-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-";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   OFFICIAL_PLUGIN_PREFIX,
+  appendToBuiltInPlugins,
+  findAllPlugins,
+  findBuiltInPlugins,
+  findLocalPlugins,
   middlewares,
+  packageNameTrim,
+  runPluginStaticImports,
+  ...require("./app-supervisor"),
   ...require("./application"),
+  ...require("./gateway"),
   ...require("./migration"),
   ...require("./plugin"),
   ...require("./plugin-manager"),
-  ...require("./gateway"),
-  ...require("./app-supervisor"),
   ...require("./sync-manager")
 });

package/lib/locale/locale.d.ts

@@ -13,6 +13,7 @@ export interface ResourceStorer {
     getResources(lang: string): Promise<{
         [ns: string]: Record<string, string>;
     }>;
+    reset?: () => Promise<void>;
 }
 export declare class Locale {
     app: Application;

package/lib/locale/locale.js

@@ -71,7 +71,9 @@ const _Locale = class _Locale {
     await this.get(this.defaultLang);
   }
   async reload() {
-    await this.cache.reset();
+    const storers = Array.from(this.resourceStorers.getValues());
+    const promises = storers.map((storer) => storer.reset());
+    await Promise.all([this.cache.reset(), ...promises]);
   }
   setLocaleFn(name, fn) {
     this.localeFn.set(name, fn);

package/lib/plugin-manager/deps.js

@@ -73,7 +73,7 @@ const deps = {
   "pg-hstore": "2.x",
   sqlite3: "5.x",
   supertest: "6.x",
-  axios: "0.26.x",
+  axios: "1.7.x",
   "@emotion/css": "11.x",
   ahooks: "3.x",
   lodash: "4.x",

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

@@ -0,0 +1,16 @@
+/**
+ * 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.
+ */
+declare function trim(packageNames: string[]): Promise<any[]>;
+export declare function findPackageNames(): Promise<any[]>;
+export declare function findBuiltInPlugins(): Promise<any[]>;
+export declare function findLocalPlugins(): Promise<any[]>;
+export declare function findAllPlugins(): Promise<any[]>;
+export declare const packageNameTrim: typeof trim;
+export declare function appendToBuiltInPlugins(nameOrPkg: string): Promise<void>;
+export {};

package/lib/plugin-manager/findPackageNames.js

@@ -0,0 +1,183 @@
+/**
+ * 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 findPackageNames_exports = {};
+__export(findPackageNames_exports, {
+  appendToBuiltInPlugins: () => appendToBuiltInPlugins,
+  findAllPlugins: () => findAllPlugins,
+  findBuiltInPlugins: () => findBuiltInPlugins,
+  findLocalPlugins: () => findLocalPlugins,
+  findPackageNames: () => findPackageNames,
+  packageNameTrim: () => packageNameTrim
+});
+module.exports = __toCommonJS(findPackageNames_exports);
+var import_fast_glob = __toESM(require("fast-glob"));
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_lodash = __toESM(require("lodash"));
+var import_path = __toESM(require("path"));
+var import__ = require("./");
+function splitNames(name) {
+  return (name || "").split(",").filter(Boolean);
+}
+__name(splitNames, "splitNames");
+async function trim(packageNames) {
+  const nameOrPkgs = import_lodash.default.uniq(packageNames).filter(Boolean);
+  const names = [];
+  for (const nameOrPkg of nameOrPkgs) {
+    const { name, packageName } = await import__.PluginManager.parseName(nameOrPkg);
+    try {
+      await import__.PluginManager.getPackageJson(packageName);
+      names.push(name);
+    } catch (error) {
+    }
+  }
+  return names;
+}
+__name(trim, "trim");
+async function findPackageNames() {
+  const patterns = [
+    "./packages/plugins/*/package.json",
+    "./packages/plugins/*/*/package.json",
+    "./packages/pro-plugins/*/*/package.json",
+    "./storage/plugins/*/package.json",
+    "./storage/plugins/*/*/package.json"
+  ];
+  try {
+    const packageJsonPaths = await (0, import_fast_glob.default)(patterns, {
+      cwd: process.cwd(),
+      absolute: true,
+      ignore: ["**/external-db-data-source/**"]
+    });
+    const packageNames = await Promise.all(
+      packageJsonPaths.map(async (packageJsonPath) => {
+        const packageJson = await import_fs_extra.default.readJson(packageJsonPath);
+        return packageJson.name;
+      })
+    );
+    const excludes = [
+      "@nocobase/plugin-audit-logs",
+      "@nocobase/plugin-backup-restore",
+      "@nocobase/plugin-charts",
+      "@nocobase/plugin-disable-pm-add",
+      "@nocobase/plugin-mobile-client",
+      "@nocobase/plugin-mock-collections",
+      "@nocobase/plugin-multi-app-share-collection",
+      "@nocobase/plugin-notifications",
+      "@nocobase/plugin-snapshot-field",
+      "@nocobase/plugin-workflow-test"
+    ];
+    const nocobasePlugins = await findNocobasePlugins();
+    const { APPEND_PRESET_BUILT_IN_PLUGINS = "", APPEND_PRESET_LOCAL_PLUGINS = "" } = process.env;
+    return trim(
+      import_lodash.default.difference(packageNames, excludes).filter(Boolean).concat(nocobasePlugins).concat(splitNames(APPEND_PRESET_BUILT_IN_PLUGINS)).concat(splitNames(APPEND_PRESET_LOCAL_PLUGINS))
+    );
+  } catch (error) {
+    return [];
+  }
+}
+__name(findPackageNames, "findPackageNames");
+async function getPackageJson() {
+  const packageJson = await import_fs_extra.default.readJson(
+    import_path.default.resolve(process.env.NODE_MODULES_PATH, "@nocobase/preset-nocobase/package.json")
+  );
+  return packageJson;
+}
+__name(getPackageJson, "getPackageJson");
+async function findNocobasePlugins() {
+  try {
+    const packageJson = await getPackageJson();
+    const pluginNames = Object.keys(packageJson.dependencies).filter((name) => name.startsWith("@nocobase/plugin-"));
+    return trim(pluginNames);
+  } catch (error) {
+    return [];
+  }
+}
+__name(findNocobasePlugins, "findNocobasePlugins");
+async function findBuiltInPlugins() {
+  const { APPEND_PRESET_BUILT_IN_PLUGINS = "" } = process.env;
+  try {
+    const packageJson = await getPackageJson();
+    return trim(packageJson.builtIn.concat(splitNames(APPEND_PRESET_BUILT_IN_PLUGINS)));
+  } catch (error) {
+    return [];
+  }
+}
+__name(findBuiltInPlugins, "findBuiltInPlugins");
+async function findLocalPlugins() {
+  const { APPEND_PRESET_LOCAL_PLUGINS = "" } = process.env;
+  const plugins1 = await findNocobasePlugins();
+  const plugins2 = await findPackageNames();
+  const builtInPlugins = await findBuiltInPlugins();
+  const packageJson = await getPackageJson();
+  const items = await trim(
+    import_lodash.default.difference(
+      plugins1.concat(plugins2).concat(splitNames(APPEND_PRESET_LOCAL_PLUGINS)),
+      builtInPlugins.concat(await trim(packageJson.deprecated))
+    )
+  );
+  return items;
+}
+__name(findLocalPlugins, "findLocalPlugins");
+async function findAllPlugins() {
+  const builtInPlugins = await findBuiltInPlugins();
+  const localPlugins = await findLocalPlugins();
+  return import_lodash.default.uniq(builtInPlugins.concat(localPlugins));
+}
+__name(findAllPlugins, "findAllPlugins");
+const packageNameTrim = trim;
+async function appendToBuiltInPlugins(nameOrPkg) {
+  const APPEND_PRESET_BUILT_IN_PLUGINS = process.env.APPEND_PRESET_BUILT_IN_PLUGINS || "";
+  const keys = APPEND_PRESET_BUILT_IN_PLUGINS.split(",");
+  const { name, packageName } = await import__.PluginManager.parseName(nameOrPkg);
+  if (keys.includes(packageName)) {
+    return;
+  }
+  if (keys.includes(name)) {
+    return;
+  }
+  process.env.APPEND_PRESET_BUILT_IN_PLUGINS += "," + nameOrPkg;
+}
+__name(appendToBuiltInPlugins, "appendToBuiltInPlugins");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  appendToBuiltInPlugins,
+  findAllPlugins,
+  findBuiltInPlugins,
+  findLocalPlugins,
+  findPackageNames,
+  packageNameTrim
+});

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

@@ -146,7 +146,8 @@ var resource_default = {
     async list(ctx, next) {
       const locale = ctx.getCurrentLocale();
       const pm = ctx.app.pm;
-      ctx.body = await pm.list({ locale, isPreset: false });
+      const plugin = pm.get("nocobase");
+      ctx.body = await plugin.getAllPlugins(locale);
       await next();
     },
     async listEnabled(ctx, next) {
@@ -179,7 +180,8 @@ var resource_default = {
       if (!filterByTk) {
         ctx.throw(400, "plugin name invalid");
       }
-      ctx.body = await pm.get(filterByTk).toJSON({ locale });
+      const plugin = pm.get("nocobase");
+      ctx.body = await plugin.getPluginInfo(filterByTk, locale);
       await next();
     }
   }

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

@@ -17,6 +17,7 @@ export declare class PluginManagerRepository extends Repository {
      * @internal
      */
     setPluginManager(pm: PluginManager): void;
+    createByName(nameOrPkgs: any): Promise<void>;
     has(nameOrPkg: string): Promise<boolean>;
     /**
      * @deprecated

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

@@ -54,6 +54,8 @@ const _PluginManagerRepository = class _PluginManagerRepository extends import_d
   setPluginManager(pm) {
     this.pm = pm;
   }
+  async createByName(nameOrPkgs) {
+  }
   async has(nameOrPkg) {
     const { name } = await import_plugin_manager.PluginManager.parseName(nameOrPkg);
     const instance = await this.findOne({
@@ -103,11 +105,19 @@ const _PluginManagerRepository = class _PluginManagerRepository extends import_d
     return pluginNames;
   }
   async updateVersions() {
-    const items = await this.find();
+    const items = await this.find({
+      filter: {
+        enabled: true
+      }
+    });
     for (const item of items) {
-      const json = await import_plugin_manager.PluginManager.getPackageJson(item.packageName);
-      item.set("version", json.version);
-      await item.save();
+      try {
+        const json = await import_plugin_manager.PluginManager.getPackageJson(item.packageName);
+        item.set("version", json.version);
+        await item.save();
+      } catch (error) {
+        this.pm.app.log.error(error);
+      }
     }
   }
   /**
@@ -136,7 +146,10 @@ const _PluginManagerRepository = class _PluginManagerRepository extends import_d
       return [];
     }
     return await this.find({
-      sort: "id"
+      sort: "id",
+      filter: {
+        enabled: true
+      }
     });
   }
   async init() {

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

@@ -13,6 +13,7 @@ import Application from '../application';
 import { Plugin } from '../plugin';
 import { PluginManagerRepository } from './plugin-manager-repository';
 import { PluginData } from './types';
+import { checkAndGetCompatible } from './utils';
 export declare const sleep: (timeout?: number) => Promise<unknown>;
 export interface PluginManagerOptions {
     app: Application;
@@ -28,6 +29,7 @@ export declare class AddPresetError extends Error {
 }
 export declare class PluginManager {
     options: PluginManagerOptions;
+    static checkAndGetCompatible: typeof checkAndGetCompatible;
     /**
      * @internal
      */
@@ -57,10 +59,11 @@ export declare class PluginManager {
      */
     _repository: PluginManagerRepository;
     get repository(): PluginManagerRepository;
+    static packageExists(nameOrPkg: string): Promise<boolean>;
     /**
      * @internal
      */
-    static getPackageJson(packageName: string): Promise<any>;
+    static getPackageJson(nameOrPkg: string): Promise<any>;
     /**
      * @internal
      */

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

@@ -47,10 +47,9 @@ __export(plugin_manager_exports, {
 module.exports = __toCommonJS(plugin_manager_exports);
 var import_topo = __toESM(require("@hapi/topo"));
 var import_utils = require("@nocobase/utils");
-var import_plugin_symlink = require("@nocobase/utils/plugin-symlink");
 var import_execa = __toESM(require("execa"));
 var import_fast_glob = __toESM(require("fast-glob"));
-var import_fs = __toESM(require("fs"));
+var import_fs_extra = __toESM(require("fs-extra"));
 var import_lodash = __toESM(require("lodash"));
 var import_path = require("path");
 var import_helper = require("../helper");
@@ -120,12 +119,18 @@ const _PluginManager = class _PluginManager {
   get repository() {
     return this.app.db.getRepository("applicationPlugins");
   }
+  static async packageExists(nameOrPkg) {
+    const { packageName } = await this.parseName(nameOrPkg);
+    const file = (0, import_path.resolve)(process.env.NODE_MODULES_PATH, packageName, "package.json");
+    return import_fs_extra.default.exists(file);
+  }
   /**
    * @internal
    */
-  static async getPackageJson(packageName) {
-    const file = await import_fs.default.promises.realpath((0, import_path.resolve)(process.env.NODE_MODULES_PATH, packageName, "package.json"));
-    const data = await import_fs.default.promises.readFile(file, { encoding: "utf-8" });
+  static async getPackageJson(nameOrPkg) {
+    const { packageName } = await this.parseName(nameOrPkg);
+    const file = await import_fs_extra.default.realpath((0, import_path.resolve)(process.env.NODE_MODULES_PATH, packageName, "package.json"));
+    const data = await import_fs_extra.default.readFile(file, { encoding: "utf-8" });
     return JSON.parse(data);
   }
   /**
@@ -135,7 +140,7 @@ const _PluginManager = class _PluginManager {
     const prefixes = this.getPluginPkgPrefix();
     for (const prefix of prefixes) {
       const pkg = (0, import_path.resolve)(process.env.NODE_MODULES_PATH, `${prefix}${name}`, "package.json");
-      const exists = await (0, import_plugin_symlink.fsExists)(pkg);
+      const exists = await import_fs_extra.default.exists(pkg);
       if (exists) {
         return `${prefix}${name}`;
       }
@@ -193,8 +198,7 @@ const _PluginManager = class _PluginManager {
    */
   static async resolvePlugin(pluginName, isUpgrade = false, isPkg = false) {
     if (typeof pluginName === "string") {
-      const packageName = isPkg ? pluginName : await this.getPackageName(pluginName);
-      this.clearCache(packageName);
+      const { packageName } = await this.parseName(pluginName);
       return await (0, import_utils.importModule)(packageName);
     } else {
       return pluginName;
@@ -219,7 +223,7 @@ const _PluginManager = class _PluginManager {
       return this.parsedNames[nameOrPkg];
     }
     const exists = /* @__PURE__ */ __name(async (name, isPreset = false) => {
-      return (0, import_plugin_symlink.fsExists)(
+      return import_fs_extra.default.exists(
         (0, import_path.resolve)(process.env.NODE_MODULES_PATH, `@nocobase/${isPreset ? "preset" : "plugin"}-${name}`, "package.json")
       );
     }, "exists");
@@ -271,7 +275,7 @@ const _PluginManager = class _PluginManager {
     const createPlugin = /* @__PURE__ */ __name(async (name2) => {
       const pluginDir = (0, import_path.resolve)(process.cwd(), "packages/plugins", name2);
       if (options == null ? void 0 : options.forceRecreate) {
-        await import_fs.default.promises.rm(pluginDir, { recursive: true, force: true });
+        await import_fs_extra.default.rm(pluginDir, { recursive: true, force: true });
       }
       const { PluginGenerator } = require("@nocobase/cli/src/plugin-generator");
       const generator = new PluginGenerator({
@@ -284,16 +288,6 @@ const _PluginManager = class _PluginManager {
       await generator.run();
     }, "createPlugin");
     await createPlugin(pluginName);
-    try {
-      await this.app.db.auth({ retry: 1 });
-      const installed = await this.app.isInstalled();
-      if (!installed) {
-        console.log(`yarn pm add ${pluginName}`);
-        return;
-      }
-    } catch (error) {
-      return;
-    }
     this.app.log.info("attempt to add the plugin to the app");
     const { name, packageName } = await _PluginManager.parseName(pluginName);
     const json = await _PluginManager.getPackageJson(packageName);
@@ -302,15 +296,6 @@ const _PluginManager = class _PluginManager {
       packageName,
       version: json.version
     });
-    await this.repository.updateOrCreate({
-      values: {
-        name,
-        packageName,
-        version: json.version
-      },
-      filterKeys: ["name"]
-    });
-    await sleep(1e3);
     await (0, import_helper.tsxRerunning)();
   }
   async add(plugin, options = {}, insert = false, isUpgrade = false) {
@@ -355,14 +340,6 @@ const _PluginManager = class _PluginManager {
     if (options.packageName) {
       this.pluginAliases.set(options.packageName, instance);
     }
-    if (insert && options.name) {
-      await this.repository.updateOrCreate({
-        values: {
-          ...options
-        },
-        filterKeys: ["name"]
-      });
-    }
     await instance.afterAdd();
   }
   /**
@@ -485,16 +462,69 @@ const _PluginManager = class _PluginManager {
   async enable(nameOrPkg) {
     let pluginNames = nameOrPkg;
     if (nameOrPkg === "*") {
-      const items = await this.repository.find();
-      pluginNames = items.map((item) => item.name);
+      const plugin = this.get("nocobase");
+      pluginNames = await plugin.findLocalPlugins();
+    }
+    pluginNames = await this.sort(pluginNames);
+    try {
+      const added = {};
+      for (const name of pluginNames) {
+        const { name: pluginName } = await _PluginManager.parseName(name);
+        if (this.has(pluginName)) {
+          added[pluginName] = true;
+          continue;
+        }
+        await this.add(pluginName);
+      }
+      for (const name of pluginNames) {
+        const { name: pluginName } = await _PluginManager.parseName(name);
+        const plugin = this.get(pluginName);
+        if (!plugin) {
+          throw new Error(`${pluginName} plugin does not exist`);
+        }
+        if (added[pluginName]) {
+          continue;
+        }
+        const instance = await this.repository.findOne({
+          filter: {
+            name: pluginName
+          }
+        });
+        if (instance) {
+          plugin.enabled = instance.enabled;
+          plugin.installed = instance.installed;
+        }
+        if (plugin.enabled) {
+          continue;
+        }
+        await plugin.beforeLoad();
+      }
+      for (const name of pluginNames) {
+        const { name: pluginName } = await _PluginManager.parseName(name);
+        const plugin = this.get(pluginName);
+        if (!plugin) {
+          throw new Error(`${pluginName} plugin does not exist`);
+        }
+        if (added[pluginName]) {
+          continue;
+        }
+        if (plugin.enabled) {
+          continue;
+        }
+        await plugin.loadCollections();
+        await plugin.load();
+      }
+    } catch (error) {
+      await this.app.tryReloadOrRestart({
+        recover: true
+      });
+      throw error;
     }
-    pluginNames = this.sort(pluginNames);
     this.app.log.debug(`enabling plugin ${pluginNames.join(",")}`);
     this.app.setMaintainingMessage(`enabling plugin ${pluginNames.join(",")}`);
     const toBeUpdated = [];
     for (const name of pluginNames) {
       const { name: pluginName } = await _PluginManager.parseName(name);
-      console.log("pluginName", pluginName);
       const plugin = this.get(pluginName);
       if (!plugin) {
         throw new Error(`${pluginName} plugin does not exist`);
@@ -505,7 +535,6 @@ const _PluginManager = class _PluginManager {
       await this.app.emitAsync("beforeEnablePlugin", pluginName);
       try {
         await plugin.beforeEnable();
-        plugin.enabled = true;
         toBeUpdated.push(pluginName);
       } catch (error) {
         if (nameOrPkg === "*") {
@@ -518,16 +547,7 @@ const _PluginManager = class _PluginManager {
     if (toBeUpdated.length === 0) {
       return;
     }
-    await this.repository.update({
-      filter: {
-        name: toBeUpdated
-      },
-      values: {
-        enabled: true
-      }
-    });
     try {
-      await this.app.reload();
       this.app.log.debug(`syncing database in enable plugin ${toBeUpdated.join(",")}...`);
       this.app.setMaintainingMessage(`syncing database in enable plugin ${toBeUpdated.join(",")}...`);
       await this.app.db.sync();
@@ -540,32 +560,31 @@ const _PluginManager = class _PluginManager {
           plugin.installed = true;
         }
       }
-      await this.repository.update({
-        filter: {
-          name: toBeUpdated
-        },
-        values: {
-          installed: true
-        }
-      });
+      for (const pluginName of toBeUpdated) {
+        const { name } = await _PluginManager.parseName(pluginName);
+        const packageJson = await _PluginManager.getPackageJson(pluginName);
+        const values = {
+          name,
+          packageName: packageJson == null ? void 0 : packageJson.name,
+          enabled: true,
+          installed: true,
+          version: packageJson == null ? void 0 : packageJson.version
+        };
+        await this.repository.updateOrCreate({
+          values,
+          filterKeys: ["name"]
+        });
+      }
       for (const pluginName of toBeUpdated) {
         const plugin = this.get(pluginName);
         this.app.log.debug(`emit afterEnablePlugin event...`);
         await plugin.afterEnable();
+        plugin.enabled = true;
         await this.app.emitAsync("afterEnablePlugin", pluginName);
         this.app.log.debug(`afterEnablePlugin event emitted`);
       }
       await this.app.tryReloadOrRestart();
     } catch (error) {
-      await this.repository.update({
-        filter: {
-          name: toBeUpdated
-        },
-        values: {
-          enabled: false,
-          installed: false
-        }
-      });
       await this.app.tryReloadOrRestart({
         recover: true
       });
@@ -594,32 +613,24 @@ const _PluginManager = class _PluginManager {
     if (toBeUpdated.length === 0) {
       return;
     }
-    await this.repository.update({
-      filter: {
-        name: toBeUpdated
-      },
-      values: {
-        enabled: false
-      }
-    });
     try {
-      await this.app.tryReloadOrRestart();
-      for (const pluginName of pluginNames) {
+      for (const pluginName of toBeUpdated) {
         const plugin = this.get(pluginName);
         this.app.log.debug(`emit afterDisablePlugin event...`);
         await plugin.afterDisable();
         await this.app.emitAsync("afterDisablePlugin", pluginName);
         this.app.log.debug(`afterDisablePlugin event emitted`);
       }
-    } catch (error) {
       await this.repository.update({
         filter: {
           name: toBeUpdated
         },
         values: {
-          enabled: true
+          enabled: false
         }
       });
+      await this.app.tryReloadOrRestart();
+    } catch (error) {
       await this.app.tryReloadOrRestart({
         recover: true
       });
@@ -643,71 +654,42 @@ const _PluginManager = class _PluginManager {
         records.map(async (plugin) => {
           const dir = (0, import_path.resolve)(process.env.NODE_MODULES_PATH, plugin.packageName);
           try {
-            const realDir = await import_fs.default.promises.realpath(dir);
+            const realDir = await import_fs_extra.default.realpath(dir);
+            console.log("realDir", realDir);
             this.app.log.debug(`rm -rf ${realDir}`);
-            return import_fs.default.promises.rm(realDir, { force: true, recursive: true });
+            return import_fs_extra.default.rm(realDir, { force: true, recursive: true });
           } catch (error) {
             return false;
           }
         })
       );
-      await (0, import_execa.default)("yarn", ["nocobase", "postinstall"]);
     }, "removeDir");
-    if (options == null ? void 0 : options.force) {
-      await this.repository.destroy({
-        filter: {
-          name: pluginNames
-        }
-      });
-      this.app.log.warn(`force remove plugins ${pluginNames.join(",")}`);
-    } else {
-      await this.app.load();
-      for (const pluginName of pluginNames) {
-        const plugin = this.get(pluginName);
-        if (!plugin) {
-          continue;
-        }
-        if (plugin.enabled) {
-          throw new Error(`plugin is enabled [${pluginName}]`);
-        }
-        await plugin.beforeRemove();
-      }
-      await this.repository.destroy({
-        filter: {
-          name: pluginNames
-        }
-      });
-      const plugins = [];
-      for (const pluginName of pluginNames) {
-        const plugin = this.get(pluginName);
-        if (!plugin) {
-          continue;
-        }
-        plugins.push(plugin);
-        this.del(pluginName);
-        await plugin.afterRemove();
-      }
-      if (await this.app.isStarted()) {
-        await this.app.tryReloadOrRestart();
+    await this.repository.destroy({
+      filter: {
+        name: pluginNames
       }
-    }
-    if (options == null ? void 0 : options.removeDir) {
+    });
+    if (!this.app.db.getCollection("applications")) {
       await removeDir();
     }
-    await (0, import_execa.default)("yarn", ["nocobase", "refresh"], {
-      env: process.env
-    });
   }
   /**
    * @internal
    */
   async addViaCLI(urlOrName, options, emitStartedEvent = true) {
+    const writeFile = /* @__PURE__ */ __name(async () => {
+      if (process.env.VITEST) {
+        return;
+      }
+      const file = (0, import_path.resolve)(process.cwd(), "storage/.upgrading");
+      this.app.log.debug("pending upgrade");
+      await import_fs_extra.default.writeFile(file, "upgrading");
+    }, "writeFile");
+    await writeFile();
     if (Array.isArray(urlOrName)) {
       for (const packageName of urlOrName) {
         await this.addViaCLI(packageName, import_lodash.default.omit(options, "name"), false);
       }
-      await this.app.emitStartedEvent();
-      await (0, import_execa.default)("yarn", ["nocobase", "postinstall"]);
       return;
     }
     if ((0, import_utils.isURL)(urlOrName)) {
@@ -718,7 +700,7 @@ const _PluginManager = class _PluginManager {
         },
         emitStartedEvent
       );
-    } else if (await (0, import_plugin_symlink.fsExists)(urlOrName)) {
+    } else if (await import_fs_extra.default.exists(urlOrName)) {
       await this.addByCompressedFileUrl(
         {
           ...options,
@@ -736,19 +718,6 @@ const _PluginManager = class _PluginManager {
         },
         emitStartedEvent
       );
-    } else {
-      const { name, packageName } = await _PluginManager.parseName(urlOrName);
-      const opts = {
-        ...options,
-        name,
-        packageName
-      };
-      await this.repository.findOne({ filter: { packageName } });
-      await this.add(name, opts, true);
-    }
-    if (emitStartedEvent) {
-      await this.app.emitStartedEvent();
-      await (0, import_execa.default)("yarn", ["nocobase", "postinstall"]);
     }
   }
   /**
@@ -773,18 +742,7 @@ const _PluginManager = class _PluginManager {
   async addByFile(options, throwError = true) {
     const { file, authToken } = options;
     const { packageName, tempFile, tempPackageContentDir } = await (0, import_utils2.downloadAndUnzipToTempDir)(file, authToken);
-    const { name } = await _PluginManager.parseName(packageName);
-    if (this.has(name)) {
-      await (0, import_utils2.removeTmpDir)(tempFile, tempPackageContentDir);
-      if (throwError) {
-        throw new Error(`plugin name [${name}] already exists`);
-      } else {
-        this.app.log.warn(`plugin name [${name}] already exists`);
-        return;
-      }
-    }
     await (0, import_utils2.copyTempPackageToStorageAndLinkToNodeModules)(tempFile, tempPackageContentDir, packageName);
-    return this.add(name, { packageName }, true);
   }
   /**
    * @internal
@@ -795,18 +753,7 @@ const _PluginManager = class _PluginManager {
       compressedFileUrl,
       authToken
     );
-    const { name } = await _PluginManager.parseName(packageName);
-    if (this.has(name)) {
-      await (0, import_utils2.removeTmpDir)(tempFile, tempPackageContentDir);
-      if (throwError) {
-        throw new Error(`plugin name [${name}] already exists`);
-      } else {
-        this.app.log.warn(`plugin name [${name}] already exists`);
-        return;
-      }
-    }
     await (0, import_utils2.copyTempPackageToStorageAndLinkToNodeModules)(tempFile, tempPackageContentDir, packageName);
-    return this.add(name, { packageName }, true);
   }
   async update(nameOrPkg, options, emitStartedEvent = true) {
     const upgrade = /* @__PURE__ */ __name(async () => {
@@ -820,7 +767,7 @@ const _PluginManager = class _PluginManager {
         return;
       }
       const file = (0, import_path.resolve)(process.cwd(), "storage/app-upgrading");
-      await import_fs.default.promises.writeFile(file, "", "utf-8");
+      await import_fs_extra.default.writeFile(file, "", "utf-8");
       await (0, import_helper.tsxRerunning)();
       await (0, import_execa.default)("yarn", ["nocobase", "pm2-restart"], {
         env: process.env
@@ -835,7 +782,7 @@ const _PluginManager = class _PluginManager {
     const opts = { ...options };
     if ((0, import_utils.isURL)(nameOrPkg)) {
       opts.compressedFileUrl = nameOrPkg;
-    } else if (await (0, import_plugin_symlink.fsExists)(nameOrPkg)) {
+    } else if (await import_fs_extra.default.exists(nameOrPkg)) {
       opts.compressedFileUrl = nameOrPkg;
     }
     if (opts.compressedFileUrl) {
@@ -888,7 +835,6 @@ const _PluginManager = class _PluginManager {
       repository: this.repository
     });
     const { name } = await _PluginManager.parseName(packageName);
-    await this.add(name, { name, version, packageName }, true, true);
   }
   /**
    * @internal
@@ -1070,22 +1016,22 @@ const _PluginManager = class _PluginManager {
     }
     this["_initPresetPlugins"] = true;
   }
-  sort(names) {
-    var _a, _b, _c;
+  async sort(names) {
     const pluginNames = import_lodash.default.castArray(names);
     if (pluginNames.length === 1) {
       return pluginNames;
     }
     const sorter = new import_topo.default.Sorter();
     for (const pluginName of pluginNames) {
-      const plugin = this.get(pluginName);
-      const peerDependencies = Object.keys(((_b = (_a = plugin.options) == null ? void 0 : _a.packageJson) == null ? void 0 : _b.peerDependencies) || {});
-      sorter.add(pluginName, { after: peerDependencies, group: ((_c = plugin.options) == null ? void 0 : _c.packageName) || pluginName });
+      const packageJson = await _PluginManager.getPackageJson(pluginName);
+      const peerDependencies = Object.keys((packageJson == null ? void 0 : packageJson.peerDependencies) || {});
+      sorter.add(pluginName, { after: peerDependencies, group: (packageJson == null ? void 0 : packageJson.packageName) || pluginName });
     }
     return sorter.nodes;
   }
 };
 __name(_PluginManager, "PluginManager");
+__publicField(_PluginManager, "checkAndGetCompatible", import_utils2.checkAndGetCompatible);
 __publicField(_PluginManager, "parsedNames", {});
 let PluginManager = _PluginManager;
 var plugin_manager_default = PluginManager;

package/lib/run-plugin-static-imports.d.ts

@@ -0,0 +1 @@
+export declare function runPluginStaticImports(): Promise<void>;

package/lib/run-plugin-static-imports.js

@@ -0,0 +1,52 @@
+/**
+ * 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 run_plugin_static_imports_exports = {};
+__export(run_plugin_static_imports_exports, {
+  runPluginStaticImports: () => runPluginStaticImports
+});
+module.exports = __toCommonJS(run_plugin_static_imports_exports);
+var import_server = require("@nocobase/server");
+async function runPluginStaticImports() {
+  const packages = await (0, import_server.findAllPlugins)();
+  for (const name of packages) {
+    const { packageName } = await import_server.PluginManager.parseName(name);
+    try {
+      const plugin = require(packageName);
+      if (plugin && plugin.staticImport) {
+        await plugin.staticImport();
+      }
+    } catch (error) {
+      continue;
+    }
+  }
+}
+__name(runPluginStaticImports, "runPluginStaticImports");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  runPluginStaticImports
+});

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.3.39-beta",
+    "version": "1.4.0-alpha",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
@@ -10,23 +10,23 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.3.39-beta",
-        "@nocobase/actions": "1.3.39-beta",
-        "@nocobase/auth": "1.3.39-beta",
-        "@nocobase/cache": "1.3.39-beta",
-        "@nocobase/data-source-manager": "1.3.39-beta",
-        "@nocobase/database": "1.3.39-beta",
-        "@nocobase/evaluators": "1.3.39-beta",
-        "@nocobase/logger": "1.3.39-beta",
-        "@nocobase/resourcer": "1.3.39-beta",
-        "@nocobase/sdk": "1.3.39-beta",
-        "@nocobase/telemetry": "1.3.39-beta",
-        "@nocobase/utils": "1.3.39-beta",
+        "@nocobase/acl": "1.4.0-alpha",
+        "@nocobase/actions": "1.4.0-alpha",
+        "@nocobase/auth": "1.4.0-alpha",
+        "@nocobase/cache": "1.4.0-alpha",
+        "@nocobase/data-source-manager": "1.4.0-alpha",
+        "@nocobase/database": "1.4.0-alpha",
+        "@nocobase/evaluators": "1.4.0-alpha",
+        "@nocobase/logger": "1.4.0-alpha",
+        "@nocobase/resourcer": "1.4.0-alpha",
+        "@nocobase/sdk": "1.4.0-alpha",
+        "@nocobase/telemetry": "1.4.0-alpha",
+        "@nocobase/utils": "1.4.0-alpha",
         "@types/decompress": "4.2.7",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
         "@types/multer": "^1.4.5",
-        "axios": "^0.26.1",
+        "axios": "^1.7.0",
         "chalk": "^4.1.1",
         "commander": "^9.2.0",
         "cron": "^2.4.4",
@@ -54,5 +54,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "68daadf8575cddf9eeb09a1a672f9baf7aabe67a"
+    "gitHead": "f097a2bddec152522b5645bd5d451f4c866d2060"
 }