@nocobase/server 2.1.0-alpha.4 → 2.1.0-alpha.40

package/lib/locale/locale.js

@@ -41,8 +41,8 @@ __export(locale_exports, {
 });
 module.exports = __toCommonJS(locale_exports);
 var import_utils = require("@nocobase/utils");
+var import_constants = require("../constants");
 var import_resource = require("./resource");
-var import__ = require("..");
 var import_deepmerge = __toESM(require("deepmerge"));
 const _Locale = class _Locale {
   app;
@@ -52,6 +52,7 @@ const _Locale = class _Locale {
   resourceCached = /* @__PURE__ */ new Map();
   i18nInstances = /* @__PURE__ */ new Map();
   resourceStorers = new import_utils.Registry();
+  sources = new import_utils.Registry();
   constructor(app) {
     this.app = app;
     this.app.on("afterLoad", async () => {
@@ -92,6 +93,25 @@ const _Locale = class _Locale {
   registerResourceStorer(name, storer) {
     this.resourceStorers.register(name, storer);
   }
+  registerSource(name, source) {
+    this.sources.register(name, source);
+  }
+  async syncSources(ctx, types) {
+    const resources = { client: {} };
+    const sources = Array.from(this.sources.getKeys());
+    const syncSources = sources.filter((source) => types.includes(source) && this.sources.get(source).sync);
+    const promises = syncSources.map((source) => this.sources.get(source).sync(ctx));
+    const results = await Promise.all(promises);
+    return results.reduce((result, resource) => {
+      Object.entries(resource).forEach(([module2, texts]) => {
+        result[module2] = {
+          ...result[module2] || {},
+          ...texts
+        };
+      });
+      return result;
+    }, resources);
+  }
   async get(lang) {
     const defaults = {
       resources: await this.getCacheResources(lang)
@@ -124,7 +144,7 @@ const _Locale = class _Locale {
     }
     return await this.wrapCache(`resources:${lang}`, () => this.getResources(lang));
   }
-  async getResources(lang) {
+  async getBuiltInResources(lang) {
     var _a;
     const resources = {};
     const names = this.app.pm.getPlugins().keys();
@@ -141,13 +161,17 @@ const _Locale = class _Locale {
         const res = await (0, import_resource.getResource)(packageName, lang);
         if (res) {
           resources[packageName] = { ...res };
-          if (packageName.includes(import__.OFFICIAL_PLUGIN_PREFIX)) {
-            resources[packageName.substring(import__.OFFICIAL_PLUGIN_PREFIX.length)] = { ...res };
+          if (packageName.includes(import_constants.OFFICIAL_PLUGIN_PREFIX)) {
+            resources[packageName.substring(import_constants.OFFICIAL_PLUGIN_PREFIX.length)] = { ...res };
           }
         }
       } catch (err) {
       }
     }
+    return resources;
+  }
+  async getResources(lang) {
+    const resources = await this.getBuiltInResources(lang);
     const storers = this.resourceStorers.getValues();
     for (const storer of storers) {
       const custom = await storer.getResources(lang);
@@ -156,7 +180,7 @@ const _Locale = class _Locale {
         const resource = resources[module2];
         const customResource = custom[key];
         resources[module2] = resource ? (0, import_deepmerge.default)(resource, customResource) : customResource;
-        const pkgName = `${import__.OFFICIAL_PLUGIN_PREFIX}${module2}`;
+        const pkgName = `${import_constants.OFFICIAL_PLUGIN_PREFIX}${module2}`;
         if (resources[pkgName]) {
           resources[pkgName] = { ...resources[module2] };
         }

package/lib/main-data-source.js

@@ -96,6 +96,7 @@ const _MainDataSource = class _MainDataSource extends import_data_source_manager
         const results = await this.tables2Collections(toAddTables);
         const values = results.map((result) => ({
           ...result,
+          from: "dbsync",
           underscored: false
         }));
         await repo.create({ values, context: ctx });
@@ -115,14 +116,16 @@ const _MainDataSource = class _MainDataSource extends import_data_source_manager
         ...filter
       }
     });
-    const collections = loadedCollections.filter((collection) => {
-      var _a;
-      return ((_a = collection.options) == null ? void 0 : _a.from) !== "db2cm";
-    });
+    const collections = loadedCollections.filter(
+      (collection) => {
+        var _a;
+        return !["db2cm", "dbsync"].includes((_a = collection.options) == null ? void 0 : _a.from);
+      }
+    );
     const loadedData = {};
     for (const collection of collections) {
       const c = db.getCollection(collection.name);
-      loadedData[c.tableName()] = {
+      loadedData[c.model.tableName] = {
         ...collection.toJSON(),
         fields: collection.fields.map((field) => {
           const f = c.getField(field.name);
@@ -155,7 +158,11 @@ const _MainDataSource = class _MainDataSource extends import_data_source_manager
       ctx.log.error(err);
     }
     const toLoadCollections = this.mergeWithLoadedCollections(collections, loadedCollections);
+    const currentSchema = process.env.COLLECTION_MANAGER_SCHEMA || db.options.schema || "public";
     for (const values of toLoadCollections) {
+      if (values.schema === currentSchema) {
+        delete values.schema;
+      }
       const existsFields = loadedCollections[values.tableName].fields;
       const deletedFields = existsFields.filter((field) => !values.fields.find((f) => f.name === field.name));
       await db.sequelize.transaction(async (transaction) => {

package/lib/plugin-manager/deps.js

@@ -44,7 +44,7 @@ const deps = {
   mathjs: "15.x",
   winston: "3.x",
   "winston-daily-rotate-file": "4.x",
-  koa: "2.x",
+  koa: "3.x",
   "@koa/cors": "5.x",
   "@koa/router": "13.x",
   multer: "1.x",
@@ -76,6 +76,7 @@ const deps = {
   lodash: "4.x",
   "china-division": "2.x",
   cronstrue: "2.x",
-  "@nocobase/license-kit": "0.3.x"
+  "@nocobase/license-kit": "0.3.x",
+  joi: "17.x"
 };
 var deps_default = deps;

package/lib/plugin-manager/findPackageNames.js

@@ -46,6 +46,7 @@ __export(findPackageNames_exports, {
 });
 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_lodash = __toESM(require("lodash"));
 var import_path = __toESM(require("path"));
@@ -81,12 +82,13 @@ 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",
-    "./storage/plugins/*/package.json",
-    "./storage/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, {

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

@@ -6,6 +6,16 @@
  * 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 getAppDevUrl(packageName: string, lane: PluginClientLane): string;
+    static hasClientEntry(packageName: string, lane: PluginClientLane): Promise<boolean>;
+    static fetch(packageName: string, lane?: PluginClientLane): Promise<string>;
+}
 declare const _default: {
     name: string;
     actions: {
@@ -15,8 +25,9 @@ declare const _default: {
         enable(ctx: any, next: any): Promise<void>;
         disable(ctx: any, next: any): Promise<void>;
         remove(ctx: any, next: any): Promise<void>;
-        list(ctx: any, next: any): Promise<void>;
+        list(ctx: any, next: any): Promise<any>;
         listEnabled(ctx: any, next: any): Promise<void>;
+        listEnabledV2(ctx: any, next: any): Promise<void>;
         get(ctx: any, next: any): Promise<void>;
     };
 };

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

@@ -39,45 +39,193 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var resource_exports = {};
 __export(resource_exports, {
+  PackageUrls: () => PackageUrls,
   default: () => resource_default
 });
 module.exports = __toCommonJS(resource_exports);
 var import_utils = require("@nocobase/utils");
+var import_crypto = __toESM(require("crypto"));
 var import_fs = __toESM(require("fs"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
+var import_plugin_manager = __toESM(require("../plugin-manager"));
+var import_utils2 = require("../utils");
+var import_package = __toESM(require("../../../package.json"));
+const PLUGIN_CLIENT_ENTRY_FILES = {
+  client: "dist/client/index.js",
+  "client-v2": "dist/client-v2/index.js"
+};
+const PLUGIN_CLIENT_MARKER_FILES = {
+  client: "client.js",
+  "client-v2": "client-v2.js"
+};
+function getAppDevPluginUrls() {
+  if (process.env.NOCOBASE_APP_DEV !== "true" || !process.env.NOCOBASE_APP_DEV_PLUGIN_URLS) {
+    return {};
+  }
+  try {
+    return JSON.parse(process.env.NOCOBASE_APP_DEV_PLUGIN_URLS);
+  } catch (error) {
+    return {};
+  }
+}
+__name(getAppDevPluginUrls, "getAppDevPluginUrls");
+function getAppDevPluginDependencies(packageJson2, lane) {
+  const appDevPluginUrls = getAppDevPluginUrls();
+  const deps = {
+    ...packageJson2.dependencies,
+    ...packageJson2.peerDependencies,
+    ...packageJson2.devDependencies
+  };
+  return Object.keys(deps).filter(
+    (packageName) => {
+      var _a;
+      return ((_a = appDevPluginUrls[packageName]) == null ? void 0 : _a[lane]) || packageName.startsWith("@nocobase/plugin-") || packageName.startsWith("@nocobase/preset-");
+    }
+  );
+}
+__name(getAppDevPluginDependencies, "getAppDevPluginDependencies");
 const _PackageUrls = class _PackageUrls {
-  static async get(packageName) {
-    if (!this.items[packageName]) {
-      this.items[packageName] = await this.fetch(packageName);
+  static clear() {
+    this.items = {};
+  }
+  static getCacheKey(packageName, lane) {
+    return `${lane}:${packageName}`;
+  }
+  static async get(packageName, lane = "client") {
+    const appDevUrl = this.getAppDevUrl(packageName, lane);
+    if (appDevUrl) {
+      return appDevUrl;
+    }
+    const cacheKey = this.getCacheKey(packageName, lane);
+    const cached = this.items[cacheKey];
+    if (cached) {
+      return cached;
+    }
+    const nextUrl = await this.fetch(packageName, lane);
+    if (nextUrl == null ? void 0 : nextUrl.includes("?hash=")) {
+      this.items[cacheKey] = nextUrl;
+    } else {
+      delete this.items[cacheKey];
     }
-    return this.items[packageName];
+    return nextUrl;
   }
-  static async fetch(packageName) {
-    const PLUGIN_CLIENT_ENTRY_FILE = "dist/client/index.js";
+  static getAppDevUrl(packageName, lane) {
+    var _a;
+    return (_a = getAppDevPluginUrls()[packageName]) == null ? void 0 : _a[lane];
+  }
+  static async hasClientEntry(packageName, lane) {
+    if (this.getAppDevUrl(packageName, lane)) {
+      return true;
+    }
     const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, packageName);
-    const r = await import_fs_extra.default.exists(pkgPath);
-    if (r) {
-      let t = "";
-      const dist = import_path.default.resolve(pkgPath, PLUGIN_CLIENT_ENTRY_FILE);
-      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 cdnBaseUrl = process.env.CDN_BASE_URL.replace(/\/+$/, "");
-      const url = `${cdnBaseUrl}${"/static/plugins/"}${packageName}/${PLUGIN_CLIENT_ENTRY_FILE}${t}`;
-      return url;
+    if (!await import_fs_extra.default.exists(pkgPath)) {
+      return false;
     }
+    return await import_fs_extra.default.exists(import_path.default.resolve(pkgPath, PLUGIN_CLIENT_MARKER_FILES[lane]));
+  }
+  static async fetch(packageName, lane = "client") {
+    const pluginClientEntryFile = PLUGIN_CLIENT_ENTRY_FILES[lane];
+    const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, packageName);
+    const pkgExists = await import_fs_extra.default.exists(pkgPath);
+    if (!pkgExists) {
+      return;
+    }
+    let t = "";
+    const dist = import_path.default.resolve(pkgPath, pluginClientEntryFile);
+    const distExists = await import_fs_extra.default.exists(dist);
+    if (distExists) {
+      const fsState = await import_fs_extra.default.stat(dist);
+      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}/${pluginClientEntryFile}${t}`;
+    return url;
   }
 };
 __name(_PackageUrls, "PackageUrls");
 __publicField(_PackageUrls, "items", {});
 let PackageUrls = _PackageUrls;
+async function listEnabledPlugins(ctx, lane = "client") {
+  const pm = ctx.db.getRepository("applicationPlugins");
+  const items = await pm.find({
+    filter: {
+      enabled: true
+    }
+  });
+  const arr = [];
+  for (const item of items) {
+    if (lane === "client-v2" && !await PackageUrls.hasClientEntry(item.packageName, lane)) {
+      continue;
+    }
+    const url = await PackageUrls.get(item.packageName, lane);
+    const { name, packageName, options } = item.toJSON();
+    if (url) {
+      const entry = {
+        name,
+        packageName,
+        options,
+        url
+      };
+      if (PackageUrls.getAppDevUrl(packageName, lane)) {
+        const packageJson2 = await import_plugin_manager.default.getPackageJson(packageName);
+        entry.devMode = "esm";
+        entry.appDevDependencies = getAppDevPluginDependencies(packageJson2, lane);
+      }
+      if (lane === "client" && await PackageUrls.hasClientEntry(packageName, "client-v2")) {
+        const clientV2Url = await PackageUrls.get(packageName, "client-v2");
+        if (clientV2Url) {
+          entry.clientV2Url = clientV2Url;
+        }
+      }
+      arr.push(entry);
+    }
+  }
+  return arr;
+}
+__name(listEnabledPlugins, "listEnabledPlugins");
+function normalizePmPluginKeys(filterByTk) {
+  if (typeof filterByTk === "string") {
+    return filterByTk.split(",").map((k) => k.trim()).filter(Boolean);
+  }
+  if (!Array.isArray(filterByTk) || filterByTk.some((item) => typeof item !== "string")) {
+    return [];
+  }
+  return filterByTk.flatMap(
+    (item) => item.split(",").map((k) => k.trim()).filter(Boolean)
+  );
+}
+__name(normalizePmPluginKeys, "normalizePmPluginKeys");
+function coerceAwaitResponse(value) {
+  if (value === true || value === 1) {
+    return true;
+  }
+  if (typeof value === "string") {
+    const v = value.trim().toLowerCase();
+    return v === "true" || v === "1" || v === "yes";
+  }
+  return false;
+}
+__name(coerceAwaitResponse, "coerceAwaitResponse");
 var resource_default = {
   name: "pm",
   actions: {
     async add(ctx, next) {
+      if (process.env.DISABLE_PM_ADD === "true") {
+        ctx.throw(403, "The current environment does not allow adding plugins online");
+      }
       const app = ctx.app;
       const { values = {} } = ctx.action.params;
       if (values == null ? void 0 : values.packageName) {
@@ -93,12 +241,12 @@ var resource_default = {
         }
         app.runAsCLI(["pm", "add", values.packageName, ...args], { from: "user" });
       } else if (ctx.file) {
-        const tmpDir = import_path.default.resolve(process.cwd(), "storage", "tmp");
+        const tmpDir = (0, import_utils.storagePathJoin)("tmp");
         try {
           await import_fs.default.promises.mkdir(tmpDir, { recursive: true });
         } catch (error) {
         }
-        const tempFile = import_path.default.join(process.cwd(), "storage/tmp", (0, import_utils.uid)() + import_path.default.extname(ctx.file.originalname));
+        const tempFile = import_path.default.join(tmpDir, (0, import_utils.uid)() + import_path.default.extname(ctx.file.originalname));
         await import_fs.default.promises.writeFile(tempFile, ctx.file.buffer, "binary");
         app.runAsCLI(["pm", "add", tempFile], { from: "user" });
       } else if (values.compressedFileUrl) {
@@ -108,6 +256,9 @@ var resource_default = {
       await next();
     },
     async update(ctx, next) {
+      if (process.env.DISABLE_PM_ADD === "true") {
+        ctx.throw(403, "The current environment does not allow adding plugins online");
+      }
       const app = ctx.app;
       const values = ctx.action.params.values || {};
       const args = [];
@@ -122,12 +273,12 @@ var resource_default = {
       }
       if (ctx.file) {
         values.packageName = ctx.request.body.packageName;
-        const tmpDir = import_path.default.resolve(process.cwd(), "storage", "tmp");
+        const tmpDir = (0, import_utils.storagePathJoin)("tmp");
         try {
           await import_fs.default.promises.mkdir(tmpDir, { recursive: true });
         } catch (error) {
         }
-        const tempFile = import_path.default.join(process.cwd(), "storage/tmp", (0, import_utils.uid)() + import_path.default.extname(ctx.file.originalname));
+        const tempFile = import_path.default.join(tmpDir, (0, import_utils.uid)() + import_path.default.extname(ctx.file.originalname));
         await import_fs.default.promises.writeFile(tempFile, ctx.file.buffer, "binary");
         values.compressedFileUrl = tempFile;
       }
@@ -145,23 +296,40 @@ var resource_default = {
       await next();
     },
     async enable(ctx, next) {
-      const { filterByTk } = ctx.action.params;
+      const { filterByTk, awaitResponse: awaitResponseRaw } = ctx.action.params;
       const app = ctx.app;
-      if (!filterByTk) {
+      const keys = normalizePmPluginKeys(filterByTk);
+      if (!keys.length) {
         ctx.throw(400, "plugin name invalid");
       }
-      const keys = Array.isArray(filterByTk) ? filterByTk : [filterByTk];
-      app.runAsCLI(["pm", "enable", ...keys], { from: "user" });
+      const awaitResponse = coerceAwaitResponse(awaitResponseRaw);
+      const argv = ["pm", "enable", ...keys];
+      if (awaitResponse) {
+        await app.runAsCLI(argv, { from: "user", throwError: true });
+      } else {
+        void app.runAsCLI(argv, { from: "user" }).catch((err) => {
+          app.log.error(err);
+        });
+      }
       ctx.body = filterByTk;
       await next();
     },
     async disable(ctx, next) {
-      const { filterByTk } = ctx.action.params;
-      if (!filterByTk) {
+      const { filterByTk, awaitResponse: awaitResponseRaw } = ctx.action.params;
+      const app = ctx.app;
+      const keys = normalizePmPluginKeys(filterByTk);
+      if (!keys.length) {
         ctx.throw(400, "plugin name invalid");
       }
-      const app = ctx.app;
-      app.runAsCLI(["pm", "disable", filterByTk], { from: "user" });
+      const awaitResponse = coerceAwaitResponse(awaitResponseRaw);
+      const argv = ["pm", "disable", ...keys];
+      if (awaitResponse) {
+        await app.runAsCLI(argv, { from: "user", throwError: true });
+      } else {
+        void app.runAsCLI(argv, { from: "user" }).catch((err) => {
+          app.log.error(err);
+        });
+      }
       ctx.body = filterByTk;
       await next();
     },
@@ -176,6 +344,11 @@ var resource_default = {
       await next();
     },
     async list(ctx, next) {
+      const { mode } = ctx.action.params;
+      if (mode === "summary") {
+        ctx.body = await (0, import_utils2.pmListSummary)(ctx.app);
+        return next();
+      }
       const locale = ctx.getCurrentLocale();
       const pm = ctx.app.pm;
       const plugin = pm.get("nocobase");
@@ -183,29 +356,11 @@ var resource_default = {
       await next();
     },
     async listEnabled(ctx, next) {
-      const toArr = /* @__PURE__ */ __name(async () => {
-        const pm = ctx.db.getRepository("applicationPlugins");
-        const items = await pm.find({
-          filter: {
-            enabled: true
-          }
-        });
-        const arr = [];
-        for (const item of items) {
-          const url = await PackageUrls.get(item.packageName);
-          const { name, packageName, options } = item.toJSON();
-          if (url) {
-            arr.push({
-              name,
-              packageName,
-              options,
-              url
-            });
-          }
-        }
-        return arr;
-      }, "toArr");
-      ctx.body = await toArr();
+      ctx.body = await listEnabledPlugins(ctx, "client");
+      await next();
+    },
+    async listEnabledV2(ctx, next) {
+      ctx.body = await listEnabledPlugins(ctx, "client-v2");
       await next();
     },
     async get(ctx, next) {
@@ -221,3 +376,7 @@ var resource_default = {
     }
   }
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  PackageUrls
+});

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

@@ -13,7 +13,6 @@ import Application from '../application';
 import { Plugin } from '../plugin';
 import { PluginManagerRepository } from './plugin-manager-repository';
 import { PluginData } from './types';
-import { checkAndGetCompatible } from './utils';
 export declare const sleep: (timeout?: number) => Promise<unknown>;
 export interface PluginManagerOptions {
     app: Application;
@@ -29,7 +28,12 @@ export declare class AddPresetError extends Error {
 }
 export declare class PluginManager {
     options: PluginManagerOptions;
-    static checkAndGetCompatible: typeof checkAndGetCompatible;
+    private static compatibleCache;
+    private static compatiblePending;
+    static checkAndGetCompatible(packageName: string): Promise<{
+        isCompatible: boolean;
+        depsCompatible: import("./utils").DepCompatible[];
+    }>;
     /**
      * @internal
      */
@@ -95,6 +99,7 @@ export declare class PluginManager {
     create(pluginName: string, options?: {
         forceRecreate?: boolean;
     }): Promise<void>;
+    addOrThrow(plugin?: string | typeof Plugin, options?: any, insert?: boolean, isUpgrade?: boolean): Promise<void>;
     add(plugin?: string | typeof Plugin, options?: any, insert?: boolean, isUpgrade?: boolean): Promise<void>;
     /**
      * @internal