@myagentroam/marctl 0.11.3 → 0.11.5

package/src/terminal-interaction.mjs

@@ -0,0 +1,177 @@
+import { MarctlError } from './errors.mjs';
+import { DirectRejectedError } from './direct-errors.mjs';
+import { parseFrame } from './terminal-frame.mjs';
+
+const MAX_INPUT_BYTES = 65536;
+const DEFAULT_ROWS = 24;
+const DEFAULT_COLS = 80;
+
+export function splitInput(text, maxBytes = MAX_INPUT_BYTES) {
+  const value = Buffer.isBuffer(text) ? text.toString('utf8') : String(text);
+  const chunks = [];
+  let chunk = '';
+  let chunkBytes = 0;
+
+  for (const character of value) {
+    const characterBytes = Buffer.byteLength(character);
+    if (chunk !== '' && chunkBytes + characterBytes > maxBytes) {
+      chunks.push(chunk);
+      chunk = '';
+      chunkBytes = 0;
+    }
+    if (characterBytes > maxBytes) continue;
+    chunk += character;
+    chunkBytes += characterBytes;
+  }
+  if (chunk !== '') chunks.push(chunk);
+  return chunks;
+}
+
+export function runAttachedTerminal({
+  transport,
+  terminalId,
+  commandMode,
+  stdin,
+  stdout,
+  signal,
+  translate
+}) {
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    let inputEnabled = false;
+    let rawModeEnabled = false;
+    let inputTasks = 0;
+
+    const cleanup = () => {
+      transport.removeListener?.('message', onMessage);
+      transport.removeListener?.('error', onError);
+      transport.removeListener?.('close', onClose);
+      stdin.removeListener?.('data', onInput);
+      stdout.removeListener?.('resize', onResize);
+      signal?.removeEventListener('abort', onAbort);
+      if (rawModeEnabled) {
+        try {
+          stdin.setRawMode(false);
+        } catch {
+          // The terminal may already be gone.
+        }
+      }
+      stdin.pause?.();
+    };
+
+    const finish = (error, exitCode) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      sendCloseFrame(transport, terminalId);
+      transport.close?.();
+      if (error === undefined) resolve(exitCode);
+      else reject(error);
+    };
+    const fail = (key) => finish(new MarctlError(translate(key)));
+    const send = (frame) => {
+      return transport.send(JSON.stringify(frame));
+    };
+    const onInput = async (data) => {
+      inputTasks += 1;
+      stdin.pause?.();
+      try {
+        for (const chunk of splitInput(data)) {
+          if (settled) return;
+          await send({ type: 'input', terminalId, data: chunk });
+        }
+      } catch {
+        fail('errors.terminalInputFailed');
+      } finally {
+        inputTasks -= 1;
+        if (!settled && inputTasks === 0) stdin.resume?.();
+      }
+    };
+    const onResize = () => {
+      try {
+        const { rows, cols } = getDimensions(stdout);
+        Promise.resolve(send({ type: 'resize', terminalId, rows, cols })).catch(() =>
+          fail('errors.terminalResizeFailed')
+        );
+      } catch {
+        fail('errors.terminalResizeFailed');
+      }
+    };
+    const onMessage = (raw, isBinary) => {
+      try {
+        const frame = parseFrame(raw, isBinary, terminalId, translate);
+        if (frame.type === 'output') stdout.write(frame.data);
+        else if (frame.type === 'exit') {
+          finish(undefined, frame.exitCode === null ? 1 : frame.exitCode);
+        } else if (frame.type === 'error') fail('errors.terminalRemoteError');
+        else fail('errors.terminalUnexpectedFrame');
+      } catch (error) {
+        finish(
+          error instanceof MarctlError
+            ? error
+            : new MarctlError(translate('errors.terminalFrameInvalid'))
+        );
+      }
+    };
+    const onError = (error) =>
+      finish(
+        error instanceof DirectRejectedError
+          ? new MarctlError(`${translate('errors.terminalConnectionFailed')} [${error.code}]`, {
+              code: error.code
+            })
+          : new MarctlError(translate('errors.terminalConnectionFailed'))
+      );
+    const onClose = () => finish(new MarctlError(translate('errors.terminalConnectionLost')));
+    const onAbort = () => finish(undefined, signal.reason === 'SIGTERM' ? 143 : 130);
+    const startInput = () => {
+      if (settled || inputEnabled) return;
+      inputEnabled = true;
+      try {
+        if (!commandMode) {
+          if (typeof stdin.setRawMode !== 'function') {
+            fail('errors.terminalInteractiveRequired');
+            return;
+          }
+          stdin.setRawMode(true);
+          rawModeEnabled = true;
+        }
+        stdin.resume?.();
+        stdin.on?.('data', onInput);
+        stdout.on?.('resize', onResize);
+        onResize();
+      } catch {
+        fail(commandMode ? 'errors.terminalSessionFailed' : 'errors.terminalInteractiveInit');
+      }
+    };
+    transport.on?.('message', onMessage);
+    transport.on?.('error', onError);
+    transport.on?.('close', onClose);
+    signal?.addEventListener('abort', onAbort, { once: true });
+    if (signal?.aborted) {
+      onAbort();
+      return;
+    }
+    transport.activate?.();
+    startInput();
+  });
+}
+
+function sendCloseFrame(socket, terminalId) {
+  if (!terminalId || !isSocketOpen(socket)) return;
+  try {
+    Promise.resolve(socket.send(JSON.stringify({ type: 'close', terminalId }))).catch(() => {});
+  } catch {
+    // The DELETE request below remains the authoritative cleanup path.
+  }
+}
+
+function isSocketOpen(socket) {
+  return socket.readyState === undefined || socket.readyState === 1;
+}
+
+export function getDimensions(stdout) {
+  const rows = Number.isSafeInteger(stdout.rows) && stdout.rows > 0 ? stdout.rows : DEFAULT_ROWS;
+  const cols =
+    Number.isSafeInteger(stdout.columns) && stdout.columns > 0 ? stdout.columns : DEFAULT_COLS;
+  return { rows: Math.min(rows, 1000), cols: Math.min(cols, 1000) };
+}

