@yefengr/remote-pi 0.7.10 → 0.7.12

package/dist/pairing/qr.js

@@ -35,7 +35,7 @@ export class QRSession {
 }
 export const qrSession = new QRSession();
 /** Builds the endpoint-aware pairing URI. */
-export function buildQRUri(token, longtermEdPk, sessionName, endpointId, runtimeInstanceId) {
+export function buildQRUri(token, longtermEdPk, sessionName, endpointId, runtimeInstanceId, relayUrl) {
     const params = new URLSearchParams({
         t: token,
         epk: Buffer.from(longtermEdPk).toString("base64url"),
@@ -43,6 +43,14 @@ export function buildQRUri(token, longtermEdPk, sessionName, endpointId, runtime
         ep: endpointId,
         rt: runtimeInstanceId,
     });
+    if (relayUrl) {
+        try {
+            const protocol = new URL(relayUrl).protocol;
+            if (protocol === "http:" || protocol === "https:")
+                params.set("r", relayUrl);
+        }
+        catch { /* invalid optional hint */ }
+    }
     return `remotepi://pair?${params.toString()}`;
 }
 export function renderQRAscii(uri) {
@@ -53,14 +61,14 @@ export function renderQRAscii(uri) {
 export function displayQR(uri) {
     process.stderr.write(`\nScan to pair:\n\n${renderQRAscii(uri)}\n`);
 }
-export function startQRRotation(longtermEdPk, sessionName, endpointId, runtimeInstanceId) {
+export function startQRRotation(longtermEdPk, sessionName, endpointId, runtimeInstanceId, relayUrl) {
     let timer = null;
     let stopped = false;
     const rotate = () => {
         if (stopped)
             return;
         const { token, expiresAt } = qrSession.issueToken();
-        displayQR(buildQRUri(token, longtermEdPk, sessionName, endpointId, runtimeInstanceId));
+        displayQR(buildQRUri(token, longtermEdPk, sessionName, endpointId, runtimeInstanceId, relayUrl));
         console.log(`Renews at ${new Date(expiresAt).toLocaleTimeString()} — waiting for scan…`);
         timer = setTimeout(rotate, TOKEN_TTL_MS);
     };

package/dist/pairing/qr.js.map

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

package/dist/runtime/relay_lifecycle.d.ts

@@ -0,0 +1,58 @@
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { RelayResolution } from "../config.js";
+import type { Ed25519Keypair } from "../pairing/crypto.js";
+import type { HostConnectOptions, RelayClient } from "../transport/relay_client.js";
+export type RemoteState = "idle" | "started";
+export type RelayConnectivity = "connected" | "reconnecting" | "disconnected";
+export type InitialRelayResult = "completed" | "cancelled";
+export type RelayStartContext = Pick<ExtensionContext, "ui" | "cwd">;
+export interface RelayLifecycleDependencies {
+    loadIdentity(): Promise<Ed25519Keypair>;
+    resolveRelayUrl(): RelayResolution;
+    createClient(relayUrl: string, identity: Ed25519Keypair): RelayClient;
+    buildConnectOptions(cwd?: string): Promise<HostConnectOptions>;
+    handleIdentityError(error: unknown, ctx: RelayStartContext): boolean;
+    describeConnection(resolution: RelayResolution): string;
+    onStateChange(): void;
+    onConnected(client: RelayClient, ctx?: RelayStartContext): void;
+    onDisconnected(): void;
+}
+export declare class RelayLifecycle {
+    private readonly deps;
+    private activeRelay;
+    private pendingCandidate;
+    private currentRelayUrl;
+    private identity;
+    private initialAttempt;
+    private cancelInitialAttempt;
+    private reconnectTimer;
+    private reconnectAttempt;
+    private generation;
+    private isDisposed;
+    private currentState;
+    private readonly closedCandidates;
+    constructor(deps: RelayLifecycleDependencies);
+    get state(): RemoteState;
+    get relay(): RelayClient | null;
+    get relayUrl(): string | null;
+    get keypair(): Ed25519Keypair | null;
+    get disposed(): boolean;
+    get hasPendingReconnect(): boolean;
+    get status(): RelayConnectivity;
+    isCurrent(candidate: RelayClient): boolean;
+    setDisposed(value: boolean): void;
+    start(ctx: RelayStartContext): Promise<InitialRelayResult>;
+    waitForInitial(): Promise<InitialRelayResult>;
+    stop(): void;
+    private startInitial;
+    private scheduleReconnect;
+    private reconnect;
+    private onRelayClose;
+    private handleConnectionFailure;
+    private clearCandidate;
+    private closeCandidateOnce;
+    private clearInitialAttempt;
+    private isOperationCurrent;
+    private isReconnectCurrent;
+    private notify;
+}

package/dist/runtime/relay_lifecycle.js

@@ -0,0 +1,241 @@
+const RECONNECT_BACKOFFS_MS = [1_000, 2_000, 5_000, 10_000, 30_000];
+export class RelayLifecycle {
+    deps;
+    activeRelay = null;
+    pendingCandidate = null;
+    currentRelayUrl = null;
+    identity = null;
+    initialAttempt = null;
+    cancelInitialAttempt = null;
+    reconnectTimer = null;
+    reconnectAttempt = 0;
+    generation = 0;
+    isDisposed = false;
+    currentState = "idle";
+    closedCandidates = new WeakSet();
+    constructor(deps) {
+        this.deps = deps;
+    }
+    get state() { return this.currentState; }
+    get relay() { return this.activeRelay; }
+    get relayUrl() { return this.currentRelayUrl; }
+    get keypair() { return this.identity; }
+    get disposed() { return this.isDisposed; }
+    get hasPendingReconnect() { return this.reconnectTimer !== null; }
+    get status() {
+        if (this.currentState === "idle")
+            return "disconnected";
+        return this.activeRelay?.isOpen() ? "connected" : "reconnecting";
+    }
+    isCurrent(candidate) {
+        return !this.isDisposed && this.currentState === "started" && this.activeRelay === candidate;
+    }
+    setDisposed(value) {
+        this.isDisposed = value;
+    }
+    start(ctx) {
+        const existing = this.initialAttempt;
+        if (existing)
+            return existing;
+        if (this.currentState !== "idle") {
+            const message = this.status === "reconnecting"
+                ? "[remote-pi] Relay is reconnecting in background."
+                : "[remote-pi] Already connected.";
+            this.notify(ctx, message, "warning");
+            return Promise.resolve("completed");
+        }
+        const operation = this.startInitial(ctx);
+        let cancel;
+        const cancellation = new Promise((resolve) => {
+            cancel = () => resolve("cancelled");
+        });
+        const attempt = Promise.race([operation.then(() => "completed"), cancellation]);
+        this.initialAttempt = attempt;
+        this.cancelInitialAttempt = cancel;
+        void operation.catch(() => undefined);
+        void attempt.then(() => this.clearInitialAttempt(attempt, cancel), () => this.clearInitialAttempt(attempt, cancel));
+        return attempt;
+    }
+    waitForInitial() {
+        return this.initialAttempt ?? Promise.resolve("completed");
+    }
+    stop() {
+        this.generation += 1;
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = null;
+        }
+        this.reconnectAttempt = 0;
+        const active = this.activeRelay;
+        const pending = this.pendingCandidate;
+        const cancel = this.cancelInitialAttempt;
+        this.activeRelay = null;
+        this.pendingCandidate = null;
+        this.currentRelayUrl = null;
+        this.initialAttempt = null;
+        this.cancelInitialAttempt = null;
+        this.currentState = "idle";
+        cancel?.();
+        if (active)
+            this.closeCandidateOnce(active);
+        if (pending && pending !== active)
+            this.closeCandidateOnce(pending);
+        this.deps.onDisconnected();
+        this.deps.onStateChange();
+    }
+    async startInitial(ctx) {
+        const expectedGeneration = ++this.generation;
+        let identity;
+        try {
+            identity = await this.deps.loadIdentity();
+        }
+        catch (error) {
+            if (!this.isOperationCurrent(expectedGeneration))
+                return;
+            if (this.deps.handleIdentityError(error, ctx))
+                return;
+            throw error;
+        }
+        if (!this.isOperationCurrent(expectedGeneration))
+            return;
+        this.identity = identity;
+        const resolution = this.deps.resolveRelayUrl();
+        this.currentRelayUrl = resolution.url;
+        this.currentState = "started";
+        this.deps.onStateChange();
+        this.notify(ctx, this.deps.describeConnection(resolution));
+        let options;
+        try {
+            options = await this.deps.buildConnectOptions(ctx.cwd);
+        }
+        catch (error) {
+            this.handleConnectionFailure(expectedGeneration, resolution.url, ctx, error);
+            return;
+        }
+        if (!this.isReconnectCurrent(expectedGeneration))
+            return;
+        const candidate = this.deps.createClient(resolution.url, identity);
+        this.pendingCandidate = candidate;
+        try {
+            await candidate.connect(options);
+        }
+        catch (error) {
+            this.clearCandidate(candidate, true);
+            this.handleConnectionFailure(expectedGeneration, resolution.url, ctx, error);
+            return;
+        }
+        if (!this.isReconnectCurrent(expectedGeneration) || this.pendingCandidate !== candidate) {
+            this.closeCandidateOnce(candidate);
+            return;
+        }
+        this.pendingCandidate = null;
+        this.activeRelay = candidate;
+        this.reconnectAttempt = 0;
+        candidate.on("close", () => this.onRelayClose(candidate));
+        this.deps.onConnected(candidate, ctx);
+        this.deps.onStateChange();
+    }
+    scheduleReconnect(url) {
+        if (!this.identity || this.isDisposed || this.currentState !== "started")
+            return;
+        if (this.reconnectTimer)
+            clearTimeout(this.reconnectTimer);
+        const expectedGeneration = ++this.generation;
+        const delay = RECONNECT_BACKOFFS_MS[Math.min(this.reconnectAttempt++, RECONNECT_BACKOFFS_MS.length - 1)];
+        this.reconnectTimer = setTimeout(() => {
+            this.reconnectTimer = null;
+            if (!this.isReconnectCurrent(expectedGeneration))
+                return;
+            void this.reconnect(url, expectedGeneration);
+        }, delay);
+    }
+    async reconnect(url, expectedGeneration) {
+        const identity = this.identity;
+        if (!identity || !this.isReconnectCurrent(expectedGeneration))
+            return;
+        let options;
+        try {
+            options = await this.deps.buildConnectOptions();
+        }
+        catch {
+            if (this.isReconnectCurrent(expectedGeneration)) {
+                this.deps.onStateChange();
+                this.scheduleReconnect(url);
+            }
+            return;
+        }
+        if (!this.isReconnectCurrent(expectedGeneration) || this.identity !== identity)
+            return;
+        const candidate = this.deps.createClient(url, identity);
+        this.pendingCandidate = candidate;
+        try {
+            await candidate.connect(options);
+        }
+        catch {
+            this.clearCandidate(candidate, true);
+            if (this.isReconnectCurrent(expectedGeneration)) {
+                this.deps.onStateChange();
+                this.scheduleReconnect(url);
+            }
+            return;
+        }
+        if (!this.isReconnectCurrent(expectedGeneration) || this.pendingCandidate !== candidate) {
+            this.closeCandidateOnce(candidate);
+            return;
+        }
+        this.pendingCandidate = null;
+        this.activeRelay = candidate;
+        this.reconnectAttempt = 0;
+        candidate.on("close", () => this.onRelayClose(candidate));
+        this.deps.onConnected(candidate);
+        this.deps.onStateChange();
+    }
+    onRelayClose(closed) {
+        if (closed !== this.activeRelay || this.currentState === "idle")
+            return;
+        this.activeRelay = null;
+        this.deps.onDisconnected();
+        this.deps.onStateChange();
+        if (this.currentRelayUrl)
+            this.scheduleReconnect(this.currentRelayUrl);
+    }
+    handleConnectionFailure(expectedGeneration, url, ctx, error) {
+        if (!this.isReconnectCurrent(expectedGeneration))
+            return;
+        this.notify(ctx, `[remote-pi] Relay unavailable; reconnecting in background: ${String(error)}`, "warning");
+        this.deps.onStateChange();
+        this.scheduleReconnect(url);
+    }
+    clearCandidate(candidate, close) {
+        if (this.pendingCandidate !== candidate)
+            return;
+        this.pendingCandidate = null;
+        if (close)
+            this.closeCandidateOnce(candidate);
+    }
+    closeCandidateOnce(candidate) {
+        if (this.closedCandidates.has(candidate))
+            return;
+        this.closedCandidates.add(candidate);
+        candidate.close();
+    }
+    clearInitialAttempt(attempt, cancel) {
+        if (this.initialAttempt === attempt)
+            this.initialAttempt = null;
+        if (this.cancelInitialAttempt === cancel)
+            this.cancelInitialAttempt = null;
+    }
+    isOperationCurrent(expected) {
+        return !this.isDisposed && this.generation === expected;
+    }
+    isReconnectCurrent(expected) {
+        return this.currentState === "started" && this.isOperationCurrent(expected);
+    }
+    notify(ctx, message, kind = "info") {
+        try {
+            ctx.ui.notify(message, kind);
+        }
+        catch { /* stale context */ }
+    }
+}
+//# sourceMappingURL=relay_lifecycle.js.map

package/dist/runtime/relay_lifecycle.js.map

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

package/dist/transport/relay_client.d.ts

@@ -33,15 +33,28 @@ export declare class RelayClient extends EventEmitter {
     private ws;
     private lastActivityAt;
     private livenessTimer;
+    private livenessSocket;
+    private pendingConnection;
+    private pendingMessage;
     constructor(url: string, keypair: Ed25519Keypair);
     connect(options?: ConnectOptions): Promise<void>;
     isOpen(): boolean;
     send(line: string): void;
     sendControl(frame: object): void;
     close(): void;
+    private finishConnection;
     private startLiveness;
     private stopLiveness;
     private authenticate;
     private nextMessage;
+    private isPendingConnection;
+    private assertPendingConnection;
+    private resolvePendingConnection;
+    private abortPendingConnection;
+    private clearConnectTimer;
+    private clearPendingConnectionListeners;
+    private cancelPendingMessage;
+    private reportError;
+    private asError;
     private rawSend;
 }

package/dist/transport/relay_client.js

@@ -1,6 +1,7 @@
 import { EventEmitter } from "node:events";
 import WebSocket from "ws";
 import { ed25519Sign } from "../pairing/crypto.js";
+const CONNECT_TIMEOUT_MS = 10_000;
 const AUTH_TIMEOUT_MS = 5_000;
 const LIVENESS_TIMEOUT_MS = 70_000;
 const LIVENESS_CHECK_MS = 20_000;
@@ -11,43 +12,36 @@ export class RelayClient extends EventEmitter {
     ws = null;
     lastActivityAt = 0;
     livenessTimer = null;
+    livenessSocket = null;
+    pendingConnection = null;
+    pendingMessage = null;
     constructor(url, keypair) {
         super();
         this.url = url;
         this.keypair = keypair;
     }
-    async connect(options = { role: "owner" }) {
+    connect(options = { role: "owner" }) {
+        this.close();
         return new Promise((resolve, reject) => {
             const ws = new WebSocket(this.url);
+            const onEarlyClose = () => this.abortPendingConnection(ws, new Error("relay connection closed"), false);
+            const onOpen = () => {
+                this.clearConnectTimer(ws);
+                void this.finishConnection(ws, options);
+            };
             this.ws = ws;
-            ws.on("error", (err) => reject(err));
-            ws.on("open", async () => {
-                try {
-                    await this.authenticate(ws, options);
-                    this.lastActivityAt = Date.now();
-                    ws.on("message", (raw) => {
-                        this.lastActivityAt = Date.now();
-                        const text = Buffer.isBuffer(raw) ? raw.toString() : String(raw);
-                        for (const line of text.split("\n")) {
-                            const trimmed = line.trim();
-                            if (trimmed)
-                                this.emit("message", trimmed);
-                        }
-                    });
-                    ws.on("ping", () => { this.lastActivityAt = Date.now(); });
-                    ws.on("pong", () => { this.lastActivityAt = Date.now(); });
-                    ws.on("close", () => {
-                        this.stopLiveness();
-                        this.emit("close");
-                    });
-                    this.startLiveness(ws);
-                    resolve();
-                }
-                catch (err) {
-                    ws.terminate();
-                    reject(err);
-                }
+            const pending = { ws, resolve, reject, onEarlyClose, onOpen, connectTimer: null };
+            this.pendingConnection = pending;
+            pending.connectTimer = setTimeout(() => this.abortPendingConnection(ws, new Error("relay connection timeout"), true), CONNECT_TIMEOUT_MS);
+            ws.on("error", (error) => {
+                if (this.ws !== ws)
+                    return;
+                this.reportError(error);
+                if (this.isPendingConnection(ws))
+                    this.abortPendingConnection(ws, error, true);
             });
+            ws.once("close", onEarlyClose);
+            ws.once("open", onOpen);
         });
     }
     isOpen() {
@@ -65,26 +59,77 @@ export class RelayClient extends EventEmitter {
         this.ws.send(JSON.stringify(frame));
     }
     close() {
-        this.stopLiveness();
-        this.ws?.close();
+        const ws = this.ws;
+        if (!ws)
+            return;
+        this.stopLiveness(ws);
+        if (this.isPendingConnection(ws)) {
+            this.abortPendingConnection(ws, new Error("relay connection closed"), true);
+            return;
+        }
         this.ws = null;
+        ws.close();
+    }
+    async finishConnection(ws, options) {
+        if (!this.isPendingConnection(ws))
+            return;
+        try {
+            await this.authenticate(ws, options);
+            if (!this.isPendingConnection(ws))
+                return;
+            this.lastActivityAt = Date.now();
+            const pending = this.pendingConnection;
+            if (!pending || pending.ws !== ws)
+                return;
+            ws.removeListener("close", pending.onEarlyClose);
+            ws.on("message", (raw) => {
+                if (this.ws !== ws)
+                    return;
+                this.lastActivityAt = Date.now();
+                const text = Buffer.isBuffer(raw) ? raw.toString() : String(raw);
+                for (const line of text.split("\n")) {
+                    const trimmed = line.trim();
+                    if (trimmed)
+                        this.emit("message", trimmed);
+                }
+            });
+            ws.on("ping", () => { if (this.ws === ws)
+                this.lastActivityAt = Date.now(); });
+            ws.on("pong", () => { if (this.ws === ws)
+                this.lastActivityAt = Date.now(); });
+            ws.on("close", () => {
+                if (this.ws !== ws)
+                    return;
+                this.stopLiveness(ws);
+                this.ws = null;
+                this.emit("close");
+            });
+            this.startLiveness(ws);
+            this.resolvePendingConnection(ws);
+        }
+        catch (error) {
+            this.abortPendingConnection(ws, this.asError(error), true);
+        }
     }
     startLiveness(ws) {
         this.stopLiveness();
+        this.livenessSocket = ws;
         this.livenessTimer = setInterval(() => {
             if (Date.now() - this.lastActivityAt > LIVENESS_TIMEOUT_MS) {
-                this.stopLiveness();
+                this.stopLiveness(ws);
                 ws.terminate();
             }
         }, LIVENESS_CHECK_MS);
     }
-    stopLiveness() {
-        if (!this.livenessTimer)
+    stopLiveness(ws) {
+        if (!this.livenessTimer || (ws && this.livenessSocket !== ws))
             return;
         clearInterval(this.livenessTimer);
         this.livenessTimer = null;
+        this.livenessSocket = null;
     }
     async authenticate(ws, options) {
+        this.assertPendingConnection(ws);
         const pubkey = Buffer.from(this.keypair.publicKey).toString("base64");
         const hello = options.role === "host"
             ? {
@@ -100,6 +145,7 @@ export class RelayClient extends EventEmitter {
             : { type: "hello", protocol_version: 2, role: "owner", pubkey };
         this.rawSend(ws, JSON.stringify(hello));
         const challengeRaw = await this.nextMessage(ws);
+        this.assertPendingConnection(ws);
         let challenge;
         try {
             challenge = JSON.parse(challengeRaw);
@@ -119,17 +165,96 @@ export class RelayClient extends EventEmitter {
             type: "auth",
             sig: Buffer.from(ed25519Sign(this.keypair.secretKey, nonce)).toString("base64"),
         };
+        this.assertPendingConnection(ws);
         this.rawSend(ws, JSON.stringify(auth));
     }
     nextMessage(ws) {
         return new Promise((resolve, reject) => {
-            const timer = setTimeout(() => reject(new Error("relay auth timeout")), AUTH_TIMEOUT_MS);
-            ws.once("message", (raw) => {
-                clearTimeout(timer);
-                resolve(Buffer.isBuffer(raw) ? raw.toString() : String(raw));
-            });
+            let timer = null;
+            let settled = false;
+            const cleanup = () => {
+                if (timer)
+                    clearTimeout(timer);
+                ws.removeListener("message", onMessage);
+                ws.removeListener("error", onError);
+                ws.removeListener("close", onClose);
+                if (this.pendingMessage?.ws === ws)
+                    this.pendingMessage = null;
+            };
+            const finish = (settle) => {
+                if (settled)
+                    return;
+                settled = true;
+                cleanup();
+                settle();
+            };
+            const onMessage = (raw) => finish(() => resolve(Buffer.isBuffer(raw) ? raw.toString() : String(raw)));
+            const onError = (error) => finish(() => reject(error));
+            const onClose = () => finish(() => reject(new Error("relay connection closed")));
+            timer = setTimeout(() => finish(() => reject(new Error("relay auth timeout"))), AUTH_TIMEOUT_MS);
+            ws.once("message", onMessage);
+            ws.once("error", onError);
+            ws.once("close", onClose);
+            this.pendingMessage = { ws, cancel: (error) => finish(() => reject(error)) };
         });
     }
+    isPendingConnection(ws) {
+        return this.ws === ws && this.pendingConnection?.ws === ws;
+    }
+    assertPendingConnection(ws) {
+        if (!this.isPendingConnection(ws))
+            throw new Error("relay connection closed");
+    }
+    resolvePendingConnection(ws) {
+        const pending = this.pendingConnection;
+        if (!pending || pending.ws !== ws)
+            return;
+        this.pendingConnection = null;
+        this.clearPendingConnectionListeners(pending);
+        pending.resolve();
+    }
+    abortPendingConnection(ws, error, terminate) {
+        const pending = this.pendingConnection;
+        if (!pending || pending.ws !== ws)
+            return;
+        this.pendingConnection = null;
+        this.clearPendingConnectionListeners(pending);
+        this.cancelPendingMessage(ws, error);
+        this.stopLiveness(ws);
+        if (this.ws === ws)
+            this.ws = null;
+        pending.reject(error);
+        if (terminate)
+            ws.terminate();
+    }
+    clearConnectTimer(ws) {
+        const pending = this.pendingConnection;
+        if (!pending || pending.ws !== ws || !pending.connectTimer)
+            return;
+        clearTimeout(pending.connectTimer);
+        pending.connectTimer = null;
+    }
+    clearPendingConnectionListeners(pending) {
+        if (pending.connectTimer)
+            clearTimeout(pending.connectTimer);
+        pending.connectTimer = null;
+        pending.ws.removeListener("close", pending.onEarlyClose);
+        pending.ws.removeListener("open", pending.onOpen);
+    }
+    cancelPendingMessage(ws, error) {
+        const pending = this.pendingMessage;
+        if (!pending || pending.ws !== ws)
+            return;
+        this.pendingMessage = null;
+        pending.cancel(error);
+    }
+    reportError(error) {
+        if (this.listenerCount("error") > 0)
+            this.emit("error", error);
+    }
+    asError(error) {
+        return error instanceof Error ? error : new Error(String(error));
+    }
     rawSend(ws, data) {
         ws.send(data);
     }