@nocobase/server 2.1.0-alpha.1 → 2.1.0-alpha.11

package/lib/gateway/index.d.ts

@@ -57,6 +57,7 @@ export declare class Gateway extends EventEmitter {
     private port;
     private host;
     private socketPath;
+    private v2IndexTemplateCache;
     private terminating;
     private onTerminate;
     private constructor();
@@ -74,6 +75,15 @@ export declare class Gateway extends EventEmitter {
         code: string;
     }): void;
     responseErrorWithCode(code: any, res: any, options: any): void;
+    private getV2PublicPath;
+    private getAppPublicPath;
+    private isV2Request;
+    private isV2IndexRequest;
+    private getV2RuntimeConfig;
+    private getV2RuntimeConfigScript;
+    private getV2AssetPublicPath;
+    private getV2IndexTemplate;
+    private renderV2IndexHtml;
     requestHandler(req: IncomingMessage, res: ServerResponse): Promise<void>;
     getAppSelectorMiddlewares(): Toposort<AppSelectorMiddleware>;
     getRequestHandleAppName(req: IncomingRequest): Promise<string>;

package/lib/gateway/index.js

@@ -44,6 +44,7 @@ __export(gateway_exports, {
 module.exports = __toCommonJS(gateway_exports);
 var import_logger = require("@nocobase/logger");
 var import_utils = require("@nocobase/utils");
+var import_utils2 = require("@nocobase/utils");
 var import_plugin_symlink = require("@nocobase/utils/plugin-symlink");
 var import_commander = require("commander");
 var import_compression = __toESM(require("compression"));
@@ -62,10 +63,16 @@ var import_plugin_manager = require("../plugin-manager");
 var import_errors = require("./errors");
 var import_ipc_socket_client = require("./ipc-socket-client");
 var import_ipc_socket_server = require("./ipc-socket-server");
+var import_utils3 = require("./utils");
 var import_ws_server = require("./ws-server");
 var import_node_worker_threads = require("node:worker_threads");
 var import_node_process = __toESM(require("node:process"));
 const compress = (0, import_node_util.promisify)((0, import_compression.default)());
+function normalizeBasePath(path = "") {
+  const normalized = path.replace(/\/+/g, "/").replace(/\/$/, "");
+  return normalized || "/";
+}
+__name(normalizeBasePath, "normalizeBasePath");
 function getSocketPath() {
   const { SOCKET_PATH } = import_node_process.default.env;
   if ((0, import_path.isAbsolute)(SOCKET_PATH)) {
@@ -87,6 +94,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   port = import_node_process.default.env.APP_PORT ? parseInt(import_node_process.default.env.APP_PORT) : null;
   host = "0.0.0.0";
   socketPath = (0, import_path.resolve)(import_node_process.default.cwd(), "storage", "gateway.sock");
+  v2IndexTemplateCache = null;
   terminating = false;
   onTerminate = /* @__PURE__ */ __name(async (signal) => {
     var _a;
@@ -99,6 +107,9 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     try {
       for (const app of apps) {
         try {
+          if (!app) {
+            continue;
+          }
           await app.destroy({ signal });
         } catch (error) {
           const logger = (app == null ? void 0 : app.log) ?? console;
@@ -147,15 +158,31 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     this.selectorMiddlewares = new import_utils.Toposort();
     this.addAppSelectorMiddleware(
       async (ctx, next) => {
-        var _a;
+        var _a, _b;
         const { req } = ctx;
-        const appName = (_a = import_qs.default.parse((0, import_url.parse)(req.url).query)) == null ? void 0 : _a.__appName;
+        const parsedUrl = (0, import_url.parse)(req.url);
+        const appName = (_a = import_qs.default.parse(parsedUrl.query)) == null ? void 0 : _a.__appName;
+        const apiBasePath = normalizeBasePath(import_node_process.default.env.API_BASE_PATH || "/api");
+        const appPathPrefix = `${apiBasePath}/__app/`;
         if (appName) {
           ctx.resolvedAppName = appName;
         }
         if (req.headers["x-app"]) {
           ctx.resolvedAppName = req.headers["x-app"];
         }
+        if ((_b = parsedUrl.pathname) == null ? void 0 : _b.startsWith(appPathPrefix)) {
+          const restPath = parsedUrl.pathname.slice(appPathPrefix.length);
+          const [pathAppName, ...segments] = restPath.split("/");
+          if (pathAppName) {
+            ctx.resolvedAppName = pathAppName;
+            const rewrittenPath = `${apiBasePath}${segments.length ? `/${segments.join("/")}` : ""}`;
+            const rewrittenUrl = `${rewrittenPath}${parsedUrl.search || ""}`;
+            if (!req.originalUrl) {
+              req.originalUrl = req.url;
+            }
+            req.url = rewrittenUrl;
+          }
+        }
         await next();
       },
       {
@@ -218,15 +245,100 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     });
     this.responseError(res, error);
   }
+  getV2PublicPath() {
+    return (0, import_utils3.resolveV2PublicPath)(import_node_process.default.env.APP_PUBLIC_PATH || "/");
+  }
+  getAppPublicPath() {
+    return (0, import_utils3.resolvePublicPath)(import_node_process.default.env.APP_PUBLIC_PATH || "/");
+  }
+  isV2Request(pathname) {
+    const v2PublicPath = this.getV2PublicPath();
+    return pathname === v2PublicPath.slice(0, -1) || pathname.startsWith(v2PublicPath);
+  }
+  isV2IndexRequest(pathname) {
+    if (!this.isV2Request(pathname)) {
+      return false;
+    }
+    const v2PublicPath = this.getV2PublicPath();
+    if (pathname === v2PublicPath || pathname === v2PublicPath.slice(0, -1) || pathname === `${v2PublicPath}index.html`) {
+      return true;
+    }
+    return !(0, import_path.extname)(pathname);
+  }
+  getV2RuntimeConfig() {
+    return {
+      __nocobase_public_path__: this.getV2PublicPath(),
+      __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,
+      __nocobase_api_client_storage_type__: import_node_process.default.env.API_CLIENT_STORAGE_TYPE,
+      __nocobase_api_client_share_token__: import_node_process.default.env.API_CLIENT_SHARE_TOKEN === "true",
+      __nocobase_ws_url__: import_node_process.default.env.WEBSOCKET_URL || "",
+      __nocobase_ws_path__: import_node_process.default.env.WS_PATH,
+      __esm_cdn_base_url__: import_node_process.default.env.ESM_CDN_BASE_URL || "https://esm.sh",
+      __esm_cdn_suffix__: import_node_process.default.env.ESM_CDN_SUFFIX || ""
+    };
+  }
+  getV2RuntimeConfigScript() {
+    const runtimeConfig = this.getV2RuntimeConfig();
+    const scriptContent = Object.entries(runtimeConfig).map(([key, value]) => `window['${key}'] = ${JSON.stringify(value)};`).join("\n");
+    return `<script>${scriptContent}</script>`;
+  }
+  getV2AssetPublicPath() {
+    if (import_node_process.default.env.CDN_BASE_URL) {
+      return `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/v2/`;
+    }
+    return this.getV2PublicPath();
+  }
+  getV2IndexTemplate() {
+    const file = `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client/v2/index.html`;
+    if (!import_fs.default.existsSync(file)) {
+      return null;
+    }
+    const stat = import_fs.default.statSync(file);
+    if (this.v2IndexTemplateCache && this.v2IndexTemplateCache.file === file && this.v2IndexTemplateCache.mtimeMs === stat.mtimeMs) {
+      return this.v2IndexTemplateCache.html;
+    }
+    const html = import_fs.default.readFileSync(file, "utf-8");
+    this.v2IndexTemplateCache = {
+      file,
+      mtimeMs: stat.mtimeMs,
+      html
+    };
+    return html;
+  }
+  renderV2IndexHtml() {
+    const template = this.getV2IndexTemplate();
+    if (!template) {
+      return null;
+    }
+    const html = (0, import_utils3.rewriteV2AssetPublicPath)(template, this.getV2AssetPublicPath());
+    return (0, import_utils3.injectRuntimeScript)(html, this.getV2RuntimeConfigScript());
+  }
   async requestHandler(req, res) {
     const { pathname } = (0, import_url.parse)(req.url);
-    const { PLUGIN_STATICS_PATH, APP_PUBLIC_PATH } = import_node_process.default.env;
+    const { PLUGIN_STATICS_PATH } = import_node_process.default.env;
+    const APP_PUBLIC_PATH = this.getAppPublicPath();
     if (pathname.endsWith("/__umi/api/bundle-status")) {
       res.statusCode = 200;
       res.end("ok");
       return;
     }
+    const supervisor = import_app_supervisor.AppSupervisor.getInstance();
+    let handleApp = "main";
+    try {
+      handleApp = await this.getRequestHandleAppName(req);
+    } catch (error) {
+      this.getLogger("main", res).error("Failed to get handle app name", { error });
+      this.responseErrorWithCode("APP_INITIALIZING", res, { appName: handleApp });
+      return;
+    }
     if (pathname.startsWith(APP_PUBLIC_PATH + "storage/uploads/")) {
+      if (handleApp !== "main") {
+        const isProxy = await supervisor.proxyWeb(handleApp, req, res);
+        if (isProxy) {
+          return;
+        }
+      }
       req.url = req.url.substring(APP_PUBLIC_PATH.length - 1);
       await compress(req, res);
       return (0, import_serve_handler.default)(req, res, {
@@ -235,6 +347,12 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       });
     }
     if (pathname.startsWith(PLUGIN_STATICS_PATH) && !pathname.includes("/server/")) {
+      if (handleApp !== "main") {
+        const isProxy = await supervisor.proxyWeb(handleApp, req, res);
+        if (isProxy) {
+          return;
+        }
+      }
       await compress(req, res);
       const packageName = (0, import_plugin_manager.getPackageNameByExposeUrl)(pathname);
       const publicDir = (0, import_plugin_manager.getPackageDirByExposeUrl)(pathname);
@@ -250,6 +368,33 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       });
     }
     if (!pathname.startsWith(import_node_process.default.env.API_BASE_PATH)) {
+      if (this.isV2Request(pathname)) {
+        if (handleApp !== "main") {
+          const isProxy = await supervisor.proxyWeb(handleApp, req, res);
+          if (isProxy) {
+            return;
+          }
+        }
+        if (this.isV2IndexRequest(pathname)) {
+          const v2Html = this.renderV2IndexHtml();
+          if (v2Html) {
+            res.setHeader("Content-Type", "text/html; charset=utf-8");
+            res.end(v2Html);
+            return;
+          }
+        }
+        req.url = req.url.substring(APP_PUBLIC_PATH.length - 1);
+        await compress(req, res);
+        return (0, import_serve_handler.default)(req, res, {
+          public: `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client`
+        });
+      }
+      if (handleApp !== "main") {
+        const isProxy = await supervisor.proxyWeb(handleApp, req, res);
+        if (isProxy) {
+          return;
+        }
+      }
       req.url = req.url.substring(APP_PUBLIC_PATH.length - 1);
       await compress(req, res);
       return (0, import_serve_handler.default)(req, res, {
@@ -257,19 +402,17 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
         rewrites: [{ source: "/**", destination: "/index.html" }]
       });
     }
-    let handleApp = "main";
-    try {
-      handleApp = await this.getRequestHandleAppName(req);
-    } catch (error) {
-      console.log(error);
-      this.responseErrorWithCode("APP_INITIALIZING", res, { appName: handleApp });
-      return;
+    if (handleApp !== "main") {
+      const isProxy = await supervisor.proxyWeb(handleApp, req, res);
+      if (isProxy) {
+        return;
+      }
     }
-    const hasApp = import_app_supervisor.AppSupervisor.getInstance().hasApp(handleApp);
+    const hasApp = supervisor.hasApp(handleApp);
     if (!hasApp) {
-      void import_app_supervisor.AppSupervisor.getInstance().bootStrapApp(handleApp);
+      void supervisor.bootstrapApp(handleApp);
     }
-    let appStatus = import_app_supervisor.AppSupervisor.getInstance().getAppStatus(handleApp, "preparing");
+    let appStatus = await supervisor.getAppStatus(handleApp, "preparing");
     if (appStatus === "not_found") {
       this.responseErrorWithCode("APP_NOT_FOUND", res, { appName: handleApp });
       return;
@@ -283,11 +426,19 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       return;
     }
     if (appStatus === "initialized") {
-      const appInstance = await import_app_supervisor.AppSupervisor.getInstance().getApp(handleApp);
-      appInstance.runCommand("start", "--quickstart");
-      appStatus = import_app_supervisor.AppSupervisor.getInstance().getAppStatus(handleApp);
+      const appInstance = await supervisor.getApp(handleApp);
+      if (!appInstance) {
+        this.responseErrorWithCode("APP_NOT_FOUND", res, { appName: handleApp });
+        return;
+      }
+      supervisor.startApp(handleApp);
+      appStatus = await supervisor.getAppStatus(handleApp);
+    }
+    const app = await supervisor.getApp(handleApp);
+    if (!app) {
+      this.responseErrorWithCode("APP_NOT_FOUND", res, { appName: handleApp });
+      return;
     }
-    const app = await import_app_supervisor.AppSupervisor.getInstance().getApp(handleApp);
     if (appStatus !== "running") {
       this.responseErrorWithCode(`${appStatus}`, res, { app, appName: handleApp });
       return;
@@ -298,7 +449,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       return;
     }
     if (handleApp !== "main") {
-      import_app_supervisor.AppSupervisor.getInstance().touchApp(handleApp);
+      await supervisor.setAppLastSeenAt(handleApp);
     }
     const ctx = { req, res, appName: handleApp };
     const fn = (0, import_koa_compose.default)([
@@ -366,6 +517,14 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     }
     const mainApp = import_app_supervisor.AppSupervisor.getInstance().bootMainApp(options.mainAppOptions);
     mainApp.setMaxListeners(50);
+    mainApp.once("afterStart", () => {
+      (0, import_utils2.lockdownSes)({
+        consoleTaming: "unsafe",
+        errorTaming: "unsafe",
+        overrideTaming: "moderate",
+        stackFiltering: "verbose"
+      });
+    });
     let runArgs = [import_node_process.default.argv, { throwError: true, from: "node" }];
     if (!import_node_worker_threads.isMainThread) {
       runArgs = [import_node_worker_threads.workerData.argv, { throwError: true, from: "user" }];
@@ -433,6 +592,10 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     });
     this.wsServer = new import_ws_server.WSServer();
     this.server.on("upgrade", async (request, socket, head) => {
+      const isProxy = await import_app_supervisor.AppSupervisor.getInstance().proxyWs(request, socket, head);
+      if (isProxy) {
+        return;
+      }
       const appInstance = await import_app_supervisor.AppSupervisor.getInstance().getApp("main");
       for (const handle of _Gateway.wsServers) {
         const result = await handle(request, socket, head, appInstance);

package/lib/gateway/ipc-socket-server.js

@@ -104,7 +104,7 @@ const _IPCSocketServer = class _IPCSocketServer {
         const max = 300;
         let count = 0;
         const timer = setInterval(async () => {
-          status2 = import_app_supervisor.AppSupervisor.getInstance().getAppStatus("main");
+          status2 = await import_app_supervisor.AppSupervisor.getInstance().getAppStatus("main");
           if (status2 === "running") {
             clearInterval(timer);
             resolve(status2);

package/lib/gateway/utils.d.ts

@@ -0,0 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare function resolvePublicPath(appPublicPath?: 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

@@ -0,0 +1,84 @@
+/**
+ * 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 utils_exports = {};
+__export(utils_exports, {
+  injectRuntimeScript: () => injectRuntimeScript,
+  resolvePublicPath: () => resolvePublicPath,
+  resolveV2PublicPath: () => resolveV2PublicPath,
+  rewriteV2AssetPublicPath: () => rewriteV2AssetPublicPath
+});
+module.exports = __toCommonJS(utils_exports);
+function resolvePublicPath(appPublicPath = "/") {
+  const normalized = String(appPublicPath || "/").trim() || "/";
+  const withLeadingSlash = normalized.startsWith("/") ? normalized : `/${normalized}`;
+  return withLeadingSlash.endsWith("/") ? withLeadingSlash : `${withLeadingSlash}/`;
+}
+__name(resolvePublicPath, "resolvePublicPath");
+function resolveV2PublicPath(appPublicPath = "/") {
+  const publicPath = resolvePublicPath(appPublicPath);
+  return `${publicPath.replace(/\/$/, "")}/v2/`;
+}
+__name(resolveV2PublicPath, "resolveV2PublicPath");
+function ensureTrailingSlash(value) {
+  return value.endsWith("/") ? value : `${value}/`;
+}
+__name(ensureTrailingSlash, "ensureTrailingSlash");
+function rewriteV2AssetPublicPath(html, assetPublicPath) {
+  const normalizedAssetPublicPath = ensureTrailingSlash(assetPublicPath);
+  if (normalizedAssetPublicPath === "/v2/") {
+    return html;
+  }
+  return html.replace(/((?:src|href)=["'])\/v2\//g, `$1${normalizedAssetPublicPath}`);
+}
+__name(rewriteV2AssetPublicPath, "rewriteV2AssetPublicPath");
+function injectRuntimeScript(html, runtimeScript) {
+  const browserCheckerScriptMatch = html.match(/<script\b[^>]*browser-checker\.js[^>]*><\/script>/i);
+  if (browserCheckerScriptMatch == null ? void 0 : browserCheckerScriptMatch[0]) {
+    return html.replace(browserCheckerScriptMatch[0], `${runtimeScript}
+${browserCheckerScriptMatch[0]}`);
+  }
+  const moduleScriptMatch = html.match(/<script\b[^>]*type=["']module["'][^>]*>/i);
+  if (moduleScriptMatch == null ? void 0 : moduleScriptMatch[0]) {
+    return html.replace(moduleScriptMatch[0], `${runtimeScript}
+${moduleScriptMatch[0]}`);
+  }
+  if (html.includes("</head>")) {
+    return html.replace("</head>", `${runtimeScript}
+</head>`);
+  }
+  return `${runtimeScript}
+${html}`;
+}
+__name(injectRuntimeScript, "injectRuntimeScript");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  injectRuntimeScript,
+  resolvePublicPath,
+  resolveV2PublicPath,
+  rewriteV2AssetPublicPath
+});

package/lib/gateway/ws-server.js

@@ -90,7 +90,7 @@ const _WSServer = class _WSServer extends import_events.default {
           }
         }
         client.tags.add(`app#${handleAppName}`);
-        import_app_supervisor.AppSupervisor.getInstance().bootStrapApp(handleAppName);
+        import_app_supervisor.AppSupervisor.getInstance().bootstrapApp(handleAppName);
       });
     });
     import_app_supervisor.AppSupervisor.getInstance().on("appError", async ({ appName, error }) => {
@@ -112,6 +112,7 @@ const _WSServer = class _WSServer extends import_events.default {
       });
       const payload = getPayloadByErrorCode(status, {
         app,
+        appName,
         message,
         command
       });
@@ -248,7 +249,7 @@ const _WSServer = class _WSServer extends import_events.default {
     client.tags.add(`app#${handleAppName}`);
     const hasApp = import_app_supervisor.AppSupervisor.getInstance().hasApp(handleAppName);
     if (!hasApp) {
-      import_app_supervisor.AppSupervisor.getInstance().bootStrapApp(handleAppName);
+      import_app_supervisor.AppSupervisor.getInstance().bootstrapApp(handleAppName);
     }
   }
   removeConnection(id) {

package/lib/helper.js

@@ -76,6 +76,25 @@ function createResourcer(options) {
   return new import_resourcer.Resourcer({ ...options.resourcer });
 }
 __name(createResourcer, "createResourcer");
+function resolveCorsOrigin(ctx) {
+  const origin = ctx.get("origin");
+  const disallowNoOrigin = process.env.CORS_DISALLOW_NO_ORIGIN === "true";
+  const whitelistString = process.env.CORS_ORIGIN_WHITELIST;
+  if (!origin && disallowNoOrigin) {
+    return false;
+  }
+  if (!whitelistString) {
+    return origin;
+  }
+  const whitelist = new Set(
+    whitelistString.split(",").map((item) => item.trim()).filter(Boolean)
+  );
+  if (whitelist.has(origin)) {
+    return origin;
+  }
+  return false;
+}
+__name(resolveCorsOrigin, "resolveCorsOrigin");
 function registerMiddlewares(app, options) {
   var _a;
   app.use(
@@ -90,9 +109,7 @@ function registerMiddlewares(app, options) {
   app.use(
     (0, import_cors.default)({
       exposeHeaders: ["content-disposition"],
-      origin(ctx) {
-        return ctx.get("origin");
-      },
+      origin: resolveCorsOrigin,
       ...options.cors
     }),
     {
@@ -222,14 +239,46 @@ function isNumeric(str) {
   return !isNaN(str) && !isNaN(parseFloat(str));
 }
 __name(isNumeric, "isNumeric");
+function getFieldFromCollectionManager(ctx, resourceName, fieldPath) {
+  var _a;
+  const collectionManager = (_a = ctx.dataSource) == null ? void 0 : _a.collectionManager;
+  if (!(collectionManager == null ? void 0 : collectionManager.getCollection)) {
+    return;
+  }
+  const collection = collectionManager.getCollection(resourceName);
+  if (!(collection == null ? void 0 : collection.getField)) {
+    return;
+  }
+  const [firstName, ...others] = fieldPath.split(".");
+  let field = collection.getField(firstName);
+  if (!field || !others.length) {
+    return field;
+  }
+  let currentCollection = typeof field.targetCollection === "function" ? field.targetCollection() : field.targetCollection;
+  for (const name of others) {
+    if (!(currentCollection == null ? void 0 : currentCollection.getField)) {
+      return;
+    }
+    field = currentCollection.getField(name);
+    if (!field) {
+      return;
+    }
+    currentCollection = typeof field.targetCollection === "function" ? field.targetCollection() : field.targetCollection;
+  }
+  return field;
+}
+__name(getFieldFromCollectionManager, "getFieldFromCollectionManager");
 function createContextVariablesScope(ctx) {
   const state = JSON.parse(JSON.stringify(ctx.state));
   return {
     timezone: ctx.get("x-timezone"),
     now: (/* @__PURE__ */ new Date()).toISOString(),
     getField: /* @__PURE__ */ __name((path) => {
-      const fieldPath = path.split(".").filter((p) => !p.startsWith("$") && !isNumeric(p)).join(".");
       const { resourceName } = ctx.action;
+      const fieldPath = path.split(".").filter((p) => !p.startsWith("$") && !isNumeric(p)).join(".");
+      if (!ctx.database) {
+        return getFieldFromCollectionManager(ctx, resourceName, fieldPath);
+      }
       return ctx.database.getFieldByPath(`${resourceName}.${fieldPath}`);
     }, "getField"),
     vars: {

package/lib/plugin-manager/deps.js

@@ -41,7 +41,7 @@ const deps = {
   umzug: "3.x",
   "async-mutex": "0.5.x",
   "@formulajs/formulajs": "4.x",
-  mathjs: "10.x",
+  mathjs: "15.x",
   winston: "3.x",
   "winston-daily-rotate-file": "4.x",
   koa: "2.x",

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

@@ -6,6 +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 type PluginClientLane = 'client' | 'client-v2';
+export declare class PackageUrls {
+    static items: Record<string, string | undefined>;
+    static clear(): void;
+    static getCacheKey(packageName: string, lane: PluginClientLane): string;
+    static get(packageName: string, lane?: PluginClientLane): Promise<string>;
+    static hasClientEntry(packageName: string, lane: PluginClientLane): Promise<boolean>;
+    static fetch(packageName: string, lane?: PluginClientLane): Promise<string>;
+}
 declare const _default: {
     name: string;
     actions: {
@@ -17,6 +26,7 @@ declare const _default: {
         remove(ctx: any, next: any): Promise<void>;
         list(ctx: any, next: any): Promise<void>;
         listEnabled(ctx: any, next: any): Promise<void>;
+        listEnabledV2(ctx: any, next: any): Promise<void>;
         get(ctx: any, next: any): Promise<void>;
     };
 };