@thenewlabs/entangle-serve 2.1.0

package/dist/multi-session.js

@@ -0,0 +1,362 @@
+import { FrameType, encodeFrame, } from '@thenewlabs/entangle-protocol';
+import { streamAeadEncrypt, streamAeadDecrypt, frameAad, AeadDir, } from '@thenewlabs/entangle-crypto';
+import { OutputHandler, parseOutputMode, } from '@thenewlabs/entangle-utils';
+import { encode, decode } from 'cborg';
+import { StreamManager } from './stream-manager.js';
+const output = new OutputHandler({ mode: parseOutputMode(process.env.OUTPUT_MODE || 'text') });
+// Tear down a single invoker session on a protocol/counter error WITHOUT
+// closing session.ws — that socket is the shared agent-to-relay control
+// connection carrying every invoker. Killing it here would take down all of
+// them, so instead we close just this session's streams, mark it terminated so
+// further frames are ignored, and let the relay's idle timeout drop the peer.
+function terminateSession(session, reason) {
+    if (session.terminated)
+        return;
+    session.terminated = true;
+    output.warn(`Terminating invoker session ${session.socketId}: ${reason}`);
+    if (session.streamManager) {
+        try {
+            session.streamManager.closeAllStreams(reason);
+        }
+        catch { }
+    }
+}
+// Helper to send encrypted messages with per-stream counters
+async function sendEncrypted(session, frameType, message, sid) {
+    if (!session.keys) {
+        throw new Error('Session not authenticated');
+    }
+    // If we have a stream ID, update the counter
+    if (sid && 'ctr' in message) {
+        message.ctr = session.streamCounters.increment(sid, 'outgoing');
+    }
+    const plaintext = encode(message);
+    const aad = frameAad(frameType, AeadDir.ServerToClient);
+    const ciphertext = await streamAeadEncrypt(session.keys.K_enc, plaintext, aad);
+    const frame = encodeFrame(frameType, ciphertext);
+    // Relay via server: wrap in JSON envelope so the server can
+    // forward to the correct invoker socket.
+    try {
+        const envelope = {
+            type: 'RELAY_RESPONSE',
+            socketId: session.socketId,
+            frame: Buffer.from(frame).toString('base64'),
+        };
+        session.ws.send(JSON.stringify(envelope));
+    }
+    catch {
+        // Best-effort fallback: avoid crashing handler on send errors
+    }
+}
+// Handle stream open request
+async function handleStreamOpen(session, message) {
+    if (!session.streamManager) {
+        session.streamManager = new StreamManager({
+            policy: session.cap.policy,
+            output,
+            onStreamData: async (sid, data, channel) => {
+                await sendStreamData(session, sid, data, channel);
+            },
+            onStreamExit: async (sid, code, signal, usage) => {
+                await sendStreamExit(session, sid, code, signal, usage);
+            },
+            onStreamError: async (sid, error) => {
+                await sendStreamError(session, sid, error);
+            },
+        });
+    }
+    try {
+        const { mode, pty, exec } = message.msg;
+        let actualSid;
+        if (mode === 'pty' && pty) {
+            const ptyOptions = {
+                cols: pty.cols,
+                rows: pty.rows,
+            };
+            if (pty.env) {
+                ptyOptions.env = pty.env;
+            }
+            if (exec?.cwd) {
+                ptyOptions.cwd = exec.cwd;
+            }
+            actualSid = await session.streamManager.openPtyStream(ptyOptions);
+        }
+        else if (mode === 'cmd' && exec) {
+            const cmdOptions = {
+                argv: exec.argv,
+            };
+            if (exec.cwd) {
+                cmdOptions.cwd = exec.cwd;
+            }
+            if (exec.env) {
+                cmdOptions.env = exec.env;
+            }
+            if (exec.stdin !== undefined) {
+                cmdOptions.stdin = exec.stdin;
+            }
+            actualSid = await session.streamManager.openCmdStream(cmdOptions);
+        }
+        else {
+            throw new Error(`Invalid stream configuration for mode ${mode}`);
+        }
+        // Send opened confirmation
+        const openedMsg = {
+            ctr: 0, // Will be set by sendEncrypted
+            msg: {
+                v: 1,
+                kind: 'opened',
+                sid: actualSid,
+                startedAt: Date.now(),
+                mode,
+            },
+        };
+        await sendEncrypted(session, FrameType.STREAM_OPEN, openedMsg, actualSid);
+    }
+    catch (error) {
+        await sendStreamError(session, message.msg.sid, error.message);
+    }
+}
+// Handle stream data (stdin)
+async function handleStreamData(session, message) {
+    if (!session.streamManager) {
+        await sendStreamError(session, message.msg.sid, 'No active streams');
+        return;
+    }
+    try {
+        session.streamManager.writeToStream(message.msg.sid, message.msg.chunk);
+    }
+    catch (error) {
+        await sendStreamError(session, message.msg.sid, error.message);
+    }
+}
+// Handle stream resize (PTY only)
+async function handleStreamResize(session, message) {
+    if (!session.streamManager) {
+        await sendStreamError(session, message.msg.sid, 'No active streams');
+        return;
+    }
+    try {
+        session.streamManager.resizePtyStream(message.msg.sid, message.msg.cols, message.msg.rows);
+    }
+    catch (error) {
+        await sendStreamError(session, message.msg.sid, error.message);
+    }
+}
+// Handle stream signal
+async function handleStreamSignal(session, message) {
+    if (!session.streamManager) {
+        await sendStreamError(session, message.msg.sid, 'No active streams');
+        return;
+    }
+    try {
+        session.streamManager.signalStream(message.msg.sid, message.msg.signal);
+    }
+    catch (error) {
+        await sendStreamError(session, message.msg.sid, error.message);
+    }
+}
+// Handle stream close
+async function handleStreamClose(session, message) {
+    if (!session.streamManager) {
+        return;
+    }
+    session.streamManager.closeStream(message.msg.sid, 'Client requested close');
+    // Send closed confirmation
+    const closedMsg = {
+        ctr: 0, // Will be set by sendEncrypted
+        msg: {
+            v: 1,
+            kind: 'closed',
+            sid: message.msg.sid,
+        },
+    };
+    await sendEncrypted(session, FrameType.STREAM_CLOSE, closedMsg, message.msg.sid);
+    // Clean up stream counters
+    session.streamCounters.removeStream(message.msg.sid);
+}
+// Send stream data to client
+async function sendStreamData(session, sid, data, channel = 'stdout') {
+    const msg = {
+        ctr: 0, // Will be set by sendEncrypted
+        msg: {
+            v: 1,
+            kind: 'data',
+            sid,
+            chunk: data,
+            channel,
+        },
+    };
+    await sendEncrypted(session, FrameType.STREAM_DATA, msg, sid);
+}
+// Send stream exit to client
+async function sendStreamExit(session, sid, code, signal, usage) {
+    const msg = {
+        ctr: 0, // Will be set by sendEncrypted
+        msg: {
+            v: 1,
+            kind: 'exit',
+            sid,
+            code,
+            signal,
+            usage,
+        },
+    };
+    await sendEncrypted(session, FrameType.STREAM_EXIT, msg, sid);
+    // Clean up stream counters after exit
+    session.streamCounters.removeStream(sid);
+}
+// Send stream error to client
+async function sendStreamError(session, sid, error) {
+    const msg = {
+        ctr: 0, // Will be set by sendEncrypted
+        msg: {
+            v: 1,
+            kind: 'error',
+            sid,
+            message: error,
+        },
+    };
+    await sendEncrypted(session, FrameType.STREAM_ERROR, msg, sid);
+}
+// Main frame handler for multi-stream protocol
+export async function handleMultiStreamFrame(session, frame) {
+    if (session.terminated)
+        return;
+    if (!session.authenticated) {
+        terminateSession(session, 'Frame received before authentication');
+        return;
+    }
+    if (!session.keys) {
+        throw new Error('Keys not derived');
+    }
+    try {
+        // Log diagnostics for STREAM frames
+        if (frame.type === FrameType.STREAM_OPEN ||
+            frame.type === FrameType.STREAM_DATA ||
+            frame.type === FrameType.STREAM_CLOSE ||
+            frame.type === FrameType.STREAM_SIGNAL ||
+            frame.type === FrameType.STREAM_RESIZE ||
+            frame.type === FrameType.STREAM_ERROR ||
+            frame.type === FrameType.STREAM_EXIT) {
+            output.info(`MultiStream frame received: type=${frame.type} payloadLen=${frame.payload.length}`);
+            // Debug: log first few bytes of payload
+            const preview = Array.from(frame.payload.slice(0, 32)).map(b => b.toString(16).padStart(2, '0')).join(' ');
+            output.debug(`Payload preview (first 32 bytes): ${preview}`);
+        }
+        // Single canonical decryption: session key + direction-bound AAD. Frames
+        // that don't authenticate under exactly this AAD are rejected (no
+        // downgrade/alternate-AAD fallbacks).
+        const aad = frameAad(frame.type, AeadDir.ClientToServer);
+        const plaintext = await streamAeadDecrypt(session.keys.K_enc, frame.payload, aad);
+        const message = decode(plaintext);
+        // Bounded structural validation before we trust any field. A decoded value
+        // that is not a well-formed envelope terminates only this invoker session.
+        if (!message || typeof message !== 'object' || typeof message.ctr !== 'number') {
+            terminateSession(session, 'Malformed message envelope');
+            return;
+        }
+        // For stream messages, verify per-stream counter
+        if (message.msg && typeof message.msg.sid === 'string') {
+            const sid = message.msg.sid;
+            const expectedCounter = session.streamCounters.getNext(sid, 'incoming');
+            if (message.ctr !== expectedCounter) {
+                terminateSession(session, `Stream counter mismatch for ${sid}: expected=${expectedCounter}, received=${message.ctr}`);
+                return;
+            }
+            session.streamCounters.increment(sid, 'incoming');
+        }
+        else {
+            // Non-stream messages use global counter
+            try {
+                session.counters.incoming.validate(message.ctr);
+            }
+            catch (err) {
+                terminateSession(session, `Counter mismatch: ${err.message}`);
+                return;
+            }
+        }
+        // Enforce password verification for all stream operations when required
+        const pwRequiredButMissing = !!session.requiresPassword && !session.passwordVerified;
+        // Handle frame based on type
+        switch (frame.type) {
+            case FrameType.STREAM_OPEN:
+                if (pwRequiredButMissing) {
+                    // Block stream open and notify client
+                    try {
+                        const sid = message.msg?.sid;
+                        if (sid)
+                            await sendStreamError(session, sid, 'Password verification required');
+                    }
+                    catch { }
+                    return;
+                }
+                await handleStreamOpen(session, message);
+                break;
+            case FrameType.STREAM_DATA:
+                if (pwRequiredButMissing) {
+                    try {
+                        const sid = message.msg?.sid;
+                        if (sid)
+                            await sendStreamError(session, sid, 'Password verification required');
+                    }
+                    catch { }
+                    return;
+                }
+                await handleStreamData(session, message);
+                break;
+            case FrameType.STREAM_RESIZE:
+                if (pwRequiredButMissing) {
+                    try {
+                        const sid = message.msg?.sid;
+                        if (sid)
+                            await sendStreamError(session, sid, 'Password verification required');
+                    }
+                    catch { }
+                    return;
+                }
+                await handleStreamResize(session, message);
+                break;
+            case FrameType.STREAM_SIGNAL:
+                if (pwRequiredButMissing) {
+                    try {
+                        const sid = message.msg?.sid;
+                        if (sid)
+                            await sendStreamError(session, sid, 'Password verification required');
+                    }
+                    catch { }
+                    return;
+                }
+                await handleStreamSignal(session, message);
+                break;
+            case FrameType.STREAM_CLOSE:
+                if (pwRequiredButMissing) {
+                    try {
+                        const sid = message.msg?.sid;
+                        if (sid)
+                            await sendStreamError(session, sid, 'Password verification required');
+                    }
+                    catch { }
+                    return;
+                }
+                await handleStreamClose(session, message);
+                break;
+            case FrameType.KEEPALIVE:
+                // Echo keepalive back
+                await sendEncrypted(session, FrameType.KEEPALIVE, message);
+                break;
+            default:
+                output.warn(`Unknown frame type in multi-stream mode: ${frame.type}`);
+        }
+    }
+    catch (error) {
+        output.error(`Error handling multi-stream frame type ${frame.type}`, error.message);
+        terminateSession(session, 'Protocol error');
+    }
+}
+// Clean up session
+export function cleanupMultiSession(session) {
+    if (session.streamManager) {
+        session.streamManager.closeAllStreams('Session cleanup');
+    }
+}
+//# sourceMappingURL=multi-session.js.map

