clawconnect-agent 0.2.10 → 0.2.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/pair.d.ts +13 -0
- package/dist/commands/pair.js +68 -41
- package/dist/commands/pair.js.map +1 -1
- package/dist/commands/profile-hints.d.ts +1 -0
- package/dist/commands/profile-hints.js +3 -0
- package/dist/commands/profile-hints.js.map +1 -1
- package/dist/commands/run.js +16 -2
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/status.d.ts +1 -1
- package/dist/commands/status.js +15 -6
- package/dist/commands/status.js.map +1 -1
- package/dist/config/config-backups.d.ts +12 -0
- package/dist/config/config-backups.js +44 -0
- package/dist/config/config-backups.js.map +1 -0
- package/dist/core/relay/relay-server-connection.d.ts +10 -1
- package/dist/core/relay/relay-server-connection.js +11 -2
- package/dist/core/relay/relay-server-connection.js.map +1 -1
- package/dist/hermes/hermes-relay-manager.d.ts +1 -1
- package/dist/hermes/hermes-relay-manager.js +1 -1
- package/dist/hermes/hermes-relay-manager.js.map +1 -1
- package/dist/i18n/index.js +4 -0
- package/dist/i18n/index.js.map +1 -1
- package/dist/openclaw/relay/relay-manager-protocol.d.ts +1 -1
- package/dist/openclaw/relay-manager.js +1 -1
- package/dist/openclaw/relay-manager.js.map +1 -1
- package/dist/runtime-adapters.d.ts +1 -1
- package/package.json +1 -1
- package/dist/hermes/hermes-runtime-test-support.d.ts +0 -27
- package/dist/hermes/hermes-runtime-test-support.js +0 -709
- package/dist/hermes/hermes-runtime-test-support.js.map +0 -1
package/dist/commands/pair.d.ts
CHANGED
|
@@ -7,6 +7,19 @@ interface PairOptions {
|
|
|
7
7
|
profile?: string;
|
|
8
8
|
}
|
|
9
9
|
export declare function pairCommand(opts: PairOptions): Promise<void>;
|
|
10
|
+
/** 配对请求的时间上限:代理/NAT 卡住连接时必须给出明确失败,而不是让命令无限挂起。 */
|
|
11
|
+
export declare const PAIR_REQUEST_TIMEOUT_MS = 20000;
|
|
12
|
+
export declare function postRelayJson(httpBase: string, path: string, body: unknown, fetchImpl?: typeof fetch, timeoutMs?: number): Promise<Response>;
|
|
13
|
+
export type ProfileConfigEntry = {
|
|
14
|
+
profile: string | undefined;
|
|
15
|
+
config: ClawConnectConfig;
|
|
16
|
+
};
|
|
17
|
+
/**
|
|
18
|
+
* 找出已在同一 Relay 上注册了同类型网关的其他 profile。
|
|
19
|
+
* 同一台主机只有一个本地 OpenClaw/Hermes 运行时,重复注册只会产生两个指向同一运行时的网关。
|
|
20
|
+
* 多个冲突时按 profile 名排序取第一个(default 最前),结果与目录遍历顺序无关。
|
|
21
|
+
*/
|
|
22
|
+
export declare function findConflictingRegistration(currentProfile: string | undefined, gatewayType: "openclaw" | "hermes", relayServerUrl: string, candidates: ProfileConfigEntry[]): ProfileConfigEntry | undefined;
|
|
10
23
|
export declare function sameRelayServer(left: string, right: string): boolean;
|
|
11
24
|
export declare function shouldReuseExistingPairing(config: ClawConnectConfig | null, gatewayType: "openclaw" | "hermes", requestedRelayServerUrl: string): boolean;
|
|
12
25
|
export { normalizeRelayServerIdentity } from "../core/relay/file-upload-utils.js";
|
package/dist/commands/pair.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { copyFileSync, existsSync } from "fs";
|
|
2
|
-
import { dirname, join } from "path";
|
|
3
1
|
import { configExists, getConfigPath, readConfig, writeConfig } from "../config/config.js";
|
|
2
|
+
import { backupConfigBeforeRegistration } from "../config/config-backups.js";
|
|
4
3
|
import { installCommand } from "./install.js";
|
|
5
4
|
import qrcodeTerminal from "qrcode-terminal";
|
|
6
5
|
import { t } from "../i18n/index.js";
|
|
@@ -10,7 +9,8 @@ import { getServicePlatform } from "../platform/service-manager.js";
|
|
|
10
9
|
import { normalizeRelayServerIdentity, toRelayHttpBase } from "../core/relay/file-upload-utils.js";
|
|
11
10
|
import { getDefaultRelayServerUrl } from "../config/env.js";
|
|
12
11
|
import { gatewayCapabilitiesForType, normalizeGatewayType } from "../gateway-profiles.js";
|
|
13
|
-
import { clearProfileLogs } from "../config/profile.js";
|
|
12
|
+
import { clearProfileLogs, getActiveProfile, listProfileNames, normalizeProfileName, profileDisplayName } from "../config/profile.js";
|
|
13
|
+
import { pairCommandForProfile, resetCommandForProfile } from "./profile-hints.js";
|
|
14
14
|
export async function pairCommand(opts) {
|
|
15
15
|
let gatewayId = "";
|
|
16
16
|
let relaySecret = "";
|
|
@@ -32,17 +32,7 @@ export async function pairCommand(opts) {
|
|
|
32
32
|
displayName = opts.name ? sanitizeDisplayName(opts.name) : config.displayName;
|
|
33
33
|
console.log(t("pair.alreadyRegistered", gatewayId));
|
|
34
34
|
const httpBase = toRelayHttpBase(relayServerUrl);
|
|
35
|
-
|
|
36
|
-
try {
|
|
37
|
-
res = await fetch(`${httpBase}/api/relay/accesscode`, {
|
|
38
|
-
method: "POST",
|
|
39
|
-
headers: { "Content-Type": "application/json" },
|
|
40
|
-
body: JSON.stringify({ gatewayId, relaySecret }),
|
|
41
|
-
});
|
|
42
|
-
}
|
|
43
|
-
catch (err) {
|
|
44
|
-
throw new Error(t("pair.refreshFailed", "network", String(err)));
|
|
45
|
-
}
|
|
35
|
+
const res = await postRelayJson(httpBase, "/api/relay/accesscode", { gatewayId, relaySecret });
|
|
46
36
|
if (res.status === 401) {
|
|
47
37
|
console.log(`Existing gateway credentials (${gatewayId}) unrecognized by relay server (401); re-registering a new gateway…`);
|
|
48
38
|
reRegisterNeeded = true;
|
|
@@ -65,7 +55,11 @@ export async function pairCommand(opts) {
|
|
|
65
55
|
console.log(`Existing ${gatewayType} gateway config is for ${toRelayHttpBase(existingConfig.relayServerUrl)}.`);
|
|
66
56
|
console.log(`Requested relay is ${toRelayHttpBase(requestedRelayServerUrl)}; registering a new ${gatewayType} gateway.`);
|
|
67
57
|
}
|
|
68
|
-
const
|
|
58
|
+
const conflict = findConflictingRegistration(getActiveProfile(), gatewayType, requestedRelayServerUrl, loadOtherProfileConfigs());
|
|
59
|
+
if (conflict) {
|
|
60
|
+
throw new Error(t("pair.duplicateRegistration", gatewayType, toRelayHttpBase(requestedRelayServerUrl), profileDisplayName(conflict.profile), pairCommandForProfile(conflict.profile), resetCommandForProfile(conflict.profile)));
|
|
61
|
+
}
|
|
62
|
+
const backupPath = existingConfig ? backupConfigBeforeRegistration(getConfigPath()) : undefined;
|
|
69
63
|
if (backupPath) {
|
|
70
64
|
console.log(`Previous config backed up to ${backupPath}`);
|
|
71
65
|
}
|
|
@@ -73,11 +67,7 @@ export async function pairCommand(opts) {
|
|
|
73
67
|
displayName = opts.name ? sanitizeDisplayName(opts.name) : existingConfig?.displayName ?? getDisplayName();
|
|
74
68
|
console.log(t("pair.registering"));
|
|
75
69
|
const httpBase = toRelayHttpBase(relayServerUrl);
|
|
76
|
-
const res = await
|
|
77
|
-
method: "POST",
|
|
78
|
-
headers: { "Content-Type": "application/json" },
|
|
79
|
-
body: JSON.stringify({ displayName, gatewayType, capabilities }),
|
|
80
|
-
});
|
|
70
|
+
const res = await postRelayJson(httpBase, "/api/relay/register", { displayName, gatewayType, capabilities });
|
|
81
71
|
if (!res.ok) {
|
|
82
72
|
const body = await res.text();
|
|
83
73
|
throw new Error(t("pair.registrationFailed", String(res.status), body));
|
|
@@ -112,6 +102,64 @@ export async function pairCommand(opts) {
|
|
|
112
102
|
console.log(t("pair.installingService"));
|
|
113
103
|
installCommand();
|
|
114
104
|
}
|
|
105
|
+
/** 配对请求的时间上限:代理/NAT 卡住连接时必须给出明确失败,而不是让命令无限挂起。 */
|
|
106
|
+
export const PAIR_REQUEST_TIMEOUT_MS = 20_000;
|
|
107
|
+
export async function postRelayJson(httpBase, path, body, fetchImpl = fetch, timeoutMs = PAIR_REQUEST_TIMEOUT_MS) {
|
|
108
|
+
try {
|
|
109
|
+
return await fetchImpl(`${httpBase}${path}`, {
|
|
110
|
+
method: "POST",
|
|
111
|
+
headers: { "Content-Type": "application/json" },
|
|
112
|
+
body: JSON.stringify(body),
|
|
113
|
+
signal: AbortSignal.timeout(timeoutMs),
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
catch (err) {
|
|
117
|
+
throw new Error(t("pair.networkFailed", httpBase, describeNetworkError(err, timeoutMs)));
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
// undici 只抛 "fetch failed",真正原因在 cause.code(如 UND_ERR_CONNECT_TIMEOUT、ENOTFOUND)。
|
|
121
|
+
function describeNetworkError(err, timeoutMs) {
|
|
122
|
+
if (err instanceof Error && (err.name === "TimeoutError" || err.name === "AbortError")) {
|
|
123
|
+
return `no response within ${timeoutMs}ms`;
|
|
124
|
+
}
|
|
125
|
+
const cause = err instanceof Error ? err.cause : undefined;
|
|
126
|
+
if (cause && typeof cause === "object") {
|
|
127
|
+
const record = cause;
|
|
128
|
+
const code = typeof record.code === "string" ? record.code : "";
|
|
129
|
+
const message = typeof record.message === "string" ? record.message : "";
|
|
130
|
+
const described = [code, message].filter(Boolean).join(" ");
|
|
131
|
+
if (described)
|
|
132
|
+
return described;
|
|
133
|
+
}
|
|
134
|
+
return err instanceof Error ? err.message : String(err);
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* 找出已在同一 Relay 上注册了同类型网关的其他 profile。
|
|
138
|
+
* 同一台主机只有一个本地 OpenClaw/Hermes 运行时,重复注册只会产生两个指向同一运行时的网关。
|
|
139
|
+
* 多个冲突时按 profile 名排序取第一个(default 最前),结果与目录遍历顺序无关。
|
|
140
|
+
*/
|
|
141
|
+
export function findConflictingRegistration(currentProfile, gatewayType, relayServerUrl, candidates) {
|
|
142
|
+
const current = normalizeProfileName(currentProfile);
|
|
143
|
+
return candidates
|
|
144
|
+
.map((entry) => ({ ...entry, profile: normalizeProfileName(entry.profile) }))
|
|
145
|
+
.filter((entry) => entry.profile !== current)
|
|
146
|
+
.filter((entry) => (entry.config.gatewayType ?? "openclaw") === gatewayType
|
|
147
|
+
&& sameRelayServer(entry.config.relayServerUrl, relayServerUrl))
|
|
148
|
+
.sort((left, right) => (left.profile ?? "").localeCompare(right.profile ?? ""))[0];
|
|
149
|
+
}
|
|
150
|
+
function loadOtherProfileConfigs() {
|
|
151
|
+
const entries = [];
|
|
152
|
+
for (const name of listProfileNames()) {
|
|
153
|
+
const profile = normalizeProfileName(name);
|
|
154
|
+
try {
|
|
155
|
+
entries.push({ profile, config: readConfig(profile) });
|
|
156
|
+
}
|
|
157
|
+
catch {
|
|
158
|
+
// 损坏或不可读的配置无法代表有效注册,不参与冲突判断。
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
return entries;
|
|
162
|
+
}
|
|
115
163
|
export function sameRelayServer(left, right) {
|
|
116
164
|
return normalizeRelayServerIdentity(left) === normalizeRelayServerIdentity(right);
|
|
117
165
|
}
|
|
@@ -122,27 +170,6 @@ export function shouldReuseExistingPairing(config, gatewayType, requestedRelaySe
|
|
|
122
170
|
&& sameRelayServer(config.relayServerUrl, requestedRelayServerUrl);
|
|
123
171
|
}
|
|
124
172
|
export { normalizeRelayServerIdentity } from "../core/relay/file-upload-utils.js";
|
|
125
|
-
function backupExistingConfig() {
|
|
126
|
-
const configPath = getConfigPath();
|
|
127
|
-
if (!existsSync(configPath)) {
|
|
128
|
-
return undefined;
|
|
129
|
-
}
|
|
130
|
-
const backupPath = join(dirname(configPath), `config.json.server-switch-${formatBackupTimestamp(new Date())}.bak`);
|
|
131
|
-
copyFileSync(configPath, backupPath);
|
|
132
|
-
return backupPath;
|
|
133
|
-
}
|
|
134
|
-
function formatBackupTimestamp(date) {
|
|
135
|
-
const pad = (value) => String(value).padStart(2, "0");
|
|
136
|
-
return [
|
|
137
|
-
date.getFullYear(),
|
|
138
|
-
pad(date.getMonth() + 1),
|
|
139
|
-
pad(date.getDate()),
|
|
140
|
-
"-",
|
|
141
|
-
pad(date.getHours()),
|
|
142
|
-
pad(date.getMinutes()),
|
|
143
|
-
pad(date.getSeconds()),
|
|
144
|
-
].join("");
|
|
145
|
-
}
|
|
146
173
|
function sanitizeDisplayName(name) {
|
|
147
174
|
// Replace smart quotes and other problematic characters with regular ones
|
|
148
175
|
return name
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pair.js","sourceRoot":"","sources":["../../src/commands/pair.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"pair.js","sourceRoot":"","sources":["../../src/commands/pair.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export declare function resetCommandForProfile(profile: string | undefined): string;
|
|
2
2
|
export declare function pairCommandForProfile(profile: string | undefined): string;
|
|
3
3
|
export declare function invalidCredentialsRecoveryHint(profile: string | undefined): string;
|
|
4
|
+
export declare function relayCredentialsRejectedHint(profile: string | undefined): string;
|
|
4
5
|
export declare const RESET_PROFILE_HELP_TEXT: string;
|
|
5
6
|
export declare const PAIR_OPENCLAW_HELP_TEXT: string;
|
|
6
7
|
export declare const PAIR_HERMES_HELP_TEXT: string;
|
|
@@ -18,6 +18,9 @@ export function pairCommandForProfile(profile) {
|
|
|
18
18
|
export function invalidCredentialsRecoveryHint(profile) {
|
|
19
19
|
return `Run \`${resetCommandForProfile(profile)}\` to clear this profile config, then run \`${pairCommandForProfile(profile)}\` to re-register.`;
|
|
20
20
|
}
|
|
21
|
+
export function relayCredentialsRejectedHint(profile) {
|
|
22
|
+
return `Relay rejected this host's credentials (4401): the gateway was unpaired or removed on the relay. ${invalidCredentialsRecoveryHint(profile)}`;
|
|
23
|
+
}
|
|
21
24
|
export const RESET_PROFILE_HELP_TEXT = [
|
|
22
25
|
"",
|
|
23
26
|
"Profile recovery examples:",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-hints.js","sourceRoot":"","sources":["../../src/commands/profile-hints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,UAAU,sBAAsB,CAAC,OAA2B;IAChE,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,UAAU,KAAK,UAAU;QAAE,OAAO,4BAA4B,CAAC;IACnE,IAAI,UAAU,KAAK,QAAQ;QAAE,OAAO,0BAA0B,CAAC;IAC/D,OAAO,UAAU,CAAC,CAAC,CAAC,+BAA+B,UAAU,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC;AACxF,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,OAA2B;IAC/D,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,UAAU,KAAK,UAAU;QAAE,OAAO,2BAA2B,CAAC;IAClE,IAAI,UAAU,KAAK,QAAQ;QAAE,OAAO,yBAAyB,CAAC;IAC9D,OAAO,UAAU,CAAC,CAAC,CAAC,8BAA8B,UAAU,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC;AACtF,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,OAA2B;IACxE,OAAO,SAAS,sBAAsB,CAAC,OAAO,CAAC,+CAA+C,qBAAqB,CAAC,OAAO,CAAC,oBAAoB,CAAC;AACnJ,CAAC;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,EAAE;IACF,4BAA4B;IAC5B,qEAAqE;IACrE,iEAAiE;IACjE,0EAA0E;IAC1E,EAAE;CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,EAAE;IACF,mBAAmB;IACnB,8EAA8E;IAC9E,gCAAgC;IAChC,EAAE;CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,EAAE;IACF,mBAAmB;IACnB,4EAA4E;IAC5E,8BAA8B;IAC9B,EAAE;CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,EAAE;IACF,0BAA0B;IAC1B,kDAAkD;IAClD,gEAAgE;IAChE,kEAAkE;IAClE,2DAA2D;IAC3D,iDAAiD;IACjD,mDAAmD;IACnD,8DAA8D;IAC9D,0DAA0D;IAC1D,wDAAwD;IACxD,qDAAqD;IACrD,0DAA0D;IAC1D,wDAAwD;IACxD,kDAAkD;IAClD,uDAAuD;IACvD,qDAAqD;IACrD,mEAAmE;IACnE,4EAA4E;IAC5E,8EAA8E;IAC9E,kEAAkE;IAClE,uEAAuE;IACvE,0EAA0E;IAC1E,iFAAiF;IACjF,0DAA0D;IAC1D,EAAE;CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"profile-hints.js","sourceRoot":"","sources":["../../src/commands/profile-hints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,UAAU,sBAAsB,CAAC,OAA2B;IAChE,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,UAAU,KAAK,UAAU;QAAE,OAAO,4BAA4B,CAAC;IACnE,IAAI,UAAU,KAAK,QAAQ;QAAE,OAAO,0BAA0B,CAAC;IAC/D,OAAO,UAAU,CAAC,CAAC,CAAC,+BAA+B,UAAU,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC;AACxF,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,OAA2B;IAC/D,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,UAAU,KAAK,UAAU;QAAE,OAAO,2BAA2B,CAAC;IAClE,IAAI,UAAU,KAAK,QAAQ;QAAE,OAAO,yBAAyB,CAAC;IAC9D,OAAO,UAAU,CAAC,CAAC,CAAC,8BAA8B,UAAU,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC;AACtF,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,OAA2B;IACxE,OAAO,SAAS,sBAAsB,CAAC,OAAO,CAAC,+CAA+C,qBAAqB,CAAC,OAAO,CAAC,oBAAoB,CAAC;AACnJ,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,OAA2B;IACtE,OAAO,oGAAoG,8BAA8B,CAAC,OAAO,CAAC,EAAE,CAAC;AACvJ,CAAC;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,EAAE;IACF,4BAA4B;IAC5B,qEAAqE;IACrE,iEAAiE;IACjE,0EAA0E;IAC1E,EAAE;CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,EAAE;IACF,mBAAmB;IACnB,8EAA8E;IAC9E,gCAAgC;IAChC,EAAE;CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,EAAE;IACF,mBAAmB;IACnB,4EAA4E;IAC5E,8BAA8B;IAC9B,EAAE;CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,EAAE;IACF,0BAA0B;IAC1B,kDAAkD;IAClD,gEAAgE;IAChE,kEAAkE;IAClE,2DAA2D;IAC3D,iDAAiD;IACjD,mDAAmD;IACnD,8DAA8D;IAC9D,0DAA0D;IAC1D,wDAAwD;IACxD,qDAAqD;IACrD,0DAA0D;IAC1D,wDAAwD;IACxD,kDAAkD;IAClD,uDAAuD;IACvD,qDAAqD;IACrD,mEAAmE;IACnE,4EAA4E;IAC5E,8EAA8E;IAC9E,kEAAkE;IAClE,uEAAuE;IACvE,0EAA0E;IAC1E,iFAAiF;IACjF,0DAA0D;IAC1D,EAAE;CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC"}
|
package/dist/commands/run.js
CHANGED
|
@@ -6,6 +6,8 @@ import { createInterface } from "readline";
|
|
|
6
6
|
import { disposeReliableRelayOutboxes } from "../core/relay/reliable-relay-outbox-registry.js";
|
|
7
7
|
import { rotateProfileLogsIfOversized } from "../config/profile-log-rotation.js";
|
|
8
8
|
import { getActiveProfile } from "../config/profile.js";
|
|
9
|
+
import { RELAY_CLOSE_CODE_UNAUTHORIZED } from "../core/relay/relay-server-connection.js";
|
|
10
|
+
import { relayCredentialsRejectedHint } from "./profile-hints.js";
|
|
9
11
|
export async function runCommand() {
|
|
10
12
|
// 服务管理器只会追加写日志;每次进程启动先做一次有界轮转,避免日志无限增长。
|
|
11
13
|
for (const result of rotateProfileLogsIfOversized(getActiveProfile())) {
|
|
@@ -41,6 +43,9 @@ export async function runCommand() {
|
|
|
41
43
|
if (runtimeAdapter.logsGatewayUrl) {
|
|
42
44
|
console.log(t("run.gatewayUrl", gatewayUrl));
|
|
43
45
|
}
|
|
46
|
+
// 4401 基本是永久性的(网关已解绑或被清理),但 Relay 数据可能被恢复,因此仍按退避重连;
|
|
47
|
+
// 只在每段连续拒绝的第一次打印恢复指引,避免每 30 秒刷一条相同日志。
|
|
48
|
+
let credentialsRejectionReported = false;
|
|
44
49
|
try {
|
|
45
50
|
await withReconnect((session) => runtimeAdapter.start({
|
|
46
51
|
config,
|
|
@@ -48,8 +53,17 @@ export async function runCommand() {
|
|
|
48
53
|
gatewayAuth,
|
|
49
54
|
signal: shutdown.signal,
|
|
50
55
|
onConnected: () => console.log(t("run.connected")),
|
|
51
|
-
onRelayReady: () =>
|
|
52
|
-
|
|
56
|
+
onRelayReady: () => {
|
|
57
|
+
credentialsRejectionReported = false;
|
|
58
|
+
session.markEstablished();
|
|
59
|
+
},
|
|
60
|
+
onDisconnected: (closeCode) => {
|
|
61
|
+
console.log(t("run.disconnected"));
|
|
62
|
+
if (closeCode === RELAY_CLOSE_CODE_UNAUTHORIZED && !credentialsRejectionReported) {
|
|
63
|
+
credentialsRejectionReported = true;
|
|
64
|
+
console.error(`[relay] ${relayCredentialsRejectedHint(getActiveProfile())}`);
|
|
65
|
+
}
|
|
66
|
+
},
|
|
53
67
|
}), {
|
|
54
68
|
signal: shutdown.signal,
|
|
55
69
|
onRetry: (attempt, delayMs) => {
|
package/dist/commands/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,CAAC,EAAE,MAAM,kBAAkB,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAE,4BAA4B,EAAE,MAAM,iDAAiD,CAAC;AAC/F,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ type GatewayType = "openclaw" | "hermes";
|
|
|
6
6
|
export declare function statusCommand(opts?: {
|
|
7
7
|
profile?: string;
|
|
8
8
|
}): void;
|
|
9
|
-
export declare function readHealth(logPath: string, gatewayType?: GatewayType): {
|
|
9
|
+
export declare function readHealth(logPath: string, gatewayType?: GatewayType, profile?: string): {
|
|
10
10
|
relay: HealthState;
|
|
11
11
|
gateway: HealthState;
|
|
12
12
|
};
|
package/dist/commands/status.js
CHANGED
|
@@ -3,6 +3,7 @@ import { execFileSync } from "child_process";
|
|
|
3
3
|
import { configExists, readConfig, readGatewayUrl } from "../config/config.js";
|
|
4
4
|
import { listProfileNames, profileDisplayName } from "../config/profile.js";
|
|
5
5
|
import { t } from "../i18n/index.js";
|
|
6
|
+
import { invalidCredentialsRecoveryHint } from "./profile-hints.js";
|
|
6
7
|
import { getServiceStatus } from "../platform/service-manager.js";
|
|
7
8
|
import { decodeTextBuffer } from "../platform/text-file-decoder.js";
|
|
8
9
|
import { resolveOpenClawConfigPath, resolveOpenClawStateDir } from "../openclaw/runtime/openclaw-paths.js";
|
|
@@ -94,7 +95,7 @@ function statusOne(profile) {
|
|
|
94
95
|
else if (service.running) {
|
|
95
96
|
console.log(t("status.serviceRunning", service.manager));
|
|
96
97
|
console.log(t("status.serviceLog", service.logPath));
|
|
97
|
-
const health = readHealth(service.logPath, gatewayType);
|
|
98
|
+
const health = readHealth(service.logPath, gatewayType, profile);
|
|
98
99
|
console.log(formatHealthLine("status.relayHealth", health.relay));
|
|
99
100
|
console.log(formatHealthLine(gatewayType === "openclaw" ? "status.gatewayHealth" : "status.agentHealth", health.gateway));
|
|
100
101
|
}
|
|
@@ -109,7 +110,7 @@ function statusOne(profile) {
|
|
|
109
110
|
}
|
|
110
111
|
console.log("");
|
|
111
112
|
}
|
|
112
|
-
export function readHealth(logPath, gatewayType = "openclaw") {
|
|
113
|
+
export function readHealth(logPath, gatewayType = "openclaw", profile) {
|
|
113
114
|
if (!existsSync(logPath)) {
|
|
114
115
|
return {
|
|
115
116
|
relay: { kind: "unknown", detail: "log missing" },
|
|
@@ -118,7 +119,7 @@ export function readHealth(logPath, gatewayType = "openclaw") {
|
|
|
118
119
|
}
|
|
119
120
|
const lines = readTailLines(logPath, 400);
|
|
120
121
|
return {
|
|
121
|
-
relay: parseRelayHealth(lines, gatewayType),
|
|
122
|
+
relay: withRelayRecoveryHint(parseRelayHealth(lines, gatewayType), profile),
|
|
122
123
|
gateway: parseGatewayHealth(lines, gatewayType),
|
|
123
124
|
};
|
|
124
125
|
}
|
|
@@ -169,12 +170,20 @@ function parseRelayHealth(lines, gatewayType) {
|
|
|
169
170
|
if (connectedIndex > disconnectedIndex) {
|
|
170
171
|
return { kind: "ok", detail: "connected" };
|
|
171
172
|
}
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
173
|
+
// Agent 先写 "connection closed: <code>" 再写 "Relay disconnected.";关闭码才是诊断依据,
|
|
174
|
+
// 只要它发生在最近一次连接之后,就优先展示它。
|
|
175
|
+
const closedIndex = findLastIndex(lines, (line) => line.includes("Relay connection closed:") || line.includes("Hermes relay connection closed:"));
|
|
176
|
+
const detail = closedIndex > connectedIndex
|
|
177
|
+
? lines[closedIndex].replace(/^.*(?:Hermes relay connection closed:|Relay connection closed:)\s*/, "").trim() || "disconnected"
|
|
175
178
|
: "disconnected";
|
|
176
179
|
return { kind: "error", detail };
|
|
177
180
|
}
|
|
181
|
+
// 4401 表示 Relay 已不认可本机凭证,重试无法自愈;状态里直接给出重新配对的命令。
|
|
182
|
+
function withRelayRecoveryHint(state, profile) {
|
|
183
|
+
if (state.kind !== "error" || !/^4401\b/.test(state.detail ?? ""))
|
|
184
|
+
return state;
|
|
185
|
+
return { ...state, detail: `${state.detail} — ${invalidCredentialsRecoveryHint(profile)}` };
|
|
186
|
+
}
|
|
178
187
|
function parseGatewayHealth(lines, gatewayType) {
|
|
179
188
|
if (gatewayType === "hermes") {
|
|
180
189
|
return parseHermesAgentHealth(lines);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export declare const REGISTRATION_BACKUP_PREFIX = "config.json.server-switch-";
|
|
2
|
+
export declare const REGISTRATION_BACKUP_SUFFIX = ".bak";
|
|
3
|
+
/** 每个 profile 只保留最近几份重新注册前的配置备份,避免反复配对后备份无限堆积。 */
|
|
4
|
+
export declare const REGISTRATION_BACKUP_RETENTION = 5;
|
|
5
|
+
/** 重新注册会覆盖凭证,先把旧配置备份,再按保留数量清理更早的备份。 */
|
|
6
|
+
export declare function backupConfigBeforeRegistration(configPath: string, now?: Date, retention?: number): string | undefined;
|
|
7
|
+
/**
|
|
8
|
+
* 删除超出保留数量的重新注册备份,返回被删除的文件名。
|
|
9
|
+
* 文件名时间戳为 YYYYMMDD-HHMMSS,字典序即时间序,排序结果与文件系统遍历顺序无关。
|
|
10
|
+
* 只处理本模块生成的备份,其他 .bak 文件(迁移、手工备份)一律保留。
|
|
11
|
+
*/
|
|
12
|
+
export declare function pruneRegistrationBackups(directory: string, retention?: number): string[];
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { copyFileSync, existsSync, readdirSync, unlinkSync } from "fs";
|
|
2
|
+
import { dirname, join } from "path";
|
|
3
|
+
export const REGISTRATION_BACKUP_PREFIX = "config.json.server-switch-";
|
|
4
|
+
export const REGISTRATION_BACKUP_SUFFIX = ".bak";
|
|
5
|
+
/** 每个 profile 只保留最近几份重新注册前的配置备份,避免反复配对后备份无限堆积。 */
|
|
6
|
+
export const REGISTRATION_BACKUP_RETENTION = 5;
|
|
7
|
+
/** 重新注册会覆盖凭证,先把旧配置备份,再按保留数量清理更早的备份。 */
|
|
8
|
+
export function backupConfigBeforeRegistration(configPath, now = new Date(), retention = REGISTRATION_BACKUP_RETENTION) {
|
|
9
|
+
if (!existsSync(configPath)) {
|
|
10
|
+
return undefined;
|
|
11
|
+
}
|
|
12
|
+
const backupPath = join(dirname(configPath), `${REGISTRATION_BACKUP_PREFIX}${formatBackupTimestamp(now)}${REGISTRATION_BACKUP_SUFFIX}`);
|
|
13
|
+
copyFileSync(configPath, backupPath);
|
|
14
|
+
pruneRegistrationBackups(dirname(configPath), retention);
|
|
15
|
+
return backupPath;
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* 删除超出保留数量的重新注册备份,返回被删除的文件名。
|
|
19
|
+
* 文件名时间戳为 YYYYMMDD-HHMMSS,字典序即时间序,排序结果与文件系统遍历顺序无关。
|
|
20
|
+
* 只处理本模块生成的备份,其他 .bak 文件(迁移、手工备份)一律保留。
|
|
21
|
+
*/
|
|
22
|
+
export function pruneRegistrationBackups(directory, retention = REGISTRATION_BACKUP_RETENTION) {
|
|
23
|
+
const backups = readdirSync(directory)
|
|
24
|
+
.filter((name) => name.startsWith(REGISTRATION_BACKUP_PREFIX) && name.endsWith(REGISTRATION_BACKUP_SUFFIX))
|
|
25
|
+
.sort();
|
|
26
|
+
const stale = backups.slice(0, Math.max(0, backups.length - Math.max(0, retention)));
|
|
27
|
+
for (const name of stale) {
|
|
28
|
+
unlinkSync(join(directory, name));
|
|
29
|
+
}
|
|
30
|
+
return stale;
|
|
31
|
+
}
|
|
32
|
+
function formatBackupTimestamp(date) {
|
|
33
|
+
const pad = (value) => String(value).padStart(2, "0");
|
|
34
|
+
return [
|
|
35
|
+
date.getFullYear(),
|
|
36
|
+
pad(date.getMonth() + 1),
|
|
37
|
+
pad(date.getDate()),
|
|
38
|
+
"-",
|
|
39
|
+
pad(date.getHours()),
|
|
40
|
+
pad(date.getMinutes()),
|
|
41
|
+
pad(date.getSeconds()),
|
|
42
|
+
].join("");
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=config-backups.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config-backups.js","sourceRoot":"","sources":["../../src/config/config-backups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAErC,MAAM,CAAC,MAAM,0BAA0B,GAAG,4BAA4B,CAAC;AACvE,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC;AACjD,kDAAkD;AAClD,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAE/C,uCAAuC;AACvC,MAAM,UAAU,8BAA8B,CAC5C,UAAkB,EAClB,MAAY,IAAI,IAAI,EAAE,EACtB,YAAoB,6BAA6B;IAEjD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,CACrB,OAAO,CAAC,UAAU,CAAC,EACnB,GAAG,0BAA0B,GAAG,qBAAqB,CAAC,GAAG,CAAC,GAAG,0BAA0B,EAAE,CAC1F,CAAC;IACF,YAAY,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACrC,wBAAwB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,CAAC;IACzD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,SAAiB,EAAE,YAAoB,6BAA6B;IAC3G,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS,CAAC;SACnC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC;SAC1G,IAAI,EAAE,CAAC;IACV,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IACrF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAU;IACvC,MAAM,GAAG,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACtE,OAAO;QACL,IAAI,CAAC,WAAW,EAAE;QAClB,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACxB,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QACnB,GAAG;QACH,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpB,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QACtB,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;KACvB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACb,CAAC"}
|
|
@@ -2,8 +2,17 @@ import { WebSocket, type RawData } from "ws";
|
|
|
2
2
|
export declare const RELAY_WS_BACKPRESSURE_HIGH_WATER_MARK_BYTES: number;
|
|
3
3
|
export declare const RELAY_WS_COMPRESSION_THRESHOLD_BYTES = 1024;
|
|
4
4
|
export declare const RELAY_WS_WRITE_CONFIRMATION_TIMEOUT_MS = 10000;
|
|
5
|
+
/**
|
|
6
|
+
* 建连握手(TCP + TLS + HTTP Upgrade)的时间上限。
|
|
7
|
+
* 存活检测只在 open 之后启动;没有这个上限时,代理/NAT 把握手卡在半路会让连接永远停在
|
|
8
|
+
* CONNECTING,既不触发 close 也不再重连。超时后 ws 以 1006 关闭,交给既有重连退避处理。
|
|
9
|
+
*/
|
|
10
|
+
export declare const RELAY_WS_HANDSHAKE_TIMEOUT_MS = 15000;
|
|
11
|
+
/** Relay 拒绝主机凭证(网关已解绑/被清理或密钥不匹配)时使用的关闭码。 */
|
|
12
|
+
export declare const RELAY_CLOSE_CODE_UNAUTHORIZED = 4401;
|
|
5
13
|
export declare const RELAY_WS_CLIENT_OPTIONS: Readonly<{
|
|
6
14
|
perMessageDeflate: true;
|
|
15
|
+
handshakeTimeout: 15000;
|
|
7
16
|
}>;
|
|
8
17
|
export type RelaySendResult = {
|
|
9
18
|
status: "sent" | "socket_not_open" | "backpressure_skipped" | "backpressure_disconnected" | "send_failed";
|
|
@@ -14,7 +23,7 @@ export type RelaySendResult = {
|
|
|
14
23
|
error?: unknown;
|
|
15
24
|
};
|
|
16
25
|
export declare function buildRelayUrl(serverUrl: string, gatewayId: string, relaySecret: string): string;
|
|
17
|
-
export declare function createRelayWebSocket(url: string): WebSocket;
|
|
26
|
+
export declare function createRelayWebSocket(url: string, handshakeTimeoutMs?: number): WebSocket;
|
|
18
27
|
export declare function sendRelayJson(ws: WebSocket, message: unknown, highWaterMarkBytes?: number, onComplete?: (error?: Error) => void): RelaySendResult;
|
|
19
28
|
/** Waits for the ws.send callback so a stream coalescer can compensate for async write failures. */
|
|
20
29
|
export declare function sendRelayJsonWithWriteConfirmation(ws: WebSocket, message: unknown, highWaterMarkBytes?: number, timeoutMs?: number): Promise<RelaySendResult>;
|
|
@@ -2,15 +2,24 @@ import { WebSocket } from "ws";
|
|
|
2
2
|
export const RELAY_WS_BACKPRESSURE_HIGH_WATER_MARK_BYTES = 4 * 1024 * 1024;
|
|
3
3
|
export const RELAY_WS_COMPRESSION_THRESHOLD_BYTES = 1024;
|
|
4
4
|
export const RELAY_WS_WRITE_CONFIRMATION_TIMEOUT_MS = 10_000;
|
|
5
|
+
/**
|
|
6
|
+
* 建连握手(TCP + TLS + HTTP Upgrade)的时间上限。
|
|
7
|
+
* 存活检测只在 open 之后启动;没有这个上限时,代理/NAT 把握手卡在半路会让连接永远停在
|
|
8
|
+
* CONNECTING,既不触发 close 也不再重连。超时后 ws 以 1006 关闭,交给既有重连退避处理。
|
|
9
|
+
*/
|
|
10
|
+
export const RELAY_WS_HANDSHAKE_TIMEOUT_MS = 15_000;
|
|
11
|
+
/** Relay 拒绝主机凭证(网关已解绑/被清理或密钥不匹配)时使用的关闭码。 */
|
|
12
|
+
export const RELAY_CLOSE_CODE_UNAUTHORIZED = 4401;
|
|
5
13
|
export const RELAY_WS_CLIENT_OPTIONS = Object.freeze({
|
|
6
14
|
perMessageDeflate: true,
|
|
15
|
+
handshakeTimeout: RELAY_WS_HANDSHAKE_TIMEOUT_MS,
|
|
7
16
|
});
|
|
8
17
|
export function buildRelayUrl(serverUrl, gatewayId, relaySecret) {
|
|
9
18
|
const base = serverUrl.replace(/\/+$/, "").replace(/^http/, "ws");
|
|
10
19
|
return `${base}/relay/${gatewayId}?secret=${encodeURIComponent(relaySecret)}`;
|
|
11
20
|
}
|
|
12
|
-
export function createRelayWebSocket(url) {
|
|
13
|
-
return new WebSocket(url, RELAY_WS_CLIENT_OPTIONS);
|
|
21
|
+
export function createRelayWebSocket(url, handshakeTimeoutMs = RELAY_WS_HANDSHAKE_TIMEOUT_MS) {
|
|
22
|
+
return new WebSocket(url, { ...RELAY_WS_CLIENT_OPTIONS, handshakeTimeout: handshakeTimeoutMs });
|
|
14
23
|
}
|
|
15
24
|
export function sendRelayJson(ws, message, highWaterMarkBytes = RELAY_WS_BACKPRESSURE_HIGH_WATER_MARK_BYTES, onComplete) {
|
|
16
25
|
const bufferedAmount = finiteNonNegative(ws.bufferedAmount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay-server-connection.js","sourceRoot":"","sources":["../../../src/core/relay/relay-server-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAgB,MAAM,IAAI,CAAC;AAE7C,MAAM,CAAC,MAAM,2CAA2C,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAC3E,MAAM,CAAC,MAAM,oCAAoC,GAAG,IAAI,CAAC;AACzD,MAAM,CAAC,MAAM,sCAAsC,GAAG,MAAM,CAAC;AAC7D,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC;IACnD,iBAAiB,EAAE,IAAa;
|
|
1
|
+
{"version":3,"file":"relay-server-connection.js","sourceRoot":"","sources":["../../../src/core/relay/relay-server-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ export interface HermesRelayManagerOptions {
|
|
|
45
45
|
onConnected?: () => void;
|
|
46
46
|
/** Relay hello 校验通过并挂载可靠投递 outbox 后触发;仅此时才算一次成功连接。 */
|
|
47
47
|
onRelayReady?: () => void;
|
|
48
|
-
onDisconnected?: () => void;
|
|
48
|
+
onDisconnected?: (closeCode: number) => void;
|
|
49
49
|
/** @internal Allows deterministic protocol-negotiation timeout tests. */
|
|
50
50
|
relayHelloTimeoutMs?: number;
|
|
51
51
|
/** @internal 存活检测的 ping 周期与超时(毫秒),仅用于测试。 */
|
|
@@ -537,7 +537,7 @@ export async function runHermesRelayManagerWithDependencies(opts, dependencies)
|
|
|
537
537
|
relayWs.on("close", (code, reason) => {
|
|
538
538
|
console.log(`Hermes relay connection closed: ${code} ${reason.toString()}`);
|
|
539
539
|
livenessMonitor?.stop();
|
|
540
|
-
opts.onDisconnected?.();
|
|
540
|
+
opts.onDisconnected?.(code);
|
|
541
541
|
if (relayHelloTimer) {
|
|
542
542
|
clearTimeout(relayHelloTimer);
|
|
543
543
|
relayHelloTimer = undefined;
|