@nocobase/server 2.4.0-alpha.5 → 2.4.0-alpha.7

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

@@ -122,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;
     }

package/package.json

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