@nocobase/server 2.4.0-alpha.4 → 2.4.0-alpha.6

package/lib/app-supervisor/index.d.ts

@@ -53,6 +53,7 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     private appSsoIssuer?;
     appOptionsFactory: AppOptionsFactory;
     private environmentHeartbeatInterval;
+    private environmentHeartbeatTimeout;
     private environmentHeartbeatTimer;
     private constructor();
     private resolveDiscoveryAdapterName;
@@ -163,11 +164,13 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     proxyWeb(appName: string, req: IncomingMessage, res: ServerResponse): Promise<boolean>;
     proxyWs(req: IncomingMessage, socket: any, head: Buffer): Promise<boolean>;
     registerEnvironment(mainApp: Application): Promise<void>;
+    private getEnvironmentInfo;
     unregisterEnvironment(): Promise<void>;
     private normalizeEnvInfo;
     listEnvironments(): Promise<EnvironmentInfo[]>;
     getEnvironment(environmentName: string): Promise<EnvironmentInfo>;
-    heartbeatEnvironment(): Promise<void>;
+    heartbeatEnvironment(mainApp: Application): Promise<void>;
+    private stopEnvironmentHeartbeat;
     dispatchCommand(command: ProcessCommand): Promise<void>;
     registerCommandHandler(mainApp: Application): void;
     sendSyncMessage(mainApp: Application, message: {

package/lib/app-supervisor/index.js

@@ -74,6 +74,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   appSsoIssuer;
   appOptionsFactory = import_app_options_factory.appOptionsFactory;
   environmentHeartbeatInterval = 2 * 60 * 1e3;
+  environmentHeartbeatTimeout = 5 * 60 * 1e3;
   environmentHeartbeatTimer = null;
   constructor() {
     super();
@@ -282,13 +283,11 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   }
   async reset() {
     var _a, _b, _c, _d;
+    this.stopEnvironmentHeartbeat();
     await this.processAdapter.removeAllApps();
     await ((_b = (_a = this.discoveryAdapter).dispose) == null ? void 0 : _b.call(_a));
     await ((_d = (_c = this.commandAdapter) == null ? void 0 : _c.dispose) == null ? void 0 : _d.call(_c));
     this.appManifests.clear();
-    if (this.environmentHeartbeatTimer) {
-      this.environmentHeartbeatTimer = null;
-    }
     this.removeAllListeners();
     this.logger.close();
   }
@@ -604,24 +603,25 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     if (!this.environmentName || typeof this.discoveryAdapter.registerEnvironment !== "function") {
       return;
     }
-    const registered = await this.discoveryAdapter.registerEnvironment({
+    const registered = await this.discoveryAdapter.registerEnvironment(this.getEnvironmentInfo(mainApp));
+    if (registered) {
+      this.heartbeatEnvironment(mainApp);
+    }
+  }
+  getEnvironmentInfo(mainApp) {
+    return {
       name: this.environmentName,
       url: this.environmentUrl || "",
       proxyUrl: this.environmentProxyUrl || this.environmentUrl || "",
       appVersion: mainApp.getPackageVersion(),
       lastHeartbeatAt: Date.now()
-    });
-    if (registered) {
-      this.heartbeatEnvironment();
-    }
+    };
   }
   async unregisterEnvironment() {
+    this.stopEnvironmentHeartbeat();
     if (this.environmentName && typeof this.discoveryAdapter.unregisterEnvironment === "function") {
       await this.discoveryAdapter.unregisterEnvironment();
     }
-    if (this.environmentHeartbeatTimer) {
-      this.environmentHeartbeatTimer = null;
-    }
   }
   normalizeEnvInfo(environment) {
     if (typeof environment.available === "boolean") {
@@ -634,7 +634,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
         available: false
       };
     }
-    const available = Date.now() - lastHeartbeatAt <= this.environmentHeartbeatInterval;
+    const available = Date.now() - lastHeartbeatAt <= this.environmentHeartbeatTimeout;
     return {
       ...environment,
       available
@@ -657,17 +657,26 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     }
     return this.normalizeEnvInfo(environment);
   }
