mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-12 07:20:45 +00:00
* Terminal: measure grapheme display width * Tests: cover grapheme terminal width * Terminal: wrap table cells by grapheme width * Tests: cover emoji table alignment * Terminal: refine table wrapping and width handling * Terminal: stop shrinking CLI tables by one column * Skills: use Terminal-safe emoji in list output * Changelog: note terminal skills table fixes * Skills: normalize emoji presentation across outputs * Terminal: consume unsupported escape bytes in tables
454 lines
15 KiB
TypeScript
454 lines
15 KiB
TypeScript
import type { Command } from "commander";
|
|
import { buildGatewayConnectionDetails, callGateway } from "../gateway/call.js";
|
|
import { isLoopbackHost } from "../gateway/net.js";
|
|
import {
|
|
approveDevicePairing,
|
|
listDevicePairing,
|
|
summarizeDeviceTokens,
|
|
type PairedDevice as InfraPairedDevice,
|
|
} from "../infra/device-pairing.js";
|
|
import { formatTimeAgo } from "../infra/format-time/format-relative.ts";
|
|
import { defaultRuntime } from "../runtime.js";
|
|
import { getTerminalTableWidth, renderTable } from "../terminal/table.js";
|
|
import { theme } from "../terminal/theme.js";
|
|
import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";
|
|
import { withProgress } from "./progress.js";
|
|
|
|
type DevicesRpcOpts = {
|
|
url?: string;
|
|
token?: string;
|
|
password?: string;
|
|
timeout?: string;
|
|
json?: boolean;
|
|
latest?: boolean;
|
|
yes?: boolean;
|
|
pending?: boolean;
|
|
device?: string;
|
|
role?: string;
|
|
scope?: string[];
|
|
};
|
|
|
|
type DeviceTokenSummary = {
|
|
role: string;
|
|
scopes?: string[];
|
|
revokedAtMs?: number;
|
|
};
|
|
|
|
type PendingDevice = {
|
|
requestId: string;
|
|
deviceId: string;
|
|
displayName?: string;
|
|
role?: string;
|
|
remoteIp?: string;
|
|
isRepair?: boolean;
|
|
ts?: number;
|
|
};
|
|
|
|
type PairedDevice = {
|
|
deviceId: string;
|
|
displayName?: string;
|
|
roles?: string[];
|
|
scopes?: string[];
|
|
remoteIp?: string;
|
|
tokens?: DeviceTokenSummary[];
|
|
createdAtMs?: number;
|
|
approvedAtMs?: number;
|
|
};
|
|
|
|
type DevicePairingList = {
|
|
pending?: PendingDevice[];
|
|
paired?: PairedDevice[];
|
|
};
|
|
|
|
const FALLBACK_NOTICE = "Direct scope access failed; using local fallback.";
|
|
|
|
const devicesCallOpts = (cmd: Command, defaults?: { timeoutMs?: number }) =>
|
|
cmd
|
|
.option("--url <url>", "Gateway WebSocket URL (defaults to gateway.remote.url when configured)")
|
|
.option("--token <token>", "Gateway token (if required)")
|
|
.option("--password <password>", "Gateway password (password auth)")
|
|
.option("--timeout <ms>", "Timeout in ms", String(defaults?.timeoutMs ?? 10_000))
|
|
.option("--json", "Output JSON", false);
|
|
|
|
const callGatewayCli = async (method: string, opts: DevicesRpcOpts, params?: unknown) =>
|
|
withProgress(
|
|
{
|
|
label: `Devices ${method}`,
|
|
indeterminate: true,
|
|
enabled: opts.json !== true,
|
|
},
|
|
async () =>
|
|
await callGateway({
|
|
url: opts.url,
|
|
token: opts.token,
|
|
password: opts.password,
|
|
method,
|
|
params,
|
|
timeoutMs: Number(opts.timeout ?? 10_000),
|
|
clientName: GATEWAY_CLIENT_NAMES.CLI,
|
|
mode: GATEWAY_CLIENT_MODES.CLI,
|
|
}),
|
|
);
|
|
|
|
function normalizeErrorMessage(error: unknown): string {
|
|
if (error instanceof Error) {
|
|
return error.message;
|
|
}
|
|
return String(error);
|
|
}
|
|
|
|
function shouldUseLocalPairingFallback(opts: DevicesRpcOpts, error: unknown): boolean {
|
|
const message = normalizeErrorMessage(error).toLowerCase();
|
|
if (!message.includes("pairing required")) {
|
|
return false;
|
|
}
|
|
if (typeof opts.url === "string" && opts.url.trim().length > 0) {
|
|
// Explicit --url might point at a remote/tunneled gateway; never silently
|
|
// switch to local pairing files in that case.
|
|
return false;
|
|
}
|
|
const connection = buildGatewayConnectionDetails();
|
|
if (connection.urlSource !== "local loopback") {
|
|
return false;
|
|
}
|
|
try {
|
|
return isLoopbackHost(new URL(connection.url).hostname);
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
function redactLocalPairedDevice(device: InfraPairedDevice): PairedDevice {
|
|
const { tokens, ...rest } = device;
|
|
return {
|
|
...(rest as unknown as PairedDevice),
|
|
tokens: summarizeDeviceTokens(tokens) as DeviceTokenSummary[] | undefined,
|
|
};
|
|
}
|
|
|
|
async function listPairingWithFallback(opts: DevicesRpcOpts): Promise<DevicePairingList> {
|
|
try {
|
|
return parseDevicePairingList(await callGatewayCli("device.pair.list", opts, {}));
|
|
} catch (error) {
|
|
if (!shouldUseLocalPairingFallback(opts, error)) {
|
|
throw error;
|
|
}
|
|
if (opts.json !== true) {
|
|
defaultRuntime.log(theme.warn(FALLBACK_NOTICE));
|
|
}
|
|
const local = await listDevicePairing();
|
|
return {
|
|
pending: local.pending as PendingDevice[],
|
|
paired: local.paired.map((device) => redactLocalPairedDevice(device)),
|
|
};
|
|
}
|
|
}
|
|
|
|
async function approvePairingWithFallback(
|
|
opts: DevicesRpcOpts,
|
|
requestId: string,
|
|
): Promise<Record<string, unknown> | null> {
|
|
try {
|
|
return await callGatewayCli("device.pair.approve", opts, { requestId });
|
|
} catch (error) {
|
|
if (!shouldUseLocalPairingFallback(opts, error)) {
|
|
throw error;
|
|
}
|
|
if (opts.json !== true) {
|
|
defaultRuntime.log(theme.warn(FALLBACK_NOTICE));
|
|
}
|
|
const approved = await approveDevicePairing(requestId);
|
|
if (!approved) {
|
|
return null;
|
|
}
|
|
return {
|
|
requestId,
|
|
device: redactLocalPairedDevice(approved.device),
|
|
};
|
|
}
|
|
}
|
|
|
|
function parseDevicePairingList(value: unknown): DevicePairingList {
|
|
const obj = typeof value === "object" && value !== null ? (value as Record<string, unknown>) : {};
|
|
return {
|
|
pending: Array.isArray(obj.pending) ? (obj.pending as PendingDevice[]) : [],
|
|
paired: Array.isArray(obj.paired) ? (obj.paired as PairedDevice[]) : [],
|
|
};
|
|
}
|
|
|
|
function selectLatestPendingRequest(pending: PendingDevice[] | undefined) {
|
|
if (!pending?.length) {
|
|
return null;
|
|
}
|
|
return pending.reduce((latest, current) => {
|
|
const latestTs = typeof latest.ts === "number" ? latest.ts : 0;
|
|
const currentTs = typeof current.ts === "number" ? current.ts : 0;
|
|
return currentTs > latestTs ? current : latest;
|
|
});
|
|
}
|
|
|
|
function formatTokenSummary(tokens: DeviceTokenSummary[] | undefined) {
|
|
if (!tokens || tokens.length === 0) {
|
|
return "none";
|
|
}
|
|
const parts = tokens
|
|
.map((t) => `${t.role}${t.revokedAtMs ? " (revoked)" : ""}`)
|
|
.toSorted((a, b) => a.localeCompare(b));
|
|
return parts.join(", ");
|
|
}
|
|
|
|
function resolveRequiredDeviceRole(
|
|
opts: DevicesRpcOpts,
|
|
): { deviceId: string; role: string } | null {
|
|
const deviceId = String(opts.device ?? "").trim();
|
|
const role = String(opts.role ?? "").trim();
|
|
if (deviceId && role) {
|
|
return { deviceId, role };
|
|
}
|
|
defaultRuntime.error("--device and --role required");
|
|
defaultRuntime.exit(1);
|
|
return null;
|
|
}
|
|
|
|
export function registerDevicesCli(program: Command) {
|
|
const devices = program.command("devices").description("Device pairing and auth tokens");
|
|
|
|
devicesCallOpts(
|
|
devices
|
|
.command("list")
|
|
.description("List pending and paired devices")
|
|
.action(async (opts: DevicesRpcOpts) => {
|
|
const list = await listPairingWithFallback(opts);
|
|
if (opts.json) {
|
|
defaultRuntime.log(JSON.stringify(list, null, 2));
|
|
return;
|
|
}
|
|
if (list.pending?.length) {
|
|
const tableWidth = getTerminalTableWidth();
|
|
defaultRuntime.log(
|
|
`${theme.heading("Pending")} ${theme.muted(`(${list.pending.length})`)}`,
|
|
);
|
|
defaultRuntime.log(
|
|
renderTable({
|
|
width: tableWidth,
|
|
columns: [
|
|
{ key: "Request", header: "Request", minWidth: 10 },
|
|
{ key: "Device", header: "Device", minWidth: 16, flex: true },
|
|
{ key: "Role", header: "Role", minWidth: 8 },
|
|
{ key: "IP", header: "IP", minWidth: 12 },
|
|
{ key: "Age", header: "Age", minWidth: 8 },
|
|
{ key: "Flags", header: "Flags", minWidth: 8 },
|
|
],
|
|
rows: list.pending.map((req) => ({
|
|
Request: req.requestId,
|
|
Device: req.displayName || req.deviceId,
|
|
Role: req.role ?? "",
|
|
IP: req.remoteIp ?? "",
|
|
Age: typeof req.ts === "number" ? formatTimeAgo(Date.now() - req.ts) : "",
|
|
Flags: req.isRepair ? "repair" : "",
|
|
})),
|
|
}).trimEnd(),
|
|
);
|
|
}
|
|
if (list.paired?.length) {
|
|
const tableWidth = getTerminalTableWidth();
|
|
defaultRuntime.log(
|
|
`${theme.heading("Paired")} ${theme.muted(`(${list.paired.length})`)}`,
|
|
);
|
|
defaultRuntime.log(
|
|
renderTable({
|
|
width: tableWidth,
|
|
columns: [
|
|
{ key: "Device", header: "Device", minWidth: 16, flex: true },
|
|
{ key: "Roles", header: "Roles", minWidth: 12, flex: true },
|
|
{ key: "Scopes", header: "Scopes", minWidth: 12, flex: true },
|
|
{ key: "Tokens", header: "Tokens", minWidth: 12, flex: true },
|
|
{ key: "IP", header: "IP", minWidth: 12 },
|
|
],
|
|
rows: list.paired.map((device) => ({
|
|
Device: device.displayName || device.deviceId,
|
|
Roles: device.roles?.length ? device.roles.join(", ") : "",
|
|
Scopes: device.scopes?.length ? device.scopes.join(", ") : "",
|
|
Tokens: formatTokenSummary(device.tokens),
|
|
IP: device.remoteIp ?? "",
|
|
})),
|
|
}).trimEnd(),
|
|
);
|
|
}
|
|
if (!list.pending?.length && !list.paired?.length) {
|
|
defaultRuntime.log(theme.muted("No device pairing entries."));
|
|
}
|
|
}),
|
|
);
|
|
|
|
devicesCallOpts(
|
|
devices
|
|
.command("remove")
|
|
.description("Remove a paired device entry")
|
|
.argument("<deviceId>", "Paired device id")
|
|
.action(async (deviceId: string, opts: DevicesRpcOpts) => {
|
|
const trimmed = deviceId.trim();
|
|
if (!trimmed) {
|
|
defaultRuntime.error("deviceId is required");
|
|
defaultRuntime.exit(1);
|
|
return;
|
|
}
|
|
const result = await callGatewayCli("device.pair.remove", opts, { deviceId: trimmed });
|
|
if (opts.json) {
|
|
defaultRuntime.log(JSON.stringify(result, null, 2));
|
|
return;
|
|
}
|
|
defaultRuntime.log(`${theme.warn("Removed")} ${theme.command(trimmed)}`);
|
|
}),
|
|
);
|
|
|
|
devicesCallOpts(
|
|
devices
|
|
.command("clear")
|
|
.description("Clear paired devices from the gateway table")
|
|
.option("--pending", "Also reject all pending pairing requests", false)
|
|
.option("--yes", "Confirm destructive clear", false)
|
|
.action(async (opts: DevicesRpcOpts) => {
|
|
if (!opts.yes) {
|
|
defaultRuntime.error("Refusing to clear pairing table without --yes");
|
|
defaultRuntime.exit(1);
|
|
return;
|
|
}
|
|
const list = parseDevicePairingList(await callGatewayCli("device.pair.list", opts, {}));
|
|
const removedDeviceIds: string[] = [];
|
|
const rejectedRequestIds: string[] = [];
|
|
const paired = Array.isArray(list.paired) ? list.paired : [];
|
|
for (const device of paired) {
|
|
const deviceId = typeof device.deviceId === "string" ? device.deviceId.trim() : "";
|
|
if (!deviceId) {
|
|
continue;
|
|
}
|
|
await callGatewayCli("device.pair.remove", opts, { deviceId });
|
|
removedDeviceIds.push(deviceId);
|
|
}
|
|
if (opts.pending) {
|
|
const pending = Array.isArray(list.pending) ? list.pending : [];
|
|
for (const req of pending) {
|
|
const requestId = typeof req.requestId === "string" ? req.requestId.trim() : "";
|
|
if (!requestId) {
|
|
continue;
|
|
}
|
|
await callGatewayCli("device.pair.reject", opts, { requestId });
|
|
rejectedRequestIds.push(requestId);
|
|
}
|
|
}
|
|
if (opts.json) {
|
|
defaultRuntime.log(
|
|
JSON.stringify(
|
|
{
|
|
removedDevices: removedDeviceIds,
|
|
rejectedPending: rejectedRequestIds,
|
|
},
|
|
null,
|
|
2,
|
|
),
|
|
);
|
|
return;
|
|
}
|
|
defaultRuntime.log(
|
|
`${theme.warn("Cleared")} ${removedDeviceIds.length} paired device${removedDeviceIds.length === 1 ? "" : "s"}`,
|
|
);
|
|
if (opts.pending) {
|
|
defaultRuntime.log(
|
|
`${theme.warn("Rejected")} ${rejectedRequestIds.length} pending request${rejectedRequestIds.length === 1 ? "" : "s"}`,
|
|
);
|
|
}
|
|
}),
|
|
);
|
|
|
|
devicesCallOpts(
|
|
devices
|
|
.command("approve")
|
|
.description("Approve a pending device pairing request")
|
|
.argument("[requestId]", "Pending request id")
|
|
.option("--latest", "Approve the most recent pending request", false)
|
|
.action(async (requestId: string | undefined, opts: DevicesRpcOpts) => {
|
|
let resolvedRequestId = requestId?.trim();
|
|
if (!resolvedRequestId || opts.latest) {
|
|
const latest = selectLatestPendingRequest((await listPairingWithFallback(opts)).pending);
|
|
resolvedRequestId = latest?.requestId?.trim();
|
|
}
|
|
if (!resolvedRequestId) {
|
|
defaultRuntime.error("No pending device pairing requests to approve");
|
|
defaultRuntime.exit(1);
|
|
return;
|
|
}
|
|
const result = await approvePairingWithFallback(opts, resolvedRequestId);
|
|
if (!result) {
|
|
defaultRuntime.error("unknown requestId");
|
|
defaultRuntime.exit(1);
|
|
return;
|
|
}
|
|
if (opts.json) {
|
|
defaultRuntime.log(JSON.stringify(result, null, 2));
|
|
return;
|
|
}
|
|
const deviceId = (result as { device?: { deviceId?: string } })?.device?.deviceId;
|
|
defaultRuntime.log(
|
|
`${theme.success("Approved")} ${theme.command(deviceId ?? "ok")} ${theme.muted(`(${resolvedRequestId})`)}`,
|
|
);
|
|
}),
|
|
);
|
|
|
|
devicesCallOpts(
|
|
devices
|
|
.command("reject")
|
|
.description("Reject a pending device pairing request")
|
|
.argument("<requestId>", "Pending request id")
|
|
.action(async (requestId: string, opts: DevicesRpcOpts) => {
|
|
const result = await callGatewayCli("device.pair.reject", opts, { requestId });
|
|
if (opts.json) {
|
|
defaultRuntime.log(JSON.stringify(result, null, 2));
|
|
return;
|
|
}
|
|
const deviceId = (result as { deviceId?: string })?.deviceId;
|
|
defaultRuntime.log(`${theme.warn("Rejected")} ${theme.command(deviceId ?? "ok")}`);
|
|
}),
|
|
);
|
|
|
|
devicesCallOpts(
|
|
devices
|
|
.command("rotate")
|
|
.description("Rotate a device token for a role")
|
|
.requiredOption("--device <id>", "Device id")
|
|
.requiredOption("--role <role>", "Role name")
|
|
.option("--scope <scope...>", "Scopes to attach to the token (repeatable)")
|
|
.action(async (opts: DevicesRpcOpts) => {
|
|
const required = resolveRequiredDeviceRole(opts);
|
|
if (!required) {
|
|
return;
|
|
}
|
|
const result = await callGatewayCli("device.token.rotate", opts, {
|
|
deviceId: required.deviceId,
|
|
role: required.role,
|
|
scopes: Array.isArray(opts.scope) ? opts.scope : undefined,
|
|
});
|
|
defaultRuntime.log(JSON.stringify(result, null, 2));
|
|
}),
|
|
);
|
|
|
|
devicesCallOpts(
|
|
devices
|
|
.command("revoke")
|
|
.description("Revoke a device token for a role")
|
|
.requiredOption("--device <id>", "Device id")
|
|
.requiredOption("--role <role>", "Role name")
|
|
.action(async (opts: DevicesRpcOpts) => {
|
|
const required = resolveRequiredDeviceRole(opts);
|
|
if (!required) {
|
|
return;
|
|
}
|
|
const result = await callGatewayCli("device.token.revoke", opts, {
|
|
deviceId: required.deviceId,
|
|
role: required.role,
|
|
});
|
|
defaultRuntime.log(JSON.stringify(result, null, 2));
|
|
}),
|
|
);
|
|
}
|