mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-30 00:18:44 +00:00
* refactor: share talk event metric extraction * refactor: reuse shared coercion helpers * refactor: reuse shared primitive guards * refactor: reuse shared record guard * refactor: reuse shared primitive helpers * refactor: reuse shared string guards * refactor: reuse shared non-empty string guard * refactor: share plugin primitive coercion helpers * refactor: reuse plugin coercion helpers * refactor: reuse plugin coercion helpers in more plugins * refactor: reuse channel coercion helpers * refactor: reuse monitor coercion helpers * refactor: reuse provider coercion helpers * refactor: reuse core coercion helpers * refactor: reuse runtime coercion helpers * refactor: reuse helper coercion in codex paths * refactor: reuse helper coercion in runtime paths * refactor: reuse codex app-server coercion helpers * refactor: reuse codex record helpers * refactor: reuse migration and qa record helpers * refactor: reuse feishu and core helper guards * refactor: reuse browser and policy coercion helpers * refactor: reuse memory wiki record helper * refactor: share boolean coercion helpers * refactor: reuse finite number coercion * refactor: reuse trimmed string list helpers * refactor: reuse string list normalization * refactor: reuse remaining string list helpers * refactor: reuse string entry normalizer * refactor: share sorted string helpers * refactor: share string list normalization * test: preserve command registry browser imports * refactor: reuse trimmed list helpers * refactor: reuse string dedupe helpers * refactor: reuse local dedupe helpers * refactor: reuse more string dedupe helpers * refactor: reuse command string dedupe helpers * refactor: dedupe memory path lists with helper * refactor: expose string dedupe helpers to plugins * refactor: reuse core string dedupe helpers * refactor: reuse shared unique value helpers * refactor: reuse unique helpers in agent utilities * refactor: reuse unique helpers in config plumbing * refactor: reuse unique helpers in extensions * refactor: reuse unique helpers in core utilities * refactor: reuse unique helpers in qa plugins * refactor: reuse unique helpers in memory plugins * refactor: reuse unique helpers in channel plugins * refactor: reuse unique helpers in core tails * refactor: reuse unique helper in comfy workflow * refactor: reuse unique helpers in test utilities * refactor: expose unique value helper to plugins * refactor: reuse unique helpers for numeric lists * refactor: replace index dedupe filters * refactor: reuse string entry normalization * refactor: reuse string normalization in plugin helpers * refactor: reuse string normalization in extension helpers * refactor: reuse string normalization in channel parsers * refactor: reuse string normalization in memory search * refactor: reuse string normalization in provider parsers * refactor: reuse string normalization in qa helpers * refactor: reuse string normalization in infra parsers * refactor: reuse string normalization in messaging parsers * refactor: reuse string normalization in core parsers * refactor: reuse string normalization in extension parsers * refactor: reuse string normalization in remaining parsers * refactor: reuse string normalization in final parser spots * refactor: reuse string normalization in qa media helpers * refactor: reuse normalization in provider and media lists * refactor: reuse normalization for remaining set filters * refactor: reuse normalization in policy allowlists * refactor: reuse normalization in session and owner lists * refactor: centralize primitive string lists * refactor: reuse lowercase entry helpers * refactor: reuse sorted string helpers * refactor: reuse unique trimmed helpers * refactor: reuse string normalization helpers * refactor: reuse catalog string helpers * refactor: reuse remaining string helpers * refactor: simplify remaining list normalization * refactor: reuse codex auth order normalization * chore: refresh plugin sdk api baseline * fix: make shared string sorting deterministic * chore: refresh plugin sdk api baseline * fix: align host env security ordering
228 lines
7.6 KiB
TypeScript
228 lines
7.6 KiB
TypeScript
import { hasEffectivePairedDeviceRole, type PairedDevice } from "../infra/device-pairing.js";
|
|
import type { NodePairingPairedNode } from "../infra/node-pairing.js";
|
|
import type { NodeListNode } from "../shared/node-list-types.js";
|
|
import { normalizeLowercaseStringOrEmpty } from "../shared/string-coerce.js";
|
|
import { normalizeSortedUniqueTrimmedStringList } from "../shared/string-normalization.js";
|
|
import type { NodeSession } from "./node-registry.js";
|
|
|
|
type KnownNodeDevicePairingSource = {
|
|
nodeId: string;
|
|
displayName?: string;
|
|
platform?: string;
|
|
clientId?: string;
|
|
clientMode?: string;
|
|
remoteIp?: string;
|
|
approvedAtMs?: number;
|
|
lastSeenAtMs?: number;
|
|
lastSeenReason?: string;
|
|
};
|
|
|
|
type KnownNodeApprovedSource = {
|
|
nodeId: string;
|
|
displayName?: string;
|
|
platform?: string;
|
|
version?: string;
|
|
coreVersion?: string;
|
|
uiVersion?: string;
|
|
remoteIp?: string;
|
|
deviceFamily?: string;
|
|
modelIdentifier?: string;
|
|
caps: string[];
|
|
commands: string[];
|
|
permissions?: Record<string, boolean>;
|
|
approvedAtMs?: number;
|
|
lastConnectedAtMs?: number;
|
|
lastSeenAtMs?: number;
|
|
lastSeenReason?: string;
|
|
};
|
|
|
|
type KnownNodeEntry = {
|
|
nodeId: string;
|
|
devicePairing?: KnownNodeDevicePairingSource;
|
|
nodePairing?: KnownNodeApprovedSource;
|
|
live?: NodeSession;
|
|
effective: NodeListNode;
|
|
};
|
|
|
|
type KnownNodeCatalog = {
|
|
entriesById: Map<string, KnownNodeEntry>;
|
|
};
|
|
|
|
function uniqueSortedStrings(...items: Array<readonly unknown[] | undefined>): string[] {
|
|
return normalizeSortedUniqueTrimmedStringList(items.flatMap((item) => item ?? []));
|
|
}
|
|
|
|
function buildDevicePairingSource(entry: PairedDevice): KnownNodeDevicePairingSource {
|
|
return {
|
|
nodeId: entry.deviceId,
|
|
displayName: entry.displayName,
|
|
platform: entry.platform,
|
|
clientId: entry.clientId,
|
|
clientMode: entry.clientMode,
|
|
remoteIp: entry.remoteIp,
|
|
approvedAtMs: entry.approvedAtMs,
|
|
lastSeenAtMs: entry.lastSeenAtMs,
|
|
lastSeenReason: entry.lastSeenReason,
|
|
};
|
|
}
|
|
|
|
function buildApprovedNodeSource(entry: NodePairingPairedNode): KnownNodeApprovedSource {
|
|
return {
|
|
nodeId: entry.nodeId,
|
|
displayName: entry.displayName,
|
|
platform: entry.platform,
|
|
version: entry.version,
|
|
coreVersion: entry.coreVersion,
|
|
uiVersion: entry.uiVersion,
|
|
remoteIp: entry.remoteIp,
|
|
deviceFamily: entry.deviceFamily,
|
|
modelIdentifier: entry.modelIdentifier,
|
|
caps: entry.caps ?? [],
|
|
commands: entry.commands ?? [],
|
|
permissions: entry.permissions,
|
|
approvedAtMs: entry.approvedAtMs,
|
|
lastConnectedAtMs: entry.lastConnectedAtMs,
|
|
lastSeenAtMs: entry.lastSeenAtMs,
|
|
lastSeenReason: entry.lastSeenReason,
|
|
};
|
|
}
|
|
|
|
function resolveEffectiveLastSeen(params: {
|
|
live?: NodeSession;
|
|
devicePairing?: KnownNodeDevicePairingSource;
|
|
nodePairing?: KnownNodeApprovedSource;
|
|
}): { lastSeenAtMs?: number; lastSeenReason?: string } {
|
|
const candidates: Array<{ atMs: number; reason?: string }> = [
|
|
params.live?.connectedAtMs ? { atMs: params.live.connectedAtMs, reason: "connect" } : undefined,
|
|
params.nodePairing?.lastSeenAtMs
|
|
? { atMs: params.nodePairing.lastSeenAtMs, reason: params.nodePairing.lastSeenReason }
|
|
: undefined,
|
|
params.nodePairing?.lastConnectedAtMs
|
|
? { atMs: params.nodePairing.lastConnectedAtMs, reason: "connect" }
|
|
: undefined,
|
|
params.devicePairing?.lastSeenAtMs
|
|
? { atMs: params.devicePairing.lastSeenAtMs, reason: params.devicePairing.lastSeenReason }
|
|
: undefined,
|
|
].filter((entry) => entry !== undefined);
|
|
let newest: { atMs: number; reason?: string } | undefined;
|
|
for (const candidate of candidates) {
|
|
if (!newest || candidate.atMs > newest.atMs) {
|
|
newest = candidate;
|
|
}
|
|
}
|
|
if (!newest) {
|
|
return {};
|
|
}
|
|
return {
|
|
lastSeenAtMs: newest.atMs,
|
|
lastSeenReason: newest.reason,
|
|
};
|
|
}
|
|
|
|
function buildEffectiveKnownNode(entry: {
|
|
nodeId: string;
|
|
devicePairing?: KnownNodeDevicePairingSource;
|
|
nodePairing?: KnownNodeApprovedSource;
|
|
live?: NodeSession;
|
|
}): NodeListNode {
|
|
const { nodeId, devicePairing, nodePairing, live } = entry;
|
|
const lastSeen = resolveEffectiveLastSeen({ live, devicePairing, nodePairing });
|
|
return {
|
|
nodeId,
|
|
displayName: live?.displayName ?? nodePairing?.displayName ?? devicePairing?.displayName,
|
|
platform: live?.platform ?? nodePairing?.platform ?? devicePairing?.platform,
|
|
version: live?.version ?? nodePairing?.version,
|
|
coreVersion: live?.coreVersion ?? nodePairing?.coreVersion,
|
|
uiVersion: live?.uiVersion ?? nodePairing?.uiVersion,
|
|
clientId: live?.clientId ?? devicePairing?.clientId,
|
|
clientMode: live?.clientMode ?? devicePairing?.clientMode,
|
|
deviceFamily: live?.deviceFamily ?? nodePairing?.deviceFamily,
|
|
modelIdentifier: live?.modelIdentifier ?? nodePairing?.modelIdentifier,
|
|
remoteIp: live?.remoteIp ?? nodePairing?.remoteIp ?? devicePairing?.remoteIp,
|
|
caps: live ? uniqueSortedStrings(live.caps) : uniqueSortedStrings(nodePairing?.caps),
|
|
commands: live
|
|
? uniqueSortedStrings(live.commands)
|
|
: uniqueSortedStrings(nodePairing?.commands),
|
|
pathEnv: live?.pathEnv,
|
|
permissions: live?.permissions ?? nodePairing?.permissions,
|
|
connectedAtMs: live?.connectedAtMs,
|
|
lastSeenAtMs: lastSeen.lastSeenAtMs,
|
|
lastSeenReason: lastSeen.lastSeenReason,
|
|
approvedAtMs: nodePairing?.approvedAtMs ?? devicePairing?.approvedAtMs,
|
|
paired: Boolean(devicePairing ?? nodePairing),
|
|
connected: Boolean(live),
|
|
};
|
|
}
|
|
|
|
function compareKnownNodes(left: NodeListNode, right: NodeListNode): number {
|
|
if (left.connected !== right.connected) {
|
|
return left.connected ? -1 : 1;
|
|
}
|
|
const leftName = normalizeLowercaseStringOrEmpty(left.displayName ?? left.nodeId);
|
|
const rightName = normalizeLowercaseStringOrEmpty(right.displayName ?? right.nodeId);
|
|
if (leftName < rightName) {
|
|
return -1;
|
|
}
|
|
if (leftName > rightName) {
|
|
return 1;
|
|
}
|
|
return left.nodeId.localeCompare(right.nodeId);
|
|
}
|
|
|
|
export function createKnownNodeCatalog(params: {
|
|
pairedDevices: readonly PairedDevice[];
|
|
pairedNodes?: readonly NodePairingPairedNode[];
|
|
connectedNodes: readonly NodeSession[];
|
|
}): KnownNodeCatalog {
|
|
const devicePairingById = new Map(
|
|
params.pairedDevices
|
|
.filter((entry) => hasEffectivePairedDeviceRole(entry, "node"))
|
|
.map((entry) => [entry.deviceId, buildDevicePairingSource(entry)]),
|
|
);
|
|
const nodePairingById = new Map(
|
|
(params.pairedNodes ?? []).map((entry) => [entry.nodeId, buildApprovedNodeSource(entry)]),
|
|
);
|
|
const liveById = new Map(params.connectedNodes.map((entry) => [entry.nodeId, entry]));
|
|
const nodeIds = new Set<string>([
|
|
...devicePairingById.keys(),
|
|
...nodePairingById.keys(),
|
|
...liveById.keys(),
|
|
]);
|
|
const entriesById = new Map<string, KnownNodeEntry>();
|
|
for (const nodeId of nodeIds) {
|
|
const devicePairing = devicePairingById.get(nodeId);
|
|
const nodePairing = nodePairingById.get(nodeId);
|
|
const live = liveById.get(nodeId);
|
|
entriesById.set(nodeId, {
|
|
nodeId,
|
|
devicePairing,
|
|
nodePairing,
|
|
live,
|
|
effective: buildEffectiveKnownNode({
|
|
nodeId,
|
|
devicePairing,
|
|
nodePairing,
|
|
live,
|
|
}),
|
|
});
|
|
}
|
|
return { entriesById };
|
|
}
|
|
|
|
export function listKnownNodes(catalog: KnownNodeCatalog): NodeListNode[] {
|
|
return [...catalog.entriesById.values()]
|
|
.map((entry) => entry.effective)
|
|
.toSorted(compareKnownNodes);
|
|
}
|
|
|
|
export function getKnownNodeEntry(
|
|
catalog: KnownNodeCatalog,
|
|
nodeId: string,
|
|
): KnownNodeEntry | null {
|
|
return catalog.entriesById.get(nodeId) ?? null;
|
|
}
|
|
|
|
export function getKnownNode(catalog: KnownNodeCatalog, nodeId: string): NodeListNode | null {
|
|
return getKnownNodeEntry(catalog, nodeId)?.effective ?? null;
|
|
}
|