package/src/terminal-race.mjs

@@ -0,0 +1,117 @@
+import { prepareRelayTransport } from './terminal-relay.mjs';
+import { DirectFallbackError, DirectRejectedError } from './direct-errors.mjs';
+
+export async function raceTerminalConnections({
+  openDirectTerminal,
+  directOptions,
+  client,
+  WebSocketClass,
+  nodeId,
+  terminalId,
+  translate,
+  connectionTimeoutMs,
+  signal
+}) {
+  if (signal?.aborted) throw new DirectFallbackError('DIRECT_RACE_CANCELLED');
+  const abort = new AbortController();
+  const relayAbort = new AbortController();
+  const preparing = new Set(['direct', 'relay']);
+  let start;
+  const preparation = new Promise((resolve) => {
+    start = resolve;
+  });
+  const prepared = (candidate) => {
+    preparing.delete(candidate);
+    if (preparing.size === 0) start();
+    return preparation;
+  };
+  let selected;
+  let announce;
+  const first = new Promise((resolve) => {
+    announce = resolve;
+  });
+  const select = (candidate) => {
+    if (selected) return false;
+    selected = candidate;
+    announce(candidate);
+    if (candidate === 'relay') abort.abort();
+    else relayAbort.abort();
+    return true;
+  };
+  const cancel = () => {
+    abort.abort();
+    relayAbort.abort();
+    if (selected) return;
+    selected = 'cancel';
+    start();
+    announce('cancel');
+  };
+  signal?.addEventListener('abort', cancel, { once: true });
+  const direct = openDirectTerminal({
+    ...directOptions,
+    signal: abort.signal,
+    onPrepared: () => prepared('direct'),
+    onRejected: () => select('direct'),
+    onIceConnected: () => {
+      if (!select('direct')) throw new Error('DIRECT_RACE_CANCELLED');
+    },
+    onTransportReady: () => {
+      if (selected !== 'direct') throw new Error('DIRECT_RACE_CANCELLED');
+    }
+  }).then(
+    (value) => {
+      if (selected === 'cancel' || signal?.aborted) value.close();
+      return { value };
+    },
+    (error) => {
+      prepared('direct');
+      if (error instanceof DirectRejectedError) select('direct');
+      return { error };
+    }
+  );
+  const relay = prepareRelayTransport({
+    client,
+    WebSocketClass,
+    nodeId,
+    terminalId,
+    translate,
+    connectionTimeoutMs,
+    signal: relayAbort.signal,
+    onPrepared: () => prepared('relay')
+  }).then(
+    (value) => {
+      if (!select('relay')) value.close();
+      return { value };
+    },
+    (error) => {
+      prepared('relay');
+      return { error };
+    }
+  );
+  const winner = await Promise.race([
+    first,
+    Promise.all([direct, relay]).then(() => selected ?? 'none')
+  ]);
+  if (winner === 'cancel' || signal?.aborted) {
+    signal?.removeEventListener('abort', cancel);
+    abort.abort();
+    relayAbort.abort();
+    throw new DirectFallbackError('DIRECT_RACE_CANCELLED');
+  }
+  if (winner === 'direct') {
+    const result = await direct;
+    signal?.removeEventListener('abort', cancel);
+    if (result.error) throw result.error;
+    return result.value;
+  }
+  if (winner === 'relay') {
+    const result = await relay;
+    signal?.removeEventListener('abort', cancel);
+    if (result.error) throw result.error;
+    return result.value.activate(signal);
+  }
+  const [directResult, relayResult] = await Promise.all([direct, relay]);
+  signal?.removeEventListener('abort', cancel);
+  if (directResult.error instanceof DirectRejectedError) throw directResult.error;
+  throw relayResult.error ?? directResult.error;
+}

