termbridge 0.3.10 → 0.3.12

package/dist/bin.js

@@ -2480,8 +2480,8 @@ var createAuth = ({
     if (!record) {
       return null;
     }
+    wsTokens.delete(token);
     if (record.expiresAt <= clock()) {
-      wsTokens.delete(token);
       return null;
     }
     return getSession(record.sessionId);
@@ -2599,22 +2599,10 @@ var createTerminalRegistry = () => {
 };
 
 // src/server/server.ts
-import { createServer as createHttpServer, request as httpRequest } from "http";
-import { request as httpsRequest } from "https";
+import { createServer as createHttpServer } from "http";
 import { randomBytes as randomBytes3 } from "crypto";
 import { WebSocketServer, WebSocket as WsWebSocket } from "ws";
 
-// ../packages/shared/src/index.ts
-var TERMINAL_CONTROL_KEYS = [
-  "ctrl_c",
-  "esc",
-  "tab",
-  "up",
-  "down",
-  "left",
-  "right"
-];
-
 // src/server/static.ts
 import { readFile } from "fs/promises";
 import { extname, resolve as resolve3 } from "path";
@@ -2666,10 +2654,8 @@ var createStaticHandler = (uiDistPath, basePath) => {
   };
 };
 
-// src/server/server.ts
+// src/server/http-utils.ts
 var MAX_HTTP_BODY_SIZE = 64 * 1024;
-var MAX_WS_MESSAGE_SIZE = 1024 * 1024;
-var MAX_INPUT_LENGTH = 64 * 1024;
 var jsonResponse = (response, status, payload) => {
   const body = JSON.stringify(payload);
   response.statusCode = status;
@@ -2716,6 +2702,21 @@ var isAllowedOrigin = (origin, host, forwardedHost) => {
   }
 };
 var resolveForwardedHost = (header) => Array.isArray(header) ? header[0] : header;
+
+// ../packages/shared/src/index.ts
+var TERMINAL_CONTROL_KEYS = [
+  "ctrl_c",
+  "esc",
+  "tab",
+  "up",
+  "down",
+  "left",
+  "right"
+];
+
+// src/server/ws-utils.ts
+var MAX_WS_MESSAGE_SIZE = 1024 * 1024;
+var MAX_INPUT_LENGTH = 64 * 1024;
 var allowedControlKeys = new Set(TERMINAL_CONTROL_KEYS);
 var parseClientMessage = (payload) => {
   const size = typeof payload === "string" ? payload.length : Array.isArray(payload) ? payload.reduce((sum, buf) => sum + buf.length, 0) : payload.byteLength;
@@ -2748,50 +2749,74 @@ var parseClientMessage = (payload) => {
 var sendWsMessage = (socket, message) => {
   socket.send(JSON.stringify(message));
 };
+
+// src/server/proxy.ts
+import { request as httpRequest } from "http";
+import { request as httpsRequest } from "https";
+var resolveProxyUrl = (config, targetPath, search) => {
+  if (typeof config.proxyPort === "number") {
+    return new URL(`http://localhost:${config.proxyPort}${targetPath}${search}`);
+  }
+  if (config.devProxyUrl) {
+    try {
+      return new URL(`${targetPath}${search}`, config.devProxyUrl);
+    } catch {
+      return null;
+    }
+  }
+  return null;
+};
+var proxyRequest = (config, request, response, targetPath, search) => {
+  const targetUrl = resolveProxyUrl(config, targetPath, search);
+  if (!targetUrl) {
+    response.statusCode = 502;
+    response.end("proxy error");
+    return;
+  }
+  const proxyHeaders = { ...request.headers, ...config.devProxyHeaders ?? {} };
+  delete proxyHeaders.cookie;
+  delete proxyHeaders.host;
+  proxyHeaders.host = targetUrl.host;
+  const requestImpl = targetUrl.protocol === "https:" ? httpsRequest : httpRequest;
+  const proxyReq = requestImpl(
+    targetUrl,
+    { method: request.method, headers: proxyHeaders },
+    (proxyRes) => {
+      response.writeHead(proxyRes.statusCode, proxyRes.headers);
+      proxyRes.pipe(response);
+    }
+  );
+  proxyReq.on("error", () => {
+    response.statusCode = 502;
+    response.end("proxy error");
+  });
+  request.pipe(proxyReq);
+};
+var getProxyWebSocketUrl = (config) => {
+  try {
+    if (typeof config.proxyPort === "number") {
+      return new URL(`http://localhost:${config.proxyPort}`);
+    }
+    if (config.devProxyUrl) {
+      return new URL(config.devProxyUrl);
+    }
+  } catch {
+    return null;
+  }
+  return null;
+};
+
+// src/server/server.ts
 var createSessionName = () => `termbridge-${randomBytes3(4).toString("hex")}`;
 var createAppServer = (deps) => {
   const staticHandler = createStaticHandler(deps.uiDistPath, "/__tb/app");
   const wss = new WebSocketServer({ noServer: true });
   const connectionInfo = /* @__PURE__ */ new WeakMap();
   const hasProxy = typeof deps.proxyPort === "number" || deps.devProxyUrl !== void 0;
-  const resolveProxyUrl = (targetPath, search) => {
-    if (typeof deps.proxyPort === "number") {
-      return new URL(`http://localhost:${deps.proxyPort}${targetPath}${search}`);
-    }
-    if (deps.devProxyUrl) {
-      try {
-        return new URL(`${targetPath}${search}`, deps.devProxyUrl);
-      } catch {
-        return null;
-      }
-    }
-    return null;
-  };
-  const proxyRequest = (request, response, targetPath, search) => {
-    const targetUrl = resolveProxyUrl(targetPath, search);
-    if (!targetUrl) {
-      response.statusCode = 502;
-      response.end("proxy error");
-      return;
-    }
-    const proxyHeaders = { ...request.headers, ...deps.devProxyHeaders ?? {} };
-    delete proxyHeaders.cookie;
-    delete proxyHeaders.host;
-    proxyHeaders.host = targetUrl.host;
-    const requestImpl = targetUrl.protocol === "https:" ? httpsRequest : httpRequest;
-    const proxyReq = requestImpl(
-      targetUrl,
-      { method: request.method, headers: proxyHeaders },
-      (proxyRes) => {
-        response.writeHead(proxyRes.statusCode, proxyRes.headers);
-        proxyRes.pipe(response);
-      }
-    );
-    proxyReq.on("error", () => {
-      response.statusCode = 502;
-      response.end("proxy error");
-    });
-    request.pipe(proxyReq);
+  const proxyConfig = {
+    proxyPort: deps.proxyPort,
+    devProxyUrl: deps.devProxyUrl,
+    devProxyHeaders: deps.devProxyHeaders
   };
   const server = createHttpServer(async (request, response) => {
     const url = new URL(request.url, `http://${request.headers.host}`);
@@ -2890,7 +2915,7 @@ var createAppServer = (deps) => {
     const handled = await staticHandler(request, response);
     if (!handled) {
       if (hasProxy && deps.auth.getSessionFromRequest(request)) {
-        proxyRequest(request, response, url.pathname, url.search);
+        proxyRequest(proxyConfig, request, response, url.pathname, url.search);
         return;
       }
       response.statusCode = 404;
@@ -2901,17 +2926,15 @@ var createAppServer = (deps) => {
     const url = new URL(request.url, `http://${request.headers.host}`);
     if (!url.pathname.startsWith("/__tb/ws/terminal/")) {
       if (hasProxy && deps.auth.getSessionFromRequest(request)) {
-        let baseUrl = null;
-        try {
-          baseUrl = typeof deps.proxyPort === "number" ? new URL(`http://localhost:${deps.proxyPort}`) : new URL(deps.devProxyUrl);
-        } catch {
+        const baseUrl = getProxyWebSocketUrl(proxyConfig);
+        if (!baseUrl) {
           socket.destroy();
           return;
         }
         const wsProtocol = baseUrl.protocol === "https:" ? "wss:" : "ws:";
         const targetUrl = new URL(`${url.pathname}${url.search}`, baseUrl);
         targetUrl.protocol = wsProtocol;
-        const proxyHeaders = { ...request.headers, ...deps.devProxyHeaders ?? {} };
+        const proxyHeaders = { ...request.headers, ...proxyConfig.devProxyHeaders ?? {} };
         delete proxyHeaders.cookie;
         delete proxyHeaders.host;
         proxyHeaders.host = targetUrl.host;
@@ -3844,47 +3867,7 @@ var createSandboxDaytonaServerProvider = (options = {}) => {
   };
 };
 
-// src/cli/start.ts
-var resolveUiDistPath = () => {
-  const currentDir = dirname3(fileURLToPath(import.meta.url));
-  const candidates = [
-    resolve5(currentDir, "../../ui/dist"),
-    resolve5(currentDir, "../ui/dist"),
-    resolve5(process.cwd(), "ui/dist"),
-    resolve5(process.cwd(), "cli/ui/dist")
-  ];
-  for (const candidate of candidates) {
-    if (existsSync(candidate)) {
-      return candidate;
-    }
-  }
-  return candidates[0];
-};
-var packLocalCli = (logger) => {
-  const cliDir = resolve5(dirname3(fileURLToPath(import.meta.url)), "..");
-  const packageJson = resolve5(cliDir, "package.json");
-  if (!existsSync(packageJson)) {
-    return void 0;
-  }
-  const result = spawnSync("npm", ["pack"], { cwd: cliDir, encoding: "utf8" });
-  if (result.status !== 0) {
-    const stderr = result.stderr?.toString().trim();
-    logger.warn(`Local CLI pack failed${stderr ? ` (${stderr})` : ""}`);
-    return void 0;
-  }
-  const lines = result.stdout?.toString().trim().split(/\r?\n/).filter(Boolean) ?? [];
-  const filename = lines[lines.length - 1];
-  if (!filename) {
-    logger.warn("Local CLI pack failed (no output)");
-    return void 0;
-  }
-  return resolve5(cliDir, filename);
-};
-var createDefaultLogger = () => ({
-  info: (message) => console.log(message),
-  warn: (message) => console.warn(message),
-  error: (message) => console.error(message)
-});
+// src/cli/agent-config.ts
 var defaultAgentEnvKeys = [
   "OPENAI_API_KEY",
   "OPENAI_BASE_URL",
@@ -3955,6 +3938,48 @@ var resolveAutoAgentNames = (env) => {
   const auto = parseBoolean(env.TERMBRIDGE_SANDBOX_AGENT_AUTO);
   return auto ? ["all"] : [];
 };
+
+// src/cli/start.ts
+var resolveUiDistPath = () => {
+  const currentDir = dirname3(fileURLToPath(import.meta.url));
+  const candidates = [
+    resolve5(currentDir, "../../ui/dist"),
+    resolve5(currentDir, "../ui/dist"),
+    resolve5(process.cwd(), "ui/dist"),
+    resolve5(process.cwd(), "cli/ui/dist")
+  ];
+  for (const candidate of candidates) {
+    if (existsSync(candidate)) {
+      return candidate;
+    }
+  }
+  return candidates[0];
+};
+var packLocalCli = (logger) => {
+  const cliDir = resolve5(dirname3(fileURLToPath(import.meta.url)), "..");
+  const packageJson = resolve5(cliDir, "package.json");
+  if (!existsSync(packageJson)) {
+    return void 0;
+  }
+  const result = spawnSync("npm", ["pack"], { cwd: cliDir, encoding: "utf8" });
+  if (result.status !== 0) {
+    const stderr = result.stderr?.toString().trim();
+    logger.warn(`Local CLI pack failed${stderr ? ` (${stderr})` : ""}`);
+    return void 0;
+  }
+  const lines = result.stdout?.toString().trim().split(/\r?\n/).filter(Boolean) ?? [];
+  const filename = lines[lines.length - 1];
+  if (!filename) {
+    logger.warn("Local CLI pack failed (no output)");
+    return void 0;
+  }
+  return resolve5(cliDir, filename);
+};
+var createDefaultLogger = () => ({
+  info: (message) => console.log(message),
+  warn: (message) => console.warn(message),
+  error: (message) => console.error(message)
+});
 var resolveBackendMode = (value) => {
   if (!value) {
     return "tmux";