@nocobase/server 0.13.0-alpha.9 → 0.14.0-alpha.2

package/lib/plugin-manager/deps.js

@@ -0,0 +1,74 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 deps_exports = {};
+__export(deps_exports, {
+  default: () => deps_default
+});
+module.exports = __toCommonJS(deps_exports);
+var import_package = require("../../package.json");
+const deps = {
+  "@nocobase": `${import_package.version.split(".").slice(0, 2).join(".")}.x`,
+  // 0.12.x
+  "@formily": "2.x",
+  "@formily/antd-v5": "1.x",
+  jsonwebtoken: "8.x",
+  "cache-manager": "4.x",
+  sequelize: "6.x",
+  umzug: "3.x",
+  "async-mutex": "0.3.x",
+  "@formulajs/formulajs": "4.x",
+  mathjs: "10.x",
+  winston: "3.x",
+  "winston-daily-rotate-file": "4.x",
+  koa: "2.x",
+  "@koa/cors": "3.x",
+  "@koa/router": "9.x",
+  multer: "1.x",
+  "@koa/multer": "3.x",
+  "koa-bodyparser": "4.x",
+  "koa-static": "5.x",
+  "koa-send": "5.x",
+  react: "18.x",
+  "react-dom": "18.x",
+  "react-router": "6.x",
+  "react-router-dom": "6.x",
+  antd: "5.x",
+  "antd-style": "3.x",
+  "@ant-design/icons": "5.x",
+  "@ant-design/cssinjs": "1.x",
+  i18next: "22.x",
+  "react-i18next": "11.x",
+  "@dnd-kit/accessibility": "3.x",
+  "@dnd-kit/core": "5.x",
+  "@dnd-kit/modifiers": "6.x",
+  "@dnd-kit/sortable": "6.x",
+  "@dnd-kit/utilities": "3.x",
+  dayjs: "1.x",
+  mysql2: "2.x",
+  pg: "8.x",
+  "pg-hstore": "2.x",
+  sqlite3: "5.x",
+  supertest: "6.x",
+  axios: "0.26.x",
+  "@emotion/css": "11.x",
+  ahooks: "3.x",
+  lodash: "4.x",
+  "china-division": "2.x",
+  cronstrue: "2.x"
+};
+var deps_default = deps;

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

@@ -1,2 +1,2 @@
-export * from './clientStaticMiddleware';
+export * from './clientStaticUtils';
 export * from './plugin-manager';

package/lib/plugin-manager/index.js

@@ -14,10 +14,10 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var plugin_manager_exports = {};
 module.exports = __toCommonJS(plugin_manager_exports);
-__reExport(plugin_manager_exports, require("./clientStaticMiddleware"), module.exports);
+__reExport(plugin_manager_exports, require("./clientStaticUtils"), module.exports);
 __reExport(plugin_manager_exports, require("./plugin-manager"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ...require("./clientStaticMiddleware"),
+  ...require("./clientStaticUtils"),
   ...require("./plugin-manager")
 });

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

@@ -0,0 +1,2 @@
+import { Context, Next } from '@nocobase/actions';
+export declare function uploadMiddleware(ctx: Context, next: Next): Promise<any>;

package/lib/plugin-manager/{clientStaticMiddleware.js → middleware.js}

@@ -16,16 +16,21 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var clientStaticMiddleware_exports = {};
-__export(clientStaticMiddleware_exports, {
-  getPackageClientStaticUrl: () => getPackageClientStaticUrl
+var middleware_exports = {};
+__export(middleware_exports, {
+  uploadMiddleware: () => uploadMiddleware
 });
-module.exports = __toCommonJS(clientStaticMiddleware_exports);
-const PREFIX = "/api/plugins/client/";
-const getPackageClientStaticUrl = /* @__PURE__ */ __name((packageName, filePath) => {
-  return `${PREFIX}${packageName}/${filePath}`;
-}, "getPackageClientStaticUrl");
+module.exports = __toCommonJS(middleware_exports);
+var import_utils = require("@nocobase/utils");
+async function uploadMiddleware(ctx, next) {
+  if (ctx.action.resourceName === "pm" && ["add", "update"].includes(ctx.action.actionName)) {
+    const upload = (0, import_utils.koaMulter)().single("file");
+    return upload(ctx, next);
+  }
+  return next();
+}
+__name(uploadMiddleware, "uploadMiddleware");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getPackageClientStaticUrl
+  uploadMiddleware
 });

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

