@nocobase/server 2.1.0-alpha.22 → 2.1.0-alpha.24

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

@@ -67,10 +67,17 @@ const _PackageUrls = class _PackageUrls {
   }
   static async get(packageName, lane = "client") {
     const cacheKey = this.getCacheKey(packageName, lane);
-    if (!this.items[cacheKey]) {
-      this.items[cacheKey] = await this.fetch(packageName, lane);
+    const cached = this.items[cacheKey];
+    if (cached) {
+      return cached;
     }
-    return this.items[cacheKey];
+    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 nextUrl;
   }
   static async hasClientEntry(packageName, lane) {
     const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, packageName);
@@ -140,7 +147,15 @@ async function listEnabledPlugins(ctx, lane = "client") {
 }
 __name(listEnabledPlugins, "listEnabledPlugins");
 function normalizePmPluginKeys(filterByTk) {
-  return filterByTk.split(",").map((k) => k.trim()).filter(Boolean);
+  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) {
@@ -233,9 +248,6 @@ var resource_default = {
     async enable(ctx, next) {
       const { filterByTk, awaitResponse: awaitResponseRaw } = ctx.action.params;
       const app = ctx.app;
-      if (filterByTk == null || filterByTk === "" || typeof filterByTk !== "string") {
-        ctx.throw(400, "plugin name invalid");
-      }
       const keys = normalizePmPluginKeys(filterByTk);
       if (!keys.length) {
         ctx.throw(400, "plugin name invalid");
@@ -255,9 +267,6 @@ var resource_default = {
     async disable(ctx, next) {
       const { filterByTk, awaitResponse: awaitResponseRaw } = ctx.action.params;
       const app = ctx.app;
-      if (filterByTk == null || filterByTk === "" || typeof filterByTk !== "string") {
-        ctx.throw(400, "plugin name invalid");
-      }
       const keys = normalizePmPluginKeys(filterByTk);
       if (!keys.length) {
         ctx.throw(400, "plugin name invalid");

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

@@ -302,7 +302,7 @@ const _PluginManager = class _PluginManager {
       if (options == null ? void 0 : options.forceRecreate) {
         await import_fs_extra.default.rm(pluginDir, { recursive: true, force: true });
       }
-      const { PluginGenerator } = require("@nocobase/cli/src/plugin-generator");
+      const { PluginGenerator } = require("@nocobase/cli-v1/src/plugin-generator");
       const generator = new PluginGenerator({
         cwd: process.cwd(),
         args: {},

package/package.json

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