ugly-app 0.1.519 → 0.1.521

package/src/cli/sidecar.ts

@@ -1,350 +0,0 @@
-/**
- * sidecar.ts
- *
- * Local TCP multiplexer that tunnels 5 service ports over a single WSS connection
- * to the ugly.bot dev-tunnel endpoint.
- */
-
-import net from 'net';
-import WebSocket from 'ws';
-import { getUglyBotWsUrl } from '../shared/uglyBotUrl.js';
-import type { SidecarPorts } from './sidecarHealth.js';
-import {
-  SERVICE,
-  SERVICE_NAME,
-  FLAGS,
-  type ServiceId,
-  encodeFrame,
-  decodeFrame,
-} from './sidecarProtocol.js';
-
-export interface StartSidecarOpts {
-  projectId: string;
-  token: string;
-  /** Defaults to 'wss://ugly.bot' */
-  serverUrl?: string;
-}
-
-const BACKPRESSURE_THRESHOLD = 1024 * 1024; // 1 MB
-const SERVICE_LIST: ServiceId[] = [
-  SERVICE.POSTGRES,
-  SERVICE.NATS,
-  SERVICE.S3,
-  SERVICE.QDRANT_HTTP,
-  SERVICE.QDRANT_GRPC,
-];
-
-interface SidecarState {
-  ws: WebSocket | null;
-  servers: Map<ServiceId, net.Server>;
-  streams: Map<number, net.Socket>;
-  nextStreamId: number;
-  reconnectTimer: ReturnType<typeof setTimeout> | null;
-  reconnectDelay: number;
-  connected: boolean;
-  stopped: boolean;
-}
-
-let state: SidecarState | null = null;
-
-/**
- * Start the sidecar: opens WSS tunnel and binds ephemeral TCP ports.
- * Returns the actual ports bound.
- */
-export async function startSidecar(opts: StartSidecarOpts): Promise<SidecarPorts> {
-  if (state && !state.stopped) {
-    throw new Error('Sidecar already running');
-  }
-
-  state = {
-    ws: null,
-    servers: new Map(),
-    streams: new Map(),
-    nextStreamId: 1,
-    reconnectTimer: null,
-    reconnectDelay: 1000,
-    connected: false,
-    stopped: false,
-  };
-
-  // Create TCP servers for each service on port 0 (ephemeral)
-  const portResults = new Map<ServiceId, number>();
-
-  for (const serviceId of SERVICE_LIST) {
-    const server = net.createServer((socket) => {
-      handleTcpConnection(serviceId, socket);
-    });
-
-    await new Promise<void>((resolve, reject) => {
-      server.listen(0, '127.0.0.1', () => resolve());
-      server.on('error', reject);
-    });
-
-    const addr = server.address() as net.AddressInfo;
-    portResults.set(serviceId, addr.port);
-    state.servers.set(serviceId, server);
-  }
-
-  // Connect WebSocket
-  await connectWs(opts);
-
-  const ports: SidecarPorts = {
-    postgres: portResults.get(SERVICE.POSTGRES)!,
-    nats: portResults.get(SERVICE.NATS)!,
-    s3: portResults.get(SERVICE.S3)!,
-    qdrantHttp: portResults.get(SERVICE.QDRANT_HTTP)!,
-    qdrantGrpc: portResults.get(SERVICE.QDRANT_GRPC)!,
-  };
-
-  console.log('[ugly-app] Sidecar listening:');
-  for (const [serviceId, port] of portResults) {
-    console.log(`  ${SERVICE_NAME[serviceId]}: localhost:${port}`);
-  }
-
-  return ports;
-}
-
-function connectWs(opts: StartSidecarOpts): Promise<void> {
-  if (!state || state.stopped) return Promise.resolve();
-
-  const serverUrl = opts.serverUrl ?? getUglyBotWsUrl();
-
-  return new Promise<void>((resolve, reject) => {
-    let resolved = false;
-
-    try {
-      const ws = new WebSocket(`${serverUrl}/dev-tunnel`, {
-        headers: {
-          'Authorization': `Bearer ${opts.token}`,
-          'X-Project-Id': opts.projectId,
-        },
-      });
-
-      ws.binaryType = 'nodebuffer';
-
-      ws.on('open', () => {
-        if (!state) return;
-        state.ws = ws;
-        state.reconnectDelay = 1000;
-        // Don't resolve yet — wait for 'ready' message from server.
-        // The server needs time to spin up per-client proxy instances.
-      });
-
-      ws.on('message', (data: Buffer | string) => {
-        if (!state) return;
-
-        // Handle JSON control messages (text frames from server)
-        if (typeof data === 'string' || (Buffer.isBuffer(data) && data[0] === 0x7b /* '{' */)) {
-          try {
-            const msg = JSON.parse(typeof data === 'string' ? data : data.toString('utf8')) as { type: string };
-            if (msg.type === 'ready') {
-              state.connected = true;
-              if (!resolved) {
-                resolved = true;
-                resolve();
-              }
-            } else if (msg.type === 'provisioning') {
-              console.log('[ugly-app] Cloud DB being provisioned — first-time setup...');
-            }
-          } catch {
-            // Not JSON — fall through to binary handling
-          }
-          return;
-        }
-
-        // Handle binary tunnel frames
-        try {
-          const { streamId, flags, payload } = decodeFrame(Buffer.from(data));
-
-          if (flags & FLAGS.RST) {
-            const socket = state.streams.get(streamId);
-            if (socket) {
-              state.streams.delete(streamId);
-              socket.destroy();
-            }
-            return;
-          }
-
-          // Write payload before checking FIN (last data chunk)
-          if (payload.length > 0) {
-            const socket = state.streams.get(streamId);
-            if (socket && !socket.destroyed) {
-              socket.write(payload);
-            }
-          }
-
-          if (flags & FLAGS.FIN) {
-            const socket = state.streams.get(streamId);
-            if (socket) {
-              state.streams.delete(streamId);
-              socket.end();
-            }
-            return;
-          }
-        } catch {
-          // Ignore malformed frames
-        }
-      });
-
-      ws.on('close', (code) => {
-        if (!state || state.stopped) return;
-        state.connected = false;
-        state.ws = null;
-
-        if (code === 4001) {
-          console.error('[ugly-app] Auth expired — run `npx ugly-app login` then restart');
-        }
-
-        // RST all active streams
-        for (const [id, socket] of state.streams) {
-          socket.destroy();
-          state.streams.delete(id);
-        }
-
-        if (!resolved) {
-          // Initial connect failed — clean up and reject
-          resolved = true;
-          cleanupServers();
-          reject(new Error('[ugly-app] Cannot reach ugly.bot — check your connection'));
-          return;
-        }
-
-        console.warn('[ugly-app] Tunnel disconnected, reconnecting...');
-        scheduleReconnect(opts);
-      });
-
-      ws.on('error', () => {
-        // error is always followed by close — handled there
-      });
-    } catch (err) {
-      if (!resolved) {
-        resolved = true;
-        cleanupServers();
-        reject(err instanceof Error ? err : new Error(String(err)));
-      }
-    }
-  });
-}
-
-function cleanupServers(): void {
-  if (!state) return;
-  for (const server of state.servers.values()) {
-    server.close();
-  }
-  state.servers.clear();
-  for (const socket of state.streams.values()) {
-    socket.destroy();
-  }
-  state.streams.clear();
-  state = null;
-}
-
-function scheduleReconnect(opts: StartSidecarOpts): void {
-  if (!state || state.stopped || state.reconnectTimer) return;
-
-  state.reconnectTimer = setTimeout(() => {
-    if (!state || state.stopped) return;
-    state.reconnectTimer = null;
-    state.reconnectDelay = Math.min(state.reconnectDelay * 2, 30_000);
-    connectWs(opts).then(() => {
-      console.log('[ugly-app] Tunnel reconnected');
-    }).catch(() => {
-      scheduleReconnect(opts);
-    });
-  }, state.reconnectDelay);
-}
-
-function handleTcpConnection(serviceId: ServiceId, socket: net.Socket): void {
-  if (!state) { socket.destroy(); return; }
-
-  if (!state.connected || !state.ws) {
-    console.warn(`[ugly-app] Tunnel reconnecting — rejecting ${SERVICE_NAME[serviceId]} connection`);
-    socket.destroy();
-    return;
-  }
-
-  const streamId = state.nextStreamId++;
-  // Wrap around at uint32 max
-  if (state.nextStreamId > 0xFFFFFFFF) {
-    state.nextStreamId = 1;
-  }
-
-  state.streams.set(streamId, socket);
-  const serviceFlags = serviceId << 2;
-
-  // Send an empty data frame to signal "stream opened" — the server needs this
-  // to create the upstream connection. Without it, server-speaks-first protocols
-  // (NATS INFO, Postgres auth challenge) would hang because the server never
-  // knows to connect upstream.
-  if (state.ws?.readyState === WebSocket.OPEN) {
-    state.ws.send(encodeFrame(streamId, serviceFlags, Buffer.alloc(0)));
-  }
-
-  socket.on('data', (chunk: Buffer) => {
-    if (state?.ws?.readyState !== WebSocket.OPEN) return;
-
-    const frame = encodeFrame(streamId, serviceFlags, chunk);
-    state.ws.send(frame);
-
-    // Backpressure: pause this socket if WS buffer is too full
-    if (state.ws.bufferedAmount > BACKPRESSURE_THRESHOLD) {
-      socket.pause();
-      const checkDrain = () => {
-        if (!state?.ws) return;
-        if (state.ws.bufferedAmount <= BACKPRESSURE_THRESHOLD) {
-          socket.resume();
-        } else {
-          setTimeout(checkDrain, 50);
-        }
-      };
-      setTimeout(checkDrain, 50);
-    }
-  });
-
-  socket.on('end', () => {
-    if (!state) return;
-    state.streams.delete(streamId);
-    if (state.ws?.readyState === WebSocket.OPEN) {
-      state.ws.send(encodeFrame(streamId, serviceFlags | FLAGS.FIN, Buffer.alloc(0)));
-    }
-  });
-
-  socket.on('error', () => {
-    if (!state) return;
-    state.streams.delete(streamId);
-    if (state.ws?.readyState === WebSocket.OPEN) {
-      state.ws.send(encodeFrame(streamId, serviceFlags | FLAGS.RST, Buffer.alloc(0)));
-    }
-  });
-
-  socket.on('close', () => {
-    state?.streams.delete(streamId);
-  });
-}
-
-/** Stop the sidecar: close WS, all TCP servers and sockets. */
-export function stopSidecar(): void {
-  if (!state) return;
-  state.stopped = true;
-
-  if (state.reconnectTimer) {
-    clearTimeout(state.reconnectTimer);
-    state.reconnectTimer = null;
-  }
-
-  if (state.ws && state.ws.readyState <= WebSocket.OPEN) {
-    state.ws.close(1000, 'Sidecar stopped');
-  }
-
-  for (const socket of state.streams.values()) {
-    socket.destroy();
-  }
-  state.streams.clear();
-
-  for (const server of state.servers.values()) {
-    server.close();
-  }
-  state.servers.clear();
-
-  state = null;
-}

