@nocobase/server 2.3.0-alpha.1 → 3.0.0-alpha.1

package/lib/event-queue.d.ts

@@ -53,17 +53,18 @@ export interface EventQueueOptions {
 export declare class MemoryEventQueueAdapter implements IEventQueueAdapter {
     private options;
     private connected;
-    private emitter;
     private reading;
+    private scheduledChannels;
     protected events: Map<string, QueueEventOptions>;
     protected queues: Map<string, {
         id: string;
         content: any;
         options?: QueueMessageOptions;
     }[]>;
-    get processing(): Promise<Promise<void>[][]>;
+    get processing(): Promise<void[]>;
     private get storagePath();
     listen: (channel: string) => void;
+    private scheduleListen;
     constructor(options: {
         appName: string;
         logger: SystemLogger;

package/lib/event-queue.js

@@ -46,7 +46,6 @@ __export(event_queue_exports, {
 });
 module.exports = __toCommonJS(event_queue_exports);
 var import_crypto = require("crypto");
-var import_events = require("events");
 var import_path = __toESM(require("path"));
 var import_promises = __toESM(require("fs/promises"));
 var import_utils = require("@nocobase/utils");
@@ -56,15 +55,14 @@ const QUEUE_DEFAULT_ACK_TIMEOUT = 15e3;
 const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
   constructor(options) {
     this.options = options;
-    this.emitter.setMaxListeners(0);
   }
   connected = false;
-  emitter = new import_events.EventEmitter();
   reading = /* @__PURE__ */ new Map();
+  scheduledChannels = /* @__PURE__ */ new Set();
   events = /* @__PURE__ */ new Map();
   queues = /* @__PURE__ */ new Map();
   get processing() {
-    const processing = Array.from(this.reading.values());
+    const processing = Array.from(this.reading.values()).flat();
     if (processing.length > 0) {
       return Promise.all(processing);
     }
@@ -80,7 +78,6 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     const { logger } = this.options;
     const event = this.events.get(channel);
     if (!event) {
-      logger.warn(`memory queue (${channel}) not found, skipping...`);
       return;
     }
     if (!event.idle()) {
@@ -99,10 +96,24 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
         if (index > -1) {
           reading.splice(index, 1);
         }
+        this.scheduleListen(channel);
       });
     });
     this.reading.set(channel, reading);
   }, "listen");
+  scheduleListen(channel) {
+    if (this.scheduledChannels.has(channel)) {
+      return;
+    }
+    this.scheduledChannels.add(channel);
+    setImmediate(() => {
+      this.scheduledChannels.delete(channel);
+      if (!this.events.has(channel)) {
+        return;
+      }
+      this.listen(channel);
+    });
+  }
   isConnected() {
     return this.connected;
   }
@@ -181,7 +192,6 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     if (!this.queues.has(channel)) {
       this.queues.set(channel, []);
     }
-    this.emitter.on(channel, this.listen);
     if (this.connected) {
       this.consume(channel);
     }
@@ -191,12 +201,12 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
       return;
     }
     this.events.delete(channel);
