@thenewlabs/entangle-connect 1.0.0 → 2.0.1

package/dist/connection.d.ts

@@ -0,0 +1,69 @@
+export type SignalName = 'SIGINT' | 'SIGTERM' | 'SIGHUP' | 'SIGQUIT' | 'SIGKILL';
+export interface StreamHandlers {
+    onOpened?: () => void;
+    onData?: (chunk: Uint8Array, channel: 'stdout' | 'stderr') => void;
+    onExit?: (code: number | null, signal: string | null) => void;
+    onError?: (message: string) => void;
+}
+/**
+ * A live stream. `sid` starts as a provisional client id and is rebound to the
+ * agent-assigned id once the `opened` confirmation arrives; all writes use the
+ * current `sid`, so callers should write after `onOpened`.
+ */
+export declare class StreamHandle {
+    sid: string;
+    private conn;
+    constructor(sid: string, conn: InvokeConnection);
+    write(chunk: Uint8Array): void;
+    signal(sig: SignalName): void;
+    resize(cols: number, rows: number): void;
+    close(): void;
+}
+/**
+ * Node-side connection to an entangle agent via the blind relay. Implements
+ * the v2 handshake (per-session keys bound to the fresh nonces, client-side
+ * verification of the echoed nonceB and expiry) and the multi-stream data
+ * protocol. Both single-command and terminal invokers build on this.
+ */
+export declare class InvokeConnection {
+    private capId;
+    private S;
+    private password?;
+    private ws;
+    private reader;
+    private K_raw;
+    private bootstrapKeys;
+    private sessionKeys;
+    private counters;
+    private streamCounters;
+    private nonceB;
+    private authenticated;
+    private passwordVerified;
+    private requiresPassword;
+    private streams;
+    private pendingOpens;
+    private onCloseCb?;
+    constructor(capId: string, S: string, password?: string | undefined);
+    /** Connect and complete the handshake (including password if required). */
+    connect(wsUrl: string): Promise<void>;
+    private handleHandshakeFrame;
+    private dispatchStreamFrame;
+    private sendStream;
+    /** Open a command stream. */
+    openCmd(argv: string[], options?: {
+        cwd?: string;
+    }, handlers?: StreamHandlers): StreamHandle;
+    /** Open a PTY stream. */
+    openPty(options: {
+        cols: number;
+        rows: number;
+        cwd?: string;
+    }, handlers?: StreamHandlers): StreamHandle;
+    sendData(sid: string, chunk: Uint8Array): void;
+    sendSignal(sid: string, signal: SignalName): void;
+    sendResize(sid: string, cols: number, rows: number): void;
+    close(sid: string): void;
+    onClose(cb: () => void): void;
+    disconnect(): void;
+}
+//# sourceMappingURL=connection.d.ts.map

package/dist/connection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAwBA,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;AAEjF,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,GAAG,QAAQ,KAAK,IAAI,CAAC;IACnE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC9D,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAED;;;;GAIG;AACH,qBAAa,YAAY;IACJ,GAAG,EAAE,MAAM;IAAE,OAAO,CAAC,IAAI;gBAAzB,GAAG,EAAE,MAAM,EAAU,IAAI,EAAE,gBAAgB;IAC9D,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAC9B,MAAM,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI;IAC7B,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IACxC,KAAK,IAAI,IAAI;CACd;AAOD;;;;;GAKG;AACH,qBAAa,gBAAgB;IAiBzB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,CAAC;IACT,OAAO,CAAC,QAAQ,CAAC;IAlBnB,OAAO,CAAC,EAAE,CAAa;IACvB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,cAAc,CAAwB;IAC9C,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,SAAS,CAAC,CAAa;gBAGrB,KAAK,EAAE,MAAM,EACb,CAAC,EAAE,MAAM,EACT,QAAQ,CAAC,EAAE,MAAM,YAAA;IAG3B,2EAA2E;IACrE,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAsC7B,oBAAoB;YAiEpB,mBAAmB;YAiDnB,UAAU;IASxB,6BAA6B;IAC7B,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAA;KAAO,EAAE,QAAQ,GAAE,cAAmB,GAAG,YAAY;IAWpG,yBAAyB;IACzB,OAAO,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,QAAQ,GAAE,cAAmB,GAAG,YAAY;IAY3G,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IAI9C,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI;IAIjD,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAIzD,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIxB,OAAO,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI;IAI7B,UAAU,IAAI,IAAI;CAGnB"}

package/dist/connection.js

