@nocobase/server 2.0.22 → 2.1.0-alpha.10

package/lib/gateway/index.d.ts

@@ -57,6 +57,7 @@ export declare class Gateway extends EventEmitter {
     private port;
     private host;
     private socketPath;
+    private v2IndexTemplateCache;
     private terminating;
     private onTerminate;
     private constructor();
@@ -74,6 +75,15 @@ export declare class Gateway extends EventEmitter {
         code: string;
     }): void;
     responseErrorWithCode(code: any, res: any, options: any): void;
+    private getV2PublicPath;
+    private getAppPublicPath;
+    private isV2Request;
+    private isV2IndexRequest;
+    private getV2RuntimeConfig;
+    private getV2RuntimeConfigScript;
+    private getV2AssetPublicPath;
+    private getV2IndexTemplate;
+    private renderV2IndexHtml;
     requestHandler(req: IncomingMessage, res: ServerResponse): Promise<void>;
     getAppSelectorMiddlewares(): Toposort<AppSelectorMiddleware>;
     getRequestHandleAppName(req: IncomingRequest): Promise<string>;

package/lib/gateway/index.js

@@ -63,10 +63,16 @@ var import_plugin_manager = require("../plugin-manager");
 var import_errors = require("./errors");
 var import_ipc_socket_client = require("./ipc-socket-client");
 var import_ipc_socket_server = require("./ipc-socket-server");
+var import_utils3 = require("./utils");
 var import_ws_server = require("./ws-server");
 var import_node_worker_threads = require("node:worker_threads");
 var import_node_process = __toESM(require("node:process"));
 const compress = (0, import_node_util.promisify)((0, import_compression.default)());
