@nocobase/server 2.0.0-alpha.33 → 2.0.0-alpha.34

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

@@ -13,6 +13,8 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -34,6 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var resource_exports = {};
 __export(resource_exports, {
   default: () => resource_default
@@ -43,6 +46,33 @@ var import_utils = require("@nocobase/utils");
 var import_fs = __toESM(require("fs"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
+const _PackageUrls = class _PackageUrls {
+  static async get(packageName, version) {
+    if (!this.items[packageName]) {
+      this.items[packageName] = await this.fetch(packageName, version);
+    }
+    return this.items[packageName];
+  }
+  static async fetch(packageName, version) {
+    const PLUGIN_CLIENT_ENTRY_FILE = "dist/client/index.js";
+    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 url = `${process.env.APP_SERVER_BASE_URL}${process.env.PLUGIN_STATICS_PATH}${packageName}/${PLUGIN_CLIENT_ENTRY_FILE}?version=${version}${t}`;
+      return url;
+    }
+  }
+};
+__name(_PackageUrls, "PackageUrls");
+__publicField(_PackageUrls, "items", {});
+let PackageUrls = _PackageUrls;
 var resource_default = {
   name: "pm",
   actions: {
@@ -152,33 +182,26 @@ var resource_default = {
       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
-        }
-      });
-      const arr = [];
-      for (const item of items) {
-        const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, item.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 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, item.version);
+          if (url) {
+            arr.push({
+              ...item.toJSON(),
+              url
+            });
           }
-          const url = `${process.env.APP_SERVER_BASE_URL}${process.env.PLUGIN_STATICS_PATH}${item.packageName}/${PLUGIN_CLIENT_ENTRY_FILE}?version=${item.version}${t}`;
-          arr.push({
-            ...item.toJSON(),
-            url
-          });
         }
-      }
-      ctx.body = arr;
+        return arr;
+      }, "toArr");
+      ctx.body = await toArr();
       await next();
     },
     async get(ctx, next) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.0.0-alpha.33",
+  "version": "2.0.0-alpha.34",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,20 +10,20 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.0.0-alpha.33",
-    "@nocobase/actions": "2.0.0-alpha.33",
-    "@nocobase/auth": "2.0.0-alpha.33",
-    "@nocobase/cache": "2.0.0-alpha.33",
-    "@nocobase/data-source-manager": "2.0.0-alpha.33",
-    "@nocobase/database": "2.0.0-alpha.33",
-    "@nocobase/evaluators": "2.0.0-alpha.33",
-    "@nocobase/lock-manager": "2.0.0-alpha.33",
-    "@nocobase/logger": "2.0.0-alpha.33",
-    "@nocobase/resourcer": "2.0.0-alpha.33",
-    "@nocobase/sdk": "2.0.0-alpha.33",
-    "@nocobase/snowflake-id": "2.0.0-alpha.33",
-    "@nocobase/telemetry": "2.0.0-alpha.33",
-    "@nocobase/utils": "2.0.0-alpha.33",
+    "@nocobase/acl": "2.0.0-alpha.34",
+    "@nocobase/actions": "2.0.0-alpha.34",
+    "@nocobase/auth": "2.0.0-alpha.34",
+    "@nocobase/cache": "2.0.0-alpha.34",
+    "@nocobase/data-source-manager": "2.0.0-alpha.34",
+    "@nocobase/database": "2.0.0-alpha.34",
+    "@nocobase/evaluators": "2.0.0-alpha.34",
+    "@nocobase/lock-manager": "2.0.0-alpha.34",
+    "@nocobase/logger": "2.0.0-alpha.34",
+    "@nocobase/resourcer": "2.0.0-alpha.34",
+    "@nocobase/sdk": "2.0.0-alpha.34",
+    "@nocobase/snowflake-id": "2.0.0-alpha.34",
+    "@nocobase/telemetry": "2.0.0-alpha.34",
+    "@nocobase/utils": "2.0.0-alpha.34",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -60,5 +60,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "d5970aa7f8bf84e92082e182b780344e86bde998"
+  "gitHead": "d7bda14bac775be7ef207cb25986511740b2ed70"
 }