@@ -0,0 +1,250 @@
+import WebSocket from 'ws';
+import { randomBytes } from 'crypto';
+import { FrameType, FrameReader, encodeFrame, } from '@thenewlabs/entangle-protocol';
+import { deriveKeyMaterial, deriveBootstrapKeys, deriveSessionKeys, extractSaltFromCapId, aeadEncrypt, aeadDecrypt, computeHmac, streamAeadEncrypt, streamAeadDecrypt, frameAad, AeadDir, } from '@thenewlabs/entangle-crypto';
+import { BidirectionalCounters, StreamCounters } from '@thenewlabs/entangle-utils';
+import { encode, decode } from 'cborg';
+/**
+ * A live stream. `sid` starts as a provisional client id and is rebound to the
+ * agent-assigned id once the `opened` confirmation arrives; all writes use the
+ * current `sid`, so callers should write after `onOpened`.
+ */
+export class StreamHandle {
+    sid;
+    conn;
+    constructor(sid, conn) {
+        this.sid = sid;
+        this.conn = conn;
+    }
+    write(chunk) { this.conn.sendData(this.sid, chunk); }
+    signal(sig) { this.conn.sendSignal(this.sid, sig); }
+    resize(cols, rows) { this.conn.sendResize(this.sid, cols, rows); }
+    close() { this.conn.close(this.sid); }
+}
+/**
+ * Node-side connection to an entangle agent via the blind relay. Implements
+ * the v2 handshake (per-session keys bound to the fresh nonces, client-side
+ * verification of the echoed nonceB and expiry) and the multi-stream data
+ * protocol. Both single-command and terminal invokers build on this.
+ */
+export class InvokeConnection {
+    capId;
+    S;
+    password;
+    ws;
+    reader = new FrameReader();
+    K_raw;
+    bootstrapKeys;
+    sessionKeys;
+    counters = new BidirectionalCounters();
+    streamCounters = new StreamCounters();
+    nonceB;
+    authenticated = false;
+    passwordVerified = false;
+    requiresPassword = false;
+    streams = new Map();
+    pendingOpens = [];
+    onCloseCb;
+    constructor(capId, S, password) {
+        this.capId = capId;
+        this.S = S;
+        this.password = password;
+    }
+    /** Connect and complete the handshake (including password if required). */
+    async connect(wsUrl) {
+        const saltCap = extractSaltFromCapId(this.capId);
+        this.K_raw = await deriveKeyMaterial(this.S, saltCap);
+        this.bootstrapKeys = deriveBootstrapKeys(this.K_raw);
+        this.ws = new WebSocket(wsUrl);
+        await new Promise((resolve, reject) => {
+            const fail = (err) => { try {
+                this.ws.close();
+            }
+            catch { } reject(err); };
+            this.ws.on('open', () => {
+                // AUTH1 = HMAC(bootstrap K_auth, "hello"+capId+nonceB) || nonceB
+                this.nonceB = randomBytes(16).toString('hex');
+                const auth1Data = new TextEncoder().encode('hello' + this.capId + this.nonceB);
+                const hmac = computeHmac(this.bootstrapKeys.K_auth, auth1Data);
+                const nonceBBytes = new TextEncoder().encode(this.nonceB);
+                const payload = new Uint8Array(32 + nonceBBytes.length);
+                payload.set(hmac, 0);
+                payload.set(nonceBBytes, 32);
+                this.ws.send(encodeFrame(FrameType.AUTH1, payload));
+            });
+            this.ws.on('message', async (data) => {
+                if (!(data instanceof Buffer))
+                    return;
+                for (const frame of this.reader.push(data)) {
+                    try {
+                        await this.handleHandshakeFrame(frame, resolve, fail);
+                    }
+                    catch (err) {
+                        fail(err instanceof Error ? err : new Error(String(err)));
+                    }
+                }
+            });
+            this.ws.on('error', (err) => fail(err instanceof Error ? err : new Error(String(err))));
+            this.ws.on('close', () => { this.onCloseCb?.(); });
+        });
+    }
+    async handleHandshakeFrame(frame, resolve, fail) {
+        if (frame.type === FrameType.AUTH2 && !this.authenticated) {
+            const encrypted = decode(frame.payload);
+            // AUTH2 is protected with the bootstrap key.
+            const decrypted = aeadDecrypt(this.bootstrapKeys.K_enc, FrameType.AUTH2, encrypted.nonce, encrypted.cipher, AeadDir.ServerToClient);
+            const auth2 = decrypted.msg;
+            // Freshness checks: the agent must echo OUR nonceB and the session must
+            // not be expired. This is what rejects a relay replaying a stale AUTH2.
+            if (auth2.nonceB !== this.nonceB) {
+                return fail(new Error('AUTH2 nonce mismatch (possible replay)'));
+            }
+            if (typeof auth2.expiryTs !== 'number' || auth2.expiryTs <= Date.now()) {
+                return fail(new Error('AUTH2 expired'));
+            }
+            this.sessionKeys = deriveSessionKeys(this.K_raw, this.nonceB, auth2.nonceC);
+            this.requiresPassword = !!auth2.requiresPassword;
+            // AUTH3 HMAC keyed with the SESSION key.
+            const auth3Data = new TextEncoder().encode('ready' + auth2.nonceC);
+            const auth3Hmac = computeHmac(this.sessionKeys.K_auth, auth3Data);
+            this.ws.send(encodeFrame(FrameType.AUTH3, auth3Hmac));
+            this.authenticated = true;
+            if (this.requiresPassword) {
+                if (!this.password)
+                    return fail(new Error('Password required but not provided'));
+                const ctr = this.counters.outgoing.next();
+                const enc = aeadEncrypt(this.sessionKeys.K_enc, FrameType.AUTH_PW, ctr, { password: this.password }, AeadDir.ClientToServer);
+                this.ws.send(encodeFrame(FrameType.AUTH_PW, encode(enc)));
+            }
+            else {
+                this.passwordVerified = true;
+                resolve();
+            }
+            return;
+        }
+        if (frame.type === FrameType.AUTH_PW && this.authenticated && !this.passwordVerified) {
+            const encrypted = decode(frame.payload);
+            const decrypted = aeadDecrypt(this.sessionKeys.K_enc, FrameType.AUTH_PW, encrypted.nonce, encrypted.cipher, AeadDir.ServerToClient);
+            this.counters.incoming.validate(decrypted.ctr);
+            if (decrypted.msg?.ok) {
+                this.passwordVerified = true;
+                resolve();
+            }
+            else {
+                fail(new Error('Password verification failed'));
+            }
+            return;
+        }
+        if (frame.type === FrameType.ERROR) {
+            const encrypted = decode(frame.payload);
+            const decrypted = aeadDecrypt(this.sessionKeys?.K_enc ?? this.bootstrapKeys.K_enc, FrameType.ERROR, encrypted.nonce, encrypted.cipher, AeadDir.ServerToClient);
+            fail(new Error(`Server error: ${decrypted.msg?.code} - ${decrypted.msg?.detail}`));
+            return;
+        }
+        // Post-handshake stream frames.
+        await this.dispatchStreamFrame(frame);
+    }
+    async dispatchStreamFrame(frame) {
+        if (!this.sessionKeys)
+            return;
+        const aad = frameAad(frame.type, AeadDir.ServerToClient);
+        const plaintext = await streamAeadDecrypt(this.sessionKeys.K_enc, frame.payload, aad);
+        const message = decode(plaintext);
+        const sid = message?.msg?.sid;
+        if (!sid)
+            return;
+        // Per-stream incoming counter (drop out-of-order/replayed frames).
+        const expected = this.streamCounters.getNext(sid, 'incoming');
+        if (message.ctr !== expected)
+            return;
+        this.streamCounters.increment(sid, 'incoming');
+        switch (frame.type) {
+            case FrameType.STREAM_OPEN: {
+                if (message.msg.kind === 'opened') {
+                    const pending = this.pendingOpens.shift();
+                    if (pending) {
+                        pending.handle.sid = sid; // rebind to agent-assigned id
+                        this.streams.set(sid, pending.handlers);
+                        pending.handlers.onOpened?.();
+                    }
+                }
+                break;
+            }
+            case FrameType.STREAM_DATA:
+                this.streams.get(sid)?.onData?.(new Uint8Array(message.msg.chunk), message.msg.channel === 'stderr' ? 'stderr' : 'stdout');
+                break;
+            case FrameType.STREAM_EXIT: {
+                const h = this.streams.get(sid);
+                this.streamCounters.removeStream(sid);
+                this.streams.delete(sid);
+                h?.onExit?.(message.msg.code ?? null, message.msg.signal ?? null);
+                break;
+            }
+            case FrameType.STREAM_ERROR: {
+                // An error can arrive before `opened` (e.g. the agent rejected the
+                // open); in that case the stream is still pending under this sid.
+                let handlers = this.streams.get(sid);
+                if (!handlers) {
+                    const idx = this.pendingOpens.findIndex((p) => p.handle.sid === sid);
+                    if (idx >= 0)
+                        handlers = this.pendingOpens.splice(idx, 1)[0].handlers;
+                }
+                handlers?.onError?.(message.msg.message || 'stream error');
+                break;
+            }
+        }
+    }
+    async sendStream(type, sid, msgBody) {
+        const ctr = this.streamCounters.getNext(sid, 'outgoing');
+        const plaintext = encode({ ctr, msg: { v: 1, sid, ...msgBody } });
+        const aad = frameAad(type, AeadDir.ClientToServer);
+        const ct = await streamAeadEncrypt(this.sessionKeys.K_enc, plaintext, aad);
+        this.ws.send(encodeFrame(type, ct));
+        this.streamCounters.increment(sid, 'outgoing');
+    }
+    /** Open a command stream. */
+    openCmd(argv, options = {}, handlers = {}) {
+        const handle = new StreamHandle(randomBytes(8).toString('hex'), this);
+        this.pendingOpens.push({ handle, handlers });
+        void this.sendStream(FrameType.STREAM_OPEN, handle.sid, {
+            kind: 'open',
+            mode: 'cmd',
+            exec: { argv, ...(options.cwd ? { cwd: options.cwd } : {}), stdin: true },
+        });
+        return handle;
+    }
+    /** Open a PTY stream. */
+    openPty(options, handlers = {}) {
+        const handle = new StreamHandle(randomBytes(8).toString('hex'), this);
+        this.pendingOpens.push({ handle, handlers });
+        void this.sendStream(FrameType.STREAM_OPEN, handle.sid, {
+            kind: 'open',
+            mode: 'pty',
+            pty: { cols: options.cols, rows: options.rows },
+            ...(options.cwd ? { exec: { argv: [], cwd: options.cwd } } : {}),
+        });
+        return handle;
+    }
+    sendData(sid, chunk) {
+        void this.sendStream(FrameType.STREAM_DATA, sid, { kind: 'data', chunk });
+    }
+    sendSignal(sid, signal) {
+        void this.sendStream(FrameType.STREAM_SIGNAL, sid, { kind: 'signal', signal });
+    }
+    sendResize(sid, cols, rows) {
+        void this.sendStream(FrameType.STREAM_RESIZE, sid, { kind: 'pty-resize', cols, rows });
+    }
+    close(sid) {
+        void this.sendStream(FrameType.STREAM_CLOSE, sid, { kind: 'close' });
+    }
+    onClose(cb) {
+        this.onCloseCb = cb;
+    }
+    disconnect() {
+        try {
+            this.ws.close();
+        }
+        catch { }
+    }
+}
+//# sourceMappingURL=connection.js.map