@@ -28,6 +28,7 @@ var collection_default = (0, import_database.defineCollection)({
   repository: "PluginManagerRepository",
   fields: [
     { type: "string", name: "name", unique: true },
+    { type: "string", name: "packageName", unique: true },
     { type: "string", name: "version" },
     { type: "boolean", name: "enabled" },
     { type: "boolean", name: "installed" },

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

@@ -2,10 +2,14 @@ declare const _default: {
     name: string;
     actions: {
         add(ctx: any, next: any): Promise<void>;
+        update(ctx: any, next: any): Promise<void>;
+        npmVersionList(ctx: any, next: any): Promise<void>;
         enable(ctx: any, next: any): Promise<void>;
         disable(ctx: any, next: any): Promise<void>;
-        upgrade(ctx: any, next: any): Promise<void>;
         remove(ctx: any, next: any): Promise<void>;
+        list(ctx: any, next: any): Promise<void>;
+        listEnabled(ctx: any, next: any): Promise<void>;
+        get(ctx: any, next: any): Promise<void>;
     };
 };
 export default _default;

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,27 +16,99 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var resource_exports = {};
 __export(resource_exports, {
   default: () => resource_default
 });
 module.exports = __toCommonJS(resource_exports);
+var import_utils = require("@nocobase/utils");
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
+var import_clientStaticUtils = require("../clientStaticUtils");
+var import_plugin_manager = __toESM(require("../plugin-manager"));
 var resource_default = {
   name: "pm",
   actions: {
     async add(ctx, next) {
-      const pm = ctx.app.pm;
+      const app = ctx.app;
+      const { values = {} } = ctx.action.params;
+      if (values == null ? void 0 : values.packageName) {
+        const args = [];
+        if (values.registry) {
+          args.push("--registry=" + values.registry);
+        }
+        if (values.version) {
+          args.push("--version=" + values.version);
+        }
+        if (values.authToken) {
+          args.push("--auth-token=" + values.authToken);
+        }
+        app.runAsCLI(["pm", "add", values.packageName, ...args], { from: "user" });
+      } else if (ctx.file) {
+        const tmpDir = import_path.default.resolve(process.cwd(), "storage", "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));
+        await import_fs.default.promises.writeFile(tempFile, ctx.file.buffer, "binary");
+        app.runAsCLI(["pm", "add", tempFile], { from: "user" });
+      } else if (values.compressedFileUrl) {
+        app.runAsCLI(["pm", "add", values.compressedFileUrl], { from: "user" });
+      }
+      ctx.body = "ok";
+      await next();
+    },
+    async update(ctx, next) {
+      const app = ctx.app;
+      const values = ctx.action.params.values || {};
+      const args = [];
+      if (values.registry) {
+        args.push("--registry=" + values.registry);
+      }
+      if (values.version) {
+        args.push("--version=" + values.version);
+      }
+      if (values.authToken) {
+        args.push("--auth-token=" + values.authToken);
+      }
+      if (values.compressedFileUrl) {
+        args.push("--url=" + values.compressedFileUrl);
+      }
+      if (ctx.file) {
+        values.packageName = ctx.request.body.packageName;
+        const tmpDir = import_path.default.resolve(process.cwd(), "storage", "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));
+        await import_fs.default.promises.writeFile(tempFile, ctx.file.buffer, "binary");
+        args.push(`--url=${tempFile}`);
+      }
+      app.runAsCLI(["pm", "update", values.packageName, ...args], { from: "user" });
+      ctx.body = "ok";
+      await next();
+    },
+    async npmVersionList(ctx, next) {
       const { filterByTk } = ctx.action.params;
       if (!filterByTk) {
         ctx.throw(400, "plugin name invalid");
       }
-      await pm.add(filterByTk);
-      ctx.body = filterByTk;
+      const pm = ctx.app.pm;
+      ctx.body = await pm.getNpmVersionList(filterByTk);
       await next();
     },
     async enable(ctx, next) {
-      const pm = ctx.app.pm;
       const { filterByTk } = ctx.action.params;
       const app = ctx.app;
       if (!filterByTk) {
@@ -45,7 +119,6 @@ var resource_default = {
       await next();
     },
     async disable(ctx, next) {
-      const pm = ctx.app.pm;
       const { filterByTk } = ctx.action.params;
       if (!filterByTk) {
         ctx.throw(400, "plugin name invalid");
@@ -55,12 +128,7 @@ var resource_default = {
       ctx.body = filterByTk;
       await next();
     },
-    async upgrade(ctx, next) {
-      ctx.body = "ok";
-      await next();
-    },
     async remove(ctx, next) {
-      const pm = ctx.app.pm;
       const { filterByTk } = ctx.action.params;
       if (!filterByTk) {
         ctx.throw(400, "plugin name invalid");
@@ -69,6 +137,44 @@ var resource_default = {
       app.runAsCLI(["pm", "remove", filterByTk], { from: "user" });
       ctx.body = filterByTk;
       await next();
+    },
+    async list(ctx, next) {
+      const locale = ctx.getCurrentLocale();
+      const pm = ctx.app.pm;
+      ctx.body = await pm.list({ locale, isPreset: false });
+      await next();
+    },
+    async listEnabled(ctx, next) {
+      const pm = ctx.db.getRepository("applicationPlugins");
+      const PLUGIN_CLIENT_ENTRY_FILE = "dist/client/index.js";
+      const items = await pm.find({
+        filter: {
+          enabled: true
+        }
+      });
+      ctx.body = items.map((item) => {
+        try {
+          const packageName = import_plugin_manager.default.getPackageName(item.name);
+          return {
+            ...item.toJSON(),
+            packageName,
+            url: (0, import_clientStaticUtils.getExposeUrl)(packageName, PLUGIN_CLIENT_ENTRY_FILE)
+          };
+        } catch {
+          return false;
+        }
+      }).filter(Boolean);
+      await next();
+    },
+    async get(ctx, next) {
+      const locale = ctx.getCurrentLocale();
+      const pm = ctx.app.pm;
+      const { filterByTk } = ctx.action.params;
+      if (!filterByTk) {
+        ctx.throw(400, "plugin name invalid");
+      }
+      ctx.body = await pm.get(filterByTk).toJSON({ locale });
+      await next();
     }
   }
 };

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

@@ -1,10 +1,12 @@
 import { Repository } from '@nocobase/database';
 import { PluginManager } from './plugin-manager';
+import { PluginData } from './types';
 export declare class PluginManagerRepository extends Repository {
     pm: PluginManager;
     setPluginManager(pm: PluginManager): void;
     remove(name: string | string[]): Promise<void>;
     enable(name: string | string[]): Promise<string[]>;
+    upgrade(name: string, data: PluginData): Promise<any>;
     disable(name: string | string[]): Promise<string[]>;
     getItems(): Promise<any>;
     init(): Promise<void>;

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

@@ -71,6 +71,14 @@ const _PluginManagerRepository = class _PluginManagerRepository extends import_d
     });
     return pluginNames;
   }
+  async upgrade(name, data) {
+    return this.update({
+      filter: {
+        name
+      },
+      values: data
+    });
+  }
   async disable(name) {
     name = import_lodash.default.cloneDeep(name);
     const pluginNames = import_lodash.default.castArray(name);
@@ -94,6 +102,7 @@ const _PluginManagerRepository = class _PluginManagerRepository extends import_d
         sort: "id"
       });
     } catch (error) {
+      await this.database.migrator.up();
       await this.collection.sync({
         alter: {
           drop: false

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

@@ -4,6 +4,7 @@ import net from 'net';
 import Application from '../application';
 import { Plugin } from '../plugin';
 import { PluginManagerRepository } from './plugin-manager-repository';
+import { PluginData } from './types';
 export interface PluginManagerOptions {
     app: Application;
     plugins?: any[];
@@ -29,15 +30,16 @@ export declare class PluginManager {
     static getPackageName(name: string): string;
     static getPluginPkgPrefix(): string[];
     static findPackage(name: string): Promise<string>;
-    static resolvePlugin(pluginName: string | typeof Plugin): any;
+    static clearCache(packageName: string): void;
+    static resolvePlugin(pluginName: string | typeof Plugin, isUpgrade?: boolean, isPkg?: boolean): any;
     addPreset(plugin: string | typeof Plugin, options?: any): void;
     getPlugins(): Map<typeof Plugin, Plugin<any>>;
     getAliases(): IterableIterator<string>;
     get(name: string | typeof Plugin): Plugin<any>;
     has(name: string | typeof Plugin): boolean;
     del(name: string | typeof Plugin): void;
-    create(name: string | string[]): Promise<void>;
-    add(plugin?: any, options?: any, insert?: boolean): Promise<void>;
+    create(pluginName: string): Promise<void>;
+    add(plugin?: any, options?: any, insert?: boolean, isUpgrade?: boolean): Promise<void>;
     initPlugins(): Promise<void>;
     load(options?: any): Promise<void>;
     install(options?: InstallOptions): Promise<void>;
@@ -45,5 +47,33 @@ export declare class PluginManager {
     disable(name: string | string[]): Promise<void>;
     remove(name: string | string[]): Promise<void>;
     protected initPresetPlugins(): Promise<void>;
+    loadOne(plugin: Plugin): Promise<void>;
+    addViaCLI(urlOrName: string, options?: PluginData): Promise<void>;
+    addByNpm(options: {
+        packageName: string;
+        name?: string;
+        registry: string;
+        authToken?: string;
+    }): Promise<void>;
+    addByFile(options: {
+        file: string;
+        registry?: string;
+        authToken?: string;
+        type?: string;
+        name?: string;
+    }): Promise<void>;
+    addByCompressedFileUrl(options: {
+        compressedFileUrl: string;
+        registry?: string;
+        authToken?: string;
+        type?: string;
+        name?: string;
+    }): Promise<void>;
+    update(options: PluginData): Promise<void>;
+    upgradeByNpm(values: PluginData): Promise<void>;
+    upgradeByCompressedFileUrl(options: PluginData): Promise<void>;
+    getNameByPackageName(packageName: string): string;
+    list(options?: any): Promise<any[]>;
+    getNpmVersionList(name: string): Promise<string[]>;
 }
 export default PluginManager;