package/dist/multi-session.js.map

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

package/dist/session.d.ts

@@ -0,0 +1,26 @@
+import WebSocket from 'ws';
+import { type DerivedKeys } from '@thenewlabs/entangle-crypto';
+import { BidirectionalCounters } from '@thenewlabs/entangle-utils';
+import type { CapabilityInfo } from './capability.js';
+export interface Session {
+    socketId: string;
+    ws: WebSocket;
+    cap: CapabilityInfo;
+    K_raw?: Uint8Array;
+    bootstrapKeys?: DerivedKeys;
+    keys?: DerivedKeys;
+    counters: BidirectionalCounters;
+    authenticated: boolean;
+    passwordVerified: boolean;
+    requiresPassword: boolean;
+    passwordHash?: string | undefined;
+    nonceB?: string;
+    nonceC?: string;
+    auth1Seen?: boolean;
+}
+export declare function sendRelayResponse(session: Session, frame: Uint8Array): void;
+export declare function handleInvokerConnection(agentWs: WebSocket, socketId: string, cap: CapabilityInfo, passwordHash?: string): {
+    handleFrame: (data: Buffer) => Promise<void>;
+    cleanup: () => void;
+};
+//# sourceMappingURL=session.d.ts.map

package/dist/session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAO3B,OAAO,EAWL,KAAK,WAAW,EACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAGL,qBAAqB,EAEtB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAStD,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,SAAS,CAAC;IACd,GAAG,EAAE,cAAc,CAAC;IACpB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,QAAQ,EAAE,qBAAqB,CAAC;IAChC,aAAa,EAAE,OAAO,CAAC;IACvB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAGD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,CAM3E;AAMD,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,SAAS,EAClB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,cAAc,EACnB,YAAY,CAAC,EAAE,MAAM,GACpB;IAAE,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CAmCvE"}

