@nocobase/server 2.1.0-alpha.10 → 2.1.0-alpha.11

package/lib/gateway/utils.js

@@ -57,6 +57,11 @@ function rewriteV2AssetPublicPath(html, assetPublicPath) {
 }
 __name(rewriteV2AssetPublicPath, "rewriteV2AssetPublicPath");
 function injectRuntimeScript(html, runtimeScript) {
+  const browserCheckerScriptMatch = html.match(/<script\b[^>]*browser-checker\.js[^>]*><\/script>/i);
+  if (browserCheckerScriptMatch == null ? void 0 : browserCheckerScriptMatch[0]) {
+    return html.replace(browserCheckerScriptMatch[0], `${runtimeScript}
+${browserCheckerScriptMatch[0]}`);
+  }
   const moduleScriptMatch = html.match(/<script\b[^>]*type=["']module["'][^>]*>/i);
   if (moduleScriptMatch == null ? void 0 : moduleScriptMatch[0]) {
     return html.replace(moduleScriptMatch[0], `${runtimeScript}

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

@@ -6,6 +6,15 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+export type PluginClientLane = 'client' | 'client-v2';
+export declare class PackageUrls {
+    static items: Record<string, string | undefined>;
+    static clear(): void;
+    static getCacheKey(packageName: string, lane: PluginClientLane): string;
+    static get(packageName: string, lane?: PluginClientLane): Promise<string>;
+    static hasClientEntry(packageName: string, lane: PluginClientLane): Promise<boolean>;
+    static fetch(packageName: string, lane?: PluginClientLane): Promise<string>;
+}
 declare const _default: {
     name: string;
     actions: {
@@ -17,6 +26,7 @@ declare const _default: {
         remove(ctx: any, next: any): Promise<void>;
         list(ctx: any, next: any): Promise<void>;
         listEnabled(ctx: any, next: any): Promise<void>;
+        listEnabledV2(ctx: any, next: any): Promise<void>;
         get(ctx: any, next: any): Promise<void>;
     };
 };

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

@@ -39,6 +39,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var resource_exports = {};
 __export(resource_exports, {
+  PackageUrls: () => PackageUrls,
   default: () => resource_default
 });
 module.exports = __toCommonJS(resource_exports);
@@ -48,46 +49,95 @@ var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
 var import_crypto = __toESM(require("crypto"));
 var import_package = __toESM(require("../../../package.json"));
+const PLUGIN_CLIENT_ENTRY_FILES = {
+  client: "dist/client/index.js",
+  "client-v2": "dist/client-v2/index.js"
+};
+const PLUGIN_CLIENT_MARKER_FILES = {
+  client: "client.js",
+  "client-v2": "client-v2.js"
+};
 const _PackageUrls = class _PackageUrls {
-  static async get(packageName) {
-    if (!this.items[packageName]) {
-      this.items[packageName] = await this.fetch(packageName);
+  static clear() {
+    this.items = {};
+  }
+  static getCacheKey(packageName, lane) {
+    return `${lane}:${packageName}`;
+  }
+  static async get(packageName, lane = "client") {
+    const cacheKey = this.getCacheKey(packageName, lane);
+    if (!this.items[cacheKey]) {
+      this.items[cacheKey] = await this.fetch(packageName, lane);
     }
-    return this.items[packageName];
+    return this.items[cacheKey];
   }
-  static async fetch(packageName) {
-    const PLUGIN_CLIENT_ENTRY_FILE = "dist/client/index.js";
+  static async hasClientEntry(packageName, lane) {
     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);
-        const appKey = process.env.APP_KEY || "";
-        let version = "";
-        try {
-          const pkgJson = await import_fs_extra.default.readJson(import_path.default.resolve(pkgPath, "package.json"));
-          if (pkgJson && typeof pkgJson.version === "string") {
-            version = pkgJson.version;
-          }
-        } catch (error) {
+    if (!await import_fs_extra.default.exists(pkgPath)) {
+      return false;
+    }
+    return await import_fs_extra.default.exists(import_path.default.resolve(pkgPath, PLUGIN_CLIENT_MARKER_FILES[lane]));
+  }
+  static async fetch(packageName, lane = "client") {
+    const pluginClientEntryFile = PLUGIN_CLIENT_ENTRY_FILES[lane];
+    const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, packageName);
+    const pkgExists = await import_fs_extra.default.exists(pkgPath);
+    if (!pkgExists) {
+      return;
+    }
+    let t = "";
+    const dist = import_path.default.resolve(pkgPath, pluginClientEntryFile);
+    const distExists = await import_fs_extra.default.exists(dist);
+    if (distExists) {
+      const fsState = await import_fs_extra.default.stat(dist);
+      const appKey = process.env.APP_KEY || "";
+      let version = "";
+      try {
+        const pkgJson = await import_fs_extra.default.readJson(import_path.default.resolve(pkgPath, "package.json"));
+        if (pkgJson && typeof pkgJson.version === "string") {
+          version = pkgJson.version;
         }
-        const appVersion = import_package.default.version;
-        const salt = process.env.PLUGIN_URL_HASH_SALT || "";
-        const hash = import_crypto.default.createHash("sha256").update(fsState.mtime.getTime() + appKey + version + appVersion + salt).digest("hex").slice(0, 8);
-        t = `?hash=${hash}`;
+      } catch (error) {
       }
-      const cdnBaseUrl = process.env.CDN_BASE_URL.replace(/\/+$/, "");
-      const url = `${cdnBaseUrl}${"/static/plugins/"}${packageName}/${PLUGIN_CLIENT_ENTRY_FILE}${t}`;
-      return url;
+      const appVersion = import_package.default.version;
+      const salt = process.env.PLUGIN_URL_HASH_SALT || "";
+      const hash = import_crypto.default.createHash("sha256").update(fsState.mtime.getTime() + appKey + version + appVersion + salt).digest("hex").slice(0, 8);
+      t = `?hash=${hash}`;
     }
+    const cdnBaseUrl = process.env.CDN_BASE_URL.replace(/\/+$/, "");
+    const url = `${cdnBaseUrl}${"/static/plugins/"}${packageName}/${pluginClientEntryFile}${t}`;
+    return url;
   }
 };
 __name(_PackageUrls, "PackageUrls");
 __publicField(_PackageUrls, "items", {});
 let PackageUrls = _PackageUrls;
+async function listEnabledPlugins(ctx, lane = "client") {
+  const pm = ctx.db.getRepository("applicationPlugins");
+  const items = await pm.find({
+    filter: {
+      enabled: true
+    }
+  });
+  const arr = [];
+  for (const item of items) {
+    if (lane === "client-v2" && !await PackageUrls.hasClientEntry(item.packageName, lane)) {
+      continue;
+    }
+    const url = await PackageUrls.get(item.packageName, lane);
+    const { name, packageName, options } = item.toJSON();
+    if (url) {
+      arr.push({
+        name,
+        packageName,
+        options,
+        url
+      });
+    }
+  }
+  return arr;
+}
+__name(listEnabledPlugins, "listEnabledPlugins");
 var resource_default = {
   name: "pm",
   actions: {
@@ -197,29 +247,11 @@ var resource_default = {
       await next();
     },
     async listEnabled(ctx, next) {
-      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);
-          const { name, packageName, options } = item.toJSON();
-          if (url) {
-            arr.push({
-              name,
-              packageName,
-              options,
-              url
-            });
-          }
-        }
-        return arr;
-      }, "toArr");
-      ctx.body = await toArr();
+      ctx.body = await listEnabledPlugins(ctx, "client");
+      await next();
+    },
+    async listEnabledV2(ctx, next) {
+      ctx.body = await listEnabledPlugins(ctx, "client-v2");
       await next();
     },
     async get(ctx, next) {
@@ -235,3 +267,7 @@ var resource_default = {
     }
   }
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  PackageUrls
+});

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

@@ -90,6 +90,7 @@ const _PluginManager = class _PluginManager {
     this._repository.setPluginManager(this);
     this.app.resourcer.define(import_resource.default);
     this.app.acl.allow("pm", "listEnabled", "public");
+    this.app.acl.allow("pm", "listEnabledV2", "public");
     this.app.acl.registerSnippet({
       name: "pm",
       actions: ["pm:*"]

package/lib/plugin.js

@@ -213,6 +213,33 @@ const _Plugin = class _Plugin {
       log: this.log
     });
     await toolsLoader.load();
+    const mcpLoader = new import_ai.MCPLoader(this.ai, {
+      scan: {
+        basePath,
+        pattern: ["mcp/*.ts", "mcp/*.js", "!mcp/*.d.ts"]
+      },
+      log: this.log
+    });
+    await mcpLoader.load();
+    const skillsLoader = new import_ai.SkillsLoader(this.ai, {
+      scan: { basePath, pattern: ["**/skills/**/SKILLS.md"] },
+      log: this.log
+    });
+    await skillsLoader.load();
+    const employeeLoader = new import_ai.AIEmployeeLoader(this.ai, {
+      scan: {
+        basePath,
+        pattern: [
+          "**/ai-employees/*.ts",
+          "**/ai-employees/*/index.ts",
+          "**/ai-employees/*.js",
+          "**/ai-employees/*/index.js",
+          "!**/ai-employees/**/*.d.ts"
+        ]
+      },
+      log: this.log
+    });
+    await employeeLoader.load();
   }
   /**
    * @deprecated

package/lib/pub-sub-manager/pub-sub-manager.js

@@ -38,7 +38,7 @@ const createPubSubManager = /* @__PURE__ */ __name((app, options) => {
   app.on("afterStart", async () => {
     await pubSubManager.connect();
   });
-  app.on("afterStop", async () => {
+  app.on("beforeStop", async () => {
     await pubSubManager.close();
   });
   return pubSubManager;

package/package.json

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