-  async heartbeatEnvironment() {
+  async heartbeatEnvironment(mainApp) {
     if (typeof this.discoveryAdapter.heartbeatEnvironment !== "function") {
       return;
     }
     if (this.environmentHeartbeatTimer) {
       return;
     }
-    this.environmentHeartbeatTimer = setInterval(
-      () => this.discoveryAdapter.heartbeatEnvironment(),
-      this.environmentHeartbeatInterval
-    );
+    this.environmentHeartbeatTimer = setInterval(async () => {
+      try {
+        await this.discoveryAdapter.heartbeatEnvironment(this.getEnvironmentInfo(mainApp));
+      } catch (error) {
+        this.logger.error(error instanceof Error ? error.message : String(error), { method: "heartbeatEnvironment" });
+      }
+    }, this.environmentHeartbeatInterval);
+  }
+  stopEnvironmentHeartbeat() {
+    if (this.environmentHeartbeatTimer) {
+      clearInterval(this.environmentHeartbeatTimer);
+      this.environmentHeartbeatTimer = null;
+    }
   }
   async dispatchCommand(command) {
     var _a;

package/lib/app-supervisor/types.d.ts

@@ -132,7 +132,7 @@ export interface AppDiscoveryAdapter {
     unregisterEnvironment?(): Promise<void>;
     listEnvironments?(): Promise<EnvironmentInfo[]>;
     getEnvironment?(environmentName: string): Promise<EnvironmentInfo | null>;
-    heartbeatEnvironment?(): Promise<void>;
+    heartbeatEnvironment?(environment: EnvironmentInfo): Promise<void>;
     getBootstrapLock?(appName: string): Promise<BootstrapLock | null> | BootstrapLock | null;
     proxyWeb?(appName: string, req: IncomingMessage, res: ServerResponse): Promise<boolean>;
     proxyWs?(req: IncomingMessage, socket: any, head: Buffer): Promise<boolean>;

package/lib/environment.d.ts

@@ -8,10 +8,14 @@
  */
 export declare class Environment {
     private vars;
-    setVariable(key: string, value: string): void;
+    private secretKeys;
+    setVariable(key: string, value: string, options?: {
+        isSecret?: boolean;
+    }): void;
     removeVariable(key: string): void;
     getVariablesAndSecrets(): {};
     getVariables(): {};
+    getNonSecretVariables(): {};
     renderJsonTemplate(template: any, options?: {
         omit?: string[];
     }): any;

package/lib/environment.js

@@ -44,11 +44,18 @@ var import_utils = require("@nocobase/utils");
 var import_lodash = __toESM(require("lodash"));
 const _Environment = class _Environment {
   vars = {};
-  setVariable(key, value) {
+  secretKeys = /* @__PURE__ */ new Set();
+  setVariable(key, value, options) {
     this.vars[key] = value;
+    if ((options == null ? void 0 : options.isSecret) === true) {
+      this.secretKeys.add(key);
+    } else if ((options == null ? void 0 : options.isSecret) === false) {
+      this.secretKeys.delete(key);
+    }
   }
   removeVariable(key) {
     delete this.vars[key];
+    this.secretKeys.delete(key);
   }
   getVariablesAndSecrets() {
     return this.vars;
@@ -56,6 +63,15 @@ const _Environment = class _Environment {
   getVariables() {
     return this.vars;
   }
+  getNonSecretVariables() {
+    const result = {};
+    for (const key of Object.keys(this.vars)) {
+      if (!this.secretKeys.has(key)) {
+        result[key] = this.vars[key];
+      }
+    }
+    return result;
+  }
   renderJsonTemplate(template, options) {
     if (options == null ? void 0 : options.omit) {
       const omitTemplate = import_lodash.default.omit(template, options.omit);

package/lib/gateway/errors.js

@@ -54,6 +54,11 @@ function getAppName(app) {
 }
 __name(getAppName, "getAppName");
 const errors = {
+  APP_ENVIRONMENT_UNAVAILABLE: {
+    status: 503,
+    message: /* @__PURE__ */ __name(({ appName }) => `deployment environment for application ${appName} is unavailable`, "message"),
+    maintaining: true
+  },
   APP_NOT_FOUND: {
     status: 404,
     message: /* @__PURE__ */ __name(({ appName }) => `application ${appName} not found`, "message"),

package/lib/gateway/index.js

@@ -66,7 +66,6 @@ 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_static_file_security = require("./static-file-security");
 var import_utils3 = require("./utils");
 var import_ws_server = require("./ws-server");
 var import_node_worker_threads = require("node:worker_threads");
@@ -123,7 +122,17 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     const internalUrl = req.url;
     req.url = this.getOriginalRequestUrl(req);
     try {
-      return await supervisor.proxyWeb(appName, req, res);
+      const proxied = await supervisor.proxyWeb(appName, req, res);
+      const adapter = supervisor.getDiscoveryAdapter();
+      if (!proxied && import_node_process.default.env.APP_MODE === "supervisor" && typeof adapter.proxyWeb === "function") {
+        let code = "APP_ENVIRONMENT_UNAVAILABLE";
+        if (typeof adapter.getAppModel === "function" && !await supervisor.getAppModel(appName)) {
+          code = "APP_NOT_FOUND";
+        }
+        this.responseErrorWithCode(code, res, { appName });
+        return true;
+      }
+      return proxied;
     } finally {
       req.url = internalUrl;
     }
@@ -608,27 +617,6 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       this.responseErrorWithCode("APP_INITIALIZING", res, { appName: handleApp });
       return;
     }
-    if (pathname.startsWith(APP_PUBLIC_PATH + "storage/uploads/")) {
-      if (handleApp !== "main") {
-        const isProxy = await this.proxyRequestToSubApp(supervisor, handleApp, req, res);
-        if (isProxy) {
-          return;
-        }
-      }
-      const headers = (0, import_static_file_security.getStorageUploadSecurityHeaders)(`${pathname}${search || ""}`);
-      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,
-        headers: [
-          {
-            source: "**/*",
-            headers: Object.entries(headers).map(([key, value]) => ({ key, value }))
-          }
-        ]
-      });
-    }
     if (pathname.startsWith(APP_PUBLIC_PATH + "dist/")) {
       if (handleApp !== "main") {
         const isProxy = await this.proxyRequestToSubApp(supervisor, handleApp, req, res);
@@ -665,7 +653,8 @@ 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) {
+    const isLegacyUploadRequest = pathname.startsWith(APP_PUBLIC_PATH + "storage/uploads/");
+    if (!pathname.startsWith(import_node_process.default.env.API_BASE_PATH) && !isFilesRequest && !isLegacyUploadRequest) {
       if (this.isSettingsRequest(pathname)) {
         if (handleApp !== "main") {
           const isProxy = await this.proxyRequestToSubApp(supervisor, handleApp, req, res);

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

@@ -74,6 +74,7 @@ function hasActiveContentExtension(pathname = "") {
 __name(hasActiveContentExtension, "hasActiveContentExtension");
 function getStorageUploadSecurityHeaders(pathname = "") {
   const headers = {
+    "Cache-Control": "private, no-store",
     "Content-Security-Policy": "sandbox",
     "X-Content-Type-Options": "nosniff"
   };

package/lib/helper.js

@@ -57,10 +57,24 @@ var import_crypto = require("crypto");
 var import_fs = __toESM(require("fs"));
 var import_i18next = __toESM(require("i18next"));
 var import_koa_bodyparser = __toESM(require("koa-bodyparser"));
+var import_koa_send = __toESM(require("koa-send"));
 var import_perf_hooks = require("perf_hooks");
 var import_data_wrapping = require("./middlewares/data-wrapping");
 var import_extract_client_ip = require("./middlewares/extract-client-ip");
+var import_static_file_security = require("./gateway/static-file-security");
 var import_i18n = require("./middlewares/i18n");
+function resolveAppPublicPath(value = "/") {
+  const normalized = String(value || "/").trim() || "/";
+  const withLeadingSlash = normalized.startsWith("/") ? normalized : `/${normalized}`;
+  return withLeadingSlash.endsWith("/") ? withLeadingSlash : `${withLeadingSlash}/`;
+}
+__name(resolveAppPublicPath, "resolveAppPublicPath");
+function resolveApiBasePath(value = "/api") {
+  const normalized = String(value || "/api").trim() || "/api";
+  const withLeadingSlash = normalized.startsWith("/") ? normalized : `/${normalized}`;
+  return withLeadingSlash.replace(/\/+$/g, "") || "/";
+}
+__name(resolveApiBasePath, "resolveApiBasePath");
 function createI18n(options) {
   const instance = import_i18next.default.createInstance();
   instance.init({
@@ -138,7 +152,7 @@ function registerMiddlewares(app, options) {
   }
   app.use(/* @__PURE__ */ __name(async function getBearerToken(ctx, next) {
     ctx.getBearerToken = () => {
-      var _a2;
+      var _a2, _b;
       const authorization = ctx.get("Authorization");
       if (authorization) {
         ctx.state.pendingAuthTokenSource = "authorization";
@@ -148,7 +162,7 @@ function registerMiddlewares(app, options) {
         ctx.state.pendingAuthTokenSource = "query";
         return ctx.query.token;
       }
-      const canUseAuthCookie = Boolean((_a2 = ctx.state) == null ? void 0 : _a2.fileAccess) && ["GET", "HEAD"].includes(ctx.method);
+      const canUseAuthCookie = Boolean(((_a2 = ctx.state) == null ? void 0 : _a2.fileAccess) || ((_b = ctx.state) == null ? void 0 : _b.legacyFileAccess)) && ["GET", "HEAD"].includes(ctx.method);
       const cookieToken = canUseAuthCookie ? ctx.cookies.get((0, import_utils.getAuthCookieName)("authToken", app.name)) : void 0;
       ctx.state.pendingAuthTokenSource = cookieToken ? "cookie" : void 0;
       return cookieToken;
@@ -159,6 +173,47 @@ function registerMiddlewares(app, options) {
   if (options.dataWrapping !== false) {
     app.use((0, import_data_wrapping.dataWrapping)(), { tag: "dataWrapping", after: "cors" });
   }
+  app.use(
+    /* @__PURE__ */ __name(async function legacyFileAccess(ctx, next) {
+      const publicPath = resolveAppPublicPath(process.env.APP_PUBLIC_PATH);
+      const uploadsPrefix = `${publicPath}storage/uploads/`;
+      const authCheckPath = `${resolveApiBasePath(process.env.API_BASE_PATH)}/auth:checkLegacyFileAccess`;
+      const isUploadRequest = ctx.path.startsWith(uploadsPrefix);
+      const isAuthCheckRequest = ctx.path === authCheckPath || ctx.path === "/auth:checkLegacyFileAccess";
+      if (!isUploadRequest && !isAuthCheckRequest) {
+        return next();
+      }
+      if (!["GET", "HEAD"].includes(ctx.method)) {
+        return ctx.throw(405);
+      }
+      ctx.state.legacyFileAccess = true;
+      ctx.state.legacyLocalStoragePublicAccess = process.env.LEGACY_LOCAL_STORAGE_PUBLIC_ACCESS === "true";
+      if (ctx.state.legacyLocalStoragePublicAccess) {
+        ctx.skipAuthCheck = true;
+      }
+      if (isAuthCheckRequest) {
+        return next();
+      }
+      const originalPath = ctx.path;
+      ctx.path = authCheckPath;
+      try {
+        await next();
+      } finally {
+        ctx.path = originalPath;
+      }
+      const relativePath = `uploads/${originalPath.slice(uploadsPrefix.length)}`;
+      const headers = (0, import_static_file_security.getStorageUploadSecurityHeaders)(`${originalPath}${ctx.search || ""}`);
+      if (!headers["Content-Disposition"]) {
+        headers["Content-Disposition"] = "inline";
+      }
+      for (const [name, value] of Object.entries(headers)) {
+        ctx.set(name, value);
+      }
+      ctx.status = 200;
+      await (0, import_koa_send.default)(ctx, relativePath, { root: (0, import_utils.resolveStorageRoot)() });
+    }, "legacyFileAccess"),
+    { tag: "legacyFileAccess", before: "dataSource", after: "dataWrapping" }
+  );
   app.use(app.dataSourceManager.middleware(), { tag: "dataSource", after: "dataWrapping" });
   app.use((0, import_extract_client_ip.extractClientIp)(), { tag: "extractClientIp", before: "cors" });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.4.0-alpha.4",
+  "version": "2.4.0-alpha.6",
   "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.4.0-alpha.4",
-    "@nocobase/actions": "2.4.0-alpha.4",
-    "@nocobase/ai": "2.4.0-alpha.4",
-    "@nocobase/auth": "2.4.0-alpha.4",
-    "@nocobase/cache": "2.4.0-alpha.4",
-    "@nocobase/data-source-manager": "2.4.0-alpha.4",
-    "@nocobase/database": "2.4.0-alpha.4",
-    "@nocobase/evaluators": "2.4.0-alpha.4",
-    "@nocobase/lock-manager": "2.4.0-alpha.4",
-    "@nocobase/logger": "2.4.0-alpha.4",
-    "@nocobase/resourcer": "2.4.0-alpha.4",
-    "@nocobase/sdk": "2.4.0-alpha.4",
-    "@nocobase/snowflake-id": "2.4.0-alpha.4",
-    "@nocobase/telemetry": "2.4.0-alpha.4",
-    "@nocobase/utils": "2.4.0-alpha.4",
+    "@nocobase/acl": "2.4.0-alpha.6",
+    "@nocobase/actions": "2.4.0-alpha.6",
+    "@nocobase/ai": "2.4.0-alpha.6",
+    "@nocobase/auth": "2.4.0-alpha.6",
+    "@nocobase/cache": "2.4.0-alpha.6",
+    "@nocobase/data-source-manager": "2.4.0-alpha.6",
+    "@nocobase/database": "2.4.0-alpha.6",
+    "@nocobase/evaluators": "2.4.0-alpha.6",
+    "@nocobase/lock-manager": "2.4.0-alpha.6",
+    "@nocobase/logger": "2.4.0-alpha.6",
+    "@nocobase/resourcer": "2.4.0-alpha.6",
+    "@nocobase/sdk": "2.4.0-alpha.6",
+    "@nocobase/snowflake-id": "2.4.0-alpha.6",
+    "@nocobase/telemetry": "2.4.0-alpha.6",
+    "@nocobase/utils": "2.4.0-alpha.6",
     "@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": "527910882037ce1558ee6b0ef748208b8d6996bb"
+  "gitHead": "1fc4fcd17a0cd79912a642600bdc2103e2104bdb"
 }