vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-07-31 20:01:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nodes): keep Gateway connections healthy and consistent (#103093)

Browse Source 
* fix(gateway): evict unresponsive node sockets

Co-authored-by: hoangsaga123 <hoangsaga123@gmail.com>

* fix(nodes): align invoke timeout semantics

* fix(node): preserve managed connection settings

* docs(changelog): note node connection fixes

* fix(node): redact service credentials in status

* fix(systemd): preserve escaped operator values

* fix(node): carry explicit plaintext service mode

* fix(systemd): avoid promoting stale shell references

* fix(node): clear fingerprints for plaintext runs

* docs(changelog): defer node notes to release

* fix(nodes): normalize forwarded system run timeout

* fix(systemd): preserve operator environment values

* fix(nodes): type normalized invoke payload

---------

Co-authored-by: hoangsaga123 <hoangsaga123@gmail.com>
This commit is contained in:
Peter Steinberger
2026-07-09 22:48:25 +01:00
committed by GitHub
parent b8537cd81e
commit b4428fb9df
17 changed files with 665 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/cli/node-cli/daemon.ts
View File

@@ -31,6 +31,7 @@ import {
createCliStatusTextStyles,
createDaemonInstallActionContext,
failIfNixDaemonInstallMode,
filterDaemonEnv,
formatRuntimeStatus,
parsePort,
resolveRuntimeStatusColor,
@@ -81,18 +82,23 @@ function resolveNodeDefaults(
config: Awaited<ReturnType<typeof loadNodeHostConfig>>,
) {
// CLI flags override node-host config; missing values fall back to loopback Gateway defaults.
const host = normalizeOptionalString(opts.host) || config?.gateway?.host || "127.0.0.1";
const savedHost = config?.gateway?.host || "127.0.0.1";
const host = normalizeOptionalString(opts.host) || savedHost;
const retargeted = opts.host !== undefined || opts.port !== undefined;
const portOverride = parsePort(opts.port);
if (opts.port !== undefined && portOverride === null) {
return { host, port: null };
return { host, port: null, retargeted, endpointChanged: false };
}
const port = portOverride ?? config?.gateway?.port ?? 18789;
const retargeted = opts.host !== undefined || opts.port !== undefined;
const savedPort = config?.gateway?.port ?? 18789;
const port = portOverride ?? savedPort;
const endpointChanged =
(opts.host !== undefined && host !== savedHost) ||
(opts.port !== undefined && port !== savedPort);
const explicitContextPath = opts.contextPath !== undefined;
const contextPath =
normalizeOptionalString(opts.contextPath) ||
(explicitContextPath || retargeted ? undefined : config?.gateway?.contextPath);
return { host, port, contextPath };
return { host, port, contextPath, retargeted, endpointChanged };
}
export async function runNodeDaemonInstall(opts: NodeDaemonInstallOptions) {
@@ -102,7 +108,7 @@ export async function runNodeDaemonInstall(opts: NodeDaemonInstallOptions) {
}
const config = await loadNodeHostConfig();
const { host, port, contextPath } = resolveNodeDefaults(opts, config);
const { host, port, contextPath, endpointChanged } = resolveNodeDefaults(opts, config);
if (!Number.isFinite(port ?? Number.NaN) || (port ?? 0) <= 0 || (port ?? 0) > 65_535) {
fail(
opts.port !== undefined
@@ -142,8 +148,10 @@ export async function runNodeDaemonInstall(opts: NodeDaemonInstallOptions) {
}
const tlsFingerprint =
normalizeOptionalString(opts.tlsFingerprint) || config?.gateway?.tlsFingerprint;
const tls = Boolean(opts.tls) || Boolean(tlsFingerprint) || Boolean(config?.gateway?.tls);
normalizeOptionalString(opts.tlsFingerprint) ||
(endpointChanged ? undefined : config?.gateway?.tlsFingerprint);
const inheritedTls = endpointChanged ? undefined : config?.gateway?.tls;
const tls = Boolean(opts.tls) || Boolean(tlsFingerprint) || Boolean(inheritedTls);
const { programArguments, workingDirectory, environment, environmentValueSources, description } =
await buildNodeInstallPlan({
env: process.env,
@@ -248,7 +256,18 @@ export async function runNodeDaemonStatus(opts: NodeDaemonStatusOptions = {}) {
};
if (json) {
defaultRuntime.writeJson(payload);
const safeEnvironment = filterDaemonEnv(command?.environment);
defaultRuntime.writeJson({
service: {
...payload.service,
command: command
? {
...command,
environment: Object.keys(safeEnvironment).length > 0 ? safeEnvironment : undefined,
}
: command,
},
});
return;
}