@nocobase/server 2.1.0-alpha.14 → 2.1.0-alpha.15

package/lib/commands/pm.js

@@ -32,9 +32,39 @@ __export(pm_exports, {
 module.exports = __toCommonJS(pm_exports);
 var import_app_supervisor = require("../app-supervisor");
 var import_plugin_command_error = require("../errors/plugin-command-error");
+var import_plugin_manager = require("../plugin-manager");
+var import_findPackageNames = require("../plugin-manager/findPackageNames");
 /* istanbul ignore file -- @preserve */
 var pm_default = /* @__PURE__ */ __name((app) => {
   const pm = app.command("pm");
+  pm.command("list").action(async () => {
+    const plugins1 = await (0, import_findPackageNames.findBuiltInPlugins)();
+    const plugins2 = await (0, import_findPackageNames.findLocalPlugins)();
+    let enabledPlugins = [];
+    try {
+      enabledPlugins = (await app.pm.repository.find({
+        filter: {
+          enabled: true
+        }
+      })).map((item) => item.packageName);
+    } catch (error) {
+    }
+    const items = await Promise.all(
+      [...plugins1, ...plugins2].map(async (name) => {
+        const item = await import_plugin_manager.PluginManager.parseName(name);
+        const json = await import_plugin_manager.PluginManager.getPackageJson(item.packageName);
+        return {
+          displayName: json.displayName || name,
+          packageName: item.packageName,
+          enabled: enabledPlugins.includes(item.packageName),
+          description: json.description
+        };
+      })
+    );
+    console.log("--- BEGIN_PLUGIN_LIST_JSON ---");
+    console.log(JSON.stringify(items));
+    console.log("--- END_PLUGIN_LIST_JSON ---");
+  });
   pm.command("create").argument("plugin").option("--force-recreate").action(async (plugin, options) => {
     await app.pm.create(plugin, options);
   });

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
      */

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

@@ -101,6 +101,23 @@ const _PluginManager = class _PluginManager {
     });
     this.app.resourceManager.use(import_middleware.uploadMiddleware, { tag: "upload", after: "acl" });
   }
+  static async checkAndGetCompatible(packageName) {
+    if (this.compatibleCache.has(packageName)) {
+      return this.compatibleCache.get(packageName);
+    }
+    const pending = this.compatiblePending.get(packageName);
+    if (pending) {
+      return pending;
+    }
+    const task = (0, import_utils2.checkAndGetCompatible)(packageName).then((compatible) => {
+      this.compatibleCache.set(packageName, compatible);
+      return compatible;
+    }).finally(() => {
+      this.compatiblePending.delete(packageName);
+    });
+    this.compatiblePending.set(packageName, task);
+    return task;
+  }
   /**
    * @internal
    */
@@ -1108,7 +1125,8 @@ const _PluginManager = class _PluginManager {
   }
 };
 __name(_PluginManager, "PluginManager");
-__publicField(_PluginManager, "checkAndGetCompatible", import_utils2.checkAndGetCompatible);
+__publicField(_PluginManager, "compatibleCache", /* @__PURE__ */ new Map());
+__publicField(_PluginManager, "compatiblePending", /* @__PURE__ */ new Map());
 __publicField(_PluginManager, "parsedNames", {});
 let PluginManager = _PluginManager;
 var plugin_manager_default = PluginManager;

package/package.json

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