-    this.emitter.off(channel, this.listen);
   }
   publish(channel, content, options = { timestamp: Date.now() }) {
+    const { logger } = this.options;
     const event = this.events.get(channel);
     if (!event) {
-      console.debug(`memory queue (${channel}) not subscribed, skip`);
+      logger.debug(`memory queue (${channel}) not subscribed, skip`);
       return;
     }
     if (!this.queues.get(channel)) {
@@ -205,11 +215,8 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
     const queue = this.queues.get(channel);
     const message = { id: (0, import_crypto.randomUUID)(), content, options };
     queue.push(message);
-    const { logger } = this.options;
     logger.debug(`memory queue (${channel}) published message`, content);
-    setImmediate(() => {
-      this.emitter.emit(channel, channel);
-    });
+    this.scheduleListen(channel);
   }
   async consume(channel, once = false) {
     while (this.connected && this.events.get(channel)) {

package/lib/gateway/index.d.ts

@@ -59,6 +59,7 @@ export declare class Gateway extends EventEmitter {
     private host;
     private socketPath;
     private v2IndexTemplateCache;
+    private settingsIndexTemplateCache;
     private terminating;
     private getOriginalRequestUrl;
     private proxyRequestToSubApp;
@@ -80,6 +81,17 @@ export declare class Gateway extends EventEmitter {
     responseErrorWithCode(code: any, res: any, options: any): void;
     private getV2PublicPath;
     private getAppPublicPath;
+    private getSettingsPublicPath;
+    private getPathWithinAppPublicPath;
+    private isSettingsRequest;
+    private isSettingsIndexRequest;
+    private isSettingsAssetsRequest;
+    private resolveLegacyV2SettingsRedirect;
+    private getPortalRootPublicPath;
+    private getPortalAppPublicPath;
+    private getPortalMatch;
+    private isPortalIndexRequest;
+    private getPortalDistRoot;
     private isV2Request;
     private isV2IndexRequest;
     private getV2RuntimeConfig;
@@ -87,6 +99,11 @@ export declare class Gateway extends EventEmitter {
     private getV2AssetPublicPath;
     private getV2IndexTemplate;
     private renderV2IndexHtml;
+    private getSettingsRuntimeConfig;
+    private getSettingsRuntimeConfigScript;
+    private getSettingsAssetPublicPath;
+    private getSettingsIndexTemplate;
+    private renderSettingsIndexHtml;
     requestHandler(req: IncomingMessage, res: ServerResponse): Promise<void>;
     getAppSelectorMiddlewares(): Toposort<AppSelectorMiddleware>;
     getRequestHandleAppName(req: IncomingMessage | IncomingRequest): Promise<string>;

package/lib/gateway/index.js

@@ -114,6 +114,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   host = "0.0.0.0";
   socketPath = getSocketPath();
   v2IndexTemplateCache = null;
+  settingsIndexTemplateCache = null;
   terminating = false;
   getOriginalRequestUrl(req) {
     return req.originalUrl || req.url;
@@ -156,6 +157,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   }, "onTerminate");
   constructor() {
     super();
+    (0, import_utils3.normalizeModernClientPrefix)(import_node_process.default.env.APP_MODERN_CLIENT_PREFIX);
     this.reset();
     import_node_process.default.once("SIGTERM", this.onTerminate);
     import_node_process.default.once("SIGINT", this.onTerminate);
@@ -188,19 +190,28 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     this.selectorMiddlewares = new import_utils.Toposort();
     this.addAppSelectorMiddleware(
       async (ctx, next) => {
-        var _a, _b;
+        var _a, _b, _c;
         const { req } = ctx;
         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/`;
+        const appPublicPath = (0, import_utils3.resolvePublicPath)(import_node_process.default.env.APP_PUBLIC_PATH || "/");
+        const portalAppsPathPrefix = `${appPublicPath.replace(/\/$/, "")}/${import_utils3.PORTAL_CLIENT_PREFIX}/apps/`;
         if (req.headers["x-app"]) {
           ctx.resolvedAppName = req.headers["x-app"];
         }
         if (appName) {
           ctx.resolvedAppName = appName;
         }
-        if ((_b = parsedUrl.pathname) == null ? void 0 : _b.startsWith(appPathPrefix)) {
+        if ((_b = parsedUrl.pathname) == null ? void 0 : _b.startsWith(portalAppsPathPrefix)) {
+          const restPath = parsedUrl.pathname.slice(portalAppsPathPrefix.length);
+          const [pathAppName] = restPath.split("/");
+          if (pathAppName) {
+            ctx.resolvedAppName = (0, import_utils3.normalizePortalAppName)(pathAppName);
+          }
+        }
+        if ((_c = parsedUrl.pathname) == null ? void 0 : _c.startsWith(appPathPrefix)) {
           const restPath = parsedUrl.pathname.slice(appPathPrefix.length);
           const [pathAppName, ...segments] = restPath.split("/");
           if (pathAppName) {
@@ -292,6 +303,144 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   getAppPublicPath() {
     return (0, import_utils3.resolvePublicPath)(import_node_process.default.env.APP_PUBLIC_PATH || "/");
   }
+  getSettingsPublicPath() {
+    return (0, import_utils3.resolveSettingsPublicPath)(import_node_process.default.env.APP_PUBLIC_PATH || "/");
+  }
+  getPathWithinAppPublicPath(pathname) {
+    const appPublicPath = this.getAppPublicPath();
+    if (appPublicPath === "/") {
+      return pathname;
+    }
+    const appPublicPathWithoutSlash = appPublicPath.slice(0, -1);
+    if (pathname === appPublicPathWithoutSlash) {
+      return "/";
+    }
+    if (!pathname.startsWith(appPublicPath)) {
+      return null;
+    }
+    return pathname.slice(appPublicPath.length - 1);
+  }
+  isSettingsRequest(pathname) {
+    const appPath = this.getPathWithinAppPublicPath(pathname);
+    if (!appPath) {
+      return false;
+    }
+    return /^\/settings(?:\/|$)/.test(appPath);
+  }
+  isSettingsIndexRequest(pathname) {
+    if (!this.isSettingsRequest(pathname)) {
+      return false;
+    }
+    if (pathname.endsWith("/index.html")) {
+      return true;
+    }
+    return !(0, import_path.extname)(pathname);
+  }
+  isSettingsAssetsRequest(pathname) {
+    const appPath = this.getPathWithinAppPublicPath(pathname);
+    return appPath ? /^\/settings\/assets\//.test(appPath) : false;
+  }
+  resolveLegacyV2SettingsRedirect(pathname) {
+    const appPath = this.getPathWithinAppPublicPath(pathname);
+    if (!appPath) {
+      return null;
+    }
+    const modernPrefix = (0, import_utils3.normalizeModernClientPrefix)(import_node_process.default.env.APP_MODERN_CLIENT_PREFIX);
+    const escapedModernPrefix = modernPrefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const match = appPath.match(new RegExp(`^/${escapedModernPrefix}((?:/(?:apps|_app)/[^/]+)?)(/admin(?:/.*)?)$`));
+    if (!match) {
+      return null;
+    }
+    const appScope = match[1] || "";
+    const legacyPath = match[2];
+    const mappings = [
+      {
+        from: "/admin/settings/mail/oauth2",
+        to: "/admin/settings/mail/oauth2"
+      },
+      {
+        from: "/admin/ai/knowledge-base/detail",
+        to: "/settings/ai/knowledge-base/detail"
+      },
+      {
+        from: "/admin/workflow/executions",
+        to: "/settings/workflow/executions"
+      },
+      {
+        from: "/admin/workflow/workflows",
+        to: "/settings/workflow/workflows"
+      },
+      {
+        from: "/admin/settings",
+        to: "/settings"
+      }
+    ];
+    for (const { from, to } of mappings) {
+      if (legacyPath !== from && !legacyPath.startsWith(`${from}/`)) {
+        continue;
+      }
+      const appPublicPath = this.getAppPublicPath().replace(/\/$/, "");
+      const targetPath = from === "/admin/settings/mail/oauth2" ? `${appScope}${to}` : appScope ? `/settings${appScope}${to.replace(/^\/settings(?=\/|$)/, "")}` : to;
+      return `${appPublicPath}${targetPath}${legacyPath.slice(from.length)}`;
+    }
+    return null;
+  }
+  getPortalRootPublicPath() {
+    return `${this.getAppPublicPath().replace(/\/$/, "")}/${import_utils3.PORTAL_CLIENT_PREFIX}/`;
+  }
+  getPortalAppPublicPath(appName) {
+    if (appName === import_utils3.DEFAULT_PORTAL_APP_NAME) {
+      return this.getPortalRootPublicPath();
+    }
+    return `${this.getPortalRootPublicPath()}apps/${(0, import_utils3.normalizePortalAppName)(appName)}/`;
+  }
+  getPortalMatch(pathname) {
+    const portalRootPublicPath = this.getPortalRootPublicPath();
+    if (!pathname.startsWith(portalRootPublicPath)) {
+      return null;
+    }
+    let appName = import_utils3.DEFAULT_PORTAL_APP_NAME;
+    let publicRoot = portalRootPublicPath;
+    let restPath = pathname.slice(portalRootPublicPath.length).replace(/^\/+/, "");
+    const [firstSegment, secondSegment, ...remainingSegments] = restPath.split("/");
+    if (firstSegment === "apps") {
+      if (!secondSegment || !/^[A-Za-z0-9_-]+$/.test(secondSegment)) {
+        return null;
+      }
+      appName = (0, import_utils3.normalizePortalAppName)(secondSegment);
+      publicRoot = this.getPortalAppPublicPath(appName);
+      if (!pathname.startsWith(publicRoot)) {
+        return null;
+      }
+      restPath = remainingSegments.join("/").replace(/^\/+/, "");
+    }
+    const [portalName] = restPath.split("/");
+    if (!portalName || !/^[A-Za-z0-9_-]+$/.test(portalName)) {
+      return null;
+    }
+    return {
+      appName,
+      portalName,
+      publicPath: `${publicRoot}${portalName}/`
+    };
+  }
+  isPortalIndexRequest(pathname, portalPublicPath) {
+    if (pathname === portalPublicPath || pathname === portalPublicPath.slice(0, -1) || pathname === `${portalPublicPath}index.html`) {
+      return true;
+    }
+    return !(0, import_path.extname)(pathname);
+  }
+  getPortalDistRoot(portalMatch) {
+    const scopedRoot = (0, import_utils.storagePathJoin)("portals", portalMatch.appName, portalMatch.portalName, "dist");
+    if (portalMatch.appName !== import_utils3.DEFAULT_PORTAL_APP_NAME) {
+      return scopedRoot;
+    }
+    const legacyRoot = (0, import_utils.storagePathJoin)("portals", portalMatch.portalName, "dist");
+    if (!import_fs.default.existsSync((0, import_path.resolve)(scopedRoot, "index.html")) && import_fs.default.existsSync((0, import_path.resolve)(legacyRoot, "index.html"))) {
+      return legacyRoot;
+    }
+    return scopedRoot;
+  }
   isV2Request(pathname) {
     const v2PublicPath = this.getV2PublicPath();
     return pathname === v2PublicPath.slice(0, -1) || pathname.startsWith(v2PublicPath);
@@ -358,6 +507,57 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     const html = (0, import_utils3.rewriteV2AssetPublicPath)(template, this.getV2AssetPublicPath());
     return (0, import_utils3.injectRuntimeScript)(html, this.getV2RuntimeConfigScript());
   }
+  getSettingsRuntimeConfig() {
+    return {
+      __nocobase_public_path__: this.getAppPublicPath(),
+      __nocobase_modern_client_prefix__: (0, import_utils3.normalizeModernClientPrefix)(import_node_process.default.env.APP_MODERN_CLIENT_PREFIX),
+      __webpack_public_path__: import_node_process.default.env.CDN_BASE_URL ? `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/` : "",
+      __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,
+      __nocobase_app_dev__: import_node_process.default.env.NOCOBASE_APP_DEV === "true",
+      __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 || ""
+    };
+  }
+  getSettingsRuntimeConfigScript() {
+    const scriptContent = Object.entries(this.getSettingsRuntimeConfig()).map(([key, value]) => `window['${key}'] = ${JSON.stringify(value)};`).join("\n");
+    return `<script>${scriptContent}</script>`;
+  }
+  getSettingsAssetPublicPath() {
+    if (import_node_process.default.env.CDN_BASE_URL) {
+      return `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/${import_utils3.SETTINGS_CLIENT_DIST_DIR}/`;
+    }
+    return this.getSettingsPublicPath();
+  }
+  getSettingsIndexTemplate() {
+    const file = `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client/${import_utils3.SETTINGS_CLIENT_DIST_DIR}/index.html`;
+    if (!import_fs.default.existsSync(file)) {
+      return null;
+    }
+    const stat = import_fs.default.statSync(file);
+    if (this.settingsIndexTemplateCache && this.settingsIndexTemplateCache.file === file && this.settingsIndexTemplateCache.mtimeMs === stat.mtimeMs) {
+      return this.settingsIndexTemplateCache.html;
+    }
+    const html = import_fs.default.readFileSync(file, "utf-8");
+    this.settingsIndexTemplateCache = {
+      file,
+      mtimeMs: stat.mtimeMs,
+      html
+    };
+    return html;
+  }
+  renderSettingsIndexHtml() {
+    const template = this.getSettingsIndexTemplate();
+    if (!template) {
+      return null;
+    }
+    const html = (0, import_utils3.rewriteSettingsAssetPublicPath)(template, this.getSettingsAssetPublicPath());
+    return (0, import_utils3.injectRuntimeScript)(html, this.getSettingsRuntimeConfigScript());
+  }
   async requestHandler(req, res) {
     const { pathname, search } = (0, import_url.parse)(req.url);
     const { PLUGIN_STATICS_PATH } = import_node_process.default.env;
@@ -373,6 +573,13 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       res.end();
       return;
     }
+    const settingsRedirect = this.resolveLegacyV2SettingsRedirect(pathname);
+    if (settingsRedirect) {
+      res.statusCode = 302;
+      res.setHeader("Location", `${settingsRedirect}${search || ""}`);
+      res.end();
+      return;
+    }
     const supervisor = import_app_supervisor.AppSupervisor.getInstance();
     let handleApp = "main";
     try {
@@ -390,14 +597,17 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
         }
       }
       const headers = (0, import_static_file_security.getStorageUploadSecurityHeaders)(`${pathname}${search || ""}`);
-      for (const [key, value] of Object.entries(headers)) {
-        res.setHeader(key, value);
-      }
       req.url = req.url.substring(APP_PUBLIC_PATH.length + "storage".length);
       await compress(req, res);
       return (0, import_serve_handler.default)(req, res, {
         public: (0, import_utils.resolveStorageRoot)(),
-        directoryListing: false
+        directoryListing: false,
+        headers: [
+          {
+            source: "**/*",
+            headers: Object.entries(headers).map(([key, value]) => ({ key, value }))
+          }
+        ]
       });
     }
     if (pathname.startsWith(APP_PUBLIC_PATH + "dist/")) {
@@ -437,6 +647,70 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     }
     const isFilesRequest = Boolean(getFileAccessRestPath(pathname, APP_PUBLIC_PATH));
     if (!pathname.startsWith(import_node_process.default.env.API_BASE_PATH) && !isFilesRequest) {
+      if (this.isSettingsRequest(pathname)) {
+        if (handleApp !== "main") {
+          const isProxy = await this.proxyRequestToSubApp(supervisor, handleApp, req, res);
+          if (isProxy) {
+            return;
+          }
+        }
+        if (this.isSettingsIndexRequest(pathname)) {
+          const settingsHtml = this.renderSettingsIndexHtml();
+          if (settingsHtml) {
+            res.setHeader("Cache-Control", "no-store");
+            res.setHeader("Content-Type", "text/html; charset=utf-8");
+            res.end(settingsHtml);
+            return;
+          }
+        }
+        if (this.isSettingsAssetsRequest(pathname)) {
+          res.setHeader("Cache-Control", "public, max-age=31536000, immutable");
+        }
+        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`
+        });
+      }
+      const portalMatch = this.getPortalMatch(pathname);
+      if (portalMatch) {
+        if (handleApp !== "main" && handleApp !== portalMatch.appName) {
+          const isProxy = await this.proxyRequestToSubApp(supervisor, handleApp, req, res);
+          if (isProxy) {
+            return;
+          }
+        }
+        if (!pathname.startsWith(portalMatch.publicPath)) {
+          res.statusCode = 302;
+          res.setHeader("Location", `${portalMatch.publicPath}${search || ""}`);
+          res.end();
+          return;
+        }
+        const portalDistRoot = this.getPortalDistRoot(portalMatch);
+        const portalIndex = (0, import_path.resolve)(portalDistRoot, "index.html");
+        if (!import_fs.default.existsSync(portalIndex)) {
+          res.statusCode = 404;
+          res.end();
+          return;
+        }
+        if (this.isPortalIndexRequest(pathname, portalMatch.publicPath)) {
+          res.setHeader("Content-Type", "text/html; charset=utf-8");
+          res.end(import_fs.default.readFileSync(portalIndex, "utf-8"));
+          return;
+        }
+        req.url = req.url.substring(portalMatch.publicPath.length - 1);
+        await compress(req, res);
+        return (0, import_serve_handler.default)(req, res, {
+          public: portalDistRoot,
+          directoryListing: false
+        });
+      }
+      const portalRootPublicPath = this.getPortalRootPublicPath();
+      if (pathname === portalRootPublicPath.slice(0, -1) || pathname.startsWith(portalRootPublicPath)) {
+        res.statusCode = 404;
+        res.end();
+        return;
+      }
       if (this.isV2Request(pathname)) {
         if (handleApp !== "main") {
           const isProxy = await this.proxyRequestToSubApp(supervisor, handleApp, req, res);

package/lib/gateway/static-file-security.js

@@ -42,7 +42,18 @@ __export(static_file_security_exports, {
 });
 module.exports = __toCommonJS(static_file_security_exports);
 var import_node_path = __toESM(require("node:path"));
-const ACTIVE_CONTENT_EXTENSIONS = /* @__PURE__ */ new Set([".htm", ".html", ".pdf", ".svg", ".svgz", ".xhtml"]);
+const ACTIVE_CONTENT_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".htm",
+  ".html",
+  ".pdf",
+  ".svg",
+  ".svgz",
+  ".xht",
+  ".xhtml",
+  ".xml",
+  ".xsl",
+  ".xslt"
+]);
 function stripQueryAndHash(pathname = "") {
   return pathname.split("?")[0].split("#")[0];
 }
@@ -63,6 +74,7 @@ function hasActiveContentExtension(pathname = "") {
 __name(hasActiveContentExtension, "hasActiveContentExtension");
 function getStorageUploadSecurityHeaders(pathname = "") {
   const headers = {
+    "Content-Security-Policy": "sandbox",
     "X-Content-Type-Options": "nosniff"
   };
   if (hasActiveContentExtension(pathname) || shouldDownload(pathname)) {

package/lib/gateway/utils.d.ts

@@ -10,10 +10,19 @@
 import { IncomingMessage } from 'http';
 import { IncomingRequest } from '.';
 export declare const MODERN_CLIENT_DIST_DIR = "v";
+export declare const SETTINGS_CLIENT_DIST_DIR = "settings";
+export declare const PORTAL_CLIENT_PREFIX = "x";
+export declare const DEFAULT_PORTAL_APP_NAME = "main";
+export declare const DEFAULT_PORTAL_NAME = "admin";
 export declare function resolvePublicPath(appPublicPath?: string): string;
 export declare function normalizeModernClientPrefix(value?: string): string;
 export declare function resolveV2PublicPath(appPublicPath?: string): string;
+export declare function resolveSettingsPublicPath(appPublicPath?: string): string;
+export declare function normalizePortalName(value?: string): string;
+export declare function normalizePortalAppName(value?: string): string;
+export declare function resolvePortalPublicPath(portalName: string, appPublicPath?: string): string;
 export declare function rewriteV2AssetPublicPath(html: string, assetPublicPath: string): string;
+export declare function rewriteSettingsAssetPublicPath(html: string, assetPublicPath: string): string;
 export declare function injectRuntimeScript(html: string, runtimeScript: string): string;
 export declare function getHost(req: IncomingMessage | IncomingRequest): any;
 export declare function getHostname(req: IncomingMessage | IncomingRequest): any;

package/lib/gateway/utils.js

@@ -27,17 +27,30 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  DEFAULT_PORTAL_APP_NAME: () => DEFAULT_PORTAL_APP_NAME,
+  DEFAULT_PORTAL_NAME: () => DEFAULT_PORTAL_NAME,
   MODERN_CLIENT_DIST_DIR: () => MODERN_CLIENT_DIST_DIR,
+  PORTAL_CLIENT_PREFIX: () => PORTAL_CLIENT_PREFIX,
+  SETTINGS_CLIENT_DIST_DIR: () => SETTINGS_CLIENT_DIST_DIR,
   getHost: () => getHost,
   getHostname: () => getHostname,
   injectRuntimeScript: () => injectRuntimeScript,
   normalizeModernClientPrefix: () => normalizeModernClientPrefix,
+  normalizePortalAppName: () => normalizePortalAppName,
+  normalizePortalName: () => normalizePortalName,
+  resolvePortalPublicPath: () => resolvePortalPublicPath,
   resolvePublicPath: () => resolvePublicPath,
+  resolveSettingsPublicPath: () => resolveSettingsPublicPath,
   resolveV2PublicPath: () => resolveV2PublicPath,
+  rewriteSettingsAssetPublicPath: () => rewriteSettingsAssetPublicPath,
   rewriteV2AssetPublicPath: () => rewriteV2AssetPublicPath
 });
 module.exports = __toCommonJS(utils_exports);
 const MODERN_CLIENT_DIST_DIR = "v";
+const SETTINGS_CLIENT_DIST_DIR = "settings";
+const PORTAL_CLIENT_PREFIX = "x";
+const DEFAULT_PORTAL_APP_NAME = "main";
+const DEFAULT_PORTAL_NAME = "admin";
 function resolvePublicPath(appPublicPath = "/") {
   const normalized = String(appPublicPath || "/").trim() || "/";
   const withLeadingSlash = normalized.startsWith("/") ? normalized : `/${normalized}`;
@@ -46,7 +59,11 @@ function resolvePublicPath(appPublicPath = "/") {
 __name(resolvePublicPath, "resolvePublicPath");
 function normalizeModernClientPrefix(value) {
   const segment = String(value || "").trim().replace(/^\/+|\/+$/g, "");
-  return segment || MODERN_CLIENT_DIST_DIR;
+  const normalized = segment || MODERN_CLIENT_DIST_DIR;
+  if (normalized === SETTINGS_CLIENT_DIST_DIR) {
+    throw new Error('APP_MODERN_CLIENT_PREFIX "settings" is reserved for the standalone Settings application.');
+  }
+  return normalized;
 }
 __name(normalizeModernClientPrefix, "normalizeModernClientPrefix");
 function resolveV2PublicPath(appPublicPath = "/") {
@@ -55,6 +72,26 @@ function resolveV2PublicPath(appPublicPath = "/") {
   return `${publicPath.replace(/\/$/, "")}/${prefix}/`;
 }
 __name(resolveV2PublicPath, "resolveV2PublicPath");
+function resolveSettingsPublicPath(appPublicPath = "/") {
+  const publicPath = resolvePublicPath(appPublicPath);
+  return `${publicPath.replace(/\/$/, "")}/${SETTINGS_CLIENT_DIST_DIR}/`;
+}
+__name(resolveSettingsPublicPath, "resolveSettingsPublicPath");
+function normalizePortalName(value) {
+  const segment = String(value || "").trim().replace(/^\/+|\/+$/g, "");
+  return segment || DEFAULT_PORTAL_NAME;
+}
+__name(normalizePortalName, "normalizePortalName");
+function normalizePortalAppName(value) {
+  const segment = String(value || "").trim().replace(/^\/+|\/+$/g, "");
+  return segment || DEFAULT_PORTAL_APP_NAME;
+}
+__name(normalizePortalAppName, "normalizePortalAppName");
+function resolvePortalPublicPath(portalName, appPublicPath = "/") {
+  const publicPath = resolvePublicPath(appPublicPath);
+  return `${publicPath.replace(/\/$/, "")}/${PORTAL_CLIENT_PREFIX}/${normalizePortalName(portalName)}/`;
+}
+__name(resolvePortalPublicPath, "resolvePortalPublicPath");
 function ensureTrailingSlash(value) {
   return value.endsWith("/") ? value : `${value}/`;
 }
@@ -69,6 +106,16 @@ function rewriteV2AssetPublicPath(html, assetPublicPath) {
   return html.replace(sentinelPattern, `$1${normalizedAssetPublicPath}`);
 }
 __name(rewriteV2AssetPublicPath, "rewriteV2AssetPublicPath");
+function rewriteSettingsAssetPublicPath(html, assetPublicPath) {
+  const normalizedAssetPublicPath = ensureTrailingSlash(assetPublicPath);
+  const sentinel = `/${SETTINGS_CLIENT_DIST_DIR}/`;
+  if (normalizedAssetPublicPath === sentinel) {
+    return html;
+  }
+  const sentinelPattern = new RegExp(`((?:src|href)=["'])${sentinel.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "g");
+  return html.replace(sentinelPattern, `$1${normalizedAssetPublicPath}`);
+}
+__name(rewriteSettingsAssetPublicPath, "rewriteSettingsAssetPublicPath");
 function injectRuntimeScript(html, runtimeScript) {
   const browserCheckerScriptMatch = html.match(/<script\b[^>]*browser-checker\.js[^>]*><\/script>/i);
   if (browserCheckerScriptMatch == null ? void 0 : browserCheckerScriptMatch[0]) {
@@ -117,12 +164,21 @@ function getHostname(req) {
 __name(getHostname, "getHostname");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DEFAULT_PORTAL_APP_NAME,
+  DEFAULT_PORTAL_NAME,
   MODERN_CLIENT_DIST_DIR,
+  PORTAL_CLIENT_PREFIX,
+  SETTINGS_CLIENT_DIST_DIR,
   getHost,
   getHostname,
   injectRuntimeScript,
   normalizeModernClientPrefix,
+  normalizePortalAppName,
+  normalizePortalName,
+  resolvePortalPublicPath,
   resolvePublicPath,
+  resolveSettingsPublicPath,
   resolveV2PublicPath,
+  rewriteSettingsAssetPublicPath,
   rewriteV2AssetPublicPath
 });

package/lib/helper.d.ts

@@ -11,6 +11,7 @@ import { Command } from 'commander';
 import Application, { ApplicationOptions } from './application';
 export declare function createI18n(options: ApplicationOptions): import("i18next").i18n;
 export declare function createResourcer(options: ApplicationOptions): Resourcer;
+export declare function resolveCorsOrigin(ctx: any): any;
 export declare function registerMiddlewares(app: Application, options: ApplicationOptions): void;
 export declare const createAppProxy: (app: Application) => Application<import("./application").DefaultState, import("./application").DefaultContext>;
 export declare const getCommandFullName: (command: Command) => string;

package/lib/helper.js

@@ -45,6 +45,7 @@ __export(helper_exports, {
   getBodyLimit: () => getBodyLimit,
   getCommandFullName: () => getCommandFullName,
   registerMiddlewares: () => registerMiddlewares,
+  resolveCorsOrigin: () => resolveCorsOrigin,
   tsxRerunning: () => tsxRerunning
 });
 module.exports = __toCommonJS(helper_exports);
@@ -78,26 +79,23 @@ function createResourcer(options) {
 __name(createResourcer, "createResourcer");
 function isWhitelistedCorsOrigin(ctx) {
   const origin = ctx.get("origin");
-  const whitelist = (0, import_utils.getCorsWhitelist)();
   if (!origin) {
     return false;
   }
-  if (!whitelist) {
-    return (0, import_utils.isTrustedOrigin)(ctx, origin);
-  }
-  return whitelist.has(origin);
+  return (0, import_utils.isTrustedOrigin)(ctx, origin);
 }
 __name(isWhitelistedCorsOrigin, "isWhitelistedCorsOrigin");
 function resolveCorsOrigin(ctx) {
   const origin = ctx.get("origin");
   const disallowNoOrigin = process.env.CORS_DISALLOW_NO_ORIGIN === "true";
+  const whitelist = (0, import_utils.getCorsWhitelist)();
   if (!origin && disallowNoOrigin) {
     return false;
   }
   if (isWhitelistedCorsOrigin(ctx)) {
     return origin;
   }
-  return (0, import_utils.getCorsWhitelist)() ? false : origin;
+  return whitelist ? false : origin;
 }
 __name(resolveCorsOrigin, "resolveCorsOrigin");
 function registerMiddlewares(app, options) {
@@ -325,5 +323,6 @@ __name(createContextVariablesScope, "createContextVariablesScope");
   getBodyLimit,
   getCommandFullName,
   registerMiddlewares,
+  resolveCorsOrigin,
   tsxRerunning
 });

package/lib/index.d.ts

@@ -13,6 +13,7 @@ export * from './gateway/ws-server';
 export { Application as default } from './application';
 export * from './audit-manager';
 export * from './gateway';
+export * from './gateway/static-file-security';
 export * as middlewares from './middlewares';
 export * from './migration';
 export * from './plugin';

package/lib/index.js

@@ -55,6 +55,7 @@ __reExport(src_exports, require("./gateway/ws-server"), module.exports);
 var import_application = require("./application");
 __reExport(src_exports, require("./audit-manager"), module.exports);
 __reExport(src_exports, require("./gateway"), module.exports);
+__reExport(src_exports, require("./gateway/static-file-security"), module.exports);
 var middlewares = __toESM(require("./middlewares"));
 __reExport(src_exports, require("./migration"), module.exports);
 __reExport(src_exports, require("./plugin"), module.exports);
@@ -85,6 +86,7 @@ var import_helper = require("./helper");
   ...require("./gateway/ws-server"),
   ...require("./audit-manager"),
   ...require("./gateway"),
+  ...require("./gateway/static-file-security"),
   ...require("./migration"),
   ...require("./plugin"),
   ...require("./plugin-manager"),

package/lib/swagger/app.d.ts

@@ -12,7 +12,23 @@ declare const _default: {
             readonly tags: readonly ["app"];
             readonly summary: "Get the current application language";
             readonly description: "Return the current locale used by the server.";
-            readonly parameters: readonly [];
+            readonly parameters: readonly [{
+                readonly name: "locale";
+                readonly in: "query";
+                readonly required: false;
+                readonly schema: {
+                    readonly type: "string";
+                };
+                readonly description: "Requested application locale. The server validates it against enabled languages.";
+            }, {
+                readonly name: "ns";
+                readonly in: "query";
+                readonly required: false;
+                readonly schema: {
+                    readonly type: "string";
+                };
+                readonly description: "Comma-separated resource namespaces to return. Omit it to preserve the full legacy payload.";
+            }];
             readonly responses: {
                 readonly 200: {
                     readonly description: "OK";

package/lib/swagger/app.js

@@ -35,7 +35,22 @@ var app_default = {
       tags: ["app"],
       summary: "Get the current application language",
       description: "Return the current locale used by the server.",
-      parameters: [],
+      parameters: [
+        {
+          name: "locale",
+          in: "query",
+          required: false,
+          schema: { type: "string" },
+          description: "Requested application locale. The server validates it against enabled languages."
+        },
+        {
+          name: "ns",
+          in: "query",
+          required: false,
+          schema: { type: "string" },
+          description: "Comma-separated resource namespaces to return. Omit it to preserve the full legacy payload."
+        }
+      ],
       responses: {
         200: {
           description: "OK",

package/lib/swagger/index.d.ts

@@ -694,7 +694,23 @@ declare const _default: {
                 readonly tags: readonly ["app"];
                 readonly summary: "Get the current application language";
                 readonly description: "Return the current locale used by the server.";
-                readonly parameters: readonly [];
+                readonly parameters: readonly [{
+                    readonly name: "locale";
+                    readonly in: "query";
+                    readonly required: false;
+                    readonly schema: {
+                        readonly type: "string";
+                    };
+                    readonly description: "Requested application locale. The server validates it against enabled languages.";
+                }, {
+                    readonly name: "ns";
+                    readonly in: "query";
+                    readonly required: false;
+                    readonly schema: {
+                        readonly type: "string";
+                    };
+                    readonly description: "Comma-separated resource namespaces to return. Omit it to preserve the full legacy payload.";
+                }];
                 readonly responses: {
                     readonly 200: {
                         readonly description: "OK";

package/package.json

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