package/dist/session.js

@@ -0,0 +1,215 @@
+import { FrameType, FrameReader, encodeFrame, ErrorCode, } from '@thenewlabs/entangle-protocol';
+import { deriveKeyMaterial, deriveBootstrapKeys, deriveSessionKeys, extractSaltFromCapId, aeadEncrypt, aeadDecrypt, verifyHmac, verifyPassword, hashPolicy, AeadDir, } from '@thenewlabs/entangle-crypto';
+import { OutputHandler, parseOutputMode, BidirectionalCounters, StreamCounters, } from '@thenewlabs/entangle-utils';
+import { encode, decode } from 'cborg';
+import { randomBytes } from 'crypto';
+import { handleMultiStreamFrame, cleanupMultiSession } from './multi-session.js';
+const output = new OutputHandler({ mode: parseOutputMode(process.env.OUTPUT_MODE || 'text') });
+// How long an authenticated session is considered valid (advertised to the
+// client in AUTH2 so it can reject stale/replayed handshakes).
+const SESSION_TTL_MS = 3600_000;
+// Helper to send wrapped relay responses
+export function sendRelayResponse(session, frame) {
+    session.ws.send(JSON.stringify({
+        type: 'RELAY_RESPONSE',
+        socketId: session.socketId,
+        frame: Buffer.from(frame).toString('base64'),
+    }));
+}
+// NOTE: synchronous on purpose. The caller must register the returned session
+// before the next relay message is processed; an `await` here would defer that
+// by a microtask and drop the AUTH1 that the client sends immediately after
+// connecting (breaking concurrent sessions on the same capability).
+export function handleInvokerConnection(agentWs, socketId, cap, passwordHash) {
+    const session = {
+        socketId,
+        ws: agentWs,
+        cap,
+        counters: new BidirectionalCounters(),
+        authenticated: false,
+        passwordVerified: !passwordHash, // If no password, consider it verified
+        requiresPassword: !!passwordHash,
+        passwordHash: passwordHash || undefined,
+    };
+    const reader = new FrameReader();
+    const store = {};
+    return {
+        handleFrame: async (data) => {
+            const frames = reader.push(data);
+            for (const frame of frames) {
+                try {
+                    await handleFrame(session, store, frame);
+                }
+                catch (error) {
+                    output.error(`Failed to handle frame for socket ${socketId}`, error instanceof Error ? error.message : String(error));
+                    sendError(session, null, ErrorCode.INTERNAL_ERROR, 'Internal error');
+                }
+            }
+        },
+        cleanup: () => {
+            if (store.multiSession) {
+                try {
+                    cleanupMultiSession(store.multiSession);
+                }
+                catch { }
+            }
+        },
+    };
+}
+const STREAM_FRAME_TYPES = new Set([
+    FrameType.STREAM_OPEN,
+    FrameType.STREAM_DATA,
+    FrameType.STREAM_RESIZE,
+    FrameType.STREAM_SIGNAL,
+    FrameType.STREAM_CLOSE,
+    FrameType.STREAM_ERROR,
+    FrameType.STREAM_EXIT,
+]);
+async function handleFrame(session, store, frame) {
+    if (STREAM_FRAME_TYPES.has(frame.type)) {
+        if (!session.authenticated || !session.keys) {
+            output.error(`Received stream frame before authentication: type=${frame.type}`);
+            return;
+        }
+        if (!store.multiSession) {
+            store.multiSession = {
+                socketId: session.socketId,
+                ws: session.ws,
+                cap: session.cap,
+                keys: session.keys,
+                counters: session.counters,
+                streamCounters: new StreamCounters(),
+                authenticated: true,
+                requiresPassword: session.requiresPassword,
+                passwordVerified: session.passwordVerified,
+            };
+        }
+        // Keep dynamic gating fields fresh (password may be verified after streams open attempts)
+        store.multiSession.passwordVerified = session.passwordVerified;
+        await handleMultiStreamFrame(store.multiSession, frame);
+        return;
+    }
+    switch (frame.type) {
+        case FrameType.AUTH1:
+            await handleAuth1(session, frame.payload);
+            break;
+        case FrameType.AUTH3:
+            await handleAuth3(session, frame.payload);
+            break;
+        case FrameType.AUTH_PW:
+            await handleAuthPw(session, frame.payload);
+            break;
+        case FrameType.KEEPALIVE:
+            break;
+        default:
+            output.warn(`Unexpected frame type: ${frame.type}`);
+    }
+}
+async function handleAuth1(session, payload) {
+    // Bound the expensive Argon2 derivation to a single attempt per connection so
+    // a client that only knows capId cannot queue unbounded key-derivation work.
+    // (Connection setup is separately rate-limited per IP at the relay.)
+    if (session.auth1Seen) {
+        output.warn(`Ignoring repeat AUTH1 for socket ${session.socketId}`);
+        return;
+    }
+    session.auth1Seen = true;
+    // Cheap structural checks BEFORE any key derivation. AUTH1 payload is
+    // HMAC(32 bytes) || nonceB, and nonceB is a 16-byte hex string (32 chars).
+    const EXPECTED_NONCE_LEN = 32;
+    if (payload.length !== 32 + EXPECTED_NONCE_LEN) {
+        output.warn(`Rejecting malformed AUTH1 for socket ${session.socketId}: len=${payload.length}`);
+        return;
+    }
+    try {
+        const saltCap = extractSaltFromCapId(session.cap.capId);
+        const K_raw = await deriveKeyMaterial(session.cap.S, saltCap);
+        session.K_raw = K_raw;
+        session.bootstrapKeys = deriveBootstrapKeys(K_raw);
+        const receivedHmac = payload.slice(0, 32);
+        const nonceBBytes = payload.slice(32);
+        session.nonceB = new TextDecoder().decode(nonceBBytes);
+        const auth1Data = new TextEncoder().encode('hello' + session.cap.capId + session.nonceB);
+        if (!verifyHmac(session.bootstrapKeys.K_auth, auth1Data, receivedHmac)) {
+            throw new Error('AUTH1 HMAC verification failed');
+        }
+        // Fresh session nonce and per-session keys bound to (nonceB, nonceC).
+        session.nonceC = randomBytes(16).toString('hex');
+        session.keys = deriveSessionKeys(K_raw, session.nonceB, session.nonceC);
+        const auth2 = {
+            ok: true,
+            nonceB: session.nonceB,
+            nonceC: session.nonceC,
+            expiryTs: Date.now() + SESSION_TTL_MS,
+            policyHash: hashPolicy(session.cap.policy),
+            requiresPassword: session.requiresPassword,
+        };
+        // AUTH2 is protected with the BOOTSTRAP key: the client cannot derive the
+        // session key until it has learned nonceC from this very message.
+        const encrypted = aeadEncrypt(session.bootstrapKeys.K_enc, FrameType.AUTH2, 0, auth2, AeadDir.ServerToClient);
+        const frame = encodeFrame(FrameType.AUTH2, encode(encrypted));
+        sendRelayResponse(session, frame);
+    }
+    catch (error) {
+        output.error('AUTH1 failed', error instanceof Error ? error.message : String(error));
+        // No session key yet on failure paths; nothing encryptable to send.
+    }
+}
+async function handleAuth3(session, payload) {
+    if (!session.keys || !session.nonceC) {
+        output.error('AUTH3 received out of sequence');
+        return;
+    }
+    // AUTH3 HMAC is keyed with the SESSION auth key, binding the client's
+    // handshake completion to the fresh per-session key material.
+    const expectedData = new TextEncoder().encode('ready' + session.nonceC);
+    if (!verifyHmac(session.keys.K_auth, expectedData, payload)) {
+        output.error('AUTH3 HMAC verification failed');
+        return;
+    }
+    session.authenticated = true;
+    output.info(`Session authenticated: ${session.socketId}`);
+}
+async function handleAuthPw(session, payload) {
+    if (!session.authenticated || !session.keys) {
+        sendError(session, null, ErrorCode.AUTH_FAILED, 'Not authenticated');
+        return;
+    }
+    if (!session.requiresPassword || !session.passwordHash) {
+        sendError(session, null, ErrorCode.AUTH_FAILED, 'Password not required');
+        return;
+    }
+    if (session.passwordVerified) {
+        sendError(session, null, ErrorCode.AUTH_FAILED, 'Already verified');
+        return;
+    }
+    try {
+        const encrypted = decode(payload);
+        const decrypted = aeadDecrypt(session.keys.K_enc, FrameType.AUTH_PW, encrypted.nonce, encrypted.cipher, AeadDir.ClientToServer);
+        session.counters.incoming.validate(decrypted.ctr);
+        const { password } = decrypted.msg;
+        const ok = typeof password === 'string' && await verifyPassword(session.passwordHash, password);
+        if (!ok) {
+            output.warn(`Invalid password attempt for session: ${session.socketId}`);
+            sendError(session, null, ErrorCode.AUTH_FAILED, 'Invalid password');
+            return;
+        }
+        session.passwordVerified = true;
+        output.info(`Password verified for session: ${session.socketId}`);
+        const ctr = session.counters.outgoing.next();
+        const successEncrypted = aeadEncrypt(session.keys.K_enc, FrameType.AUTH_PW, ctr, { ok: true }, AeadDir.ServerToClient);
+        sendRelayResponse(session, encodeFrame(FrameType.AUTH_PW, encode(successEncrypted)));
+    }
+    catch (error) {
+        output.error('AUTH_PW failed', error instanceof Error ? error.message : String(error));
+        sendError(session, null, ErrorCode.AUTH_FAILED, 'Password verification failed');
+    }
+}
+function sendError(session, commandId, code, detail) {
+    if (!session.keys)
+        return;
+    const ctr = session.counters.outgoing.next();
+    const encrypted = aeadEncrypt(session.keys.K_enc, FrameType.ERROR, ctr, { commandId, code, detail }, AeadDir.ServerToClient);
+    sendRelayResponse(session, encodeFrame(FrameType.ERROR, encode(encrypted)));
+}
+//# sourceMappingURL=session.js.map

package/dist/session.js.map

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