@nocobase/server 2.1.0-beta.44 → 2.1.0-beta.45

package/lib/app-supervisor/index.d.ts

@@ -13,7 +13,7 @@ import { IncomingMessage, ServerResponse } from 'http';
 import { AsyncEmitter } from '@nocobase/utils';
 import { EventEmitter } from 'events';
 import Application, { ApplicationOptions } from '../application';
-import type { AppDiscoveryAdapter, AppProcessAdapter, AppStatus, EnvironmentInfo, GetAppOptions, ProcessCommand, AppDbCreator, AppOptionsFactory, AppDbCreatorOptions, AppCommandAdapter, AppModel, BootstrapLock } from './types';
+import type { AppDiscoveryAdapter, AppProcessAdapter, AppStatus, EnvironmentInfo, GetAppOptions, ProcessCommand, AppDbCreator, AppOptionsFactory, AppDbCreatorOptions, AppCommandAdapter, AppModel, BootstrapLock, AppCondition, GetAppsByConditionOptions } from './types';
 import { Predicate } from './condition-registry';
 import { PubSubManagerPublishOptions } from '../pub-sub-manager';
 import { Transaction, Transactionable } from '@nocobase/database';
@@ -48,6 +48,7 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     private processAdapterName;
     private commandAdapterName;
     private appDbCreator;
+    private appConditions;
     appOptionsFactory: AppOptionsFactory;
     private environmentHeartbeatInterval;
     private environmentHeartbeatTimer;
@@ -107,11 +108,15 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     getAppLastSeenAt(appName: string): Promise<number>;
     addAppModel(appModel: AppModel): Promise<void>;
     getAppModel(appName: string): Promise<AppModel>;
+    registerAppCondition(name: string, condition: AppCondition): void;
+    unregisterAppCondition(name: string): void;
+    getAppCondition(name: string): AppCondition;
+    getAppConditions(): [string, AppCondition][];
+    getAppsByCondition(conditionName: string, options?: GetAppsByConditionOptions): Promise<string[]>;
     removeAppModel(appName: string): Promise<void>;
     getAppNameByCName(cname: string): Promise<string>;
-    addAutoStartApps(environmentName: string, appNames: string[]): Promise<void>;
-    getAutoStartApps(): Promise<string[]>;
-    removeAutoStartApps(environmentName: string, appNames: string[]): Promise<void>;
+    addAppsToCondition(conditionName: string, environmentName: string, appNames: string[]): Promise<void>;
+    removeAppsFromCondition(conditionName: string, environmentName: string, appNames: string[]): Promise<void>;
     addApp(app: Application): Application<import("../application").DefaultState, import("../application").DefaultContext>;
     getApp(appName: string, options?: GetAppOptions): Promise<Application<import("../application").DefaultState, import("../application").DefaultContext>>;
     hasApp(appName: string): boolean;
@@ -134,6 +139,9 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     upgradeApp(appName: string, context?: {
         requestId: string;
     }): Promise<void>;
+    dispatchAppEvent(appName: string, event: string, payload?: any, context?: {
+        requestId: string;
+    }): Promise<void>;
     /**
      * @deprecated
      * use {#getApps} instead
@@ -157,5 +165,5 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     on(eventName: string | symbol, listener: (...args: any[]) => void): this;
     private bindAppEvents;
 }
-export type { AppDiscoveryAdapter, AppProcessAdapter, AppCommandAdapter, AppStatus, ProcessCommand, EnvironmentInfo, GetAppOptions, AppDbCreator, AppOptionsFactory, AppModel, AppModelOptions, BootstrapLock, } from './types';
+export type { AppDiscoveryAdapter, AppProcessAdapter, AppCommandAdapter, AppStatus, ProcessCommand, EnvironmentInfo, GetAppOptions, AppDbCreator, AppOptionsFactory, AppModel, AppModelOptions, AppCondition, GetAppsByConditionOptions, BootstrapLock, } from './types';
 export { MainOnlyAdapter } from './main-only-adapter';

package/lib/app-supervisor/index.js

@@ -69,6 +69,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   processAdapterName;
   commandAdapterName;
   appDbCreator = new import_condition_registry.ConditionalRegistry();
+  appConditions = /* @__PURE__ */ new Map();
   appOptionsFactory = import_app_options_factory.appOptionsFactory;
   environmentHeartbeatInterval = 2 * 60 * 1e3;
   environmentHeartbeatTimer = null;