+function normalizeBasePath(path = "") {
+  const normalized = path.replace(/\/+/g, "/").replace(/\/$/, "");
+  return normalized || "/";
+}
+__name(normalizeBasePath, "normalizeBasePath");
 function getSocketPath() {
   const { SOCKET_PATH } = import_node_process.default.env;
   if ((0, import_path.isAbsolute)(SOCKET_PATH)) {
@@ -88,6 +94,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   port = import_node_process.default.env.APP_PORT ? parseInt(import_node_process.default.env.APP_PORT) : null;
   host = "0.0.0.0";
   socketPath = (0, import_path.resolve)(import_node_process.default.cwd(), "storage", "gateway.sock");
+  v2IndexTemplateCache = null;
   terminating = false;
   onTerminate = /* @__PURE__ */ __name(async (signal) => {
     var _a;
@@ -151,15 +158,31 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     this.selectorMiddlewares = new import_utils.Toposort();
     this.addAppSelectorMiddleware(
       async (ctx, next) => {
-        var _a;
+        var _a, _b;
         const { req } = ctx;
-        const appName = (_a = import_qs.default.parse((0, import_url.parse)(req.url).query)) == null ? void 0 : _a.__appName;
+        const parsedUrl = (0, import_url.parse)(req.url);
+        const appName = (_a = import_qs.default.parse(parsedUrl.query)) == null ? void 0 : _a.__appName;
+        const apiBasePath = normalizeBasePath(import_node_process.default.env.API_BASE_PATH || "/api");
+        const appPathPrefix = `${apiBasePath}/__app/`;
         if (appName) {
           ctx.resolvedAppName = appName;
         }
         if (req.headers["x-app"]) {
           ctx.resolvedAppName = req.headers["x-app"];
         }
+        if ((_b = parsedUrl.pathname) == null ? void 0 : _b.startsWith(appPathPrefix)) {
+          const restPath = parsedUrl.pathname.slice(appPathPrefix.length);
+          const [pathAppName, ...segments] = restPath.split("/");
+          if (pathAppName) {
+            ctx.resolvedAppName = pathAppName;
+            const rewrittenPath = `${apiBasePath}${segments.length ? `/${segments.join("/")}` : ""}`;
+            const rewrittenUrl = `${rewrittenPath}${parsedUrl.search || ""}`;
+            if (!req.originalUrl) {
+              req.originalUrl = req.url;
+            }
+            req.url = rewrittenUrl;
+          }
+        }
         await next();
       },
       {
@@ -222,9 +245,79 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     });
     this.responseError(res, error);
   }
+  getV2PublicPath() {
+    return (0, import_utils3.resolveV2PublicPath)(import_node_process.default.env.APP_PUBLIC_PATH || "/");
+  }
+  getAppPublicPath() {
+    return (0, import_utils3.resolvePublicPath)(import_node_process.default.env.APP_PUBLIC_PATH || "/");
+  }
+  isV2Request(pathname) {
+    const v2PublicPath = this.getV2PublicPath();
+    return pathname === v2PublicPath.slice(0, -1) || pathname.startsWith(v2PublicPath);
+  }
+  isV2IndexRequest(pathname) {
+    if (!this.isV2Request(pathname)) {
+      return false;
+    }
+    const v2PublicPath = this.getV2PublicPath();
+    if (pathname === v2PublicPath || pathname === v2PublicPath.slice(0, -1) || pathname === `${v2PublicPath}index.html`) {
+      return true;
+    }
+    return !(0, import_path.extname)(pathname);
+  }
+  getV2RuntimeConfig() {
+    return {
+      __nocobase_public_path__: this.getV2PublicPath(),
+      __nocobase_api_base_url__: import_node_process.default.env.API_BASE_URL || import_node_process.default.env.API_BASE_PATH,
+      __nocobase_api_client_storage_prefix__: import_node_process.default.env.API_CLIENT_STORAGE_PREFIX,
+      __nocobase_api_client_storage_type__: import_node_process.default.env.API_CLIENT_STORAGE_TYPE,
+      __nocobase_api_client_share_token__: import_node_process.default.env.API_CLIENT_SHARE_TOKEN === "true",
+      __nocobase_ws_url__: import_node_process.default.env.WEBSOCKET_URL || "",
+      __nocobase_ws_path__: import_node_process.default.env.WS_PATH,
+      __esm_cdn_base_url__: import_node_process.default.env.ESM_CDN_BASE_URL || "https://esm.sh",
+      __esm_cdn_suffix__: import_node_process.default.env.ESM_CDN_SUFFIX || ""
+    };
+  }
+  getV2RuntimeConfigScript() {
+    const runtimeConfig = this.getV2RuntimeConfig();
+    const scriptContent = Object.entries(runtimeConfig).map(([key, value]) => `window['${key}'] = ${JSON.stringify(value)};`).join("\n");
+    return `<script>${scriptContent}</script>`;
+  }
+  getV2AssetPublicPath() {
+    if (import_node_process.default.env.CDN_BASE_URL) {
+      return `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/v2/`;
+    }
+    return this.getV2PublicPath();
+  }
+  getV2IndexTemplate() {
+    const file = `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client/v2/index.html`;
+    if (!import_fs.default.existsSync(file)) {
+      return null;
+    }
+    const stat = import_fs.default.statSync(file);
+    if (this.v2IndexTemplateCache && this.v2IndexTemplateCache.file === file && this.v2IndexTemplateCache.mtimeMs === stat.mtimeMs) {
+      return this.v2IndexTemplateCache.html;
+    }
+    const html = import_fs.default.readFileSync(file, "utf-8");
+    this.v2IndexTemplateCache = {
+      file,
+      mtimeMs: stat.mtimeMs,
+      html
+    };
+    return html;
+  }
+  renderV2IndexHtml() {
+    const template = this.getV2IndexTemplate();
+    if (!template) {
+      return null;
+    }
+    const html = (0, import_utils3.rewriteV2AssetPublicPath)(template, this.getV2AssetPublicPath());
+    return (0, import_utils3.injectRuntimeScript)(html, this.getV2RuntimeConfigScript());
+  }
   async requestHandler(req, res) {
     const { pathname } = (0, import_url.parse)(req.url);
-    const { PLUGIN_STATICS_PATH, APP_PUBLIC_PATH } = import_node_process.default.env;
+    const { PLUGIN_STATICS_PATH } = import_node_process.default.env;
+    const APP_PUBLIC_PATH = this.getAppPublicPath();
     if (pathname.endsWith("/__umi/api/bundle-status")) {
       res.statusCode = 200;
       res.end("ok");
@@ -275,6 +368,27 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       });
     }
     if (!pathname.startsWith(import_node_process.default.env.API_BASE_PATH)) {
+      if (this.isV2Request(pathname)) {
+        if (handleApp !== "main") {
+          const isProxy = await supervisor.proxyWeb(handleApp, req, res);
+          if (isProxy) {
+            return;
+          }
+        }
+        if (this.isV2IndexRequest(pathname)) {
+          const v2Html = this.renderV2IndexHtml();
+          if (v2Html) {
+            res.setHeader("Content-Type", "text/html; charset=utf-8");
+            res.end(v2Html);
+            return;
+          }
+        }
+        req.url = req.url.substring(APP_PUBLIC_PATH.length - 1);
+        await compress(req, res);
+        return (0, import_serve_handler.default)(req, res, {
+          public: `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client`
+        });
+      }
       if (handleApp !== "main") {
         const isProxy = await supervisor.proxyWeb(handleApp, req, res);
         if (isProxy) {

package/lib/gateway/utils.d.ts

@@ -0,0 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 declare function resolvePublicPath(appPublicPath?: string): string;
+export declare function resolveV2PublicPath(appPublicPath?: string): string;
+export declare function rewriteV2AssetPublicPath(html: string, assetPublicPath: string): string;
+export declare function injectRuntimeScript(html: string, runtimeScript: string): string;

package/lib/gateway/utils.js

@@ -0,0 +1,79 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  injectRuntimeScript: () => injectRuntimeScript,
+  resolvePublicPath: () => resolvePublicPath,
+  resolveV2PublicPath: () => resolveV2PublicPath,
+  rewriteV2AssetPublicPath: () => rewriteV2AssetPublicPath
+});
+module.exports = __toCommonJS(utils_exports);
+function resolvePublicPath(appPublicPath = "/") {
+  const normalized = String(appPublicPath || "/").trim() || "/";
+  const withLeadingSlash = normalized.startsWith("/") ? normalized : `/${normalized}`;
+  return withLeadingSlash.endsWith("/") ? withLeadingSlash : `${withLeadingSlash}/`;
+}
+__name(resolvePublicPath, "resolvePublicPath");
+function resolveV2PublicPath(appPublicPath = "/") {
+  const publicPath = resolvePublicPath(appPublicPath);
+  return `${publicPath.replace(/\/$/, "")}/v2/`;
+}
+__name(resolveV2PublicPath, "resolveV2PublicPath");
+function ensureTrailingSlash(value) {
+  return value.endsWith("/") ? value : `${value}/`;
+}
+__name(ensureTrailingSlash, "ensureTrailingSlash");
+function rewriteV2AssetPublicPath(html, assetPublicPath) {
+  const normalizedAssetPublicPath = ensureTrailingSlash(assetPublicPath);
+  if (normalizedAssetPublicPath === "/v2/") {
+    return html;
+  }
+  return html.replace(/((?:src|href)=["'])\/v2\//g, `$1${normalizedAssetPublicPath}`);
+}
+__name(rewriteV2AssetPublicPath, "rewriteV2AssetPublicPath");
+function injectRuntimeScript(html, runtimeScript) {
+  const moduleScriptMatch = html.match(/<script\b[^>]*type=["']module["'][^>]*>/i);
+  if (moduleScriptMatch == null ? void 0 : moduleScriptMatch[0]) {
+    return html.replace(moduleScriptMatch[0], `${runtimeScript}
+${moduleScriptMatch[0]}`);
+  }
+  if (html.includes("</head>")) {
+    return html.replace("</head>", `${runtimeScript}
+</head>`);
+  }
+  return `${runtimeScript}
+${html}`;
+}
+__name(injectRuntimeScript, "injectRuntimeScript");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  injectRuntimeScript,
+  resolvePublicPath,
+  resolveV2PublicPath,
+  rewriteV2AssetPublicPath
+});

package/package.json

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