@yefengr/remote-pi 0.7.4 → 0.7.5

package/dist/session/local_config.d.ts

@@ -1,55 +1,12 @@
 export interface LocalConfig {
     agent_name?: string;
-    /**
-     * If true (default), `/remote-pi` with no args auto-joins the local UDS
-     * mesh and starts the relay on a fresh terminal. The field name is
-     * historical (plano 21); the UX wording was reworked to "use the relay
-     * on this terminal to connect to the remote mesh (PWA + PCs)". Legacy
-     * configs without this field are treated as `true` for backward compat.
-     */
+    /** Whether an interactive Pi starts its Relay endpoint automatically. */
     auto_start_relay?: boolean;
 }
-/**
- * Normalize a name segment to a mesh-safe token: trim, replace the addressing
- * separators (`/ : @ #`) and whitespace runs with `-`, collapse repeats, strip
- * edges. The `@` is included so a sanitized name can never contain the address
- * separator — `<cwd>@<name>` stays unambiguous on the wire. Returns undefined
- * when the input isn't a usable non-empty string, sanitizes to empty, or is a
- * reserved addressing keyword (`broadcast` / `broker`). Used by the broker's
- * `sanitizeMeshName` to keep the `<nome>` half of a peer address safe to
- * compose (plan/38).
- */
-export declare function sanitizeSegment(v: unknown): string | undefined;
-/**
- * Migrate a persisted `agent_name` to the plan/38 leaf-name model (decision E).
- * Two legacy shapes get rewritten on read so a pre-fix config never fossilizes a
- * runtime accident as if it were an explicit choice:
- *
- *   - **`#N` collision suffix** — could only have come from a broker/lock
- *     assignment (the user can't type `#`: `sanitizeSegment` maps it to `-`), so
- *     a trailing `#<digits>` is stripped and the clean base re-derived.
- *   - **legacy `parent/folder`** — the old `defaultAgentName` shape; the `/`
- *     means it predates the leaf-only model, so we keep only the leaf segment.
- *
- * Returns the cleaned name, or undefined when nothing usable remains (so the
- * caller falls back to `defaultAgentName(cwd)`).
- */
-export declare function migrateAgentName(raw: string): string | undefined;
-/**
- * True when a local config is available for this cwd — either inline via
- * `REMOTE_PI_DIRECT_CONFIG` or as `<cwd>/.pi/remote-pi/config.json` on disk.
- */
 export declare function localConfigExists(cwd: string): boolean;
 export declare function loadLocalConfig(cwd: string): LocalConfig;
 export declare function saveLocalConfig(cwd: string, patch: Partial<LocalConfig>): void;
-/**
- * Default agent name when none is configured (plan/38 decision D): the **leaf**
- * of the cwd, `basename(cwd)`. The cwd now travels as its own address axis
- * (`<cwd>@<nome>`), so the name no longer needs the `parent/folder` prefix that
- * used to disambiguate folders — the broker keys peers by `(cwd, nome)`, and a
- * clean leaf means `#N` almost never fires. Falls back to `"agent"` for a
- * path with no usable basename (root / empty).
- */
+/** Default display name when none is configured. */
 export declare function defaultAgentName(cwd: string): string;
-/** Resolves auto_start_relay with backward-compat (undefined → true). */
-export declare function effectiveAutoStartRelay(cfg: LocalConfig): boolean;
+/** Resolves the default for omitted config values. */
+export declare function effectiveAutoStartRelay(config: LocalConfig): boolean;

package/dist/session/local_config.js

@@ -2,64 +2,10 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, join } from "node:path";
 const LOCAL_DIR = ".pi/remote-pi";
 const LOCAL_FILE = "config.json";
-/**
- * Escape hatch: when set, carries the WHOLE local config as inline JSON,
- * bypassing the on-disk `config.json`. For CI/ops/daemons that inject config
- * via env instead of writing a file — mirrors `REMOTE_PI_RELAY` for the relay
- * URL. Takes precedence over the file; an unset/empty/unparseable value falls
- * back to the file (never fatal).
- */
 const DIRECT_CONFIG_ENV = "REMOTE_PI_DIRECT_CONFIG";
 function pathFor(cwd) {
     return join(cwd, LOCAL_DIR, LOCAL_FILE);
 }