@@ -420,6 +421,28 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   async getAppModel(appName) {
     return this.discoveryAdapter.getAppModel(appName);
   }
+  registerAppCondition(name, condition) {
+    this.appConditions.set(name, condition);
+  }
+  unregisterAppCondition(name) {
+    this.appConditions.delete(name);
+  }
+  getAppCondition(name) {
+    return this.appConditions.get(name);
+  }
+  getAppConditions() {
+    return Array.from(this.appConditions.entries());
+  }
+  async getAppsByCondition(conditionName, options = {}) {
+    const condition = this.getAppCondition(conditionName);
+    if (!condition || typeof this.discoveryAdapter.getAppsByCondition !== "function") {
+      return [];
+    }
+    return this.discoveryAdapter.getAppsByCondition(conditionName, condition, {
+      ...options,
+      environmentName: options.allEnvironments ? options.environmentName : options.environmentName ?? this.environmentName
+    });
+  }
   async removeAppModel(appName) {
     if (typeof this.discoveryAdapter.removeAppModel !== "function") {
       return;
@@ -432,23 +455,17 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     }
     return this.discoveryAdapter.getAppNameByCName(cname);
   }
-  async addAutoStartApps(environmentName, appNames) {
-    if (typeof this.discoveryAdapter.addAutoStartApps !== "function") {
+  async addAppsToCondition(conditionName, environmentName, appNames) {
+    if (typeof this.discoveryAdapter.addAppsToCondition !== "function") {
       return;
     }
-    return this.discoveryAdapter.addAutoStartApps(environmentName, appNames);
-  }
-  async getAutoStartApps() {
-    if (typeof this.discoveryAdapter.getAutoStartApps === "function") {
-      return this.discoveryAdapter.getAutoStartApps(this.environmentName);
-    }
-    return [];
+    return this.discoveryAdapter.addAppsToCondition(conditionName, environmentName, appNames);
   }
-  async removeAutoStartApps(environmentName, appNames) {
-    if (typeof this.discoveryAdapter.addAutoStartApps !== "function") {
+  async removeAppsFromCondition(conditionName, environmentName, appNames) {
+    if (typeof this.discoveryAdapter.removeAppsFromCondition !== "function") {
       return;
     }
-    return this.discoveryAdapter.removeAutoStartApps(environmentName, appNames);
+    return this.discoveryAdapter.removeAppsFromCondition(conditionName, environmentName, appNames);
   }
   addApp(app) {
     this.processAdapter.addApp(app);
@@ -477,6 +494,10 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   async upgradeApp(appName, context) {
     await this.processAdapter.upgradeApp(appName, context);
   }
+  async dispatchAppEvent(appName, event, payload, context) {
+    var _a, _b;
+    return (_b = (_a = this.processAdapter).dispatchAppEvent) == null ? void 0 : _b.call(_a, appName, event, payload, context);
+  }
   /**
    * @deprecated
    * use {#getApps} instead

package/lib/app-supervisor/main-only-adapter.d.ts

@@ -26,6 +26,9 @@ export declare class MainOnlyAdapter implements AppDiscoveryAdapter, AppProcessA
     stopApp(appName: string): Promise<void>;
     removeApp(appName: string): Promise<void>;
     upgradeApp(appName: string): Promise<void>;
+    dispatchAppEvent(appName: string, event: string, payload?: any, _context?: {
+        requestId: string;
+    }): Promise<void>;
     removeAllApps(): Promise<void>;
     setAppStatus(appName: string, status: AppStatus, options?: {}): void;
     getAppStatus(appName: string, defaultStatus?: AppStatus): AppStatus;

package/lib/app-supervisor/main-only-adapter.js

@@ -124,6 +124,13 @@ const _MainOnlyAdapter = class _MainOnlyAdapter {
     }
     await this.apps[appName].runCommand("upgrade");
   }
+  async dispatchAppEvent(appName, event, payload, _context) {
+    const app = await this.getApp(appName, { withOutBootStrap: true });
+    if (!app) {
+      return;
+    }
+    await app.emitAsync(event, payload);
+  }
   async removeAllApps() {
     return this.removeApp("main");
   }

package/lib/app-supervisor/types.d.ts

@@ -57,11 +57,23 @@ export type AppModelOptions = {
 };
 export type AppModel = {
     name: string;
+    title?: string;
+    icon?: string;
     cname?: string;
+    sort?: number;
+    pinned?: boolean;
     environment?: string;
     environments?: string[];
     options: AppModelOptions;
 };
+export type AppCondition = {
+    filter?: Record<string, any>;
+    match?: (appModel: AppModel) => boolean;
+};
+export type GetAppsByConditionOptions = {
+    environmentName?: string;
+    allEnvironments?: boolean;
+};
 export type ProcessCommand = {
     requestId: string;
     appName: string;
@@ -102,9 +114,9 @@ export interface AppDiscoveryAdapter {
     clearAppStatus?(appName: string): void | Promise<void>;
     loadAppModels?(mainApp: Application): Promise<void>;
     getAppsStatuses?(appNames?: string[]): Promise<AppStatusesResult> | AppStatusesResult;
-    addAutoStartApps?(environmentName: string, appName: string[]): Promise<void>;
-    getAutoStartApps?(environmentName: string): Promise<string[]>;
-    removeAutoStartApps?(environmentName: string, appNames: string[]): Promise<void>;
+    getAppsByCondition?(conditionName: string, condition: AppCondition, options?: GetAppsByConditionOptions): Promise<string[]>;
+    addAppsToCondition?(conditionName: string, environmentName: string, appNames: string[]): Promise<void>;
+    removeAppsFromCondition?(conditionName: string, environmentName: string, appNames: string[]): Promise<void>;
     addAppModel?(appModel: AppModel): Promise<void>;
     getAppModel?(appName: string): Promise<AppModel>;
     removeAppModel?(appName: string): Promise<void>;
@@ -149,6 +161,9 @@ export interface AppProcessAdapter {
     upgradeApp?(appName: string, context?: {
         requestId: string;
     }): Promise<void>;
+    dispatchAppEvent?(appName: string, event: string, payload?: any, context?: {
+        requestId: string;
+    }): Promise<void>;
     removeAllApps?(): Promise<void>;
     setAppError?(appName: string, error: Error): void;
     hasAppError?(appName: string): boolean;

package/lib/gateway/index.js

@@ -287,6 +287,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   getV2RuntimeConfig() {
     return {
       __nocobase_public_path__: this.getV2PublicPath(),
+      __nocobase_modern_client_prefix__: (0, import_utils3.normalizeModernClientPrefix)(import_node_process.default.env.APP_MODERN_CLIENT_PREFIX),
       __webpack_public_path__: import_node_process.default.env.CDN_BASE_URL ? `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/` : "",
       __nocobase_api_base_url__: import_node_process.default.env.API_BASE_URL || import_node_process.default.env.API_BASE_PATH,
       __nocobase_api_client_storage_prefix__: import_node_process.default.env.API_CLIENT_STORAGE_PREFIX,
@@ -306,12 +307,12 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   }
   getV2AssetPublicPath() {
     if (import_node_process.default.env.CDN_BASE_URL) {
-      return `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/v2/`;
+      return `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/${import_utils3.MODERN_CLIENT_DIST_DIR}/`;
     }
     return this.getV2PublicPath();
   }
   getV2IndexTemplate() {
-    const file = `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client/v2/index.html`;
+    const file = `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client/${import_utils3.MODERN_CLIENT_DIST_DIR}/index.html`;
     if (!import_fs.default.existsSync(file)) {
       return null;
     }
@@ -371,6 +372,20 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
         directoryListing: false
       });
     }
+    if (pathname.startsWith(APP_PUBLIC_PATH + "dist/")) {
+      if (handleApp !== "main") {
+        const isProxy = await this.proxyRequestToSubApp(supervisor, handleApp, req, res);
+        if (isProxy) {
+          return;
+        }
+      }
+      req.url = req.url.substring(APP_PUBLIC_PATH.length + "dist".length);
+      await compress(req, res);
+      return (0, import_serve_handler.default)(req, res, {
+        public: (0, import_utils.storagePathJoin)("dist-client"),
+        directoryListing: false
+      });
+    }
     if (pathname.startsWith(PLUGIN_STATICS_PATH) && !pathname.includes("/server/")) {
       if (handleApp !== "main") {
         const isProxy = await this.proxyRequestToSubApp(supervisor, handleApp, req, res);
@@ -409,6 +424,10 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
           }
         }
         req.url = req.url.substring(APP_PUBLIC_PATH.length - 1);
+        const modernPrefix = (0, import_utils3.normalizeModernClientPrefix)(import_node_process.default.env.APP_MODERN_CLIENT_PREFIX);
+        if (modernPrefix !== import_utils3.MODERN_CLIENT_DIST_DIR && req.url.startsWith(`/${modernPrefix}/`)) {
+          req.url = `/${import_utils3.MODERN_CLIENT_DIST_DIR}/${req.url.slice(modernPrefix.length + 2)}`;
+        }
         await compress(req, res);
         return (0, import_serve_handler.default)(req, res, {
           public: `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client`

package/lib/gateway/utils.d.ts

@@ -9,7 +9,9 @@
 /// <reference types="node" />
 import { IncomingMessage } from 'http';
 import { IncomingRequest } from '.';
+export declare const MODERN_CLIENT_DIST_DIR = "v";
 export declare function resolvePublicPath(appPublicPath?: string): string;
+export declare function normalizeModernClientPrefix(value?: string): string;
 export declare function resolveV2PublicPath(appPublicPath?: string): string;
 export declare function rewriteV2AssetPublicPath(html: string, assetPublicPath: string): string;
 export declare function injectRuntimeScript(html: string, runtimeScript: string): string;

package/lib/gateway/utils.js

@@ -27,23 +27,32 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  MODERN_CLIENT_DIST_DIR: () => MODERN_CLIENT_DIST_DIR,
   getHost: () => getHost,
   getHostname: () => getHostname,
   injectRuntimeScript: () => injectRuntimeScript,
+  normalizeModernClientPrefix: () => normalizeModernClientPrefix,
   resolvePublicPath: () => resolvePublicPath,
   resolveV2PublicPath: () => resolveV2PublicPath,
   rewriteV2AssetPublicPath: () => rewriteV2AssetPublicPath
 });
 module.exports = __toCommonJS(utils_exports);
+const MODERN_CLIENT_DIST_DIR = "v";
 function resolvePublicPath(appPublicPath = "/") {
   const normalized = String(appPublicPath || "/").trim() || "/";
   const withLeadingSlash = normalized.startsWith("/") ? normalized : `/${normalized}`;
   return withLeadingSlash.endsWith("/") ? withLeadingSlash : `${withLeadingSlash}/`;
 }
 __name(resolvePublicPath, "resolvePublicPath");
+function normalizeModernClientPrefix(value) {
+  const segment = String(value || "").trim().replace(/^\/+|\/+$/g, "");
+  return segment || MODERN_CLIENT_DIST_DIR;
+}
+__name(normalizeModernClientPrefix, "normalizeModernClientPrefix");
 function resolveV2PublicPath(appPublicPath = "/") {
   const publicPath = resolvePublicPath(appPublicPath);
-  return `${publicPath.replace(/\/$/, "")}/v2/`;
+  const prefix = normalizeModernClientPrefix(process.env.APP_MODERN_CLIENT_PREFIX);
+  return `${publicPath.replace(/\/$/, "")}/${prefix}/`;
 }
 __name(resolveV2PublicPath, "resolveV2PublicPath");
 function ensureTrailingSlash(value) {
@@ -52,10 +61,12 @@ function ensureTrailingSlash(value) {
 __name(ensureTrailingSlash, "ensureTrailingSlash");
 function rewriteV2AssetPublicPath(html, assetPublicPath) {
   const normalizedAssetPublicPath = ensureTrailingSlash(assetPublicPath);
-  if (normalizedAssetPublicPath === "/v2/") {
+  const sentinel = `/${MODERN_CLIENT_DIST_DIR}/`;
+  if (normalizedAssetPublicPath === sentinel) {
     return html;
   }
-  return html.replace(/((?:src|href)=["'])\/v2\//g, `$1${normalizedAssetPublicPath}`);
+  const sentinelPattern = new RegExp(`((?:src|href)=["'])${sentinel.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "g");
+  return html.replace(sentinelPattern, `$1${normalizedAssetPublicPath}`);
 }
 __name(rewriteV2AssetPublicPath, "rewriteV2AssetPublicPath");
 function injectRuntimeScript(html, runtimeScript) {
@@ -106,9 +117,11 @@ function getHostname(req) {
 __name(getHostname, "getHostname");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  MODERN_CLIENT_DIST_DIR,
   getHost,
   getHostname,
   injectRuntimeScript,
+  normalizeModernClientPrefix,
   resolvePublicPath,
   resolveV2PublicPath,
   rewriteV2AssetPublicPath

package/lib/plugin-manager/constants.js

@@ -38,7 +38,7 @@ module.exports = __toCommonJS(constants_exports);
 const APP_NAME = "nocobase";
 const DEFAULT_PLUGIN_STORAGE_PATH = "storage/plugins";
 const DEFAULT_PLUGIN_PATH = "packages/plugins/";
-const pluginPrefix = (process.env.PLUGIN_PACKAGE_PREFIX || "@nocobase/plugin-,@nocobase/preset-,@nocobase/plugin-pro-").split(",");
+const pluginPrefix = (process.env.PLUGIN_PACKAGE_PREFIX || "@nocobase/plugin-,@nocobase/preset-").split(",");
 const requireRegex = /require\s*\(['"`](.*?)['"`]\)/g;
 const importRegex = /^import(?:['"\s]*([\w*${}\s,]+)from\s*)?['"\s]['"\s](.*[@\w_-]+)['"\s].*/gm;
 const EXTERNAL = [

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

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

package/lib/plugin-manager/findPackageNames.js

@@ -45,25 +45,17 @@ __export(findPackageNames_exports, {
   packageNameTrim: () => packageNameTrim
 });
 module.exports = __toCommonJS(findPackageNames_exports);
-var import_fast_glob = __toESM(require("fast-glob"));
-var import_utils = require("@nocobase/utils");
-var import_fs_extra = __toESM(require("fs-extra"));
+var import_plugin_package = require("../../../utils/plugin-package");
 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);
+    const { name, packageName } = await (0, import_plugin_package.parsePluginName)(nameOrPkg, {
+      nodeModulesPath: process.env.NODE_MODULES_PATH
+    });
+    if (await (0, import_plugin_package.resolvePluginPackagePath)(packageName)) {
       names.push(name);
-    } catch (error) {
     }
   }
   return names;
@@ -82,76 +74,57 @@ const excludes = [
   "@nocobase/plugin-workflow-test"
 ];
 async function findPackageNames() {
-  const pluginStoragePath = (0, import_utils.resolvePluginStoragePath)();
-  const patterns = [
-    "./packages/plugins/*/package.json",
-    "./packages/plugins/*/*/package.json",
-    "./packages/pro-plugins/*/*/package.json",
-    import_path.default.join(pluginStoragePath, "*/package.json"),
-    import_path.default.join(pluginStoragePath, "*/*/package.json")
-  ];
   try {
-    const packageJsonPaths = await (0, import_fast_glob.default)(patterns, {
-      cwd: process.cwd(),
-      absolute: true,
-      ignore: ["**/external-db-data-source/**"]
+    const packages = await (0, import_plugin_package.discoverPluginPackages)({
+      nodeModulesPath: process.env.NODE_MODULES_PATH
     });
-    const packageNames = await Promise.all(
-      packageJsonPaths.map(async (packageJsonPath) => {
-        const packageJson = await import_fs_extra.default.readJson(packageJsonPath);
-        return packageJson.name;
-      })
-    );
-    const nocobasePlugins = await findNocobasePlugins();
-    const { APPEND_PRESET_BUILT_IN_PLUGINS = "", APPEND_PRESET_LOCAL_PLUGINS = "" } = process.env;
-    return trim(
-      packageNames.filter((pkg) => pkg && !excludes.includes(pkg)).concat(nocobasePlugins).concat(splitNames(APPEND_PRESET_BUILT_IN_PLUGINS)).concat(splitNames(APPEND_PRESET_LOCAL_PLUGINS))
-    );
+    return trim(packages.filter((pkg) => !excludes.includes(pkg.packageName)).map((pkg) => pkg.packageName));
   } 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")
-  );
+  const packageJson = await (0, import_plugin_package.getPresetNocoBasePackageJson)({
+    nodeModulesPath: process.env.NODE_MODULES_PATH
+  });
+  if (!packageJson) {
+    throw new Error("Cannot find @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.filter((pkg) => pkg && !excludes.includes(pkg)));
-  } 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)));
+    return trim((packageJson.builtIn || []).concat((0, import_plugin_package.splitPluginNames)(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(
+  const packages = await (0, import_plugin_package.discoverPluginPackages)({
+    nodeModulesPath: process.env.NODE_MODULES_PATH
+  });
+  const builtInPackageNames = await Promise.all(
+    (packageJson.builtIn || []).concat((0, import_plugin_package.splitPluginNames)(process.env.APPEND_PRESET_BUILT_IN_PLUGINS || "")).map(
+      async (nameOrPkg) => (await (0, import_plugin_package.parsePluginName)(nameOrPkg, { nodeModulesPath: process.env.NODE_MODULES_PATH })).packageName
+    )
+  );
+  const deprecatedPackageNames = await Promise.all(
+    (packageJson.deprecated || []).map(
+      async (nameOrPkg) => (await (0, import_plugin_package.parsePluginName)(nameOrPkg, { nodeModulesPath: process.env.NODE_MODULES_PATH })).packageName
+    )
+  );
+  return trim(
     import_lodash.default.difference(
-      plugins1.concat(plugins2).concat(splitNames(APPEND_PRESET_LOCAL_PLUGINS)),
-      builtInPlugins.concat(await trim(packageJson.deprecated))
+      packages.filter((pkg) => !excludes.includes(pkg.packageName)).map((pkg) => pkg.packageName),
+      import_lodash.default.uniq(builtInPackageNames.concat(deprecatedPackageNames))
     )
   );
-  return items;
 }
 __name(findLocalPlugins, "findLocalPlugins");
 async function findAllPlugins() {
@@ -163,8 +136,10 @@ __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);
+  const keys = (0, import_plugin_package.splitPluginNames)(APPEND_PRESET_BUILT_IN_PLUGINS);
+  const { name, packageName } = await (0, import_plugin_package.parsePluginName)(nameOrPkg, {
+    nodeModulesPath: process.env.NODE_MODULES_PATH
+  });
   if (keys.includes(packageName)) {
     return;
   }

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

@@ -57,6 +57,7 @@ var import_middleware = require("./middleware");
 var import_collection = __toESM(require("./options/collection"));
 var import_resource = __toESM(require("./options/resource"));
 var import_plugin_manager_repository = require("./plugin-manager-repository");
+var import_plugin_package = require("../../../utils/plugin-package");
 var import_utils2 = require("./utils");
 const _PluginLoadError = class _PluginLoadError extends Error {
   constructor(pluginName) {
@@ -180,9 +181,7 @@ const _PluginManager = class _PluginManager {
    * @internal
    */
   static getPluginPkgPrefix() {
-    return (process.env.PLUGIN_PACKAGE_PREFIX || "@nocobase/plugin-,@nocobase/preset-,@nocobase/plugin-pro-").split(
-      ","
-    );
+    return (0, import_plugin_package.getPluginPackagePrefixes)();
   }
   /**
    * @internal
@@ -237,32 +236,10 @@ const _PluginManager = class _PluginManager {
     if (this.parsedNames[nameOrPkg]) {
       return this.parsedNames[nameOrPkg];
     }
-    if (nameOrPkg.startsWith("@nocobase/plugin-")) {
-      this.parsedNames[nameOrPkg] = {
-        packageName: nameOrPkg,
-        name: nameOrPkg.replace("@nocobase/plugin-", "")
-      };
-      return this.parsedNames[nameOrPkg];
-    }
-    if (nameOrPkg.startsWith("@nocobase/preset-")) {
-      this.parsedNames[nameOrPkg] = {
-        packageName: nameOrPkg,
-        name: nameOrPkg.replace("@nocobase/preset-", "")
-      };
-      return this.parsedNames[nameOrPkg];
-    }
-    const exists = /* @__PURE__ */ __name(async (name, isPreset = false) => {
-      return import_fs_extra.default.exists(
-        (0, import_path.resolve)(process.env.NODE_MODULES_PATH, `@nocobase/${isPreset ? "preset" : "plugin"}-${name}`, "package.json")
-      );
-    }, "exists");
-    if (await exists(nameOrPkg)) {
-      this.parsedNames[nameOrPkg] = { name: nameOrPkg, packageName: `@nocobase/plugin-${nameOrPkg}` };
-    } else if (await exists(nameOrPkg, true)) {
-      this.parsedNames[nameOrPkg] = { name: nameOrPkg, packageName: `@nocobase/preset-${nameOrPkg}` };
-    } else {
-      this.parsedNames[nameOrPkg] = { name: nameOrPkg, packageName: nameOrPkg };
-    }
+    this.parsedNames[nameOrPkg] = await (0, import_plugin_package.parsePluginName)(nameOrPkg, {
+      nodeModulesPath: process.env.NODE_MODULES_PATH,
+      pluginPackagePrefixes: this.getPluginPkgPrefix()
+    });
     return this.parsedNames[nameOrPkg];
   }
   addPreset(plugin, options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.1.0-beta.44",
+  "version": "2.1.0-beta.45",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,21 +10,21 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.1.0-beta.44",
-    "@nocobase/actions": "2.1.0-beta.44",
-    "@nocobase/ai": "2.1.0-beta.44",
-    "@nocobase/auth": "2.1.0-beta.44",
-    "@nocobase/cache": "2.1.0-beta.44",
-    "@nocobase/data-source-manager": "2.1.0-beta.44",
-    "@nocobase/database": "2.1.0-beta.44",
-    "@nocobase/evaluators": "2.1.0-beta.44",
-    "@nocobase/lock-manager": "2.1.0-beta.44",
-    "@nocobase/logger": "2.1.0-beta.44",
-    "@nocobase/resourcer": "2.1.0-beta.44",
-    "@nocobase/sdk": "2.1.0-beta.44",
-    "@nocobase/snowflake-id": "2.1.0-beta.44",
-    "@nocobase/telemetry": "2.1.0-beta.44",
-    "@nocobase/utils": "2.1.0-beta.44",
+    "@nocobase/acl": "2.1.0-beta.45",
+    "@nocobase/actions": "2.1.0-beta.45",
+    "@nocobase/ai": "2.1.0-beta.45",
+    "@nocobase/auth": "2.1.0-beta.45",
+    "@nocobase/cache": "2.1.0-beta.45",
+    "@nocobase/data-source-manager": "2.1.0-beta.45",
+    "@nocobase/database": "2.1.0-beta.45",
+    "@nocobase/evaluators": "2.1.0-beta.45",
+    "@nocobase/lock-manager": "2.1.0-beta.45",
+    "@nocobase/logger": "2.1.0-beta.45",
+    "@nocobase/resourcer": "2.1.0-beta.45",
+    "@nocobase/sdk": "2.1.0-beta.45",
+    "@nocobase/snowflake-id": "2.1.0-beta.45",
+    "@nocobase/telemetry": "2.1.0-beta.45",
+    "@nocobase/utils": "2.1.0-beta.45",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -61,5 +61,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "540d4897b1696cc24c0754521b0b766978b4933c"
+  "gitHead": "42587115fc34c3eb01ef2b2549f1c998e5708318"
 }