package/src/terminal-relay.mjs

@@ -0,0 +1,305 @@
+import { EventEmitter } from 'node:events';
+import { MarctlError } from './errors.mjs';
+import { TerminalRelaySender } from './terminal-relay-sender.mjs';
+import { parseFrame } from './terminal-frame.mjs';
+import { DirectFallbackError } from './direct-errors.mjs';
+
+export async function openRelayTransport({
+  client,
+  WebSocketClass,
+  nodeId,
+  terminalId,
+  translate,
+  connectionTimeoutMs,
+  signal
+}) {
+  const ticket = await client.createAttachTicket({ nodeId, terminalId });
+  if (signal?.aborted) throw new DirectFallbackError('DIRECT_RACE_CANCELLED');
+  const socket = client.openTerminalWebSocket(WebSocketClass, { terminalId, ticket });
+  const transport = new BufferedRelayTransport({
+    socket,
+    terminalId,
+    translate,
+    connectionTimeoutMs
+  });
+  try {
+    await waitForAttachment(transport, signal);
+    return transport;
+  } catch (error) {
+    transport.close();
+    throw error;
+  }
+}
+
+export async function prepareRelayTransport({
+  client,
+  WebSocketClass,
+  nodeId,
+  terminalId,
+  translate,
+  connectionTimeoutMs,
+  signal,
+  onPrepared
+}) {
+  const ticket = await client.createAttachTicket({ nodeId, terminalId });
+  if (onPrepared) await onPrepared();
+  if (signal?.aborted) throw new MarctlError(translate('errors.terminalAttachConnection'));
+  const socket = client.openTerminalWebSocket(WebSocketClass, {
+    terminalId,
+    ticket,
+    deferred: true
+  });
+  // Keep an error listener after readiness until the socket is discarded.
+  socket.on('error', () => {});
+  let activated = false;
+  const ready = new Promise((resolve, reject) => {
+    const timer = setTimeout(() => fail(), connectionTimeoutMs);
+    const cleanup = () => {
+      clearTimeout(timer);
+      socket.removeListener?.('message', onMessage);
+      socket.removeListener?.('error', fail);
+      socket.removeListener?.('close', fail);
+      signal?.removeEventListener('abort', fail);
+    };
+    const fail = () => {
+      cleanup();
+      try {
+        socket.close();
+      } catch {
+        /* Connection not yet established. */
+      }
+      reject(new MarctlError(translate('errors.terminalAttachConnection')));
+    };
+    const onMessage = (raw) => {
+      let frame;
+      try {
+        frame = JSON.parse(String(raw));
+      } catch {
+        return fail();
+      }
+      if (frame?.type !== 'ready' || frame.terminalId !== terminalId) return fail();
+      cleanup();
+      resolve();
+    };
+    socket.on('message', onMessage);
+    socket.on('error', fail);
+    socket.on('close', fail);
+    signal?.addEventListener('abort', fail, { once: true });
+    if (signal?.aborted) fail();
+  });
+  await ready;
+  return {
+    async activate(signal) {
+      if (signal?.aborted) {
+        socket.close();
+        throw new DirectFallbackError('DIRECT_RACE_CANCELLED');
+      }
+      if (activated || socket.readyState !== 1)
+        throw new MarctlError(translate('errors.terminalAttachConnection'));
+      activated = true;
+      const transport = new BufferedRelayTransport({
+        socket,
+        terminalId,
+        translate,
+        connectionTimeoutMs
+      });
+      try {
+        socket.send(JSON.stringify({ type: 'activate', terminalId }));
+        await waitForAttachment(transport, signal);
+        return transport;
+      } catch (error) {
+        transport.close();
+        throw error;
+      }
+    },
+    close() {
+      socket.close();
+    }
+  };
+}
+
+async function waitForAttachment(transport, signal) {
+  if (!signal) return transport.waitForAttachment();
+  if (signal.aborted) throw new DirectFallbackError('DIRECT_RACE_CANCELLED');
+  let cancel;
+  const cancelled = new Promise((_, reject) => {
+    cancel = () => {
+      transport.close();
+      reject(new DirectFallbackError('DIRECT_RACE_CANCELLED'));
+    };
+    signal.addEventListener('abort', cancel, { once: true });
+  });
+  try {
+    return await Promise.race([transport.waitForAttachment(), cancelled]);
+  } finally {
+    signal.removeEventListener('abort', cancel);
+  }
+}
+
+class BufferedRelayTransport extends EventEmitter {
+  #socket;
+  #sender;
+  #terminalId;
+  #translate;
+  #attached = false;
+  #active = false;
+  #pendingEvents = [];
+  #attachmentResolve;
+  #attachmentReject;
+  #openTimer;
+  #attachTimer;
+  #closed = false;
+  #onOpen;
+  #onMessage;
+  #onError;
+  #onClose;
+
+  constructor({ socket, terminalId, translate, connectionTimeoutMs }) {
+    super();
+    this.#socket = socket;
+    this.#sender = new TerminalRelaySender(socket);
+    this.#terminalId = terminalId;
+    this.#translate = translate;
+    this.#onOpen = () => {
+      clearTimeout(this.#openTimer);
+      this.#armAttachTimer(connectionTimeoutMs);
+    };
+    this.#onMessage = (raw, isBinary) => {
+      try {
+        const frame = parseFrame(raw, isBinary, this.#terminalId, this.#translate);
+        if (!this.#attached) {
+          if (frame.type === 'attach') {
+            this.#attached = true;
+            clearTimeout(this.#attachTimer);
+            this.#attachmentResolve?.();
+            this.#attachmentResolve = undefined;
+            this.#attachmentReject = undefined;
+            return;
+          }
+          if (frame.type === 'error')
+            throw new MarctlError(this.#translate('errors.terminalRemoteError'));
+          this.#queueOrEmit('message', raw, isBinary);
+          return;
+        }
+        this.#queueOrEmit('message', raw, isBinary);
+      } catch (error) {
+        this.#fail(
+          error instanceof MarctlError
+            ? error
+            : new MarctlError(this.#translate('errors.terminalFrameInvalid'))
+        );
+      }
+    };
+    this.#onError = () => {
+      const error = new MarctlError(
+        this.#translate(
+          this.#attached ? 'errors.terminalConnectionFailed' : 'errors.terminalAttachConnection'
+        )
+      );
+      if (this.#attached) this.#queueOrEmit('error', error);
+      else this.#fail(error);
+    };
+    this.#onClose = () => {
+      this.#sender.close();
+      const error = new MarctlError(
+        this.#translate(
+          this.#attached ? 'errors.terminalConnectionLost' : 'errors.terminalAttachLost'
+        )
+      );
+      if (this.#attached) this.#queueOrEmit('close');
+      else this.#fail(error);
+    };
+
+    socket.on?.('open', this.#onOpen);
+    socket.on?.('message', this.#onMessage);
+    socket.on?.('error', this.#onError);
+    socket.on?.('close', this.#onClose);
+    if (socket.readyState === 1) this.#onOpen();
+    else
+      this.#openTimer = setTimeout(
+        () => this.#fail(new MarctlError(this.#translate('errors.terminalConnectionOpen'))),
+        connectionTimeoutMs
+      );
+  }
+
+  waitForAttachment() {
+    return new Promise((resolve, reject) => {
+      if (this.#closed) {
+        reject(new MarctlError(this.#translate('errors.terminalAttachLost')));
+        return;
+      }
+      this.#attachmentResolve = resolve;
+      this.#attachmentReject = reject;
+      if (this.#attached) {
+        this.#attachmentResolve = undefined;
+        this.#attachmentReject = undefined;
+        resolve();
+      }
+    });
+  }
+
+  activate() {
+    if (this.#active) return;
+    this.#active = true;
+    const pendingEvents = this.#pendingEvents;
+    this.#pendingEvents = [];
+    for (const { type, args } of pendingEvents) this.emit(type, ...args);
+  }
+
+  get readyState() {
+    return this.#socket.readyState;
+  }
+
+  send(value) {
+    if (this.#closed) throw new Error('TERMINAL_CONNECTION_LOST');
+    if (JSON.parse(value).type === 'input') return this.#sender.send(value);
+    this.#socket.send(value);
+  }
+
+  close() {
+    if (this.#closed) return;
+    this.#closed = true;
+    this.#attachmentReject?.(new MarctlError(this.#translate('errors.terminalAttachLost')));
+    this.#attachmentReject = undefined;
+    this.#attachmentResolve = undefined;
+    this.#sender.close();
+    clearTimeout(this.#openTimer);
+    clearTimeout(this.#attachTimer);
+    this.#socket.removeListener?.('open', this.#onOpen);
+    this.#socket.removeListener?.('message', this.#onMessage);
+    this.#socket.removeListener?.('error', this.#onError);
+    this.#socket.removeListener?.('close', this.#onClose);
+    try {
+      this.#socket.close();
+    } catch {
+      // The connection is already unavailable.
+    }
+  }
+
+  #armAttachTimer(connectionTimeoutMs) {
+    if (this.#attached) return;
+    this.#attachTimer = setTimeout(
+      () => this.#fail(new MarctlError(this.#translate('errors.terminalAttachTimeout'))),
+      connectionTimeoutMs
+    );
+  }
+
+  #fail(error) {
+    if (this.#closed) return;
+    clearTimeout(this.#openTimer);
+    clearTimeout(this.#attachTimer);
+    this.#attachmentResolve = undefined;
+    const reject = this.#attachmentReject;
+    this.#attachmentReject = undefined;
+    if (!this.#attached) reject?.(error);
+    else this.#queueOrEmit('error', error);
+  }
+
+  #queueOrEmit(type, ...args) {
+    if (this.#active) {
+      if (type !== 'error' || this.listenerCount('error') > 0) this.emit(type, ...args);
+      return;
+    }
+    this.#pendingEvents.push({ type, args });
+  }
+}