package/src/cli/sidecarHealth.ts

@@ -1,58 +0,0 @@
-import net from 'net';
-
-/** Ports returned by startSidecar — the actual ephemeral ports bound. */
-export interface SidecarPorts {
-  postgres: number;
-  nats: number;
-  s3: number;
-  qdrantHttp: number;
-  qdrantGrpc: number;
-}
-
-/** Try a TCP connect to a single port. Resolves true if connection succeeds within timeoutMs. */
-function checkPort(port: number, timeoutMs = 2000): Promise<boolean> {
-  return new Promise((resolve) => {
-    const sock = net.createConnection({ port, host: '127.0.0.1' });
-    const timer = setTimeout(() => {
-      sock.destroy();
-      resolve(false);
-    }, timeoutMs);
-    sock.once('connect', () => {
-      clearTimeout(timer);
-      sock.destroy();
-      resolve(true);
-    });
-    sock.once('error', () => {
-      clearTimeout(timer);
-      sock.destroy();
-      resolve(false);
-    });
-  });
-}
-
-/** Returns true if all sidecar ports accept TCP connections. */
-export async function isSidecarHealthy(ports: SidecarPorts): Promise<boolean> {
-  const results = await Promise.all([
-    checkPort(ports.postgres),
-    checkPort(ports.nats),
-    checkPort(ports.s3),
-    checkPort(ports.qdrantHttp),
-    checkPort(ports.qdrantGrpc),
-  ]);
-  return results.every(Boolean);
-}
-
-/** Poll isSidecarHealthy until all ports are reachable. Throws after retries exhausted. */
-export async function waitForSidecar(
-  ports: SidecarPorts,
-  retries = 15,
-  intervalMs = 500,
-): Promise<void> {
-  for (let i = 0; i < retries; i++) {
-    if (await isSidecarHealthy(ports)) return;
-    await new Promise((r) => setTimeout(r, intervalMs));
-  }
-  throw new Error(
-    `[ugly-app] Sidecar not healthy after ${Math.round((retries * intervalMs) / 1000)}s`,
-  );
-}

