@yefengr/remote-pi 0.7.3 → 0.7.5

package/dist/transport/peer_channel.js

@@ -1,171 +1,114 @@
 import { decodeClientFrameV2, encodeServerFrameV2, } from "../protocol/v2/index.js";
 /**
- * Plaintext PeerChannel backed by a RelayClient WebSocket.
- *
- * Usage (after pair_request handshake completes):
- *   const channel = new PlainPeerChannel(relay, appPeerId, myRoomId, onMsg)
- *   channel.send(serverMessage)          // base64-encodes JSON, routes via relay
- *   // incoming relay messages destined for appPeerId are auto-decoded
- *   // and delivered via onMessage callback
- *
- * `myRoomId` is the *local* Pi's room id — sent on every outbound envelope
- * so the app can correlate which Pi sent it (multi-pi support, plano 17).
+ * A Host-side protocol-v2 channel for one authorized Owner. The relay
+ * authenticates and injects `source_owner_id` for Owner-to-Host routes; this
+ * channel only accepts routes for its immutable endpoint identity and owner.
  */
 export class V2PeerChannel {
     relay;
-    remotePeerId;
+    ownerId;
+    host;
     onMessage;
     unsubscribe;
-    constructor(relay, remotePeerId, onMessage) {
+    constructor(relay, ownerId, host, onMessage) {
         this.relay = relay;
-        this.remotePeerId = remotePeerId;
+        this.ownerId = ownerId;
+        this.host = host;
         this.onMessage = onMessage;
         const listener = (line) => this.onLine(line);
         relay.on("message", listener);
         this.unsubscribe = () => relay.off("message", listener);
     }
     getPeerId() {
-        return this.remotePeerId;
+        return this.ownerId;
     }
     sendV2(msg) {
-        let ct;
         try {
-            ct = Buffer.from(encodeServerFrameV2(msg)).toString("base64");
-            this.relay.send(JSON.stringify({ peer: this.remotePeerId, ct }));
+            const ct = Buffer.from(encodeServerFrameV2(msg)).toString("base64");
+            this.relay.send(JSON.stringify({
+                type: "route",
+                purpose: msg.type === "pair_ok" || msg.type === "pair_error" ? "pairing" : "session",
+                device_id: this.host.deviceId,
+                endpoint_id: this.host.endpointId,
+                runtime_instance_id: this.host.runtimeInstanceId,
+                target_owner_id: this.ownerId,
+                ct,
+            }));
         }
         catch {
-            // Reconnect plus authoritative history recovers dropped formal events.
+            // Formal history recovers messages lost while the relay reconnects.
         }
     }
     detach() {
         this.unsubscribe();
     }
     onLine(line) {
-        let outer;
-        try {
-            outer = JSON.parse(line);
-        }
-        catch {
-            return;
-        }
-        if (outer.peer !== this.remotePeerId || !outer.ct)
+        const outer = parseIncomingRoute(line, this.host, this.ownerId);
+        if (!outer)
             return;
         try {
-            const plaintext = Buffer.from(outer.ct, "base64").toString("utf8");
-            this.onMessage(decodeClientFrameV2(plaintext));
+            const frame = decodeClientFrameV2(Buffer.from(outer.ct, "base64").toString("utf8"));
+            const expectedPurpose = frame.type === "pair_request" ? "pairing" : "session";
+            if (outer.purpose !== expectedPurpose)
+                return;
+            this.onMessage(frame);
         }
         catch {
-            // Strict v2 boundary. A parseable legacy/invalid request receives an upgrade
-            // error; malformed bytes without an id cannot be safely targeted.
-            try {
-                const raw = JSON.parse(Buffer.from(outer.ct, "base64").toString("utf8"));
-                const id = typeof raw.id === "string" ? raw.id : undefined;
-                const channelId = typeof raw.channel_id === "string" ? raw.channel_id : undefined;
-                if (id) {
-                    this.sendV2({
-                        protocol_version: 2,
-                        type: "protocol_error",
-                        ...(channelId ? { target_channel_id: channelId } : {}),
-                        in_reply_to: id,
-                        code: "protocol_upgrade_required",
-                        message: "Protocol v2 is required",
-                    });
-                }
-            }
-            catch {
-                // Ignore malformed outer payloads.
-            }
+            this.sendUpgradeRequired(outer.ct);
         }
     }
-}
-/** @deprecated Protocol v1 test helper. Production uses V2PeerChannel. */
-export class PlainPeerChannel {
-    relay;
-    remotePeerId;
-    onMessage;
-    _unsubscribe;
-    constructor(relay, remotePeerId, 
-    /**
-     * This Pi's room id. Currently NOT injected in the outer envelope
-     * (defensive — relay/app not yet ready). Kept in the constructor for
-     * forward-compat so callers don't need to change again when we re-enable.
-     */
-    myRoomId, onMessage, 
-    /** Called when this specific peer connection is considered lost. */
-    _onDisconnect) {
-        this.relay = relay;
-        this.remotePeerId = remotePeerId;
-        this.onMessage = onMessage;
-        const listener = (line) => this._onLine(line);
-        relay.on("message", listener);
-        this._unsubscribe = () => relay.off("message", listener);
-        void _onDisconnect;
-        void myRoomId; // intentionally unused — see send() comment
-    }
-    // ── PeerChannel interface ──────────────────────────────────────────────────
-    /** Authenticated Owner peer id used as a server-derived sender reference. */
-    getPeerId() {
-        return this.remotePeerId;
-    }
-    send(msg) {
-        const ct = Buffer.from(JSON.stringify(msg)).toString("base64");
-        // NOTE: `room` removed from the outer envelope until relay (W1.A) + app
-        // (W1.C) accept the field. Multi-Pi multiplexing already works via
-        // `room_id`/`room_meta` in the WS-level `hello` — outer routing stays by
-        // `peer` alone. Re-add the field once downstream is ready.
-        const outer = { peer: this.remotePeerId, ct };
-        // Best-effort delivery. The relay WS can be mid-reconnect (idle/NAT drop, or
-        // a session_new/session-replacement teardown) when we push a server→app frame
-        // — notably the action_ok/action_error ack a handler emits right after
-        // newSession. `relay.send` throws "relay: not connected" in that window; since
-        // this runs inside an async SDK event callback, letting it propagate becomes an
-        // uncaughtException that kills the whole pi process. The relay auto-reconnects
-        // and the app re-syncs via session_sync, so a dropped frame is recoverable — a
-        // crash is not. Mirrors RelayClient.sendControl's no-op-when-closed policy.
+    sendUpgradeRequired(ct) {
         try {
-            this.relay.send(JSON.stringify(outer));
+            const raw = JSON.parse(Buffer.from(ct, "base64").toString("utf8"));
+            const id = typeof raw.id === "string" ? raw.id : undefined;
+            const channelId = typeof raw.channel_id === "string" ? raw.channel_id : undefined;
+            if (!id)
+                return;
+            this.sendV2({
+                protocol_version: 2,
+                type: "protocol_error",
+                ...(channelId ? { target_channel_id: channelId } : {}),
+                in_reply_to: id,
+                code: "protocol_upgrade_required",
+                message: "Protocol v2 is required",
+            });
         }
         catch {
-            /* relay down — drop this frame; reconnect + session_sync will recover */
+            // Invalid bytes without a request id are not targetable.
         }
     }
-    /** Detaches from relay (does not close the relay itself). */
-    detach() {
-        this._unsubscribe();
+}
+export function parseIncomingRoute(line, host, ownerId) {
+    let route;
+    try {
+        route = JSON.parse(line);
     }
-    // ── Incoming line from relay ────────────────────────────────────────────────
-    _onLine(line) {
-        let outer;
-        try {
-            outer = JSON.parse(line);
-        }
-        catch {
-            return; // malformed line
-        }
-        if (outer.peer !== this.remotePeerId)
-            return;
-        if (!outer.ct)
-            return;
-        let plaintext;
-        try {
-            plaintext = Buffer.from(outer.ct, "base64").toString("utf8");
-        }
-        catch {
-            return;
-        }
-        let msg;
-        try {
-            msg = JSON.parse(plaintext);
-        }
-        catch {
-            return;
-        }
-        if (!msg ||
-            typeof msg !== "object" ||
-            typeof msg.type !== "string") {
-            return;
-        }
-        this.onMessage(msg);
+    catch {
+        return null;
     }
+    if (route.type !== "route" ||
+        (route.purpose !== "pairing" && route.purpose !== "session") ||
+        typeof route.ct !== "string" ||
+        route.device_id !== host.deviceId ||
+        route.endpoint_id !== host.endpointId ||
+        route.runtime_instance_id !== host.runtimeInstanceId ||
+        typeof route.source_owner_id !== "string" ||
+        route.target_owner_id !== undefined) {
+        return null;
+    }
+    if (ownerId !== undefined && route.source_owner_id !== ownerId)
+        return null;
+    return route;
+}
+export function sendRoute(relay, host, ownerId, purpose, ct) {
+    relay.send(JSON.stringify({
+        type: "route",
+        purpose,
+        device_id: host.deviceId,
+        endpoint_id: host.endpointId,
+        runtime_instance_id: host.runtimeInstanceId,
+        target_owner_id: ownerId,
+        ct,
+    }));
 }
 //# sourceMappingURL=peer_channel.js.map

package/dist/transport/peer_channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"peer_channel.js","sourceRoot":"","sources":["../../src/transport/peer_channel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"peer_channel.js","sourceRoot":"","sources":["../../src/transport/peer_channel.ts"],"names":[],"mappings":"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"}

package/dist/transport/relay_client.d.ts

@@ -1,91 +1,47 @@
 import { EventEmitter } from "node:events";
 import type { Ed25519Keypair } from "../pairing/crypto.js";
-export interface RoomMeta {
-    name: string;
-    cwd: string;
-    /** Friendly model name (e.g. "claude-sonnet-4.5"). Optional — pi-ext sends
-     *  when `ExtensionContext.model` is available; relay/app tolerate absence. */
+export type EndpointMetadata = {
+    kind: "daemon" | "interactive";
+    name?: string;
+    cwd?: string;
+    pid?: number;
+    started_at?: number;
     model?: string;
-}
-/** Control frame sent to relay (not routed to app peer). */
-export interface RoomMetaUpdateFrame {
-    type: "room_meta_update";
-    room_id: string;
-    meta: {
-        model?: string;
-    };
-}
-export interface ConnectOptions {
-    roomId?: string;
-    roomMeta?: RoomMeta;
-}
-/** Relay rejected hello because another peer already holds (pubkey, room_id). */
-export declare class RoomAlreadyOpenError extends Error {
-    readonly roomId: string | undefined;
-    constructor(roomId: string | undefined);
-}
+    thinking?: string;
+    working?: boolean;
+};
+export type HostConnectOptions = {
+    role: "host";
+    endpointId: string;
+    runtimeInstanceId: string;
+    metadata: EndpointMetadata;
+    authorizedOwnerIds: readonly string[];
+};
+export type OwnerConnectOptions = {
+    role: "owner";
+};
+export type ConnectOptions = HostConnectOptions | OwnerConnectOptions;
 export interface RelayClientEvents {
-    /** A single JSONL line delivered by the relay (outer envelope). */
     message: [line: string];
     close: [];
     error: [err: Error];
 }
-/**
- * Thin WebSocket client for the Remote Pi relay.
- *
- * Lifecycle:
- *   const relay = new RelayClient(url, ed25519Keypair)
- *   await relay.connect()          // opens WS + runs Ed25519 challenge-response
- *   relay.on("message", line => …) // outer envelopes: { peer, ct }
- *   relay.send(jsonLine)           // write to relay
- *   relay.close()
- *
- * Auth sequence (pairing.md §Challenge-response):
- *   → { type:"hello",     pubkey: "<Ed25519 pubkey base64>" }
- *   ← { type:"challenge", nonce:  "<32 bytes base64>" }
- *   → { type:"auth",      sig:    "<Ed25519 sig base64>" }
- */
+/** Authenticated WebSocket client for the endpoint relay. */
 export declare class RelayClient extends EventEmitter {
     private readonly url;
     private readonly keypair;
     private ws;
-    /** Epoch ms of the last inbound frame (message / relay ping / pong). */
     private lastActivityAt;
     private livenessTimer;
     constructor(url: string, keypair: Ed25519Keypair);
-    /**
-     * Connects and completes Ed25519 auth.  Resolves when relay is ready.
-     *
-     * `options.roomId` (12-char id derived from cwd, see `src/rooms.ts`) is
-     * included in the hello so the relay can multiplex N concurrent peers
-     * with the same Ed25519 pubkey but different rooms (one pi-ext per cwd).
-     * Omitting `roomId` is backward-compat with old relays (treated as the
-     * default "main" room server-side).
-     *
-     * Throws `RoomAlreadyOpenError` if the relay rejects the hello because
-     * another peer already holds the (pubkey, room_id) tuple. Caller (e.g.
-     * `_cmdStart`) maps that to a clearer UI message.
-     */
     connect(options?: ConnectOptions): Promise<void>;
-    /** True only while the authenticated Relay WebSocket is currently open. */
     isOpen(): boolean;
-    /** Sends a raw line to the relay (caller is responsible for framing). */
     send(line: string): void;
-    /**
-     * Sends a control frame to the relay (not routed to app peer). Used for
-     * out-of-band metadata updates like `room_meta_update`. Silently no-ops if
-     * the WS isn't open (best-effort: control frames are observational; we
-     * don't want them throwing inside SDK event callbacks).
-     */
     sendControl(frame: object): void;
     close(): void;
-    /** Force-close the WS when no inbound frame has arrived for
-     *  `LIVENESS_TIMEOUT_MS` — see the constant's doc for why. `terminate()`
-     *  fires `close`, which the owner turns into a reconnect. */
-    private _startLiveness;
-    private _stopLiveness;
-    private _authenticate;
-    /** Waits for the next single WS message with a timeout. */
-    private _nextMsg;
-    private _rawSend;
+    private startLiveness;
+    private stopLiveness;
+    private authenticate;
+    private nextMessage;
+    private rawSend;
 }

package/dist/transport/relay_client.js

@@ -2,48 +2,13 @@ import { EventEmitter } from "node:events";
 import WebSocket from "ws";
 import { ed25519Sign } from "../pairing/crypto.js";
 const AUTH_TIMEOUT_MS = 5_000;
-/**
- * Liveness watchdog. The relay sends a WS Ping every ~25s (relay `peer.rs`),
- * so a healthy connection sees inbound frames at least that often. If NOTHING
- * arrives for this long the socket is silently dead — NAT/router idle drop,
- * laptop sleep, or the relay/Cloudflare reaping the connection WITHOUT a clean
- * close frame. That half-open case never fires `close`, so reconnect never
- * triggers and a background daemon sits "online" but dead after a few idle
- * hours. We force-close on timeout so `close` drives the caller's reconnect.
- */
-const LIVENESS_TIMEOUT_MS = 70_000; // ~2.8 missed relay pings → confidently dead
+const LIVENESS_TIMEOUT_MS = 70_000;
 const LIVENESS_CHECK_MS = 20_000;
-/** Relay rejected hello because another peer already holds (pubkey, room_id). */
-export class RoomAlreadyOpenError extends Error {
-    roomId;
-    constructor(roomId) {
-        super(roomId
-            ? `relay rejected hello: room ${roomId} already open for this peer`
-            : "relay rejected hello: peer already connected");
-        this.roomId = roomId;
-        this.name = "RoomAlreadyOpenError";
-    }
-}
-/**
- * Thin WebSocket client for the Remote Pi relay.
- *
- * Lifecycle:
- *   const relay = new RelayClient(url, ed25519Keypair)
- *   await relay.connect()          // opens WS + runs Ed25519 challenge-response
- *   relay.on("message", line => …) // outer envelopes: { peer, ct }
- *   relay.send(jsonLine)           // write to relay
- *   relay.close()
- *
- * Auth sequence (pairing.md §Challenge-response):
- *   → { type:"hello",     pubkey: "<Ed25519 pubkey base64>" }
- *   ← { type:"challenge", nonce:  "<32 bytes base64>" }
- *   → { type:"auth",      sig:    "<Ed25519 sig base64>" }
- */
+/** Authenticated WebSocket client for the endpoint relay. */
 export class RelayClient extends EventEmitter {
     url;
     keypair;
     ws = null;
-    /** Epoch ms of the last inbound frame (message / relay ping / pong). */
     lastActivityAt = 0;
     livenessTimer = null;
     constructor(url, keypair) {
@@ -51,31 +16,14 @@ export class RelayClient extends EventEmitter {
         this.url = url;
         this.keypair = keypair;
     }
-    // ── Public API ──────────────────────────────────────────────────────────────
-    /**
-     * Connects and completes Ed25519 auth.  Resolves when relay is ready.
-     *
-     * `options.roomId` (12-char id derived from cwd, see `src/rooms.ts`) is
-     * included in the hello so the relay can multiplex N concurrent peers
-     * with the same Ed25519 pubkey but different rooms (one pi-ext per cwd).
-     * Omitting `roomId` is backward-compat with old relays (treated as the
-     * default "main" room server-side).
-     *
-     * Throws `RoomAlreadyOpenError` if the relay rejects the hello because
-     * another peer already holds the (pubkey, room_id) tuple. Caller (e.g.
-     * `_cmdStart`) maps that to a clearer UI message.
-     */
-    async connect(options = {}) {
+    async connect(options = { role: "owner" }) {
         return new Promise((resolve, reject) => {
             const ws = new WebSocket(this.url);
             this.ws = ws;
             ws.on("error", (err) => reject(err));
             ws.on("open", async () => {
                 try {
-                    await this._authenticate(ws, options);
-                    // Auth done — wire persistent message handler. Every inbound frame
-                    // (data, plus the relay's keepalive ping/pong below) refreshes the
-                    // liveness clock.
+                    await this.authenticate(ws, options);
                     this.lastActivityAt = Date.now();
                     ws.on("message", (raw) => {
                         this.lastActivityAt = Date.now();
@@ -86,17 +34,13 @@ export class RelayClient extends EventEmitter {
                                 this.emit("message", trimmed);
                         }
                     });
-                    // The relay pings every ~25s; `ws` auto-replies Pong (keeping the
-                    // relay's view of us alive). The relay ignores client pings rather
-                    // than ponging, so these inbound pings — not a ping/pong we initiate
-                    // — are our liveness signal.
                     ws.on("ping", () => { this.lastActivityAt = Date.now(); });
                     ws.on("pong", () => { this.lastActivityAt = Date.now(); });
                     ws.on("close", () => {
-                        this._stopLiveness();
+                        this.stopLiveness();
                         this.emit("close");
                     });
-                    this._startLiveness(ws);
+                    this.startLiveness(ws);
                     resolve();
                 }
                 catch (err) {
@@ -106,62 +50,56 @@ export class RelayClient extends EventEmitter {
             });
         });
     }
-    /** True only while the authenticated Relay WebSocket is currently open. */
     isOpen() {
         return this.ws?.readyState === WebSocket.OPEN;
     }
-    /** Sends a raw line to the relay (caller is responsible for framing). */
     send(line) {
         if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
             throw new Error("relay: not connected");
         }
         this.ws.send(line);
     }
-    /**
-     * Sends a control frame to the relay (not routed to app peer). Used for
-     * out-of-band metadata updates like `room_meta_update`. Silently no-ops if
-     * the WS isn't open (best-effort: control frames are observational; we
-     * don't want them throwing inside SDK event callbacks).
-     */
     sendControl(frame) {
         if (!this.ws || this.ws.readyState !== WebSocket.OPEN)
             return;
         this.ws.send(JSON.stringify(frame));
     }
     close() {
-        this._stopLiveness();
+        this.stopLiveness();
         this.ws?.close();
         this.ws = null;
     }
-    // ── Liveness watchdog ─────────────────────────────────────────────────────
-    /** Force-close the WS when no inbound frame has arrived for
-     *  `LIVENESS_TIMEOUT_MS` — see the constant's doc for why. `terminate()`
-     *  fires `close`, which the owner turns into a reconnect. */
-    _startLiveness(ws) {
-        this._stopLiveness();
+    startLiveness(ws) {
+        this.stopLiveness();
         this.livenessTimer = setInterval(() => {
             if (Date.now() - this.lastActivityAt > LIVENESS_TIMEOUT_MS) {
-                this._stopLiveness();
+                this.stopLiveness();
                 ws.terminate();
             }
         }, LIVENESS_CHECK_MS);
     }
-    _stopLiveness() {
-        if (this.livenessTimer) {
-            clearInterval(this.livenessTimer);
-            this.livenessTimer = null;
-        }
+    stopLiveness() {
+        if (!this.livenessTimer)
+            return;
+        clearInterval(this.livenessTimer);
+        this.livenessTimer = null;
     }
-    // ── Auth ────────────────────────────────────────────────────────────────────
-    async _authenticate(ws, opts) {
-        const pubkeyB64 = Buffer.from(this.keypair.publicKey).toString("base64");
-        const hello = { type: "hello", pubkey: pubkeyB64 };
-        if (opts.roomId)
-            hello.room_id = opts.roomId;
-        if (opts.roomMeta)
-            hello.room_meta = opts.roomMeta;
-        this._rawSend(ws, JSON.stringify(hello));
-        const challengeRaw = await this._nextMsg(ws);
+    async authenticate(ws, options) {
+        const pubkey = Buffer.from(this.keypair.publicKey).toString("base64");
+        const hello = options.role === "host"
+            ? {
+                type: "hello",
+                protocol_version: 2,
+                role: "host",
+                pubkey,
+                endpoint_id: options.endpointId,
+                runtime_instance_id: options.runtimeInstanceId,
+                metadata: options.metadata,
+                authorized_owner_ids: options.authorizedOwnerIds,
+            }
+            : { type: "hello", protocol_version: 2, role: "owner", pubkey };
+        this.rawSend(ws, JSON.stringify(hello));
+        const challengeRaw = await this.nextMessage(ws);
         let challenge;
         try {
             challenge = JSON.parse(challengeRaw);
@@ -170,27 +108,20 @@ export class RelayClient extends EventEmitter {
             throw new Error(`relay auth_failed: not JSON: ${challengeRaw}`);
         }
         if (challenge.type === "error") {
-            const code = challenge.code ?? "";
-            if (code === "room_already_open") {
-                throw new RoomAlreadyOpenError(opts.roomId);
-            }
-            throw new Error(`relay rejected hello: ${code || challenge.message || "unknown"}`);
+            const detail = challenge.code || challenge.message || "unknown";
+            throw new Error(`relay rejected hello: ${detail}`);
         }
         if (challenge.type !== "challenge" || !challenge.nonce) {
             throw new Error(`relay auth_failed: expected challenge, got ${challengeRaw}`);
         }
         const nonce = Buffer.from(challenge.nonce, "base64");
-        const sig = ed25519Sign(this.keypair.secretKey, nonce);
         const auth = {
             type: "auth",
-            sig: Buffer.from(sig).toString("base64"),
+            sig: Buffer.from(ed25519Sign(this.keypair.secretKey, nonce)).toString("base64"),
         };
-        this._rawSend(ws, JSON.stringify(auth));
-        // Relay does not send an explicit "ok" — it simply starts routing.
-        // Proceed immediately after sending auth.
+        this.rawSend(ws, JSON.stringify(auth));
     }
-    /** Waits for the next single WS message with a timeout. */
-    _nextMsg(ws) {
+    nextMessage(ws) {
         return new Promise((resolve, reject) => {
             const timer = setTimeout(() => reject(new Error("relay auth timeout")), AUTH_TIMEOUT_MS);
             ws.once("message", (raw) => {
@@ -199,7 +130,7 @@ export class RelayClient extends EventEmitter {
             });
         });
     }
-    _rawSend(ws, data) {
+    rawSend(ws, data) {
         ws.send(data);
     }
 }