@nocobase/server 2.1.0-alpha.7 → 2.1.0-alpha.8

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

@@ -13,7 +13,7 @@ import type { AppSupervisor } from './index';
 export declare class MainOnlyAdapter implements AppDiscoveryAdapter, AppProcessAdapter {
     protected readonly supervisor: AppSupervisor;
     readonly name: string;
-    app: Application;
+    apps: Record<string, Application>;
     status: AppStatus;
     appErrors: Record<string, Error>;
     constructor(supervisor: AppSupervisor);

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

@@ -36,7 +36,7 @@ const _MainOnlyAdapter = class _MainOnlyAdapter {
     this.name = "main-only";
   }
   name;
-  app;
+  apps = {};
   status;
   appErrors = {};
   async getApp(appName, options = {}) {
@@ -47,10 +47,10 @@ const _MainOnlyAdapter = class _MainOnlyAdapter {
     if (!options.withOutBootStrap) {
       await this.bootstrapApp(appName);
     }
-    return this.app;
+    return this.apps[appName];
   }
   async bootstrapApp(appName) {
-    if (appName !== "main" || !this.app) {
+    if (appName !== "main" || !this.apps[appName]) {
       this.setAppStatus(appName, "not_found");
       return;
     }
@@ -66,23 +66,23 @@ const _MainOnlyAdapter = class _MainOnlyAdapter {
       this.supervisor.logger.warn(`only main app is supported`, { method: "addApp" });
       return;
     }
-    if (this.app) {
+    if (this.apps[app.name]) {
       throw new Error(`app ${app.name} already exists`);
     }
-    this.app = app;
+    this.apps[app.name] = app;
     if (!this.status || this.status === "not_found") {
       this.setAppStatus(app.name, "preparing");
     }
     return app;
   }
   getApps() {
-    return [this.app];
+    return Object.values(this.apps);
   }
   hasApp(appName) {
     if (appName !== "main") {
       return false;
     }
-    return !!this.app;
+    return !!this.apps[appName];
   }
   async startApp(appName) {
     if (appName !== "main") {
@@ -93,31 +93,36 @@ const _MainOnlyAdapter = class _MainOnlyAdapter {
     await (app == null ? void 0 : app.runCommand("start", "--quickstart"));
   }
   async stopApp(appName) {
+    var _a;
     if (appName !== "main") {
       this.supervisor.logger.warn(`only main app is supported`, { method: "stopApp" });
       return;
     }
-    await this.app.runCommand("stop");
+    if (!this.apps[appName]) {
+      return;
+    }
+    await ((_a = this.apps[appName]) == null ? void 0 : _a.runCommand("stop"));
   }
   async removeApp(appName) {
     if (appName !== "main") {
       this.supervisor.logger.warn(`only main app is supported`, { method: "removeApp" });
       return;
     }
-    if (!this.app) {
+    if (!this.apps[appName]) {
       return;
     }
-    await this.app.runCommand("destroy");
+    await this.apps[appName].runCommand("destroy");
+    this.apps[appName] = null;
   }
   async upgradeApp(appName) {
     if (appName !== "main") {
       this.supervisor.logger.warn(`only main app is supported`, { method: "upgrade" });
       return;
     }
-    if (!this.app) {
+    if (!this.apps[appName]) {
       return;
     }
-    await this.app.runCommand("upgrade");
+    await this.apps[appName].runCommand("upgrade");
   }
   async removeAllApps() {
     return this.removeApp("main");

package/lib/commands/install.js

@@ -37,7 +37,9 @@ var install_default = /* @__PURE__ */ __name((app) => {
     if (options.lang) {
       process.env.INIT_APP_LANG = options.lang;
     }
-    await (0, import_create_docs_index.createDocsIndex)(app);
+    if (!process.env.VITEST) {
+      await (0, import_create_docs_index.createDocsIndex)(app);
+    }
     await app.install(options);
     const reinstall = options.clean || options.force;
     app.log.info(`app ${reinstall ? "reinstalled" : "installed"} successfully [v${app.getVersion()}]`);

package/lib/commands/upgrade.js

@@ -34,7 +34,9 @@ var import_create_docs_index = require("../ai/create-docs-index");
 /* istanbul ignore file -- @preserve */
 var upgrade_default = /* @__PURE__ */ __name((app) => {
   app.command("upgrade").ipc().auth().action(async (options) => {
-    await (0, import_create_docs_index.createDocsIndex)(app);
+    if (!process.env.VITEST) {
+      await (0, import_create_docs_index.createDocsIndex)(app);
+    }
     await app.upgrade(options);
     app.log.info(`\u2728  NocoBase has been upgraded to v${app.getVersion()}`);
   });

package/lib/helper.js

@@ -239,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/options/resource.js

@@ -46,6 +46,8 @@ var import_utils = require("@nocobase/utils");
 var import_fs = __toESM(require("fs"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
+var import_crypto = __toESM(require("crypto"));
+var import_package = __toESM(require("../../../package.json"));
 const _PackageUrls = class _PackageUrls {
   static async get(packageName) {
     if (!this.items[packageName]) {
@@ -63,7 +65,19 @@ const _PackageUrls = class _PackageUrls {
       const distExists = await import_fs_extra.default.exists(dist);
       if (distExists) {
         const fsState = await import_fs_extra.default.stat(distExists ? dist : pkgPath);
-        t = `?t=${fsState.mtime.getTime()}`;
+        const appKey = process.env.APP_KEY || "";
+        let version = "";
+        try {
+          const pkgJson = await import_fs_extra.default.readJson(import_path.default.resolve(pkgPath, "package.json"));
+          if (pkgJson && typeof pkgJson.version === "string") {
+            version = pkgJson.version;
+          }
+        } catch (error) {
+        }
+        const appVersion = import_package.default.version;
+        const salt = process.env.PLUGIN_URL_HASH_SALT || "";
+        const hash = import_crypto.default.createHash("sha256").update(fsState.mtime.getTime() + appKey + version + appVersion + salt).digest("hex").slice(0, 8);
+        t = `?hash=${hash}`;
       }
       const cdnBaseUrl = process.env.CDN_BASE_URL.replace(/\/+$/, "");
       const url = `${cdnBaseUrl}${"/static/plugins/"}${packageName}/${PLUGIN_CLIENT_ENTRY_FILE}${t}`;

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

@@ -58,6 +58,14 @@ 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_utils2 = require("./utils");
+const _PluginLoadError = class _PluginLoadError extends Error {
+  constructor(pluginName) {
+    super(`${pluginName} plugin load error`);
+    this.name = "PluginLoadError";
+  }
+};
+__name(_PluginLoadError, "PluginLoadError");
+let PluginLoadError = _PluginLoadError;
 const sleep = /* @__PURE__ */ __name(async (timeout = 0) => {
   return new Promise((resolve2) => {
     setTimeout(resolve2, timeout);
@@ -526,7 +534,7 @@ const _PluginManager = class _PluginManager {
         const { name: pluginName } = await _PluginManager.parseName(name);
         const plugin = this.get(pluginName);
         if (!plugin) {
-          throw new Error(`${pluginName} plugin does not exist`);
+          throw new PluginLoadError(pluginName);
         }
         if (added[pluginName]) {
           continue;
@@ -549,7 +557,7 @@ const _PluginManager = class _PluginManager {
         const { name: pluginName } = await _PluginManager.parseName(name);
         const plugin = this.get(pluginName);
         if (!plugin) {
-          throw new Error(`${pluginName} plugin does not exist`);
+          throw new PluginLoadError(pluginName);
         }
         if (added[pluginName]) {
           continue;
@@ -574,7 +582,7 @@ const _PluginManager = class _PluginManager {
       const { name: pluginName } = await _PluginManager.parseName(name);
       const plugin = this.get(pluginName);
       if (!plugin) {
-        throw new Error(`${pluginName} plugin does not exist`);
+        throw new PluginLoadError(pluginName);
       }
       if (plugin.enabled) {
         continue;
@@ -647,7 +655,7 @@ const _PluginManager = class _PluginManager {
       const { name: pluginName } = await _PluginManager.parseName(name2);
       const plugin = this.get(pluginName);
       if (!plugin) {
-        throw new Error(`${pluginName} plugin does not exist`);
+        throw new PluginLoadError(pluginName);
       }
       if (!plugin.enabled) {
         continue;

package/lib/plugin-manager/utils.js

@@ -340,7 +340,7 @@ async function updatePluginByCompressedFileUrl(options) {
   });
   if (!instance) {
     await removeTmpDir(tempFile, tempPackageContentDir);
-    throw new Error(`plugin ${packageName} does not exist`);
+    throw new Error(`${packageName} does not exist`);
   }
   const { packageDir } = await copyTempPackageToStorageAndLinkToNodeModules(
     tempFile,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.1.0-alpha.7",
+  "version": "2.1.0-alpha.8",
   "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-alpha.7",
-    "@nocobase/actions": "2.1.0-alpha.7",
-    "@nocobase/ai": "2.1.0-alpha.7",
-    "@nocobase/auth": "2.1.0-alpha.7",
-    "@nocobase/cache": "2.1.0-alpha.7",
-    "@nocobase/data-source-manager": "2.1.0-alpha.7",
-    "@nocobase/database": "2.1.0-alpha.7",
-    "@nocobase/evaluators": "2.1.0-alpha.7",
-    "@nocobase/lock-manager": "2.1.0-alpha.7",
-    "@nocobase/logger": "2.1.0-alpha.7",
-    "@nocobase/resourcer": "2.1.0-alpha.7",
-    "@nocobase/sdk": "2.1.0-alpha.7",
-    "@nocobase/snowflake-id": "2.1.0-alpha.7",
-    "@nocobase/telemetry": "2.1.0-alpha.7",
-    "@nocobase/utils": "2.1.0-alpha.7",
+    "@nocobase/acl": "2.1.0-alpha.8",
+    "@nocobase/actions": "2.1.0-alpha.8",
+    "@nocobase/ai": "2.1.0-alpha.8",
+    "@nocobase/auth": "2.1.0-alpha.8",
+    "@nocobase/cache": "2.1.0-alpha.8",
+    "@nocobase/data-source-manager": "2.1.0-alpha.8",
+    "@nocobase/database": "2.1.0-alpha.8",
+    "@nocobase/evaluators": "2.1.0-alpha.8",
+    "@nocobase/lock-manager": "2.1.0-alpha.8",
+    "@nocobase/logger": "2.1.0-alpha.8",
+    "@nocobase/resourcer": "2.1.0-alpha.8",
+    "@nocobase/sdk": "2.1.0-alpha.8",
+    "@nocobase/snowflake-id": "2.1.0-alpha.8",
+    "@nocobase/telemetry": "2.1.0-alpha.8",
+    "@nocobase/utils": "2.1.0-alpha.8",
     "@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": "fe825ef778c0d9a941e8517d6443ffc012238391"
+  "gitHead": "eda3bfb9df40d4394905e178f1c5331adbec4e76"
 }