package/dist/connection.js.map

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

package/dist/index.js

@@ -27,6 +27,12 @@ function parseCapUrl(u) {
 const program = new Command();
 program
     .name('entangle-connect')
+    // Everything after <cap-url> is the remote command verbatim, so flags like
+    // `ls -la` or `sh -c '...'` are passed through instead of being parsed as
+    // entangle-connect options. entangle-connect's own options go before the URL
+    // (e.g. `entangle-connect --cwd /srv <url> ls -la`); `--` also works.
+    .enablePositionalOptions()
+    .passThroughOptions()
     .description('Invoke commands or terminal sessions on remote capabilities')
     .version(getVersionInfo())
     .argument('<cap-url>', 'Capability URL (e.g., https://suncoder.dev/cap/capId#S=secret)')

package/dist/index.js.map

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

package/dist/single.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"single.d.ts","sourceRoot":"","sources":["../src/single.ts"],"names":[],"mappings":"AAQA,wBAAsB,SAAS,CAC7B,KAAK,EAAE,MAAM,EACb,CAAC,EAAE,MAAM,EACT,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EACxF,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAsOf"}
+{"version":3,"file":"single.d.ts","sourceRoot":"","sources":["../src/single.ts"],"names":[],"mappings":"AAKA,wBAAsB,SAAS,CAC7B,KAAK,EAAE,MAAM,EACb,CAAC,EAAE,MAAM,EACT,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EACxF,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAuDf"}

package/dist/single.js

