feat: enhance after-pack script to copy OpenClaw runtime dependencies
- Added a new script `bundle-openclaw.mjs` to bundle OpenClaw runtime dependencies. - Updated `after-pack.cjs` to copy bundled OpenClaw runtime and its node_modules. - Improved cleanup of unnecessary development files in node_modules. - Adjusted paths for resources in the packaging process. style: update loading indicator styles in ChatHistoryPanel - Changed the border radius and padding for the loading indicator in ChatHistoryPanel. fix: improve ProvidersSection to handle provider account syncing - Added logic to sync model configuration to provider accounts. - Introduced error handling and loading states during the sync process. - Enhanced vendor resolution and account management logic. fix: fallback session handling in chat store - Implemented fallback session logic in loadSessions to ensure a valid session is always available on error.
This commit is contained in:
duanshuwen
346
electron/gateway/ws-client.ts
Normal file
346
electron/gateway/ws-client.ts
Normal file
@@ -0,0 +1,346 @@
|
||||
import type { DeviceIdentity } from '@electron/utils/device-identity';
|
||||
import {
|
||||
buildDeviceAuthPayload,
|
||||
publicKeyRawBase64UrlFromPem,
|
||||
signDevicePayload,
|
||||
} from '@electron/utils/device-identity';
|
||||
|
||||
export const GATEWAY_CHALLENGE_TIMEOUT_MS = 10_000;
|
||||
export const GATEWAY_CONNECT_HANDSHAKE_TIMEOUT_MS = 20_000;
|
||||
|
||||
type GatewayProtocolFrame =
|
||||
| {
|
||||
type?: string;
|
||||
event?: string;
|
||||
id?: string;
|
||||
ok?: boolean;
|
||||
payload?: unknown;
|
||||
error?: unknown;
|
||||
}
|
||||
| null;
|
||||
|
||||
function isBlobLike(value: unknown): value is Blob {
|
||||
return typeof Blob !== 'undefined' && value instanceof Blob;
|
||||
}
|
||||
|
||||
async function dataToString(data: unknown): Promise<string> {
|
||||
if (typeof data === 'string') {
|
||||
return data;
|
||||
}
|
||||
|
||||
if (data instanceof ArrayBuffer) {
|
||||
return Buffer.from(data).toString('utf-8');
|
||||
}
|
||||
|
||||
if (ArrayBuffer.isView(data)) {
|
||||
return Buffer.from(data.buffer, data.byteOffset, data.byteLength).toString('utf-8');
|
||||
}
|
||||
|
||||
if (isBlobLike(data)) {
|
||||
return await data.text();
|
||||
}
|
||||
|
||||
return String(data ?? '');
|
||||
}
|
||||
|
||||
async function parseGatewayFrame(data: unknown): Promise<GatewayProtocolFrame> {
|
||||
const text = await dataToString(data);
|
||||
if (!text) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return JSON.parse(text) as GatewayProtocolFrame;
|
||||
}
|
||||
|
||||
function buildGatewayConnectFrame(options: {
|
||||
challengeNonce: string;
|
||||
token: string;
|
||||
deviceIdentity: DeviceIdentity | null;
|
||||
platform: string;
|
||||
}): { connectId: string; frame: Record<string, unknown> } {
|
||||
const connectId = `connect-${Date.now()}`;
|
||||
const clientId = 'gateway-client';
|
||||
const clientMode = 'ui';
|
||||
const role = 'operator';
|
||||
const scopes = ['operator.admin'];
|
||||
const signedAtMs = Date.now();
|
||||
|
||||
const device = (() => {
|
||||
if (!options.deviceIdentity) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const payload = buildDeviceAuthPayload({
|
||||
deviceId: options.deviceIdentity.deviceId,
|
||||
clientId,
|
||||
clientMode,
|
||||
role,
|
||||
scopes,
|
||||
signedAtMs,
|
||||
token: options.token,
|
||||
nonce: options.challengeNonce,
|
||||
});
|
||||
|
||||
return {
|
||||
id: options.deviceIdentity.deviceId,
|
||||
publicKey: publicKeyRawBase64UrlFromPem(options.deviceIdentity.publicKeyPem),
|
||||
signature: signDevicePayload(options.deviceIdentity.privateKeyPem, payload),
|
||||
signedAt: signedAtMs,
|
||||
nonce: options.challengeNonce,
|
||||
};
|
||||
})();
|
||||
|
||||
return {
|
||||
connectId,
|
||||
frame: {
|
||||
type: 'req',
|
||||
id: connectId,
|
||||
method: 'connect',
|
||||
params: {
|
||||
minProtocol: 3,
|
||||
maxProtocol: 3,
|
||||
client: {
|
||||
id: clientId,
|
||||
displayName: 'zn-ai',
|
||||
version: '1.0.0',
|
||||
platform: options.platform,
|
||||
mode: clientMode,
|
||||
},
|
||||
auth: {
|
||||
token: options.token,
|
||||
},
|
||||
caps: [],
|
||||
role,
|
||||
scopes,
|
||||
device,
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export async function probeGatewayReady(
|
||||
port: number,
|
||||
timeoutMs = 1500,
|
||||
): Promise<boolean> {
|
||||
return await new Promise<boolean>((resolve) => {
|
||||
const ws = new WebSocket(`ws://127.0.0.1:${port}/ws`);
|
||||
let settled = false;
|
||||
|
||||
const resolveOnce = (value: boolean) => {
|
||||
if (settled) return;
|
||||
settled = true;
|
||||
clearTimeout(timeout);
|
||||
try {
|
||||
ws.close();
|
||||
} catch {
|
||||
// ignore probe close errors
|
||||
}
|
||||
resolve(value);
|
||||
};
|
||||
|
||||
const timeout = setTimeout(() => {
|
||||
resolveOnce(false);
|
||||
}, timeoutMs);
|
||||
|
||||
ws.addEventListener('message', (event) => {
|
||||
void (async () => {
|
||||
try {
|
||||
const message = await parseGatewayFrame(event.data);
|
||||
if (message?.type === 'event' && message.event === 'connect.challenge') {
|
||||
resolveOnce(true);
|
||||
}
|
||||
} catch {
|
||||
// ignore malformed probe payloads
|
||||
}
|
||||
})();
|
||||
});
|
||||
|
||||
ws.addEventListener('error', () => {
|
||||
resolveOnce(false);
|
||||
});
|
||||
|
||||
ws.addEventListener('close', () => {
|
||||
resolveOnce(false);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
export async function waitForGatewayReady(options: {
|
||||
port: number;
|
||||
getProcessExitCode: () => number | null;
|
||||
retries?: number;
|
||||
intervalMs?: number;
|
||||
}): Promise<void> {
|
||||
const retries = options.retries ?? 300;
|
||||
const intervalMs = options.intervalMs ?? 200;
|
||||
|
||||
for (let i = 0; i < retries; i += 1) {
|
||||
const exitCode = options.getProcessExitCode();
|
||||
if (exitCode !== null) {
|
||||
throw new Error(`OpenClaw Gateway exited before becoming ready (code=${exitCode})`);
|
||||
}
|
||||
|
||||
const ready = await probeGatewayReady(options.port, 1500);
|
||||
if (ready) {
|
||||
return;
|
||||
}
|
||||
|
||||
await new Promise((resolve) => setTimeout(resolve, intervalMs));
|
||||
}
|
||||
|
||||
throw new Error(`OpenClaw Gateway failed to become ready on port ${options.port}`);
|
||||
}
|
||||
|
||||
export async function connectGatewaySocket(options: {
|
||||
port: number;
|
||||
token: string;
|
||||
deviceIdentity: DeviceIdentity | null;
|
||||
platform: string;
|
||||
onMessage: (message: unknown) => void;
|
||||
onCloseAfterHandshake: (socket: WebSocket, code: number) => void;
|
||||
challengeTimeoutMs?: number;
|
||||
connectTimeoutMs?: number;
|
||||
}): Promise<WebSocket> {
|
||||
const challengeTimeoutMs = options.challengeTimeoutMs ?? GATEWAY_CHALLENGE_TIMEOUT_MS;
|
||||
const connectTimeoutMs = options.connectTimeoutMs ?? GATEWAY_CONNECT_HANDSHAKE_TIMEOUT_MS;
|
||||
|
||||
return await new Promise<WebSocket>((resolve, reject) => {
|
||||
const ws = new WebSocket(`ws://127.0.0.1:${options.port}/ws`);
|
||||
let handshakeComplete = false;
|
||||
let settled = false;
|
||||
let challengeTimer: NodeJS.Timeout | null = null;
|
||||
let handshakeTimer: NodeJS.Timeout | null = null;
|
||||
let connectId: string | null = null;
|
||||
|
||||
const cleanup = () => {
|
||||
if (challengeTimer) {
|
||||
clearTimeout(challengeTimer);
|
||||
challengeTimer = null;
|
||||
}
|
||||
if (handshakeTimer) {
|
||||
clearTimeout(handshakeTimer);
|
||||
handshakeTimer = null;
|
||||
}
|
||||
};
|
||||
|
||||
const resolveOnce = () => {
|
||||
if (settled) return;
|
||||
settled = true;
|
||||
cleanup();
|
||||
resolve(ws);
|
||||
};
|
||||
|
||||
const rejectOnce = (error: unknown) => {
|
||||
if (settled) return;
|
||||
settled = true;
|
||||
cleanup();
|
||||
reject(error instanceof Error ? error : new Error(String(error)));
|
||||
};
|
||||
|
||||
challengeTimer = setTimeout(() => {
|
||||
try {
|
||||
ws.close();
|
||||
} catch {
|
||||
// ignore close error
|
||||
}
|
||||
rejectOnce(new Error('Timed out waiting for connect.challenge from OpenClaw Gateway'));
|
||||
}, challengeTimeoutMs);
|
||||
|
||||
ws.addEventListener('message', (event) => {
|
||||
void (async () => {
|
||||
try {
|
||||
const message = await parseGatewayFrame(event.data);
|
||||
if (!message) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!handshakeComplete && message.type === 'event' && message.event === 'connect.challenge') {
|
||||
if (challengeTimer) {
|
||||
clearTimeout(challengeTimer);
|
||||
challengeTimer = null;
|
||||
}
|
||||
|
||||
const nonce = (
|
||||
typeof message.payload === 'object' &&
|
||||
message.payload !== null &&
|
||||
'nonce' in message.payload &&
|
||||
typeof (message.payload as { nonce?: unknown }).nonce === 'string'
|
||||
)
|
||||
? (message.payload as { nonce: string }).nonce
|
||||
: '';
|
||||
|
||||
if (!nonce) {
|
||||
rejectOnce(new Error('OpenClaw Gateway connect.challenge missing nonce'));
|
||||
return;
|
||||
}
|
||||
|
||||
const payload = buildGatewayConnectFrame({
|
||||
challengeNonce: nonce,
|
||||
token: options.token,
|
||||
deviceIdentity: options.deviceIdentity,
|
||||
platform: options.platform,
|
||||
});
|
||||
connectId = payload.connectId;
|
||||
ws.send(JSON.stringify(payload.frame));
|
||||
|
||||
handshakeTimer = setTimeout(() => {
|
||||
try {
|
||||
ws.close();
|
||||
} catch {
|
||||
// ignore close error
|
||||
}
|
||||
rejectOnce(new Error('Timed out waiting for OpenClaw Gateway connect response'));
|
||||
}, connectTimeoutMs);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!handshakeComplete && message.type === 'res' && message.id === connectId) {
|
||||
if (message.ok === false) {
|
||||
const errorMessage =
|
||||
typeof message.error === 'string'
|
||||
? message.error
|
||||
: (
|
||||
typeof message.error === 'object' &&
|
||||
message.error !== null &&
|
||||
'message' in message.error &&
|
||||
typeof (message.error as { message?: unknown }).message === 'string'
|
||||
)
|
||||
? (message.error as { message: string }).message
|
||||
: 'OpenClaw Gateway connect handshake failed';
|
||||
rejectOnce(new Error(errorMessage));
|
||||
return;
|
||||
}
|
||||
|
||||
handshakeComplete = true;
|
||||
resolveOnce();
|
||||
return;
|
||||
}
|
||||
|
||||
if (handshakeComplete) {
|
||||
options.onMessage(message);
|
||||
}
|
||||
} catch (error) {
|
||||
if (!handshakeComplete) {
|
||||
rejectOnce(error);
|
||||
}
|
||||
}
|
||||
})();
|
||||
});
|
||||
|
||||
ws.addEventListener('close', (event) => {
|
||||
if (!handshakeComplete) {
|
||||
rejectOnce(new Error(`OpenClaw Gateway socket closed before handshake (code=${event.code})`));
|
||||
return;
|
||||
}
|
||||
|
||||
cleanup();
|
||||
options.onCloseAfterHandshake(ws, event.code);
|
||||
});
|
||||
|
||||
ws.addEventListener('error', () => {
|
||||
if (!handshakeComplete) {
|
||||
rejectOnce(new Error('OpenClaw Gateway socket connection failed'));
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user