@nocobase/server 2.1.0-alpha.9 → 2.1.0-beta.10

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

@@ -95,6 +95,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

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

@@ -305,43 +305,28 @@ const _PluginManager = class _PluginManager {
     });
     await (0, import_helper.tsxRerunning)();
   }
-  async add(plugin, options = {}, insert = false, isUpgrade = false) {
+  async addOrThrow(plugin, options = {}, insert = false, isUpgrade = false) {
     if (!isUpgrade && this.has(plugin)) {
       const name = typeof plugin === "string" ? plugin : plugin.name;
-      this.app.log.warn(`plugin [${name}] added`);
-      return;
+      throw new Error(`plugin [${name}] already added`);
     }
     if (!options.name && typeof plugin === "string") {
       options.name = plugin;
     }
-    try {
-      if (typeof plugin === "string" && options.name && !options.packageName) {
-        const packageName = await _PluginManager.getPackageName(options.name);
-        if (packageName) {
-          options["packageName"] = packageName;
-        }
-      }
-      if (options.packageName) {
-        const packageJson = await _PluginManager.getPackageJson(options.packageName);
-        options["packageJson"] = packageJson;
-        options["version"] = packageJson.version;
+    if (typeof plugin === "string" && options.name && !options.packageName) {
+      const packageName = await _PluginManager.getPackageName(options.name);
+      if (packageName) {
+        options["packageName"] = packageName;
       }
-    } catch (error) {
-      this.app.log.error(error);
-      console.error(error);
     }
-    this.app.log.trace(`adding plugin [${options.name}]`, {
-      method: "add",
-      submodule: "plugin-manager",
-      name: options.name,
-      options
-    });
-    let P;
-    try {
-      P = await _PluginManager.resolvePlugin(options.packageName || plugin, isUpgrade, !!options.packageName);
-    } catch (error) {
-      this.app.log.warn("plugin not found", error);
-      return;
+    if (options.packageName) {
+      const packageJson = await _PluginManager.getPackageJson(options.packageName);
+      options["packageJson"] = packageJson;
+      options["version"] = packageJson.version;
+    }
+    const P = await _PluginManager.resolvePlugin(options.packageName || plugin, isUpgrade, !!options.packageName);
+    if (!P) {
+      throw new Error(`plugin [${(options == null ? void 0 : options.name) || "unknown"}] load error`);
     }
     const instance = new P((0, import_helper.createAppProxy)(this.app), options);
     this.pluginInstances.set(P, instance);
@@ -352,12 +337,13 @@ const _PluginManager = class _PluginManager {
       this.pluginAliases.set(options.packageName, instance);
     }
     await instance.afterAdd();
-    this.app.log.trace(`added plugin [${options.name}]`, {
-      method: "add",
-      submodule: "plugin-manager",
-      name: instance.name,
-      options: instance.options
-    });
+  }
+  async add(plugin, options = {}, insert = false, isUpgrade = false) {
+    try {
+      await this.addOrThrow(plugin, options, insert, isUpgrade);
+    } catch (error) {
+      this.app.log.error(error);
+    }
   }
   /**
    * @internal
@@ -528,7 +514,7 @@ const _PluginManager = class _PluginManager {
           added[pluginName] = true;
           continue;
         }
-        await this.add(pluginName);
+        await this.addOrThrow(pluginName);
       }
       for (const name of pluginNames) {
         const { name: pluginName } = await _PluginManager.parseName(name);

package/package.json

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