@nocobase/server 1.0.0-alpha.8 → 1.0.1-alpha.1

package/lib/app-supervisor.d.ts

@@ -25,6 +25,7 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     apps: {
         [appName: string]: Application;
     };
+    lastSeenAt: Map<string, number>;
     appErrors: {
         [appName: string]: Error;
     };
@@ -57,6 +58,7 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     getAppStatus(appName: string, defaultStatus?: AppStatus): AppStatus | null;
     bootMainApp(options: ApplicationOptions): Application<import("./application").DefaultState, import("./application").DefaultContext>;
     hasApp(appName: string): boolean;
+    touchApp(appName: string): void;
     addApp(app: Application): Application<import("./application").DefaultState, import("./application").DefaultContext>;
     getAppsNames(): Promise<string[]>;
     removeApp(appName: string): Promise<void>;

package/lib/app-supervisor.js

@@ -54,6 +54,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   runningMode = "multiple";
   singleAppName = null;
   apps = {};
+  lastSeenAt = /* @__PURE__ */ new Map();
   appErrors = {};
   appStatus = {};
   lastMaintainingMessage = {};
@@ -156,6 +157,12 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   hasApp(appName) {
     return !!this.apps[appName];
   }
+  touchApp(appName) {
+    if (!this.hasApp(appName)) {
+      return;
+    }
+    this.lastSeenAt.set(appName, Math.floor(Date.now() / 1e3));
+  }
   // add app into supervisor
   addApp(app) {
     if (this.apps[app.name]) {
@@ -203,6 +210,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
       delete this.appErrors[app.name];
       delete this.lastMaintainingMessage[app.name];
       delete this.statusBeforeCommanding[app.name];
+      this.lastSeenAt.delete(app.name);
     });
     app.on("maintainingMessageChanged", ({ message, maintainingStatus }) => {
       if (this.lastMaintainingMessage[app.name] === message) {

package/lib/application.d.ts

@@ -11,7 +11,7 @@
 import { AuthManager, AuthManagerOptions } from '@nocobase/auth';
 import { Cache, CacheManager, CacheManagerOptions } from '@nocobase/cache';
 import Database, { CollectionOptions, IDatabaseOptions } from '@nocobase/database';
-import { LoggerOptions, RequestLoggerOptions, SystemLogger, SystemLoggerOptions } from '@nocobase/logger';
+import { Logger, LoggerOptions, RequestLoggerOptions, SystemLogger, SystemLoggerOptions } from '@nocobase/logger';
 import { ResourceOptions, Resourcer } from '@nocobase/resourcer';
 import { Telemetry, TelemetryOptions } from '@nocobase/telemetry';
 import { AsyncEmitter, ToposortOptions } from '@nocobase/utils';
@@ -155,9 +155,15 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     private _maintainingCommandStatus;
     private _maintainingStatusBeforeCommand;
     private _actionCommand;
-    constructor(options: ApplicationOptions);
+    /**
+     * @internal
+     */
+    requestLogger: Logger;
+    private sqlLogger;
     protected _logger: SystemLogger;
+    constructor(options: ApplicationOptions);
     get logger(): SystemLogger;
+    get log(): SystemLogger;
     protected _loaded: boolean;
     /**
      * @internal
@@ -208,7 +214,6 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get telemetry(): Telemetry;
     protected _version: ApplicationVersion;
     get version(): ApplicationVersion;
-    get log(): SystemLogger;
     get name(): string;
     protected _dataSourceManager: DataSourceManager;
     get dataSourceManager(): DataSourceManager;
@@ -329,8 +334,10 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
      * @internal
      */
     reInitEvents(): void;
-    createLogger(options: LoggerOptions): import("winston").Logger;
+    createLogger(options: LoggerOptions): Logger;
     protected createCLI(): AppCommand;
+    protected initLogger(options: AppLoggerOptions): void;
+    protected closeLogger(): void;
     protected init(): void;
     protected createMainDataSource(options: ApplicationOptions): void;
     protected createDatabase(options: ApplicationOptions): Database;

package/lib/application.js

@@ -69,6 +69,9 @@ var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_package = __toESM(require("../package.json"));
 var import_main_data_source = require("./main-data-source");
 var import_validate_filter_params = __toESM(require("./middlewares/validate-filter-params"));
+var import_path2 = __toESM(require("path"));
+var import_middlewares = require("./middlewares");
+var import_data_template = require("./middlewares/data-template");
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
     super();
@@ -110,10 +113,18 @@ const _Application = class _Application extends import_koa.default {
   _maintainingCommandStatus;
   _maintainingStatusBeforeCommand;
   _actionCommand;
+  /**
+   * @internal
+   */
+  requestLogger;
+  sqlLogger;
   _logger;
   get logger() {
     return this._logger;
   }
+  get log() {
+    return this._logger;
+  }
   _loaded;
   /**
    * @internal
@@ -206,9 +217,6 @@ const _Application = class _Application extends import_koa.default {
   get version() {
     return this._version;
   }
-  get log() {
-    return this._logger;
-  }
   get name() {
     return this.options.name || "main";
   }
@@ -322,6 +330,7 @@ const _Application = class _Application extends import_koa.default {
     if (this.telemetry.started) {
       await this.telemetry.shutdown();
     }
+    this.closeLogger();
     const oldDb = this.db;
     this.init();
     if (!oldDb.closed()) {
@@ -350,8 +359,10 @@ const _Application = class _Application extends import_koa.default {
       }
     }
     this._cacheManager = await (0, import_cache2.createCacheManager)(this, this.options.cacheManager);
+    this.log.debug("init plugins");
     this.setMaintainingMessage("init plugins");
     await this.pm.initPlugins();
+    this.log.debug("loading app...");
     this.setMaintainingMessage("start load");
     this.setMaintainingMessage("emit beforeLoad");
     if ((options == null ? void 0 : options.hooks) !== false) {
@@ -531,6 +542,7 @@ const _Application = class _Application extends import_koa.default {
         `Application ${this.name} is not installed, Please run 'yarn nocobase install' command first`
       );
     }
+    this.log.debug(`starting app...`);
     this.setMaintainingMessage("starting app...");
     if (this.db.closed()) {
       await this.db.reconnect();
@@ -620,6 +632,7 @@ const _Application = class _Application extends import_koa.default {
     this.log.debug("emit afterDestroy", { method: "destory" });
     await this.emitAsync("afterDestroy", this, options);
     this.log.debug("finish destroy app", { method: "destory" });
+    this.closeLogger();
   }
   async isInstalled() {
     return await this.db.collectionExistsInDb("applicationVersion") || await this.db.collectionExistsInDb("collections");
@@ -702,7 +715,7 @@ const _Application = class _Application extends import_koa.default {
     const { dirname } = options;
     return (0, import_logger.createLogger)({
       ...options,
-      dirname: (0, import_logger.getLoggerFilePath)(this.name || "main", dirname || "")
+      dirname: (0, import_logger.getLoggerFilePath)(import_path2.default.join(this.name || "main", dirname || ""))
     });
   }
   createCLI() {
@@ -736,19 +749,38 @@ const _Application = class _Application extends import_koa.default {
     });
     return command;
   }
-  init() {
-    var _a;
-    const options = this.options;
+  initLogger(options) {
     this._logger = (0, import_logger.createSystemLogger)({
       dirname: (0, import_logger.getLoggerFilePath)(this.name),
       filename: "system",
       seperateError: true,
-      ...((_a = options.logger) == null ? void 0 : _a.system) || {}
+      ...(options == null ? void 0 : options.system) || {}
     }).child({
       reqId: this.context.reqId,
       app: this.name,
       module: "application"
+      // Due to the use of custom log levels,
+      // we have to use any type here until Winston updates the type definitions.
     });
+    this.requestLogger = (0, import_logger.createLogger)({
+      dirname: (0, import_logger.getLoggerFilePath)(this.name),
+      filename: "request",
+      ...(options == null ? void 0 : options.request) || {}
+    });
+    this.sqlLogger = this.createLogger({
+      filename: "sql",
+      level: "debug"
+    });
+  }
+  closeLogger() {
+    var _a, _b, _c;
+    (_a = this.log) == null ? void 0 : _a.close();
+    (_b = this.requestLogger) == null ? void 0 : _b.close();
+    (_c = this.sqlLogger) == null ? void 0 : _c.close();
+  }
+  init() {
+    const options = this.options;
+    this.initLogger(options.logger);
     this.reInitEvents();
     this.middleware = new import_utils.Toposort();
     this.plugins = /* @__PURE__ */ new Map();
@@ -785,6 +817,11 @@ const _Application = class _Application extends import_koa.default {
     });
     this._dataSourceManager.use(this._authManager.middleware(), { tag: "auth" });
     this._dataSourceManager.use(import_validate_filter_params.default, { tag: "validate-filter-params", before: ["auth"] });
+    this._dataSourceManager.use(import_middlewares.parseVariables, {
+      group: "parseVariables",
+      after: "acl"
+    });
+    this._dataSourceManager.use(import_data_template.dataTemplate, { group: "dataTemplate", after: "acl" });
     this._locales = new import_locale.Locale((0, import_helper.createAppProxy)(this));
     if (options.perfHooks) {
       (0, import_helper.enablePerfHooks)(this);
@@ -808,10 +845,6 @@ const _Application = class _Application extends import_koa.default {
     this.dataSourceManager.dataSources.set("main", mainDataSourceInstance);
   }
   createDatabase(options) {
-    const sqlLogger = this.createLogger({
-      filename: "sql",
-      level: "debug"
-    });
     const logging = /* @__PURE__ */ __name((msg) => {
       if (typeof msg === "string") {
         msg = msg.replace(/[\r\n]/gm, "").replace(/\s+/g, " ");
@@ -819,7 +852,7 @@ const _Application = class _Application extends import_koa.default {
       if (msg.includes("INSERT INTO")) {
         msg = msg.substring(0, 2e3) + "...";
       }
-      sqlLogger.debug({ message: msg, app: this.name, reqId: this.context.reqId });
+      this.sqlLogger.debug({ message: msg, app: this.name, reqId: this.context.reqId });
     }, "logging");
     const dbOptions = options.database instanceof import_database.default ? options.database.options : options.database;
     const db = new import_database.default({

package/lib/commands/start.js

@@ -52,7 +52,10 @@ var start_default = /* @__PURE__ */ __name((app) => {
     const upgrading = await (0, import_utils.fsExists)(file);
     if (upgrading) {
       await app.upgrade();
-      await import_fs.default.promises.rm(file);
+      try {
+        await import_fs.default.promises.rm(file);
+      } catch (error) {
+      }
     } else if (options.quickstart) {
       if (await app.isInstalled()) {
         await app.upgrade();

package/lib/gateway/errors.js

@@ -53,8 +53,15 @@ const errors = {
   APP_ERROR: {
     status: 503,
     message: ({ app }) => {
-      var _a;
-      return (_a = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name]) == null ? void 0 : _a.message;
+      const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name];
+      if (!error) {
+        return "";
+      }
+      let message = error.message;
+      if (error.cause) {
+        message = `${message}: ${error.cause.message}`;
+      }
+      return message;
     },
     code: ({ app }) => {
       const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name];

package/lib/gateway/index.d.ts

@@ -52,7 +52,7 @@ export declare class Gateway extends EventEmitter {
     destroy(): void;
     reset(): void;
     addAppSelectorMiddleware(middleware: AppSelectorMiddleware, options?: ToposortOptions): void;
-    getLogger(appName: string, res: ServerResponse): import("winston").Logger;
+    getLogger(appName: string, res: ServerResponse): import("@nocobase/logger/lib/logger").Logger;
     responseError(res: ServerResponse, error: {
         status: number;
         maintaining: boolean;

package/lib/gateway/index.js

@@ -240,6 +240,9 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       res.end("ok");
       return;
     }
+    if (handleApp !== "main") {
+      import_app_supervisor.AppSupervisor.getInstance().touchApp(handleApp);
+    }
     app.callback()(req, res);
   }
   getAppSelectorMiddlewares() {

package/lib/helper.js

@@ -80,7 +80,7 @@ function registerMiddlewares(app, options) {
     app.context.reqId = (0, import_crypto.randomUUID)();
     await next();
   });
-  app.use((0, import_logger.requestLogger)(app.name, (_a = options.logger) == null ? void 0 : _a.request), { tag: "logger" });
+  app.use((0, import_logger.requestLogger)(app.name, app.requestLogger, (_a = options.logger) == null ? void 0 : _a.request), { tag: "logger" });
   app.use(
     (0, import_cors.default)({
       exposeHeaders: ["content-disposition"],

package/lib/locale/locale.js

@@ -43,7 +43,7 @@ const _Locale = class _Locale {
   constructor(app) {
     this.app = app;
     this.app.on("afterLoad", async () => {
-      this.app.log.debug("load locale resource", { submodule: "locale", method: "onAfterLoad" });
+      this.app.log.debug("loading locale resource...", { submodule: "locale", method: "onAfterLoad" });
       this.app.setMaintainingMessage("load locale resource");
       await this.load();
       this.app.log.debug("locale resource loaded", { submodule: "locale", method: "onAfterLoad" });

package/lib/main-data-source.js

@@ -31,8 +31,6 @@ __export(main_data_source_exports, {
 });
 module.exports = __toCommonJS(main_data_source_exports);
 var import_data_source_manager = require("@nocobase/data-source-manager");
-var import_middlewares = require("./middlewares");
-var import_data_template = require("./middlewares/data-template");
 const _MainDataSource = class _MainDataSource extends import_data_source_manager.SequelizeDataSource {
   init(options = {}) {
     const { acl, resourceManager, database } = options;
@@ -49,11 +47,6 @@ const _MainDataSource = class _MainDataSource extends import_data_source_manager
     if (options.useACL !== false) {
       this.resourceManager.use(this.acl.middleware(), { group: "acl", after: "auth" });
     }
-    this.resourceManager.use(import_middlewares.parseVariables, {
-      group: "parseVariables",
-      after: "acl"
-    });
-    this.resourceManager.use(import_data_template.dateTemplate, { group: "dateTemplate", after: "acl" });
   }
 };
 __name(_MainDataSource, "MainDataSource");

package/lib/middlewares/data-template.d.ts

@@ -7,4 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Context } from '@nocobase/actions';
-export declare const dateTemplate: (ctx: Context, next: any) => Promise<void>;
+export declare const dataTemplate: (ctx: Context, next: any) => Promise<void>;

package/lib/middlewares/data-template.js

@@ -27,10 +27,10 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var data_template_exports = {};
 __export(data_template_exports, {
-  dateTemplate: () => dateTemplate
+  dataTemplate: () => dataTemplate
 });
 module.exports = __toCommonJS(data_template_exports);
-const dateTemplate = /* @__PURE__ */ __name(async (ctx, next) => {
+const dataTemplate = /* @__PURE__ */ __name(async (ctx, next) => {
   const { resourceName, actionName } = ctx.action;
   const { isTemplate, fields } = ctx.action.params;
   await next();
@@ -40,7 +40,7 @@ const dateTemplate = /* @__PURE__ */ __name(async (ctx, next) => {
       include: fields
     });
   }
-}, "dateTemplate");
+}, "dataTemplate");
 const traverseHasMany = /* @__PURE__ */ __name((arr, { collection, exclude = [], include = [] }) => {
   if (!arr) {
     return arr;
@@ -142,5 +142,5 @@ const traverseJSON = /* @__PURE__ */ __name((data, options) => {
 }, "traverseJSON");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  dateTemplate
+  dataTemplate
 });

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

@@ -338,7 +338,7 @@ const _PluginManager = class _PluginManager {
     } catch (error) {
       console.error(error);
     }
-    this.app.log.debug(`add plugin [${options.name}]`, {
+    this.app.log.trace(`add plugin [${options.name}]`, {
       method: "add",
       submodule: "plugin-manager",
       name: options.name
@@ -379,7 +379,7 @@ const _PluginManager = class _PluginManager {
    * @internal
    */
   async loadCommands() {
-    this.app.log.debug("load commands");
+    this.app.log.info("load commands");
     const items = await this.repository.find({
       filter: {
         enabled: true
@@ -388,21 +388,15 @@ const _PluginManager = class _PluginManager {
     const packageNames = items.map((item) => item.packageName);
     const source = [];
     for (const packageName of packageNames) {
-      const file = require.resolve(packageName);
-      const sourceDir = (0, import_path.basename)((0, import_path.dirname)(file)) === "src" ? "src" : "dist";
-      const directory = (0, import_path.join)(
-        packageName,
-        sourceDir,
-        "server/commands/*." + ((0, import_path.basename)((0, import_path.dirname)(file)) === "src" ? "ts" : "js")
-      );
+      const dirname = await (0, import_utils2.getPluginBasePath)(packageName);
+      const directory = (0, import_path.join)(dirname, "server/commands/*." + ((0, import_path.basename)(dirname) === "src" ? "ts" : "js"));
       source.push(directory.replaceAll(import_path.sep, "/"));
     }
     for (const plugin of this.options.plugins || []) {
       if (typeof plugin === "string") {
-        const packageName = await _PluginManager.getPackageName(plugin);
-        const file = require.resolve(packageName);
-        const sourceDir = (0, import_path.basename)((0, import_path.dirname)(file)) === "src" ? "src" : "lib";
-        const directory = (0, import_path.join)(packageName, sourceDir, "server/commands/*." + (sourceDir === "src" ? "ts" : "js"));
+        const { packageName } = await _PluginManager.parseName(plugin);
+        const dirname = await (0, import_utils2.getPluginBasePath)(packageName);
+        const directory = (0, import_path.join)(dirname, "server/commands/*." + ((0, import_path.basename)(dirname) === "src" ? "ts" : "js"));
         source.push(directory.replaceAll(import_path.sep, "/"));
       }
     }
@@ -416,6 +410,7 @@ const _PluginManager = class _PluginManager {
     }
   }
   async load(options = {}) {
+    this.app.log.debug("loading plugins...");
     this.app.setMaintainingMessage("loading plugins...");
     const total = this.pluginInstances.size;
     let current = 0;
@@ -429,7 +424,7 @@ const _PluginManager = class _PluginManager {
       if (!plugin.enabled) {
         continue;
       }
-      this.app.logger.debug(`before load plugin [${name}]`, { submodule: "plugin-manager", method: "load", name });
+      this.app.logger.trace(`before load plugin [${name}]`, { submodule: "plugin-manager", method: "load", name });
       await plugin.beforeLoad();
     }
     current = 0;
@@ -444,13 +439,14 @@ const _PluginManager = class _PluginManager {
         continue;
       }
       await this.app.emitAsync("beforeLoadPlugin", plugin, options);
-      this.app.logger.debug(`load plugin [${name}] `, { submodule: "plugin-manager", method: "load", name });
+      this.app.logger.trace(`load plugin [${name}] `, { submodule: "plugin-manager", method: "load", name });
       await plugin.loadCollections();
       await plugin.load();
       plugin.state.loaded = true;
       await this.app.emitAsync("afterLoadPlugin", plugin, options);
     }
-    this.app.setMaintainingMessage("loaded plugins");
+    this.app.log.debug("plugins loaded");
+    this.app.setMaintainingMessage("plugins loaded");
   }
   async install(options = {}) {
     this.app.setMaintainingMessage("install plugins...");
@@ -820,20 +816,18 @@ const _PluginManager = class _PluginManager {
       if (!await this.app.isStarted()) {
         this.app.log.debug("app upgrading");
         await this.app.runCommand("upgrade");
-        await (0, import_execa.default)("yarn", ["nocobase", "refresh"], {
+        await (0, import_helper.tsxRerunning)();
+        await (0, import_execa.default)("yarn", ["nocobase", "pm2-restart"], {
           env: process.env
         });
         return;
       }
       const file = (0, import_path.resolve)(process.cwd(), "storage/app-upgrading");
       await import_fs.default.promises.writeFile(file, "", "utf-8");
-      if (process.env.IS_DEV_CMD) {
-        await (0, import_helper.tsxRerunning)();
-      } else {
-        await (0, import_execa.default)("yarn", ["nocobase", "pm2-restart"], {
-          env: process.env
-        });
-      }
+      await (0, import_helper.tsxRerunning)();
+      await (0, import_execa.default)("yarn", ["nocobase", "pm2-restart"], {
+        env: process.env
+      });
     }, "upgrade");
     if (Array.isArray(nameOrPkg)) {
       for (const name of nameOrPkg) {

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

@@ -111,4 +111,5 @@ export declare function checkAndGetCompatible(packageName: string): Promise<{
     isCompatible: boolean;
     depsCompatible: DepCompatible[];
 }>;
+export declare function getPluginBasePath(packageName: string): Promise<string>;
 export {};

package/lib/plugin-manager/utils.js

@@ -57,6 +57,7 @@ __export(utils_exports, {
   getPackageJsonByLocalPath: () => getPackageJsonByLocalPath,
   getPackageNameFromString: () => getPackageNameFromString,
   getPackagesFromFiles: () => getPackagesFromFiles,
+  getPluginBasePath: () => getPluginBasePath,
   getPluginInfoByNpm: () => getPluginInfoByNpm,
   getPluginStoragePath: () => getPluginStoragePath,
   getServerPackages: () => getServerPackages,
@@ -512,6 +513,21 @@ async function checkAndGetCompatible(packageName) {
   };
 }
 __name(checkAndGetCompatible, "checkAndGetCompatible");
+async function getPluginBasePath(packageName) {
+  if (!packageName) {
+    return;
+  }
+  const file = await import_fs_extra.default.realpath(await (0, import_utils.requireResolve)(packageName));
+  try {
+    const basePath = await import_fs_extra.default.realpath(import_path.default.resolve(process.env.NODE_MODULES_PATH, packageName, "src"));
+    if (file.startsWith(basePath)) {
+      return basePath;
+    }
+  } catch (error) {
+  }
+  return import_path.default.dirname(import_path.default.dirname(file));
+}
+__name(getPluginBasePath, "getPluginBasePath");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkAndGetCompatible,
@@ -534,6 +550,7 @@ __name(checkAndGetCompatible, "checkAndGetCompatible");
   getPackageJsonByLocalPath,
   getPackageNameFromString,
   getPackagesFromFiles,
+  getPluginBasePath,
   getPluginInfoByNpm,
   getPluginStoragePath,
   getServerPackages,

package/lib/plugin.d.ts

@@ -43,7 +43,7 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
      */
     private _sourceDir;
     constructor(app: Application, options?: any);
-    get log(): import("winston").Logger;
+    get log(): import("@nocobase/logger/lib/logger").Logger;
     get name(): string;
     get pm(): import("./plugin-manager").PluginManager;
     get db(): import("@nocobase/database").default;
@@ -53,7 +53,7 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
     set installed(value: any);
     get isPreset(): any;
     getName(): any;
-    createLogger(options: LoggerOptions): import("winston").Logger;
+    createLogger(options: LoggerOptions): import("@nocobase/logger/lib/logger").Logger;
     afterAdd(): void;
     beforeLoad(): void;
     load(): Promise<void>;
@@ -73,10 +73,6 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
      * @internal
      */
     setOptions(options: any): void;
-    /**
-     * @internal
-     */
-    loadCommands(): Promise<void>;
     /**
      * @internal
      */
@@ -85,6 +81,7 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
         afterSync: any[];
         afterLoad: any[];
     }>;
+    private getPluginBasePath;
     /**
      * @internal
      */
@@ -98,13 +95,5 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
      * @experimental
      */
     toJSON(options?: any): Promise<any>;
-    /**
-     * @internal
-     */
-    protected getSourceDir(): Promise<string>;
-    /**
-     * @internal
-     */
-    protected isDev(): Promise<boolean>;
 }
 export default Plugin;

package/lib/plugin.js

@@ -43,7 +43,6 @@ __export(plugin_exports, {
 module.exports = __toCommonJS(plugin_exports);
 var import_utils = require("@nocobase/utils");
 var import_fs = __toESM(require("fs"));
-var import_glob = __toESM(require("glob"));
 var import_path = require("path");
 var import_plugin_manager = require("./plugin-manager");
 var import_utils2 = require("./plugin-manager/utils");
@@ -136,45 +135,16 @@ const _Plugin = class _Plugin {
   setOptions(options) {
     this.options = options || {};
   }
-  /**
-   * @internal
-   */
-  async loadCommands() {
-    const extensions = ["js", "ts"];
-    const directory = (0, import_path.resolve)(
-      process.env.NODE_MODULES_PATH,
-      this.options.packageName,
-      await this.getSourceDir(),
-      "server/commands"
-    );
-    const patten = `${directory}/*.{${extensions.join(",")}}`;
-    const files = import_glob.default.sync(patten, {
-      ignore: ["**/*.d.ts"]
-    });
-    for (const file of files) {
-      let filename = (0, import_path.basename)(file);
-      filename = filename.substring(0, filename.lastIndexOf(".")) || filename;
-      const callback = await (0, import_utils.importModule)(file);
-      callback(this.app);
-    }
-    if (files.length) {
-      this.app.log.debug(`load commands [${this.name}]`);
-    }
-  }
   /**
    * @internal
    */
   async loadMigrations() {
     this.app.log.debug(`load plugin migrations [${this.name}]`);
-    if (!this.options.packageName) {
+    const basePath = await this.getPluginBasePath();
+    if (!basePath) {
       return { beforeLoad: [], afterSync: [], afterLoad: [] };
     }
-    const directory = (0, import_path.resolve)(
-      process.env.NODE_MODULES_PATH,
-      this.options.packageName,
-      await this.getSourceDir(),
-      "server/migrations"
-    );
+    const directory = (0, import_path.resolve)(basePath, "server/migrations");
     return await this.app.loadMigrations({
       directory,
       namespace: this.options.packageName,
@@ -183,19 +153,21 @@ const _Plugin = class _Plugin {
       }
     });
   }
+  async getPluginBasePath() {
+    if (!this.options.packageName) {
+      return;
+    }
+    return (0, import_utils2.getPluginBasePath)(this.options.packageName);
+  }
   /**
    * @internal
    */
   async loadCollections() {
-    if (!this.options.packageName) {
+    const basePath = await this.getPluginBasePath();
+    if (!basePath) {
       return;
     }
-    const directory = (0, import_path.resolve)(
-      process.env.NODE_MODULES_PATH,
-      this.options.packageName,
-      await this.getSourceDir(),
-      "server/collections"
-    );
+    const directory = (0, import_path.resolve)(basePath, "server/collections");
     if (await (0, import_utils.fsExists)(directory)) {
       await this.db.import({
         directory,
@@ -246,36 +218,6 @@ const _Plugin = class _Plugin {
     }
     return results;
   }
-  /**
-   * @internal
-   */
-  async getSourceDir() {
-    if (this._sourceDir) {
-      return this._sourceDir;
-    }
-    if (await this.isDev()) {
-      return this._sourceDir = "src";
-    }
-    if ((0, import_path.basename)(__dirname) === "src") {
-      return this._sourceDir = "src";
-    }
-    return this._sourceDir = this.isPreset ? "lib" : "dist";
-  }
-  /**
-   * @internal
-   */
-  async isDev() {
-    if (!this.options.packageName) {
-      return false;
-    }
-    const file = await import_fs.default.promises.realpath(
-      (0, import_path.resolve)(process.env.NODE_MODULES_PATH || (0, import_path.resolve)(process.cwd(), "node_modules"), this.options.packageName)
-    );
-    if (file.startsWith((0, import_path.resolve)(process.cwd(), "packages"))) {
-      return !!process.env.IS_DEV_CMD;
-    }
-    return false;
-  }
 };
 __name(_Plugin, "Plugin");
 let Plugin = _Plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.0.0-alpha.8",
+    "version": "1.0.1-alpha.1",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
@@ -10,18 +10,18 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.0.0-alpha.8",
-        "@nocobase/actions": "1.0.0-alpha.8",
-        "@nocobase/auth": "1.0.0-alpha.8",
-        "@nocobase/cache": "1.0.0-alpha.8",
-        "@nocobase/data-source-manager": "1.0.0-alpha.8",
-        "@nocobase/database": "1.0.0-alpha.8",
-        "@nocobase/evaluators": "1.0.0-alpha.8",
-        "@nocobase/logger": "1.0.0-alpha.8",
-        "@nocobase/resourcer": "1.0.0-alpha.8",
-        "@nocobase/sdk": "1.0.0-alpha.8",
-        "@nocobase/telemetry": "1.0.0-alpha.8",
-        "@nocobase/utils": "1.0.0-alpha.8",
+        "@nocobase/acl": "1.0.1-alpha.1",
+        "@nocobase/actions": "1.0.1-alpha.1",
+        "@nocobase/auth": "1.0.1-alpha.1",
+        "@nocobase/cache": "1.0.1-alpha.1",
+        "@nocobase/data-source-manager": "1.0.1-alpha.1",
+        "@nocobase/database": "1.0.1-alpha.1",
+        "@nocobase/evaluators": "1.0.1-alpha.1",
+        "@nocobase/logger": "1.0.1-alpha.1",
+        "@nocobase/resourcer": "1.0.1-alpha.1",
+        "@nocobase/sdk": "1.0.1-alpha.1",
+        "@nocobase/telemetry": "1.0.1-alpha.1",
+        "@nocobase/utils": "1.0.1-alpha.1",
         "@types/decompress": "4.2.4",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -54,5 +54,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "3c4e978f6fc366c01621c9d625678e91f53f8662"
+    "gitHead": "d24aa16987a4068f857ae073fcce18f3cb490660"
 }