@@ -1,209 +1,55 @@
-import WebSocket from 'ws';
-import { deriveKeys, extractSaltFromCapId, aeadEncrypt, aeadDecrypt, computeHmac, sha256Hex } from '@thenewlabs/entangle-crypto';
-import { FrameType, FrameReader, encodeFrame } from '@thenewlabs/entangle-protocol';
-import { OutputHandler, parseOutputMode, BidirectionalCounters } from '@thenewlabs/entangle-utils';
-import { encode, decode } from 'cborg';
+import { OutputHandler, parseOutputMode } from '@thenewlabs/entangle-utils';
+import { InvokeConnection } from './connection.js';
 const output = new OutputHandler({ mode: parseOutputMode(process.env.OUTPUT_MODE || 'text') });
 export async function runSingle(wsUrl, S, options, password) {
     const { argv, cwd, abortAfterMs } = options;
     if (!argv || argv.length === 0) {
         throw new Error('No command provided');
     }
-    // Extract capId from URL
-    const urlParts = wsUrl.split('/');
-    const capId = urlParts[urlParts.length - 1];
-    // Derive keys
-    const saltCap = extractSaltFromCapId(capId);
-    const keys = await deriveKeys(S, saltCap);
-    // Connect to relay
-    const ws = new WebSocket(wsUrl);
-    const reader = new FrameReader();
-    const counters = new BidirectionalCounters();
-    // Command ID for this run
-    const commandId = Math.random().toString(36).substr(2, 9);
-    return new Promise((_, reject) => {
-        let abortTimeout;
-        ws.on('open', async () => {
-            output.info('Connected to relay');
-            try {
-                // Send AUTH1
-                const nonceB = Math.random().toString(36).substr(2);
-                const auth1Data = new TextEncoder().encode('hello' + capId + nonceB);
-                const auth1Hmac = computeHmac(keys.K_auth, auth1Data);
-                // Send HMAC + nonceB
-                const nonceBBytes = new TextEncoder().encode(nonceB);
-                const auth1Payload = new Uint8Array(32 + nonceBBytes.length);
-                auth1Payload.set(auth1Hmac, 0);
-                auth1Payload.set(nonceBBytes, 32);
-                const auth1Frame = encodeFrame(FrameType.AUTH1, auth1Payload);
-                ws.send(auth1Frame);
-            }
-            catch (error) {
-                output.error('Failed to send AUTH1', error instanceof Error ? error.message : String(error));
-                ws.close();
-                reject(error);
-            }
-        });
-        let authenticated = false;
-        let passwordVerified = false;
-        let requiresPassword = false;
-        let nonceC;
+    const capId = wsUrl.split('/').pop();
+    const conn = new InvokeConnection(capId, S, password);
+    await conn.connect(wsUrl);
+    output.info('Authenticated');
+    await new Promise((_resolve, reject) => {
         let exitCode = 0;
-        ws.on('message', async (data) => {
-            if (!(data instanceof Buffer))
-                return;
-            const frames = reader.push(data);
-            for (const frame of frames) {
-                try {
-                    if (frame.type === FrameType.AUTH2 && !authenticated) {
-                        // Handle AUTH2
-                        const encrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, FrameType.AUTH2, encrypted.nonce, encrypted.cipher);
-                        const auth2 = decrypted.msg;
-                        nonceC = auth2.nonceC;
-                        requiresPassword = auth2.requiresPassword || false;
-                        // Send AUTH3
-                        const auth3Data = new TextEncoder().encode('ready' + nonceC);
-                        const auth3Hmac = computeHmac(keys.K_auth, auth3Data);
-                        const auth3Frame = encodeFrame(FrameType.AUTH3, auth3Hmac);
-                        ws.send(auth3Frame);
-                        authenticated = true;
-                        output.info('Authenticated');
-                        // If password is required, send it
-                        if (requiresPassword) {
-                            if (!password) {
-                                // For non-interactive mode, we can't prompt for password
-                                output.error('Password required but not provided. Use --password flag or include PW in URL fragment.');
-                                ws.close();
-                                process.exit(1);
-                            }
-                            output.info('Sending password...');
-                            const pwMsg = {
-                                ctr: counters.outgoing.next(),
-                                msg: { passwordHash: sha256Hex(password) }
-                            };
-                            const pwEncrypted = aeadEncrypt(keys.K_enc, FrameType.AUTH_PW, pwMsg.ctr, pwMsg.msg);
-                            const pwFrame = encodeFrame(FrameType.AUTH_PW, encode(pwEncrypted));
-                            ws.send(pwFrame);
-                        }
-                        else {
-                            passwordVerified = true;
-                        }
-                    }
-                    else if (frame.type === FrameType.AUTH_PW && authenticated && !passwordVerified) {
-                        // Handle password response
-                        const encrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, FrameType.AUTH_PW, encrypted.nonce, encrypted.cipher);
-                        counters.incoming.validate(decrypted.ctr);
-                        const pwResponse = decrypted.msg;
-                        if (pwResponse.ok) {
-                            output.info('Password verified');
-                            passwordVerified = true;
-                            // Now send RUN command
-                            const runMsg = {
-                                commandId,
-                                argv,
-                                cwd,
-                                limits: abortAfterMs ? { wallMs: abortAfterMs } : undefined,
-                            };
-                            const runEncrypted = aeadEncrypt(keys.K_enc, FrameType.RUN, counters.outgoing.next(), runMsg);
-                            const runFrame = encodeFrame(FrameType.RUN, encode(runEncrypted));
-                            ws.send(runFrame);
-                            // Set abort timeout if specified
-                            if (abortAfterMs) {
-                                abortTimeout = setTimeout(() => {
-                                    output.info('Aborting command due to timeout');
-                                    const abortMsg = {
-                                        commandId,
-                                        reason: 'timeout',
-                                    };
-                                    const abortEncrypted = aeadEncrypt(keys.K_enc, FrameType.ABORT, counters.outgoing.next(), abortMsg);
-                                    const abortFrame = encodeFrame(FrameType.ABORT, encode(abortEncrypted));
-                                    ws.send(abortFrame);
-                                }, abortAfterMs);
-                            }
-                        }
-                        else {
-                            output.error('Password verification failed');
-                            ws.close();
-                            process.exit(1);
-                        }
-                    }
-                    else if (frame.type === FrameType.STDOUT && authenticated) {
-                        // Handle stdout
-                        const encrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, FrameType.STDOUT, encrypted.nonce, encrypted.cipher);
-                        counters.incoming.validate(decrypted.ctr);
-                        const msg = decrypted.msg;
-                        if (msg.commandId === commandId) {
-                            process.stdout.write(Buffer.from(msg.chunk));
-                        }
-                    }
-                    else if (frame.type === FrameType.STDERR && authenticated) {
-                        // Handle stderr
-                        const encrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, FrameType.STDERR, encrypted.nonce, encrypted.cipher);
-                        counters.incoming.validate(decrypted.ctr);
-                        const msg = decrypted.msg;
-                        if (msg.commandId === commandId) {
-                            process.stderr.write(Buffer.from(msg.chunk));
-                        }
-                    }
-                    else if (frame.type === FrameType.EXIT && authenticated) {
-                        // Handle exit
-                        const encrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, FrameType.EXIT, encrypted.nonce, encrypted.cipher);
-                        counters.incoming.validate(decrypted.ctr);
-                        const msg = decrypted.msg;
-                        if (msg.commandId === commandId) {
-                            exitCode = msg.code ?? 1;
-                            output.info(`Command exited: code=${msg.code}, signal=${msg.signal}, bytesOut=${msg.bytesOut}`);
-                            if (abortTimeout) {
-                                clearTimeout(abortTimeout);
-                            }
-                            ws.close();
-                            process.exit(exitCode);
-                        }
-                    }
-                    else if (frame.type === FrameType.ERROR) {
-                        // Handle error
-                        const encrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, FrameType.ERROR, encrypted.nonce, encrypted.cipher);
-                        const error = decrypted.msg;
-                        output.error('Server error', error instanceof Error ? error.message : String(error));
-                        ws.close();
-                        reject(new Error(`Server error: ${error.code} - ${error.detail}`));
-                    }
-                }
-                catch (error) {
-                    output.error(`Failed to handle frame type ${frame.type}`, error instanceof Error ? error.message : String(error));
+        let abortTimer;
+        const handle = conn.openCmd(argv, cwd ? { cwd } : {}, {
+            onOpened: () => {
+                if (abortAfterMs) {
+                    abortTimer = setTimeout(() => {
+                        output.info('Aborting command due to timeout');
+                        handle.signal('SIGTERM');
+                    }, abortAfterMs);
                 }
-            }
-        });
-        ws.on('error', (error) => {
-            output.error('WebSocket error', error instanceof Error ? error.message : String(error));
-            reject(error);
+            },
+            onData: (chunk, channel) => {
+                (channel === 'stderr' ? process.stderr : process.stdout).write(Buffer.from(chunk));
+            },
+            onExit: (code, signal) => {
+                exitCode = code ?? 1;
+                output.info(`Command exited: code=${code}, signal=${signal}`);
+                if (abortTimer)
+                    clearTimeout(abortTimer);
+                conn.disconnect();
+                process.exit(exitCode);
+            },
+            onError: (message) => {
+                output.error('Stream error', message);
+                if (abortTimer)
+                    clearTimeout(abortTimer);
+                conn.disconnect();
+                reject(new Error(message));
+            },
         });
-        ws.on('close', () => {
-            output.info('Disconnected');
-            if (abortTimeout) {
-                clearTimeout(abortTimeout);
-            }
+        conn.onClose(() => {
+            if (abortTimer)
+                clearTimeout(abortTimer);
             process.exit(exitCode);
         });
-        // Handle SIGINT
         process.on('SIGINT', () => {
-            if (authenticated && ws.readyState === WebSocket.OPEN) {
-                const abortMsg = {
-                    commandId,
-                    reason: 'user interrupt',
-                };
-                const sigintEncrypted = aeadEncrypt(keys.K_enc, FrameType.ABORT, counters.outgoing.next(), abortMsg);
-                const sigintFrame = encodeFrame(FrameType.ABORT, encode(sigintEncrypted));
-                ws.send(sigintFrame);
-            }
-            ws.close();
-            process.exit(130); // 128 + SIGINT(2)
+            handle.signal('SIGINT');
+            conn.disconnect();
+            process.exit(130);
         });
     });
 }

package/dist/single.js.map

@@ -1 +1 @@
-{"version":3,"file":"single.js","sourceRoot":"","sources":["../src/single.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACjI,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAA6C,MAAM,+BAA+B,CAAC;AAC/H,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAEvC,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,EAAE,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;AAE/F,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,KAAa,EACb,CAAS,EACT,OAAwF,EACxF,QAAiB;IAEjB,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAE5C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC;IAED,yBAAyB;IACzB,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE5C,cAAc;IACd,MAAM,OAAO,GAAG,oBAAoB,CAAC,KAAM,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAE1C,mBAAmB;IACnB,MAAM,EAAE,GAAG,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,IAAI,qBAAqB,EAAE,CAAC;IAE7C,0BAA0B;IAC1B,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE1D,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;QAC/B,IAAI,YAAwC,CAAC;QAE7C,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;YACvB,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAElC,IAAI,CAAC;gBACH,aAAa;gBACb,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACpD,MAAM,SAAS,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC;gBACrE,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;gBAEtD,qBAAqB;gBACrB,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACrD,MAAM,YAAY,GAAG,IAAI,UAAU,CAAC,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;gBAC7D,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;gBAC/B,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;gBAElC,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;gBAC9D,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC7F,EAAE,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IAAI,MAA0B,CAAC;QAC/B,IAAI,QAAQ,GAAG,CAAC,CAAC;QAEjB,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC9B,IAAI,CAAC,CAAC,IAAI,YAAY,MAAM,CAAC;gBAAE,OAAO;YAEtC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC;oBACH,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,KAAK,IAAI,CAAC,aAAa,EAAE,CAAC;wBACrD,eAAe;wBACf,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAQ,CAAC;wBAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;wBAC9F,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC;wBAE5B,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;wBACtB,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC;wBAEnD,aAAa;wBACb,MAAM,SAAS,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC;wBAC7D,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;wBACtD,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;wBAC3D,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;wBAEpB,aAAa,GAAG,IAAI,CAAC;wBACrB,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;wBAE7B,mCAAmC;wBACnC,IAAI,gBAAgB,EAAE,CAAC;4BACrB,IAAI,CAAC,QAAQ,EAAE,CAAC;gCACd,yDAAyD;gCACzD,MAAM,CAAC,KAAK,CAAC,wFAAwF,CAAC,CAAC;gCACvG,EAAE,CAAC,KAAK,EAAE,CAAC;gCACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;4BAClB,CAAC;4BAED,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;4BACnC,MAAM,KAAK,GAAG;gCACZ,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE;gCAC7B,GAAG,EAAE,EAAE,YAAY,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE;6BAC3C,CAAC;4BAEF,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;4BACrF,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;4BACpE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;wBACnB,CAAC;6BAAM,CAAC;4BACN,gBAAgB,GAAG,IAAI,CAAC;wBAC1B,CAAC;oBAEH,CAAC;yBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO,IAAI,aAAa,IAAI,CAAC,gBAAgB,EAAE,CAAC;wBAClF,2BAA2B;wBAC3B,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAQ,CAAC;wBAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;wBAChG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;wBAE1C,MAAM,UAAU,GAAG,SAAS,CAAC,GAAsB,CAAC;wBACpD,IAAI,UAAU,CAAC,EAAE,EAAE,CAAC;4BAClB,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;4BACjC,gBAAgB,GAAG,IAAI,CAAC;4BAExB,uBAAuB;4BACzB,MAAM,MAAM,GAAG;gCACb,SAAS;gCACT,IAAI;gCACJ,GAAG;gCACH,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,SAAS;6BAC5D,CAAC;4BAEF,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;4BAC9F,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;4BAClE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;4BAElB,iCAAiC;4BACjC,IAAI,YAAY,EAAE,CAAC;gCACjB,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;oCAC7B,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;oCAC/C,MAAM,QAAQ,GAAG;wCACf,SAAS;wCACT,MAAM,EAAE,SAAS;qCAClB,CAAC;oCAEF,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;oCACpG,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;oCACxE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gCACtB,CAAC,EAAE,YAAY,CAAC,CAAC;4BACnB,CAAC;wBACD,CAAC;6BAAM,CAAC;4BACN,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;4BAC7C,EAAE,CAAC,KAAK,EAAE,CAAC;4BACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAClB,CAAC;oBAEH,CAAC;yBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,IAAI,aAAa,EAAE,CAAC;wBAC5D,gBAAgB;wBAChB,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAQ,CAAC;wBAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;wBAC/F,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;wBAE1C,MAAM,GAAG,GAAG,SAAS,CAAC,GAA2B,CAAC;wBAClD,IAAI,GAAG,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;4BAChC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;wBAC/C,CAAC;oBAEH,CAAC;yBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,IAAI,aAAa,EAAE,CAAC;wBAC5D,gBAAgB;wBAChB,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAQ,CAAC;wBAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;wBAC/F,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;wBAE1C,MAAM,GAAG,GAAG,SAAS,CAAC,GAA2B,CAAC;wBAClD,IAAI,GAAG,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;4BAChC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;wBAC/C,CAAC;oBAEH,CAAC;yBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,IAAI,aAAa,EAAE,CAAC;wBAC1D,cAAc;wBACd,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAQ,CAAC;wBAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;wBAC7F,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;wBAE1C,MAAM,GAAG,GAAG,SAAS,CAAC,GAAyB,CAAC;wBAChD,IAAI,GAAG,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;4BAChC,QAAQ,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC;4BACzB,MAAM,CAAC,IAAI,CAAC,wBAAwB,GAAG,CAAC,IAAI,YAAY,GAAG,CAAC,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;4BAEhG,IAAI,YAAY,EAAE,CAAC;gCACjB,YAAY,CAAC,YAAY,CAAC,CAAC;4BAC7B,CAAC;4BAED,EAAE,CAAC,KAAK,EAAE,CAAC;4BACX,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;wBACzB,CAAC;oBAEH,CAAC;yBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,KAAK,EAAE,CAAC;wBAC1C,eAAe;wBACf,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAQ,CAAC;wBAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;wBAC9F,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC;wBAC5B,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;wBACrF,EAAE,CAAC,KAAK,EAAE,CAAC;wBACX,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,KAAK,CAAC,IAAI,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;oBACrE,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,KAAK,CAAC,+BAA+B,KAAK,CAAC,IAAI,EAAE,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;gBACpH,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACvB,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACxF,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC5B,IAAI,YAAY,EAAE,CAAC;gBACjB,YAAY,CAAC,YAAY,CAAC,CAAC;YAC7B,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,gBAAgB;QAChB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACxB,IAAI,aAAa,IAAI,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;gBACtD,MAAM,QAAQ,GAAG;oBACf,SAAS;oBACT,MAAM,EAAE,gBAAgB;iBACzB,CAAC;gBAEF,MAAM,eAAe,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;gBACrG,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC;gBAC1E,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACvB,CAAC;YACD,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,kBAAkB;QACvC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"single.js","sourceRoot":"","sources":["../src/single.ts"],"names":[],"mappings":"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"}

package/dist/terminal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../src/terminal.ts"],"names":[],"mappings":"AASA,wBAAsB,YAAY,CAChC,KAAK,EAAE,MAAM,EACb,CAAC,EAAE,MAAM,EACT,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAC3F,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAyOf"}
+{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../src/terminal.ts"],"names":[],"mappings":"AAKA,wBAAsB,YAAY,CAChC,KAAK,EAAE,MAAM,EACb,CAAC,EAAE,MAAM,EACT,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAC3F,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CA+Cf"}

package/dist/terminal.js

@@ -1,247 +1,51 @@
-import WebSocket from 'ws';
-import { deriveKeys, extractSaltFromCapId, aeadEncrypt, aeadDecrypt, computeHmac, sha256Hex } from '@thenewlabs/entangle-crypto';
-import { FrameType, FrameReader, encodeFrame } from '@thenewlabs/entangle-protocol';
-import { OutputHandler, parseOutputMode, BidirectionalCounters } from '@thenewlabs/entangle-utils';
-import { encode, decode } from 'cborg';
-// import * as readline from 'readline';
+import { OutputHandler, parseOutputMode } from '@thenewlabs/entangle-utils';
+import { InvokeConnection } from './connection.js';
 const output = new OutputHandler({ mode: parseOutputMode(process.env.OUTPUT_MODE || 'text') });
 export async function openTerminal(wsUrl, S, options, password) {
     const { cwd, cols = 80, rows = 24 } = options;
-    // Extract capId from URL
-    const urlParts = wsUrl.split('/');
-    const capId = urlParts[urlParts.length - 1];
-    // Derive keys
-    const saltCap = extractSaltFromCapId(capId);
-    const keys = await deriveKeys(S, saltCap);
-    // Connect to relay
-    const ws = new WebSocket(wsUrl);
-    const reader = new FrameReader();
-    const counters = new BidirectionalCounters();
-    // Session ID for this terminal session
-    const sessionId = Math.random().toString(36).substr(2, 9);
-    return new Promise((resolve, reject) => {
-        ws.on('open', async () => {
-            output.info('Connected to relay');
-            try {
-                // Send AUTH1
-                const nonceB = Math.random().toString(36).substr(2);
-                const auth1Data = new TextEncoder().encode('hello' + capId + nonceB);
-                const auth1Hmac = computeHmac(keys.K_auth, auth1Data);
-                // Send HMAC + nonceB
-                const nonceBBytes = new TextEncoder().encode(nonceB);
-                const auth1Payload = new Uint8Array(32 + nonceBBytes.length);
-                auth1Payload.set(auth1Hmac, 0);
-                auth1Payload.set(nonceBBytes, 32);
-                const auth1Frame = encodeFrame(FrameType.AUTH1, auth1Payload);
-                ws.send(auth1Frame);
-            }
-            catch (error) {
-                output.error('Failed to send AUTH1', error instanceof Error ? error.message : String(error));
-                ws.close();
-                reject(error);
-            }
-        });
-        let authenticated = false;
-        let passwordVerified = false;
-        let requiresPassword = false;
-        let nonceC;
-        ws.on('message', async (data) => {
-            if (!(data instanceof Buffer))
-                return;
-            const frames = reader.push(data);
-            for (const frame of frames) {
+    const capId = wsUrl.split('/').pop();
+    const conn = new InvokeConnection(capId, S, password);
+    await conn.connect(wsUrl);
+    output.info('Authenticated');
+    await new Promise((resolve) => {
+        const cleanup = () => {
+            if (process.stdin.isTTY) {
                 try {
-                    if (frame.type === FrameType.AUTH2 && !authenticated) {
-                        // Handle AUTH2
-                        const encrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, FrameType.AUTH2, encrypted.nonce, encrypted.cipher);
-                        const auth2 = decrypted.msg;
-                        nonceC = auth2.nonceC;
-                        requiresPassword = auth2.requiresPassword || false;
-                        // Send AUTH3
-                        const auth3Data = new TextEncoder().encode('ready' + nonceC);
-                        const auth3Hmac = computeHmac(keys.K_auth, auth3Data);
-                        const auth3Frame = encodeFrame(FrameType.AUTH3, auth3Hmac);
-                        ws.send(auth3Frame);
-                        authenticated = true;
-                        output.info('Authenticated');
-                        // If password is required, send it
-                        if (requiresPassword) {
-                            if (!password) {
-                                // Interactive prompt for password
-                                const readline = await import('readline');
-                                const rl = readline.createInterface({
-                                    input: process.stdin,
-                                    output: process.stdout
-                                });
-                                const passwordPromise = new Promise((resolve) => {
-                                    rl.question('Agent password: ', (answer) => {
-                                        rl.close();
-                                        resolve(answer);
-                                    });
-                                });
-                                password = await passwordPromise;
-                            }
-                            output.info('Sending password...');
-                            const pwMsg = {
-                                ctr: counters.outgoing.next(),
-                                msg: { passwordHash: sha256Hex(password) }
-                            };
-                            const pwEncrypted = aeadEncrypt(keys.K_enc, FrameType.AUTH_PW, pwMsg.ctr, pwMsg.msg);
-                            const pwFrame = encodeFrame(FrameType.AUTH_PW, encode(pwEncrypted));
-                            ws.send(pwFrame);
-                        }
-                        else {
-                            passwordVerified = true;
-                            // Send TTY_OPEN immediately if no password required
-                            const ttyOpen = {
-                                sessionId,
-                                cwd,
-                                cols,
-                                rows,
-                            };
-                            const ttyOpenEncrypted = aeadEncrypt(keys.K_enc, FrameType.TTY_OPEN, counters.outgoing.next(), ttyOpen);
-                            const ttyOpenFrame = encodeFrame(FrameType.TTY_OPEN, encode(ttyOpenEncrypted));
-                            ws.send(ttyOpenFrame);
-                            // Set up terminal input
-                            setupTerminalInput(ws, keys, counters, sessionId);
-                            // Handle terminal resize
-                            process.stdout.on('resize', () => {
-                                const newCols = process.stdout.columns || 80;
-                                const newRows = process.stdout.rows || 24;
-                                const resize = {
-                                    sessionId,
-                                    cols: newCols,
-                                    rows: newRows,
-                                };
-                                const resizeEncrypted = aeadEncrypt(keys.K_enc, FrameType.TTY_RESIZE, counters.outgoing.next(), resize);
-                                const resizeFrame = encodeFrame(FrameType.TTY_RESIZE, encode(resizeEncrypted));
-                                ws.send(resizeFrame);
-                            });
-                        }
-                    }
-                    else if (frame.type === FrameType.AUTH_PW && authenticated && !passwordVerified) {
-                        // Handle password response
-                        const encrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, FrameType.AUTH_PW, encrypted.nonce, encrypted.cipher);
-                        counters.incoming.validate(decrypted.ctr);
-                        const pwResponse = decrypted.msg;
-                        if (pwResponse.ok) {
-                            output.info('Password verified');
-                            passwordVerified = true;
-                            // Now send TTY_OPEN
-                            const ttyOpen = {
-                                sessionId,
-                                cwd,
-                                cols,
-                                rows,
-                            };
-                            const ttyOpenEncrypted = aeadEncrypt(keys.K_enc, FrameType.TTY_OPEN, counters.outgoing.next(), ttyOpen);
-                            const ttyOpenFrame = encodeFrame(FrameType.TTY_OPEN, encode(ttyOpenEncrypted));
-                            ws.send(ttyOpenFrame);
-                            // Set up terminal input
-                            setupTerminalInput(ws, keys, counters, sessionId);
-                            // Handle terminal resize
-                            process.stdout.on('resize', () => {
-                                const newCols = process.stdout.columns || 80;
-                                const newRows = process.stdout.rows || 24;
-                                const resize = {
-                                    sessionId,
-                                    cols: newCols,
-                                    rows: newRows,
-                                };
-                                const resizeEncrypted = aeadEncrypt(keys.K_enc, FrameType.TTY_RESIZE, counters.outgoing.next(), resize);
-                                const resizeFrame = encodeFrame(FrameType.TTY_RESIZE, encode(resizeEncrypted));
-                                ws.send(resizeFrame);
-                            });
-                        }
-                        else {
-                            output.error('Password verification failed');
-                            ws.close();
-                            reject(new Error('Password verification failed'));
-                        }
-                    }
-                    else if (frame.type === FrameType.TTY_DATA && authenticated) {
-                        // Handle TTY data from server
-                        const encrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, FrameType.TTY_DATA, encrypted.nonce, encrypted.cipher);
-                        counters.incoming.validate(decrypted.ctr);
-                        const msg = decrypted.msg;
-                        if (msg.sessionId === sessionId) {
-                            process.stdout.write(Buffer.from(msg.chunk));
-                        }
-                    }
-                    else if (frame.type === FrameType.TTY_EXIT && authenticated) {
-                        // Handle TTY exit
-                        const encrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, FrameType.TTY_EXIT, encrypted.nonce, encrypted.cipher);
-                        counters.incoming.validate(decrypted.ctr);
-                        const msg = decrypted.msg;
-                        if (msg.sessionId === sessionId) {
-                            output.info(`Terminal exited: code=${msg.code}, signal=${msg.signal}`);
-                            ws.close();
-                            resolve();
-                        }
-                    }
-                    else if (frame.type === FrameType.ERROR) {
-                        // Handle error
-                        const encrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, FrameType.ERROR, encrypted.nonce, encrypted.cipher);
-                        const error = decrypted.msg;
-                        output.error('Server error', error instanceof Error ? error.message : String(error));
-                        ws.close();
-                        reject(new Error(`Server error: ${error.code} - ${error.detail}`));
-                    }
-                }
-                catch (error) {
-                    output.error(`Failed to handle frame type ${frame.type}`, error instanceof Error ? error.message : String(error));
+                    process.stdin.setRawMode(false);
                 }
+                catch { }
             }
-        });
-        ws.on('error', (error) => {
-            output.error('WebSocket error', error instanceof Error ? error.message : String(error));
-            reject(error);
-        });
-        ws.on('close', () => {
-            output.info('Disconnected');
-            resolve();
-        });
-    });
-}
-function setupTerminalInput(ws, keys, counters, sessionId) {
-    // Set terminal to raw mode
-    if (process.stdin.isTTY) {
-        process.stdin.setRawMode(true);
-    }
-    process.stdin.resume();
-    // Handle input
-    process.stdin.on('data', (data) => {
-        const ttyData = {
-            sessionId,
-            chunk: new Uint8Array(data),
+            process.stdin.pause();
         };
-        const dataEncrypted = aeadEncrypt(keys.K_enc, FrameType.TTY_DATA, counters.outgoing.next(), ttyData);
-        const dataFrame = encodeFrame(FrameType.TTY_DATA, encode(dataEncrypted));
-        ws.send(dataFrame);
-    });
-    // Handle Ctrl+C
-    process.on('SIGINT', () => {
-        const signal = {
-            sessionId,
-            signal: 'SIGINT',
-        };
-        const signalEncrypted = aeadEncrypt(keys.K_enc, FrameType.TTY_SIGNAL, counters.outgoing.next(), signal);
-        const signalFrame = encodeFrame(FrameType.TTY_SIGNAL, encode(signalEncrypted));
-        ws.send(signalFrame);
+        const handle = conn.openPty({ cols, rows, ...(cwd ? { cwd } : {}) }, {
+            onOpened: () => {
+                if (process.stdin.isTTY)
+                    process.stdin.setRawMode(true);
+                process.stdin.resume();
+                process.stdin.on('data', (d) => handle.write(new Uint8Array(d)));
+                process.stdout.on('resize', () => {
+                    handle.resize(process.stdout.columns || 80, process.stdout.rows || 24);
+                });
+            },
+            onData: (chunk) => {
+                process.stdout.write(Buffer.from(chunk));
+            },
+            onExit: (code, signal) => {
+                output.info(`Terminal exited: code=${code}, signal=${signal}`);
+                cleanup();
+                conn.disconnect();
+                resolve();
+            },
+            onError: (message) => {
+                output.error('Stream error', message);
+                cleanup();
+                conn.disconnect();
+                resolve();
+            },
+        });
+        process.on('SIGINT', () => handle.signal('SIGINT'));
+        process.on('exit', cleanup);
+        conn.onClose(() => { cleanup(); resolve(); });
     });
-    // Cleanup on exit
-    const cleanup = () => {
-        if (process.stdin.isTTY) {
-            process.stdin.setRawMode(false);
-        }
-        process.stdin.pause();
-    };
-    process.on('exit', cleanup);
-    ws.on('close', cleanup);
 }
 //# sourceMappingURL=terminal.js.map

package/dist/terminal.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../src/terminal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../src/terminal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,EAAE,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;AAE/F,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,KAAa,EACb,CAAS,EACT,OAA2F,EAC3F,QAAiB;IAEjB,MAAM,EAAE,GAAG,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IAE9C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAG,CAAC;IACtC,MAAM,IAAI,GAAG,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;IAEtD,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC1B,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE7B,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QAClC,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;gBACxB,IAAI,CAAC;oBAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBAAC,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;YACnD,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACxB,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACnE,QAAQ,EAAE,GAAG,EAAE;gBACb,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK;oBAAE,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACxD,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBACvB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;oBAC/B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;gBACzE,CAAC,CAAC,CAAC;YACL,CAAC;YACD,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBAChB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3C,CAAC;YACD,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;gBACvB,MAAM,CAAC,IAAI,CAAC,yBAAyB,IAAI,YAAY,MAAM,EAAE,CAAC,CAAC;gBAC/D,OAAO,EAAE,CAAC;gBACV,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClB,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;gBACnB,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBACtC,OAAO,EAAE,CAAC;gBACV,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClB,OAAO,EAAE,CAAC;YACZ,CAAC;SACF,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACpD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thenewlabs/entangle-connect",
-  "version": "1.0.0",
+  "version": "2.0.1",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {
@@ -8,13 +8,13 @@
   },
   "scripts": {
     "build": "tsc",
-    "clean": "rm -rf dist",
+    "clean": "rm -rf dist tsconfig.tsbuildinfo",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@thenewlabs/entangle-crypto": "^1.0.0",
-    "@thenewlabs/entangle-protocol": "^1.0.0",
-    "@thenewlabs/entangle-utils": "^1.0.0",
+    "@thenewlabs/entangle-crypto": "^2.0.1",
+    "@thenewlabs/entangle-protocol": "^2.0.1",
+    "@thenewlabs/entangle-utils": "^2.0.1",
     "cborg": "^4.5.8",
     "commander": "^15.0.0",
     "ws": "^8.21.0"

package/dist/run.d.ts

@@ -1,14 +0,0 @@
-interface RunOptions {
-    namespace: string;
-    capId: string;
-    S: string;
-    tool: string;
-    argv: string[];
-    cwd: string | undefined;
-    serverUrl: string;
-    abortAfterMs: number | undefined;
-    maxOutBytes: number | undefined;
-}
-export declare function runCommand(options: RunOptions): Promise<number>;
-export {};
-//# sourceMappingURL=run.d.ts.map

package/dist/run.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAuBA,UAAU,UAAU;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAmIrE"}

package/dist/run.js

@@ -1,122 +0,0 @@
-import WebSocket from 'ws';
-import { FrameType, FrameReader, encodeFrame, } from '@sunpix/entangle-protocol';
-import { deriveKeys, extractSaltFromCapId, aeadEncrypt, aeadDecrypt, computeHmac, initCrypto, } from '@sunpix/entangle-crypto';
-import { createLogger, BidirectionalCounters, } from '@sunpix/entangle-utils';
-import { encode, decode } from 'cborg';
-const logger = createLogger('invoke-run');
-export async function runCommand(options) {
-    await initCrypto();
-    const saltCap = extractSaltFromCapId(options.capId);
-    const keys = await deriveKeys(options.S, saltCap);
-    const counters = new BidirectionalCounters();
-    const wsUrl = options.serverUrl.replace(/^http/, 'ws') +
-        `/relay/${options.namespace}/${options.capId}`;
-    logger.info({ url: wsUrl }, 'Connecting to relay');
-    return new Promise((resolve, reject) => {
-        const ws = new WebSocket(wsUrl);
-        const reader = new FrameReader();
-        let authenticated = false;
-        let nonceB;
-        let commandId = Math.random().toString(36).substr(2, 9);
-        let exitCode = 0;
-        let abortTimer;
-        ws.on('open', async () => {
-            logger.info('Connected, starting auth');
-            nonceB = require('crypto').randomBytes(16).toString('hex');
-            const auth1Data = new TextEncoder().encode('hello' + options.capId + nonceB);
-            const auth1Hmac = computeHmac(keys.K_auth, auth1Data);
-            ws.send(encodeFrame(FrameType.AUTH1, auth1Hmac));
-        });
-        ws.on('message', async (data) => {
-            if (!(data instanceof Buffer))
-                return;
-            const frames = reader.push(data);
-            for (const frame of frames) {
-                try {
-                    if (frame.type === FrameType.AUTH2 && !authenticated) {
-                        const auth2Encrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, FrameType.AUTH2, auth2Encrypted.nonce, auth2Encrypted.cipher);
-                        const auth2 = decrypted.msg;
-                        if (!auth2.ok || auth2.nonceB !== nonceB) {
-                            throw new Error('Invalid AUTH2 response');
-                        }
-                        const auth3Data = new TextEncoder().encode('ready' + auth2.nonceC);
-                        const auth3Hmac = computeHmac(keys.K_auth, auth3Data);
-                        ws.send(encodeFrame(FrameType.AUTH3, auth3Hmac));
-                        authenticated = true;
-                        logger.info('Authenticated, sending RUN');
-                        const runMsg = {
-                            ctr: counters.outgoing.next(),
-                            msg: {
-                                commandId,
-                                tool: options.tool,
-                                argv: options.argv,
-                                cwd: options.cwd,
-                                limits: {
-                                    maxOutBytes: options.maxOutBytes,
-                                },
-                            },
-                        };
-                        const runEncrypted = aeadEncrypt(keys.K_enc, FrameType.RUN, runMsg.ctr, runMsg.msg);
-                        ws.send(encodeFrame(FrameType.RUN, encode(runEncrypted)));
-                        if (options.abortAfterMs) {
-                            abortTimer = setTimeout(() => {
-                                logger.info('Sending abort');
-                                const abortMsg = {
-                                    ctr: counters.outgoing.next(),
-                                    msg: {
-                                        commandId,
-                                        reason: 'Timeout',
-                                    },
-                                };
-                                const abortEncrypted = aeadEncrypt(keys.K_enc, FrameType.ABORT, abortMsg.ctr, abortMsg.msg);
-                                ws.send(encodeFrame(FrameType.ABORT, encode(abortEncrypted)));
-                            }, options.abortAfterMs);
-                        }
-                    }
-                    else if (authenticated) {
-                        const msgEncrypted = decode(frame.payload);
-                        const decrypted = aeadDecrypt(keys.K_enc, frame.type, msgEncrypted.nonce, msgEncrypted.cipher);
-                        counters.incoming.validate(decrypted.ctr);
-                        switch (frame.type) {
-                            case FrameType.STDOUT:
-                                process.stdout.write(Buffer.from(decrypted.msg.chunk));
-                                break;
-                            case FrameType.STDERR:
-                                process.stderr.write(Buffer.from(decrypted.msg.chunk));
-                                break;
-                            case FrameType.EXIT:
-                                if (abortTimer)
-                                    clearTimeout(abortTimer);
-                                exitCode = decrypted.msg.code ?? 1;
-                                logger.info({ code: exitCode, signal: decrypted.msg.signal }, 'Command exited');
-                                ws.close();
-                                resolve(exitCode);
-                                break;
-                            case FrameType.ERROR:
-                                logger.error({ error: decrypted.msg }, 'Remote error');
-                                ws.close();
-                                reject(new Error(decrypted.msg.detail || decrypted.msg.code));
-                                break;
-                        }
-                    }
-                }
-                catch (error) {
-                    logger.error({ error }, 'Failed to handle frame');
-                    ws.close();
-                    reject(error);
-                }
-            }
-        });
-        ws.on('error', (error) => {
-            logger.error({ error }, 'WebSocket error');
-            reject(error);
-        });
-        ws.on('close', () => {
-            if (abortTimer)
-                clearTimeout(abortTimer);
-            resolve(exitCode);
-        });
-    });
-}
-//# sourceMappingURL=run.js.map

package/dist/run.js.map

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