-/**
- * Normalize a name segment to a mesh-safe token: trim, replace the addressing
- * separators (`/ : @ #`) and whitespace runs with `-`, collapse repeats, strip
- * edges. The `@` is included so a sanitized name can never contain the address
- * separator — `<cwd>@<name>` stays unambiguous on the wire. Returns undefined
- * when the input isn't a usable non-empty string, sanitizes to empty, or is a
- * reserved addressing keyword (`broadcast` / `broker`). Used by the broker's
- * `sanitizeMeshName` to keep the `<nome>` half of a peer address safe to
- * compose (plan/38).
- */
-export function sanitizeSegment(v) {
-    if (typeof v !== "string")
-        return undefined;
-    const token = v.trim().replace(/[/:@#\s]+/g, "-").replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
-    if (!token)
-        return undefined;
-    if (token.toLowerCase() === "broadcast" || token.toLowerCase() === "broker")
-        return undefined;
-    return token;
-}
-/**
- * Migrate a persisted `agent_name` to the plan/38 leaf-name model (decision E).
- * Two legacy shapes get rewritten on read so a pre-fix config never fossilizes a
- * runtime accident as if it were an explicit choice:
- *
- *   - **`#N` collision suffix** — could only have come from a broker/lock
- *     assignment (the user can't type `#`: `sanitizeSegment` maps it to `-`), so
- *     a trailing `#<digits>` is stripped and the clean base re-derived.
- *   - **legacy `parent/folder`** — the old `defaultAgentName` shape; the `/`
- *     means it predates the leaf-only model, so we keep only the leaf segment.
- *
- * Returns the cleaned name, or undefined when nothing usable remains (so the
- * caller falls back to `defaultAgentName(cwd)`).
- */
-export function migrateAgentName(raw) {
-    // Legacy `parent/folder` (or any path-ish value) → keep the trailing segment.
-    const leaf = raw.includes("/") ? raw.slice(raw.lastIndexOf("/") + 1) : raw;
-    // Drop a runtime collision suffix a pre-fix build may have frozen into config.
-    const clean = leaf.replace(/#\d+$/, "").trim();
-    return clean.length > 0 ? clean : undefined;
-}
-/**
- * Parse a raw JSON string into a LocalConfig, surfacing only known fields.
- * Returns null when the input isn't a usable JSON object. Legacy `session_name`
- * from pre-refactor configs is silently dropped — the local UDS mesh is now
- * always a single fixed session, so the field has no meaning.
- */
 function parseLocalConfig(raw) {
     let parsed;
     try {
@@ -70,88 +16,60 @@ function parseLocalConfig(raw) {
     }
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
         return null;
-    const src = parsed;
-    const cfg = {};
-    if (typeof src["agent_name"] === "string") {
-        // Migrate on read (plan/38 decision E): strip a frozen `#N` and the legacy
-        // `parent/folder` shape so neither fossilizes as an explicit name.
-        const migrated = migrateAgentName(src["agent_name"]);
-        if (migrated)
-            cfg.agent_name = migrated;
+    const source = parsed;
+    const config = {};
+    if (typeof source["agent_name"] === "string" && source["agent_name"].trim()) {
+        config.agent_name = source["agent_name"].trim();
+    }
+    if (typeof source["auto_start_relay"] === "boolean") {
+        config.auto_start_relay = source["auto_start_relay"];
     }
-    if (typeof src["auto_start_relay"] === "boolean")
-        cfg.auto_start_relay = src["auto_start_relay"];
-    return cfg;
+    return config;
 }
-/** Inline config from `REMOTE_PI_DIRECT_CONFIG`, when set + parseable; else null. */
 function directConfig() {
     const raw = process.env[DIRECT_CONFIG_ENV];
     if (!raw || raw.trim().length === 0)
         return null;
     return parseLocalConfig(raw);
 }
-/**
- * True when a local config is available for this cwd — either inline via
- * `REMOTE_PI_DIRECT_CONFIG` or as `<cwd>/.pi/remote-pi/config.json` on disk.
- */
 export function localConfigExists(cwd) {
     return directConfig() !== null || existsSync(pathFor(cwd));
 }
 export function loadLocalConfig(cwd) {
-    // Precedence: inline `REMOTE_PI_DIRECT_CONFIG` env wins over the file. An
-    // unset/empty/malformed env falls through to the on-disk config.json.
     const direct = directConfig();
     if (direct)
         return direct;
-    const p = pathFor(cwd);
-    if (!existsSync(p))
+    const path = pathFor(cwd);
+    if (!existsSync(path))
         return {};
     try {
-        return parseLocalConfig(readFileSync(p, "utf8")) ?? {};
+        return parseLocalConfig(readFileSync(path, "utf8")) ?? {};
     }
     catch {
         return {};
     }
 }
 export function saveLocalConfig(cwd, patch) {
-    const p = pathFor(cwd);
+    const path = pathFor(cwd);
     const current = loadLocalConfig(cwd);
     const next = { ...current, ...patch };
-    // Always persist auto_start_relay explicitly (default true) so future reads
-    // never need to guess. Backward-compat: legacy files without the field
-    // are treated as true on read; we lock that intent in on first save.
     if (typeof next.auto_start_relay !== "boolean")
         next.auto_start_relay = true;
-    // Best-effort persistence: a read-only config.json is a legitimate deployment
-    // (NixOS/Home Manager symlink into the immutable Nix store, read-only root,
-    // EPERM). The name/config sync is cosmetic — it must NEVER crash the pi
-    // process with an uncaughtException. `saveLocalConfig` is reached via
-    // fire-and-forget async paths (`void _syncNameFromPi()` from `turn_start` /
-    // `session_start`), so a sync throw from `mkdirSync`/`writeFileSync` sails
-    // past the runner's per-handler try/catch and takes down pi. Guard both fs
-    // calls together so a partial attempt can't throw past the caller.
     try {
-        mkdirSync(dirname(p), { recursive: true });
-        writeFileSync(p, JSON.stringify(next, null, 2));
+        mkdirSync(dirname(path), { recursive: true });
+        writeFileSync(path, JSON.stringify(next, null, 2));
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        console.warn(`[remote-pi] could not persist local config ${p}: ${message}`);
+        console.warn(`[remote-pi] could not persist local config ${path}: ${message}`);
     }
 }
-/**
- * Default agent name when none is configured (plan/38 decision D): the **leaf**
- * of the cwd, `basename(cwd)`. The cwd now travels as its own address axis
- * (`<cwd>@<nome>`), so the name no longer needs the `parent/folder` prefix that
- * used to disambiguate folders — the broker keys peers by `(cwd, nome)`, and a
- * clean leaf means `#N` almost never fires. Falls back to `"agent"` for a
- * path with no usable basename (root / empty).
- */
+/** Default display name when none is configured. */
 export function defaultAgentName(cwd) {
     return basename(cwd) || "agent";
 }
-/** Resolves auto_start_relay with backward-compat (undefined → true). */
-export function effectiveAutoStartRelay(cfg) {
-    return cfg.auto_start_relay !== false;
+/** Resolves the default for omitted config values. */
+export function effectiveAutoStartRelay(config) {
+    return config.auto_start_relay !== false;
 }
 //# sourceMappingURL=local_config.js.map

package/dist/session/local_config.js.map

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

package/dist/transport/peer_channel.d.ts

@@ -1,57 +1,43 @@
-import type { ClientMessage, ServerMessage } from "../protocol/types.js";
 import { type ClientFrame, type ServerFrame } from "../protocol/v2/index.js";
 import type { RelayClient } from "./relay_client.js";
-/** Sink for ServerMessage outbound to the remote app. */
-export interface PeerChannel {
-    send(msg: ServerMessage): void;
-}
+export type RoutePurpose = "pairing" | "session";
+export type RouteFrame = {
+    type: "route";
+    purpose: RoutePurpose;
+    device_id: string;
+    endpoint_id: string;
+    runtime_instance_id: string;
+    target_owner_id?: string;
+    source_owner_id?: string;
+    ct: string;
+};
+export type HostRouteIdentity = {
+    deviceId: string;
+    endpointId: string;
+    runtimeInstanceId: string;
+};
 export interface V2Channel {
     getPeerId(): string;
     sendV2(msg: ServerFrame): void;
     detach(): void;
 }
 /**
- * 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 declare class V2PeerChannel implements V2Channel {
     private readonly relay;
-    private readonly remotePeerId;
+    private readonly ownerId;
+    private readonly host;
     private readonly onMessage;
     private readonly unsubscribe;
-    constructor(relay: RelayClient, remotePeerId: string, onMessage: (msg: ClientFrame) => void);
+    constructor(relay: RelayClient, ownerId: string, host: HostRouteIdentity, onMessage: (msg: ClientFrame) => void);
     getPeerId(): string;
     sendV2(msg: ServerFrame): void;
     detach(): void;
     private onLine;
+    private sendUpgradeRequired;
 }
-/** @deprecated Protocol v1 test helper. Production uses V2PeerChannel. */
-export declare class PlainPeerChannel implements PeerChannel {
-    private readonly relay;
-    private readonly remotePeerId;
-    private readonly onMessage;
-    private readonly _unsubscribe;
-    constructor(relay: RelayClient, remotePeerId: string, 
-    /**
-     * 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: string | undefined, onMessage: (msg: ClientMessage) => void, 
-    /** Called when this specific peer connection is considered lost. */
-    _onDisconnect?: () => void);
-    /** Authenticated Owner peer id used as a server-derived sender reference. */
-    getPeerId(): string;
-    send(msg: ServerMessage): void;
-    /** Detaches from relay (does not close the relay itself). */
-    detach(): void;
-    private _onLine;
-}
+export declare function parseIncomingRoute(line: string, host: HostRouteIdentity, ownerId?: string): RouteFrame | null;
+export declare function sendRoute(relay: RelayClient, host: HostRouteIdentity, ownerId: string, purpose: RoutePurpose, ct: string): void;

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":"AAAA,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GAGpB,MAAM,yBAAyB,CAAC;AA4BjC;;;;GAIG;AACH,MAAM,OAAO,aAAa;IAIL;IACA;IACA;IACA;IANF,WAAW,CAAa;IAEzC,YACmB,KAAkB,EAClB,OAAe,EACf,IAAuB,EACvB,SAAqC;QAHrC,UAAK,GAAL,KAAK,CAAa;QAClB,YAAO,GAAP,OAAO,CAAQ;QACf,SAAI,GAAJ,IAAI,CAAmB;QACvB,cAAS,GAAT,SAAS,CAA4B;QAEtD,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACrD,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC9B,IAAI,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,GAAgB;QACrB,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACpE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;gBAC7B,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;gBACpF,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;gBAC7B,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;gBACjC,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB;gBAChD,eAAe,EAAE,IAAI,CAAC,OAAO;gBAC7B,EAAE;aACkB,CAAC,CAAC,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,oEAAoE;QACtE,CAAC;IACH,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAEO,MAAM,CAAC,IAAY;QACzB,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YACpF,MAAM,eAAe,GAAiB,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5F,IAAI,KAAK,CAAC,OAAO,KAAK,eAAe;gBAAE,OAAO;YAC9C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAEO,mBAAmB,CAAC,EAAU;QACpC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAA4B,CAAC;YAC9F,MAAM,EAAE,GAAG,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC3D,MAAM,SAAS,GAAG,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;YAClF,IAAI,CAAC,EAAE;gBAAE,OAAO;YAChB,IAAI,CAAC,MAAM,CAAC;gBACV,gBAAgB,EAAE,CAAC;gBACnB,IAAI,EAAE,gBAAgB;gBACtB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtD,WAAW,EAAE,EAAE;gBACf,IAAI,EAAE,2BAA2B;gBACjC,OAAO,EAAE,yBAAyB;aACnC,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,yDAAyD;QAC3D,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,kBAAkB,CAChC,IAAY,EACZ,IAAuB,EACvB,OAAgB;IAEhB,IAAI,KAAiB,CAAC;IACtB,IAAI,CAAC;QACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAe,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IACE,KAAK,CAAC,IAAI,KAAK,OAAO;QACtB,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC;QAC5D,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ;QAC5B,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC,QAAQ;QACjC,KAAK,CAAC,WAAW,KAAK,IAAI,CAAC,UAAU;QACrC,KAAK,CAAC,mBAAmB,KAAK,IAAI,CAAC,iBAAiB;QACpD,OAAO,KAAK,CAAC,eAAe,KAAK,QAAQ;QACzC,KAAK,CAAC,eAAe,KAAK,SAAS,EACnC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,eAAe,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IAC5E,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,KAAkB,EAClB,IAAuB,EACvB,OAAe,EACf,OAAqB,EACrB,EAAU;IAEV,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;QACxB,IAAI,EAAE,OAAO;QACb,OAAO;QACP,SAAS,EAAE,IAAI,CAAC,QAAQ;QACxB,WAAW,EAAE,IAAI,CAAC,UAAU;QAC5B,mBAAmB,EAAE,IAAI,CAAC,iBAAiB;QAC3C,eAAe,EAAE,OAAO;QACxB,EAAE;KACkB,CAAC,CAAC,CAAC;AAC3B,CAAC"}