feat: add exec host routing + node daemon
This commit is contained in:
Peter Steinberger
306
src/node-host/bridge-client.ts
Normal file
306
src/node-host/bridge-client.ts
Normal file
@@ -0,0 +1,306 @@
|
||||
import crypto from "node:crypto";
|
||||
import net from "node:net";
|
||||
import tls from "node:tls";
|
||||
|
||||
import type {
|
||||
BridgeErrorFrame,
|
||||
BridgeEventFrame,
|
||||
BridgeHelloFrame,
|
||||
BridgeHelloOkFrame,
|
||||
BridgeInvokeRequestFrame,
|
||||
BridgeInvokeResponseFrame,
|
||||
BridgePairOkFrame,
|
||||
BridgePairRequestFrame,
|
||||
BridgePingFrame,
|
||||
BridgePongFrame,
|
||||
BridgeRPCRequestFrame,
|
||||
BridgeRPCResponseFrame,
|
||||
} from "../infra/bridge/server/types.js";
|
||||
|
||||
export type BridgeClientOptions = {
|
||||
host: string;
|
||||
port: number;
|
||||
tls?: boolean;
|
||||
tlsFingerprint?: string;
|
||||
nodeId: string;
|
||||
token?: string;
|
||||
displayName?: string;
|
||||
platform?: string;
|
||||
version?: string;
|
||||
deviceFamily?: string;
|
||||
modelIdentifier?: string;
|
||||
caps?: string[];
|
||||
commands?: string[];
|
||||
permissions?: Record<string, boolean>;
|
||||
onInvoke?: (frame: BridgeInvokeRequestFrame) => void | Promise<void>;
|
||||
onEvent?: (frame: BridgeEventFrame) => void | Promise<void>;
|
||||
onPairToken?: (token: string) => void | Promise<void>;
|
||||
onAuthReset?: () => void | Promise<void>;
|
||||
onConnected?: (hello: BridgeHelloOkFrame) => void | Promise<void>;
|
||||
onDisconnected?: (err?: Error) => void | Promise<void>;
|
||||
log?: { info?: (msg: string) => void; warn?: (msg: string) => void };
|
||||
};
|
||||
|
||||
type PendingRpc = {
|
||||
resolve: (frame: BridgeRPCResponseFrame) => void;
|
||||
reject: (err: Error) => void;
|
||||
timer?: NodeJS.Timeout;
|
||||
};
|
||||
|
||||
|
||||
function normalizeFingerprint(input: string): string {
|
||||
return input.replace(/[^a-fA-F0-9]/g, "").toLowerCase();
|
||||
}
|
||||
|
||||
function extractFingerprint(raw: tls.PeerCertificate | tls.DetailedPeerCertificate): string | null {
|
||||
const value = "fingerprint256" in raw ? raw.fingerprint256 : undefined;
|
||||
if (!value) return null;
|
||||
return normalizeFingerprint(value);
|
||||
}
|
||||
|
||||
export class BridgeClient {
|
||||
private opts: BridgeClientOptions;
|
||||
private socket: net.Socket | tls.TLSSocket | null = null;
|
||||
private buffer = "";
|
||||
private pendingRpc = new Map<string, PendingRpc>();
|
||||
private connected = false;
|
||||
private helloReady: Promise<void> | null = null;
|
||||
private helloResolve: (() => void) | null = null;
|
||||
private helloReject: ((err: Error) => void) | null = null;
|
||||
|
||||
constructor(opts: BridgeClientOptions) {
|
||||
this.opts = opts;
|
||||
}
|
||||
|
||||
async connect(): Promise<void> {
|
||||
if (this.connected) return;
|
||||
this.helloReady = new Promise<void>((resolve, reject) => {
|
||||
this.helloResolve = resolve;
|
||||
this.helloReject = reject;
|
||||
});
|
||||
const socket = this.opts.tls
|
||||
? tls.connect({
|
||||
host: this.opts.host,
|
||||
port: this.opts.port,
|
||||
rejectUnauthorized: false,
|
||||
})
|
||||
: net.connect({ host: this.opts.host, port: this.opts.port });
|
||||
this.socket = socket;
|
||||
socket.setNoDelay(true);
|
||||
|
||||
socket.on("connect", () => {
|
||||
this.sendHello();
|
||||
});
|
||||
socket.on("error", (err) => {
|
||||
this.handleDisconnect(err);
|
||||
});
|
||||
socket.on("close", () => {
|
||||
this.handleDisconnect();
|
||||
});
|
||||
socket.on("data", (chunk) => {
|
||||
this.buffer += chunk.toString("utf8");
|
||||
this.flush();
|
||||
});
|
||||
|
||||
if (this.opts.tls && socket instanceof tls.TLSSocket && this.opts.tlsFingerprint) {
|
||||
socket.once("secureConnect", () => {
|
||||
const cert = socket.getPeerCertificate(true);
|
||||
const fingerprint = cert ? extractFingerprint(cert) : null;
|
||||
if (!fingerprint || fingerprint !== normalizeFingerprint(this.opts.tlsFingerprint ?? "")) {
|
||||
const err = new Error("bridge tls fingerprint mismatch");
|
||||
this.handleDisconnect(err);
|
||||
socket.destroy(err);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
await this.helloReady;
|
||||
}
|
||||
|
||||
async close(): Promise<void> {
|
||||
if (this.socket) {
|
||||
this.socket.destroy();
|
||||
this.socket = null;
|
||||
}
|
||||
this.connected = false;
|
||||
this.pendingRpc.forEach((pending) => {
|
||||
pending.timer && clearTimeout(pending.timer);
|
||||
pending.reject(new Error("bridge client closed"));
|
||||
});
|
||||
this.pendingRpc.clear();
|
||||
}
|
||||
|
||||
async request(method: string, params: Record<string, unknown> | null = null, timeoutMs = 5000) {
|
||||
const id = crypto.randomUUID();
|
||||
const frame: BridgeRPCRequestFrame = {
|
||||
type: "req",
|
||||
id,
|
||||
method,
|
||||
paramsJSON: params ? JSON.stringify(params) : null,
|
||||
};
|
||||
const res = await new Promise<BridgeRPCResponseFrame>((resolve, reject) => {
|
||||
const timer = setTimeout(() => {
|
||||
this.pendingRpc.delete(id);
|
||||
reject(new Error(`bridge request timeout (${method})`));
|
||||
}, timeoutMs);
|
||||
this.pendingRpc.set(id, { resolve, reject, timer });
|
||||
this.send(frame);
|
||||
});
|
||||
if (!res.ok) {
|
||||
throw new Error(res.error?.message ?? "bridge request failed");
|
||||
}
|
||||
return res.payloadJSON ? JSON.parse(res.payloadJSON) : null;
|
||||
}
|
||||
|
||||
sendEvent(event: string, payload?: unknown) {
|
||||
const frame: BridgeEventFrame = {
|
||||
type: "event",
|
||||
event,
|
||||
payloadJSON: payload ? JSON.stringify(payload) : null,
|
||||
};
|
||||
this.send(frame);
|
||||
}
|
||||
|
||||
sendInvokeResponse(frame: BridgeInvokeResponseFrame) {
|
||||
this.send(frame);
|
||||
}
|
||||
|
||||
private sendHello() {
|
||||
const hello: BridgeHelloFrame = {
|
||||
type: "hello",
|
||||
nodeId: this.opts.nodeId,
|
||||
token: this.opts.token,
|
||||
displayName: this.opts.displayName,
|
||||
platform: this.opts.platform,
|
||||
version: this.opts.version,
|
||||
deviceFamily: this.opts.deviceFamily,
|
||||
modelIdentifier: this.opts.modelIdentifier,
|
||||
caps: this.opts.caps,
|
||||
commands: this.opts.commands,
|
||||
permissions: this.opts.permissions,
|
||||
};
|
||||
this.send(hello);
|
||||
}
|
||||
|
||||
private sendPairRequest() {
|
||||
const req: BridgePairRequestFrame = {
|
||||
type: "pair-request",
|
||||
nodeId: this.opts.nodeId,
|
||||
displayName: this.opts.displayName,
|
||||
platform: this.opts.platform,
|
||||
version: this.opts.version,
|
||||
deviceFamily: this.opts.deviceFamily,
|
||||
modelIdentifier: this.opts.modelIdentifier,
|
||||
caps: this.opts.caps,
|
||||
commands: this.opts.commands,
|
||||
permissions: this.opts.permissions,
|
||||
};
|
||||
this.send(req);
|
||||
}
|
||||
|
||||
private send(frame: object) {
|
||||
if (!this.socket) return;
|
||||
this.socket.write(`${JSON.stringify(frame)}\n`);
|
||||
}
|
||||
|
||||
private handleDisconnect(err?: Error) {
|
||||
if (!this.connected && this.helloReject) {
|
||||
this.helloReject(err ?? new Error("bridge connection failed"));
|
||||
this.helloResolve = null;
|
||||
this.helloReject = null;
|
||||
}
|
||||
if (!this.connected && !this.socket) return;
|
||||
this.connected = false;
|
||||
this.socket = null;
|
||||
this.pendingRpc.forEach((pending) => {
|
||||
pending.timer && clearTimeout(pending.timer);
|
||||
pending.reject(err ?? new Error("bridge connection closed"));
|
||||
});
|
||||
this.pendingRpc.clear();
|
||||
void this.opts.onDisconnected?.(err);
|
||||
}
|
||||
|
||||
private flush() {
|
||||
while (true) {
|
||||
const idx = this.buffer.indexOf("\n");
|
||||
if (idx === -1) break;
|
||||
const line = this.buffer.slice(0, idx).trim();
|
||||
this.buffer = this.buffer.slice(idx + 1);
|
||||
if (!line) continue;
|
||||
let frame: { type?: string; [key: string]: unknown };
|
||||
try {
|
||||
frame = JSON.parse(line) as { type?: string };
|
||||
} catch {
|
||||
continue;
|
||||
}
|
||||
this.handleFrame(frame as BridgeErrorFrame);
|
||||
}
|
||||
}
|
||||
|
||||
private handleFrame(frame: {
|
||||
type?: string;
|
||||
[key: string]: unknown;
|
||||
}) {
|
||||
const type = String(frame.type ?? "");
|
||||
switch (type) {
|
||||
case "hello-ok": {
|
||||
this.connected = true;
|
||||
this.helloResolve?.();
|
||||
this.helloResolve = null;
|
||||
this.helloReject = null;
|
||||
void this.opts.onConnected?.(frame as BridgeHelloOkFrame);
|
||||
return;
|
||||
}
|
||||
case "pair-ok": {
|
||||
const token = String((frame as BridgePairOkFrame).token ?? "").trim();
|
||||
if (token) {
|
||||
this.opts.token = token;
|
||||
void this.opts.onPairToken?.(token);
|
||||
}
|
||||
return;
|
||||
}
|
||||
case "error": {
|
||||
const code = String((frame as BridgeErrorFrame).code ?? "");
|
||||
if (code === "NOT_PAIRED" || code === "UNAUTHORIZED") {
|
||||
this.opts.token = undefined;
|
||||
void this.opts.onAuthReset?.();
|
||||
this.sendPairRequest();
|
||||
return;
|
||||
}
|
||||
this.handleDisconnect(new Error((frame as BridgeErrorFrame).message ?? "bridge error"));
|
||||
return;
|
||||
}
|
||||
case "pong":
|
||||
return;
|
||||
case "ping": {
|
||||
const ping = frame as BridgePingFrame;
|
||||
const pong: BridgePongFrame = { type: "pong", id: String(ping.id ?? "") };
|
||||
this.send(pong);
|
||||
return;
|
||||
}
|
||||
case "event": {
|
||||
void this.opts.onEvent?.(frame as BridgeEventFrame);
|
||||
return;
|
||||
}
|
||||
case "res": {
|
||||
const res = frame as BridgeRPCResponseFrame;
|
||||
const pending = this.pendingRpc.get(res.id);
|
||||
if (pending) {
|
||||
pending.timer && clearTimeout(pending.timer);
|
||||
this.pendingRpc.delete(res.id);
|
||||
pending.resolve(res);
|
||||
}
|
||||
return;
|
||||
}
|
||||
case "invoke": {
|
||||
void this.opts.onInvoke?.(frame as BridgeInvokeRequestFrame);
|
||||
return;
|
||||
}
|
||||
case "invoke-res": {
|
||||
return;
|
||||
}
|
||||
default:
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
74
src/node-host/config.ts
Normal file
74
src/node-host/config.ts
Normal file
@@ -0,0 +1,74 @@
|
||||
import crypto from "node:crypto";
|
||||
import fs from "node:fs/promises";
|
||||
import path from "node:path";
|
||||
|
||||
import { resolveStateDir } from "../config/paths.js";
|
||||
|
||||
export type NodeHostGatewayConfig = {
|
||||
host?: string;
|
||||
port?: number;
|
||||
tls?: boolean;
|
||||
tlsFingerprint?: string;
|
||||
};
|
||||
|
||||
export type NodeHostConfig = {
|
||||
version: 1;
|
||||
nodeId: string;
|
||||
token?: string;
|
||||
displayName?: string;
|
||||
gateway?: NodeHostGatewayConfig;
|
||||
};
|
||||
|
||||
const NODE_HOST_FILE = "node.json";
|
||||
|
||||
export function resolveNodeHostConfigPath(): string {
|
||||
return path.join(resolveStateDir(), NODE_HOST_FILE);
|
||||
}
|
||||
|
||||
function normalizeConfig(config: Partial<NodeHostConfig> | null): NodeHostConfig {
|
||||
const base: NodeHostConfig = {
|
||||
version: 1,
|
||||
nodeId: "",
|
||||
token: config?.token,
|
||||
displayName: config?.displayName,
|
||||
gateway: config?.gateway,
|
||||
};
|
||||
if (config?.version === 1 && typeof config.nodeId === "string") {
|
||||
base.nodeId = config.nodeId.trim();
|
||||
}
|
||||
if (!base.nodeId) {
|
||||
base.nodeId = crypto.randomUUID();
|
||||
}
|
||||
return base;
|
||||
}
|
||||
|
||||
export async function loadNodeHostConfig(): Promise<NodeHostConfig | null> {
|
||||
const filePath = resolveNodeHostConfigPath();
|
||||
try {
|
||||
const raw = await fs.readFile(filePath, "utf8");
|
||||
const parsed = JSON.parse(raw) as Partial<NodeHostConfig>;
|
||||
return normalizeConfig(parsed);
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
export async function saveNodeHostConfig(config: NodeHostConfig): Promise<void> {
|
||||
const filePath = resolveNodeHostConfigPath();
|
||||
await fs.mkdir(path.dirname(filePath), { recursive: true });
|
||||
const payload = JSON.stringify(config, null, 2);
|
||||
await fs.writeFile(filePath, `${payload}\n`, { mode: 0o600 });
|
||||
try {
|
||||
await fs.chmod(filePath, 0o600);
|
||||
} catch {
|
||||
// best-effort on platforms without chmod
|
||||
}
|
||||
}
|
||||
|
||||
export async function ensureNodeHostConfig(): Promise<NodeHostConfig> {
|
||||
const existing = await loadNodeHostConfig();
|
||||
const normalized = normalizeConfig(existing);
|
||||
await saveNodeHostConfig(normalized);
|
||||
return normalized;
|
||||
}
|
||||
|
||||
654
src/node-host/runner.ts
Normal file
654
src/node-host/runner.ts
Normal file
@@ -0,0 +1,654 @@
|
||||
import crypto from "node:crypto";
|
||||
import { spawn } from "node:child_process";
|
||||
import fs from "node:fs";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
|
||||
import type { BridgeInvokeRequestFrame } from "../infra/bridge/server/types.js";
|
||||
import {
|
||||
addAllowlistEntry,
|
||||
matchAllowlist,
|
||||
recordAllowlistUse,
|
||||
requestExecApprovalViaSocket,
|
||||
resolveCommandResolution,
|
||||
resolveExecApprovals,
|
||||
} from "../infra/exec-approvals.js";
|
||||
import { getMachineDisplayName } from "../infra/machine-name.js";
|
||||
import { VERSION } from "../version.js";
|
||||
|
||||
import { BridgeClient } from "./bridge-client.js";
|
||||
import {
|
||||
ensureNodeHostConfig,
|
||||
saveNodeHostConfig,
|
||||
type NodeHostGatewayConfig,
|
||||
} from "./config.js";
|
||||
|
||||
type NodeHostRunOptions = {
|
||||
gatewayHost: string;
|
||||
gatewayPort: number;
|
||||
gatewayTls?: boolean;
|
||||
gatewayTlsFingerprint?: string;
|
||||
nodeId?: string;
|
||||
displayName?: string;
|
||||
};
|
||||
|
||||
type SystemRunParams = {
|
||||
command: string[];
|
||||
rawCommand?: string | null;
|
||||
cwd?: string | null;
|
||||
env?: Record<string, string>;
|
||||
timeoutMs?: number | null;
|
||||
needsScreenRecording?: boolean | null;
|
||||
agentId?: string | null;
|
||||
sessionKey?: string | null;
|
||||
};
|
||||
|
||||
type SystemWhichParams = {
|
||||
bins: string[];
|
||||
};
|
||||
|
||||
type RunResult = {
|
||||
exitCode?: number;
|
||||
timedOut: boolean;
|
||||
success: boolean;
|
||||
stdout: string;
|
||||
stderr: string;
|
||||
error?: string | null;
|
||||
truncated: boolean;
|
||||
};
|
||||
|
||||
type ExecEventPayload = {
|
||||
sessionKey: string;
|
||||
runId: string;
|
||||
host: string;
|
||||
command?: string;
|
||||
exitCode?: number;
|
||||
timedOut?: boolean;
|
||||
success?: boolean;
|
||||
output?: string;
|
||||
reason?: string;
|
||||
};
|
||||
|
||||
const OUTPUT_CAP = 200_000;
|
||||
const OUTPUT_EVENT_TAIL = 20_000;
|
||||
|
||||
const blockedEnvKeys = new Set([
|
||||
"PATH",
|
||||
"NODE_OPTIONS",
|
||||
"PYTHONHOME",
|
||||
"PYTHONPATH",
|
||||
"PERL5LIB",
|
||||
"PERL5OPT",
|
||||
"RUBYOPT",
|
||||
]);
|
||||
|
||||
const blockedEnvPrefixes = ["DYLD_", "LD_"];
|
||||
|
||||
class SkillBinsCache {
|
||||
private bins = new Set<string>();
|
||||
private lastRefresh = 0;
|
||||
private readonly ttlMs = 90_000;
|
||||
private readonly fetch: () => Promise<string[]>;
|
||||
|
||||
constructor(fetch: () => Promise<string[]>) {
|
||||
this.fetch = fetch;
|
||||
}
|
||||
|
||||
async current(force = false): Promise<Set<string>> {
|
||||
if (force || Date.now() - this.lastRefresh > this.ttlMs) {
|
||||
await this.refresh();
|
||||
}
|
||||
return this.bins;
|
||||
}
|
||||
|
||||
private async refresh() {
|
||||
try {
|
||||
const bins = await this.fetch();
|
||||
this.bins = new Set(bins);
|
||||
this.lastRefresh = Date.now();
|
||||
} catch {
|
||||
if (!this.lastRefresh) {
|
||||
this.bins = new Set();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function sanitizeEnv(overrides?: Record<string, string> | null): Record<string, string> | undefined {
|
||||
if (!overrides) return undefined;
|
||||
const merged = { ...process.env } as Record<string, string>;
|
||||
for (const [rawKey, value] of Object.entries(overrides)) {
|
||||
const key = rawKey.trim();
|
||||
if (!key) continue;
|
||||
const upper = key.toUpperCase();
|
||||
if (blockedEnvKeys.has(upper)) continue;
|
||||
if (blockedEnvPrefixes.some((prefix) => upper.startsWith(prefix))) continue;
|
||||
merged[key] = value;
|
||||
}
|
||||
return merged;
|
||||
}
|
||||
|
||||
function formatCommand(argv: string[]): string {
|
||||
return argv
|
||||
.map((arg) => {
|
||||
const trimmed = arg.trim();
|
||||
if (!trimmed) return "\"\"";
|
||||
const needsQuotes = /\s|"/.test(trimmed);
|
||||
if (!needsQuotes) return trimmed;
|
||||
return `"${trimmed.replace(/"/g, '\\"')}"`;
|
||||
})
|
||||
.join(" ");
|
||||
}
|
||||
|
||||
function truncateOutput(raw: string, maxChars: number): { text: string; truncated: boolean } {
|
||||
if (raw.length <= maxChars) return { text: raw, truncated: false };
|
||||
return { text: `... (truncated) ${raw.slice(raw.length - maxChars)}`, truncated: true };
|
||||
}
|
||||
|
||||
async function runCommand(
|
||||
argv: string[],
|
||||
cwd: string | undefined,
|
||||
env: Record<string, string> | undefined,
|
||||
timeoutMs: number | undefined,
|
||||
): Promise<RunResult> {
|
||||
return await new Promise((resolve) => {
|
||||
let stdout = "";
|
||||
let stderr = "";
|
||||
let outputLen = 0;
|
||||
let truncated = false;
|
||||
let timedOut = false;
|
||||
let settled = false;
|
||||
|
||||
const child = spawn(argv[0], argv.slice(1), {
|
||||
cwd,
|
||||
env,
|
||||
stdio: ["ignore", "pipe", "pipe"],
|
||||
windowsHide: true,
|
||||
});
|
||||
|
||||
const onChunk = (chunk: Buffer, target: "stdout" | "stderr") => {
|
||||
if (outputLen >= OUTPUT_CAP) {
|
||||
truncated = true;
|
||||
return;
|
||||
}
|
||||
const remaining = OUTPUT_CAP - outputLen;
|
||||
const slice = chunk.length > remaining ? chunk.subarray(0, remaining) : chunk;
|
||||
const str = slice.toString("utf8");
|
||||
outputLen += slice.length;
|
||||
if (target === "stdout") stdout += str;
|
||||
else stderr += str;
|
||||
if (chunk.length > remaining) truncated = true;
|
||||
};
|
||||
|
||||
child.stdout?.on("data", (chunk) => onChunk(chunk as Buffer, "stdout"));
|
||||
child.stderr?.on("data", (chunk) => onChunk(chunk as Buffer, "stderr"));
|
||||
|
||||
let timer: NodeJS.Timeout | undefined;
|
||||
if (timeoutMs && timeoutMs > 0) {
|
||||
timer = setTimeout(() => {
|
||||
timedOut = true;
|
||||
try {
|
||||
child.kill("SIGKILL");
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}, timeoutMs);
|
||||
}
|
||||
|
||||
const finalize = (exitCode?: number, error?: string | null) => {
|
||||
if (settled) return;
|
||||
settled = true;
|
||||
if (timer) clearTimeout(timer);
|
||||
resolve({
|
||||
exitCode,
|
||||
timedOut,
|
||||
success: exitCode === 0 && !timedOut && !error,
|
||||
stdout,
|
||||
stderr,
|
||||
error: error ?? null,
|
||||
truncated,
|
||||
});
|
||||
};
|
||||
|
||||
child.on("error", (err) => {
|
||||
finalize(undefined, err.message);
|
||||
});
|
||||
child.on("exit", (code) => {
|
||||
finalize(code === null ? undefined : code, null);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function resolveEnvPath(env?: Record<string, string>): string[] {
|
||||
const raw =
|
||||
env?.PATH ??
|
||||
(env as Record<string, string>)?.Path ??
|
||||
process.env.PATH ??
|
||||
process.env.Path ??
|
||||
"";
|
||||
return raw.split(path.delimiter).filter(Boolean);
|
||||
}
|
||||
|
||||
function resolveExecutable(bin: string, env?: Record<string, string>) {
|
||||
if (bin.includes("/") || bin.includes("\\")) return null;
|
||||
const extensions =
|
||||
process.platform === "win32"
|
||||
? (process.env.PATHEXT ?? process.env.PathExt ?? ".EXE;.CMD;.BAT;.COM")
|
||||
.split(";")
|
||||
.map((ext) => ext.toLowerCase())
|
||||
: [""];
|
||||
for (const dir of resolveEnvPath(env)) {
|
||||
for (const ext of extensions) {
|
||||
const candidate = path.join(dir, bin + ext);
|
||||
if (fs.existsSync(candidate)) return candidate;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
async function handleSystemWhich(params: SystemWhichParams, env?: Record<string, string>) {
|
||||
const bins = params.bins
|
||||
.map((bin) => bin.trim())
|
||||
.filter(Boolean);
|
||||
const found: Record<string, string> = {};
|
||||
for (const bin of bins) {
|
||||
const path = resolveExecutable(bin, env);
|
||||
if (path) found[bin] = path;
|
||||
}
|
||||
return { bins: found };
|
||||
}
|
||||
|
||||
function buildExecEventPayload(payload: ExecEventPayload): ExecEventPayload {
|
||||
if (!payload.output) return payload;
|
||||
const trimmed = payload.output.trim();
|
||||
if (!trimmed) return payload;
|
||||
const { text } = truncateOutput(trimmed, OUTPUT_EVENT_TAIL);
|
||||
return { ...payload, output: text };
|
||||
}
|
||||
|
||||
export async function runNodeHost(opts: NodeHostRunOptions): Promise<void> {
|
||||
const config = await ensureNodeHostConfig();
|
||||
const nodeId = opts.nodeId?.trim() || config.nodeId;
|
||||
if (nodeId !== config.nodeId) {
|
||||
config.nodeId = nodeId;
|
||||
config.token = undefined;
|
||||
}
|
||||
const displayName =
|
||||
opts.displayName?.trim() || config.displayName || (await getMachineDisplayName());
|
||||
config.displayName = displayName;
|
||||
const gateway: NodeHostGatewayConfig = {
|
||||
host: opts.gatewayHost,
|
||||
port: opts.gatewayPort,
|
||||
tls: opts.gatewayTls === true,
|
||||
tlsFingerprint: opts.gatewayTlsFingerprint,
|
||||
};
|
||||
config.gateway = gateway;
|
||||
await saveNodeHostConfig(config);
|
||||
|
||||
let disconnectResolve: (() => void) | null = null;
|
||||
let disconnectSignal = false;
|
||||
const waitForDisconnect = () =>
|
||||
new Promise<void>((resolve) => {
|
||||
if (disconnectSignal) {
|
||||
disconnectSignal = false;
|
||||
resolve();
|
||||
return;
|
||||
}
|
||||
disconnectResolve = resolve;
|
||||
});
|
||||
|
||||
const client = new BridgeClient({
|
||||
host: gateway.host ?? "127.0.0.1",
|
||||
port: gateway.port ?? 18790,
|
||||
tls: gateway.tls,
|
||||
tlsFingerprint: gateway.tlsFingerprint,
|
||||
nodeId,
|
||||
token: config.token,
|
||||
displayName,
|
||||
platform: process.platform,
|
||||
version: VERSION,
|
||||
deviceFamily: os.platform(),
|
||||
modelIdentifier: os.hostname(),
|
||||
caps: ["system"],
|
||||
commands: ["system.run", "system.which"],
|
||||
onPairToken: async (token) => {
|
||||
config.token = token;
|
||||
await saveNodeHostConfig(config);
|
||||
},
|
||||
onAuthReset: async () => {
|
||||
if (!config.token) return;
|
||||
config.token = undefined;
|
||||
await saveNodeHostConfig(config);
|
||||
},
|
||||
onInvoke: async (frame) => {
|
||||
await handleInvoke(frame, client, skillBins);
|
||||
},
|
||||
onDisconnected: () => {
|
||||
if (disconnectResolve) {
|
||||
disconnectResolve();
|
||||
disconnectResolve = null;
|
||||
} else {
|
||||
disconnectSignal = true;
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
const skillBins = new SkillBinsCache(async () => {
|
||||
const res = await client.request("skills.bins", {});
|
||||
const bins = Array.isArray(res?.bins) ? res.bins.map((b) => String(b)) : [];
|
||||
return bins;
|
||||
});
|
||||
|
||||
while (true) {
|
||||
try {
|
||||
await client.connect();
|
||||
await waitForDisconnect();
|
||||
} catch {
|
||||
// ignore connect errors; retry
|
||||
}
|
||||
await new Promise((resolve) => setTimeout(resolve, 1500));
|
||||
}
|
||||
}
|
||||
|
||||
async function handleInvoke(
|
||||
frame: BridgeInvokeRequestFrame,
|
||||
client: BridgeClient,
|
||||
skillBins: SkillBinsCache,
|
||||
) {
|
||||
const command = String(frame.command ?? "");
|
||||
if (command === "system.which") {
|
||||
try {
|
||||
const params = decodeParams<SystemWhichParams>(frame.paramsJSON);
|
||||
if (!Array.isArray(params.bins)) {
|
||||
throw new Error("INVALID_REQUEST: bins required");
|
||||
}
|
||||
const env = sanitizeEnv(undefined);
|
||||
const payload = await handleSystemWhich(params, env);
|
||||
client.sendInvokeResponse({
|
||||
type: "invoke-res",
|
||||
id: frame.id,
|
||||
ok: true,
|
||||
payloadJSON: JSON.stringify(payload),
|
||||
});
|
||||
} catch (err) {
|
||||
client.sendInvokeResponse({
|
||||
type: "invoke-res",
|
||||
id: frame.id,
|
||||
ok: false,
|
||||
error: { code: "INVALID_REQUEST", message: String(err) },
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (command !== "system.run") {
|
||||
client.sendInvokeResponse({
|
||||
type: "invoke-res",
|
||||
id: frame.id,
|
||||
ok: false,
|
||||
error: { code: "UNAVAILABLE", message: "command not supported" },
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
let params: SystemRunParams;
|
||||
try {
|
||||
params = decodeParams<SystemRunParams>(frame.paramsJSON);
|
||||
} catch (err) {
|
||||
client.sendInvokeResponse({
|
||||
type: "invoke-res",
|
||||
id: frame.id,
|
||||
ok: false,
|
||||
error: { code: "INVALID_REQUEST", message: String(err) },
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!Array.isArray(params.command) || params.command.length === 0) {
|
||||
client.sendInvokeResponse({
|
||||
type: "invoke-res",
|
||||
id: frame.id,
|
||||
ok: false,
|
||||
error: { code: "INVALID_REQUEST", message: "command required" },
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const argv = params.command.map((item) => String(item));
|
||||
const rawCommand = typeof params.rawCommand === "string" ? params.rawCommand.trim() : "";
|
||||
const cmdText = rawCommand || formatCommand(argv);
|
||||
const agentId = params.agentId?.trim() || undefined;
|
||||
const approvals = resolveExecApprovals(agentId);
|
||||
const security = approvals.agent.security;
|
||||
const ask = approvals.agent.ask;
|
||||
const askFallback = approvals.agent.askFallback;
|
||||
const autoAllowSkills = approvals.agent.autoAllowSkills;
|
||||
const sessionKey = params.sessionKey?.trim() || "node";
|
||||
const runId = crypto.randomUUID();
|
||||
const env = sanitizeEnv(params.env ?? undefined);
|
||||
const resolution = resolveCommandResolution(cmdText, params.cwd ?? undefined, env);
|
||||
const allowlistMatch =
|
||||
security === "allowlist" ? matchAllowlist(approvals.allowlist, resolution) : null;
|
||||
const bins = autoAllowSkills ? await skillBins.current() : new Set<string>();
|
||||
const skillAllow =
|
||||
autoAllowSkills && resolution?.executableName ? bins.has(resolution.executableName) : false;
|
||||
|
||||
if (security === "deny") {
|
||||
client.sendEvent(
|
||||
"exec.denied",
|
||||
buildExecEventPayload({
|
||||
sessionKey,
|
||||
runId,
|
||||
host: "node",
|
||||
command: cmdText,
|
||||
reason: "security=deny",
|
||||
}),
|
||||
);
|
||||
client.sendInvokeResponse({
|
||||
type: "invoke-res",
|
||||
id: frame.id,
|
||||
ok: false,
|
||||
error: { code: "UNAVAILABLE", message: "SYSTEM_RUN_DISABLED: security=deny" },
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const requiresAsk =
|
||||
ask === "always" ||
|
||||
(ask === "on-miss" && security === "allowlist" && !allowlistMatch && !skillAllow);
|
||||
|
||||
let approvedByAsk = false;
|
||||
if (requiresAsk) {
|
||||
const decision = await requestExecApprovalViaSocket({
|
||||
socketPath: approvals.socketPath,
|
||||
token: approvals.token,
|
||||
request: {
|
||||
command: cmdText,
|
||||
cwd: params.cwd ?? undefined,
|
||||
host: "node",
|
||||
security,
|
||||
ask,
|
||||
agentId,
|
||||
resolvedPath: resolution?.resolvedPath ?? null,
|
||||
},
|
||||
});
|
||||
if (decision === "deny") {
|
||||
client.sendEvent(
|
||||
"exec.denied",
|
||||
buildExecEventPayload({
|
||||
sessionKey,
|
||||
runId,
|
||||
host: "node",
|
||||
command: cmdText,
|
||||
reason: "user-denied",
|
||||
}),
|
||||
);
|
||||
client.sendInvokeResponse({
|
||||
type: "invoke-res",
|
||||
id: frame.id,
|
||||
ok: false,
|
||||
error: { code: "UNAVAILABLE", message: "SYSTEM_RUN_DENIED: user denied" },
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!decision) {
|
||||
if (askFallback === "full") {
|
||||
approvedByAsk = true;
|
||||
} else if (askFallback === "allowlist") {
|
||||
if (allowlistMatch || skillAllow) {
|
||||
approvedByAsk = true;
|
||||
} else {
|
||||
client.sendEvent(
|
||||
"exec.denied",
|
||||
buildExecEventPayload({
|
||||
sessionKey,
|
||||
runId,
|
||||
host: "node",
|
||||
command: cmdText,
|
||||
reason: "approval-required",
|
||||
}),
|
||||
);
|
||||
client.sendInvokeResponse({
|
||||
type: "invoke-res",
|
||||
id: frame.id,
|
||||
ok: false,
|
||||
error: { code: "UNAVAILABLE", message: "SYSTEM_RUN_DENIED: approval required" },
|
||||
});
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
client.sendEvent(
|
||||
"exec.denied",
|
||||
buildExecEventPayload({
|
||||
sessionKey,
|
||||
runId,
|
||||
host: "node",
|
||||
command: cmdText,
|
||||
reason: "approval-required",
|
||||
}),
|
||||
);
|
||||
client.sendInvokeResponse({
|
||||
type: "invoke-res",
|
||||
id: frame.id,
|
||||
ok: false,
|
||||
error: { code: "UNAVAILABLE", message: "SYSTEM_RUN_DENIED: approval required" },
|
||||
});
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (decision === "allow-once") {
|
||||
approvedByAsk = true;
|
||||
}
|
||||
if (decision === "allow-always") {
|
||||
approvedByAsk = true;
|
||||
if (security === "allowlist") {
|
||||
const pattern = resolution?.resolvedPath ?? resolution?.rawExecutable ?? argv[0] ?? "";
|
||||
if (pattern) addAllowlistEntry(approvals.file, agentId, pattern);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (security === "allowlist" && !allowlistMatch && !skillAllow && !approvedByAsk) {
|
||||
client.sendEvent(
|
||||
"exec.denied",
|
||||
buildExecEventPayload({
|
||||
sessionKey,
|
||||
runId,
|
||||
host: "node",
|
||||
command: cmdText,
|
||||
reason: "allowlist-miss",
|
||||
}),
|
||||
);
|
||||
client.sendInvokeResponse({
|
||||
type: "invoke-res",
|
||||
id: frame.id,
|
||||
ok: false,
|
||||
error: { code: "UNAVAILABLE", message: "SYSTEM_RUN_DENIED: allowlist miss" },
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (allowlistMatch) {
|
||||
recordAllowlistUse(approvals.file, agentId, allowlistMatch, cmdText, resolution?.resolvedPath);
|
||||
}
|
||||
|
||||
if (params.needsScreenRecording === true) {
|
||||
client.sendEvent(
|
||||
"exec.denied",
|
||||
buildExecEventPayload({
|
||||
sessionKey,
|
||||
runId,
|
||||
host: "node",
|
||||
command: cmdText,
|
||||
reason: "permission:screenRecording",
|
||||
}),
|
||||
);
|
||||
client.sendInvokeResponse({
|
||||
type: "invoke-res",
|
||||
id: frame.id,
|
||||
ok: false,
|
||||
error: { code: "UNAVAILABLE", message: "PERMISSION_MISSING: screenRecording" },
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
client.sendEvent(
|
||||
"exec.started",
|
||||
buildExecEventPayload({
|
||||
sessionKey,
|
||||
runId,
|
||||
host: "node",
|
||||
command: cmdText,
|
||||
}),
|
||||
);
|
||||
|
||||
const result = await runCommand(
|
||||
argv,
|
||||
params.cwd?.trim() || undefined,
|
||||
env,
|
||||
params.timeoutMs ?? undefined,
|
||||
);
|
||||
if (result.truncated) {
|
||||
const suffix = "... (truncated)";
|
||||
if (result.stderr.trim().length > 0) {
|
||||
result.stderr = `${result.stderr}\n${suffix}`;
|
||||
} else {
|
||||
result.stdout = `${result.stdout}\n${suffix}`;
|
||||
}
|
||||
}
|
||||
const combined = [result.stdout, result.stderr, result.error].filter(Boolean).join("\n");
|
||||
client.sendEvent(
|
||||
"exec.finished",
|
||||
buildExecEventPayload({
|
||||
sessionKey,
|
||||
runId,
|
||||
host: "node",
|
||||
command: cmdText,
|
||||
exitCode: result.exitCode,
|
||||
timedOut: result.timedOut,
|
||||
success: result.success,
|
||||
output: combined,
|
||||
}),
|
||||
);
|
||||
|
||||
client.sendInvokeResponse({
|
||||
type: "invoke-res",
|
||||
id: frame.id,
|
||||
ok: true,
|
||||
payloadJSON: JSON.stringify({
|
||||
exitCode: result.exitCode,
|
||||
timedOut: result.timedOut,
|
||||
success: result.success,
|
||||
stdout: result.stdout,
|
||||
stderr: result.stderr,
|
||||
error: result.error ?? null,
|
||||
}),
|
||||
});
|
||||
}
|
||||
|
||||
function decodeParams<T>(raw?: string | null): T {
|
||||
if (!raw) {
|
||||
throw new Error("INVALID_REQUEST: paramsJSON required");
|
||||
}
|
||||
return JSON.parse(raw) as T;
|
||||
}
|
||||
Reference in New Issue
Block a user