package/src/cli/sidecarProtocol.ts

@@ -1,68 +0,0 @@
-/**
- * sidecarProtocol.ts
- *
- * Wire protocol for the TCP-over-WebSocket multiplexer (sidecar proxy).
- *
- * Frame layout (5-byte header + payload):
- *   Bytes 0-3  : streamId  (uint32 big-endian)
- *   Byte  4    : flags
- *   Bytes 5+   : payload
- *
- * Flags byte layout:
- *   bit 0      : FIN
- *   bit 1      : RST
- *   bits 2-4   : serviceId  (extracted with (flags >> 2) & 0x07)
- *   bit 5      : WINDOW_UPDATE
- */
-
-export const SERVICE = {
-  POSTGRES: 0,
-  NATS: 1,
-  S3: 2,
-  QDRANT_HTTP: 3,
-  QDRANT_GRPC: 4,
-} as const;
-
-export type ServiceId = (typeof SERVICE)[keyof typeof SERVICE];
-
-export const FLAGS = {
-  FIN: 0x01,
-  RST: 0x02,
-  WINDOW_UPDATE: 0x20,
-} as const;
-
-export const SERVICE_NAME: Record<ServiceId, string> = {
-  [SERVICE.POSTGRES]: 'postgres',
-  [SERVICE.NATS]: 'nats',
-  [SERVICE.S3]: 's3',
-  [SERVICE.QDRANT_HTTP]: 'qdrant-http',
-  [SERVICE.QDRANT_GRPC]: 'qdrant-grpc',
-};
-
-/** Extract the service identifier from bits 2-4 of the flags byte. Throws on invalid service. */
-export function serviceFromFlags(flags: number): ServiceId {
-  const id = (flags >> 2) & 0x07;
-  if (id > SERVICE.QDRANT_GRPC) {
-    throw new Error(`sidecarProtocol: invalid serviceId ${id} in flags byte 0x${flags.toString(16)}`);
-  }
-  return id as ServiceId;
-}
-
-/** Encode a frame into a Buffer with a 5-byte header followed by payload. */
-export function encodeFrame(streamId: number, flags: number, payload: Buffer): Buffer {
-  const header = Buffer.allocUnsafe(5);
-  header.writeUInt32BE(streamId >>> 0, 0);
-  header[4] = flags & 0xff;
-  return Buffer.concat([header, payload]);
-}
-
-/** Decode a frame buffer. Throws if the buffer is shorter than 5 bytes. */
-export function decodeFrame(buf: Buffer): { streamId: number; flags: number; payload: Buffer } {
-  if (buf.length < 5) {
-    throw new Error(`sidecarProtocol: buffer too short to decode frame (got ${buf.length} bytes, need at least 5)`);
-  }
-  const streamId = buf.readUInt32BE(0);
-  const flags = buf[4];
-  const payload = buf.subarray(5);
-  return { streamId, flags, payload };
-}

package/src/vite/tunnelPlugin.ts

@@ -1,32 +0,0 @@
-import type { Plugin } from 'vite';
-
-/**
- * Vite plugin for ugly-app dev mode.
- *
- * The tunnel relay (HTTP/WS proxy for public dev URLs) has been moved to
- * devTunnel.ts in the CLI process. This plugin now only provides Vite
- * config optimizations for linked packages.
- */
-export function tunnelPlugin(): Plugin {
-  return {
-    name: 'ugly-app-tunnel',
-    apply: 'serve',
-
-    config() {
-      // Each module served through the tunnel is a separate HTTP request
-      // relayed via WebSocket.  Vite excludes linked (file:) packages from
-      // dep optimization, serving every sub-module individually — this can
-      // easily exceed 100 requests per page load.  Force linked deps into
-      // the optimization bundle so they become a single request each.
-      return {
-        optimizeDeps: {
-          include: [
-            'ugly-app',
-            'ugly-app/client',
-            'ugly-app/shared',
-          ],
-        },
-      };
-    },
-  };
-}