termbridge 0.2.0 → 0.3.1

package/dist/bin.js

@@ -1788,6 +1788,22 @@ var parseArgs = (argv) => {
       options.port = port;
       continue;
     }
+    if (current === "--proxy") {
+      const proxy = parseNumber(args.shift());
+      if (!proxy || proxy <= 0) {
+        throw new Error("invalid proxy port");
+      }
+      options.proxy = proxy;
+      continue;
+    }
+    if (current === "--dev-proxy-url") {
+      const url = args.shift();
+      if (!url) {
+        throw new Error("missing dev proxy URL");
+      }
+      options.devProxyUrl = url;
+      continue;
+    }
     if (current === "--session") {
       const session = args.shift();
       if (!session) {
@@ -1825,6 +1841,7 @@ Usage:
 
 Options:
   --port <port>       Bind the local server to a fixed port
+  --proxy <port>      Proxy a local dev server (e.g., Vite) through termbridge
   --session <name>    Use a specific tmux session name
   --kill-on-exit      Kill the tmux session when the CLI exits
   --no-qr             Disable QR code output
@@ -1866,7 +1883,8 @@ var defaultDeps = {
   spawnPty: pty.spawn,
   env: process.env,
   defaultCols: 80,
-  defaultRows: 24
+  defaultRows: 24,
+  _skipSpawnHelperCheck: false
 };
 var ensureSpawnHelperExecutable = () => {
   if (spawnHelperChecked || process.platform === "win32") {
@@ -1939,7 +1957,9 @@ var createTmuxBackend = (deps = {}) => {
     if (entry.pty) {
       return entry.pty;
     }
-    ensureSpawnHelperExecutable();
+    if (!runtime._skipSpawnHelperCheck) {
+      ensureSpawnHelperExecutable();
+    }
     const ptyInstance = runtime.spawnPty("tmux", ["attach-session", "-t", entry.session.name], {
       name: "xterm-256color",
       cols: entry.cols,
@@ -2246,9 +2266,9 @@ var createTerminalRegistry = () => {
 };
 
 // src/server/server.ts
-import { createServer as createHttpServer } from "http";
+import { createServer as createHttpServer, request as httpRequest } from "http";
 import { randomBytes as randomBytes3 } from "crypto";
-import { WebSocketServer } from "ws";
+import { WebSocketServer, WebSocket as WsWebSocket } from "ws";
 
 // ../packages/shared/src/index.ts
 var TERMINAL_CONTROL_KEYS = [
@@ -2356,11 +2376,11 @@ var isAllowedOrigin = (origin, host) => {
 };
 var allowedControlKeys = new Set(TERMINAL_CONTROL_KEYS);
 var parseClientMessage = (payload) => {
-  const size = typeof payload === "string" ? payload.length : payload.byteLength;
+  const size = typeof payload === "string" ? payload.length : Array.isArray(payload) ? payload.reduce((sum, buf) => sum + buf.length, 0) : payload.byteLength;
   if (size > MAX_WS_MESSAGE_SIZE) {
     return { ok: false, error: "too_large" };
   }
-  const text = typeof payload === "string" ? payload : payload.toString();
+  const text = typeof payload === "string" ? payload : Array.isArray(payload) ? Buffer.concat(payload).toString() : payload.toString();
   try {
     const parsed = JSON.parse(text);
     if (parsed.type === "input" && typeof parsed.data === "string") {
@@ -2385,24 +2405,44 @@ var sendWsMessage = (socket, message) => {
 };
 var createSessionName = () => `termbridge-${randomBytes3(4).toString("hex")}`;
 var createAppServer = (deps) => {
-  const staticHandler = createStaticHandler(deps.uiDistPath, "/app");
+  const staticHandler = createStaticHandler(deps.uiDistPath, "/__tb/app");
   const wss = new WebSocketServer({ noServer: true });
   const connectionInfo = /* @__PURE__ */ new WeakMap();
+  const proxyRequest = (request, response, targetPath, search) => {
+    const targetUrl = `http://localhost:${deps.proxyPort}${targetPath}${search}`;
+    const proxyHeaders = { ...request.headers };
+    delete proxyHeaders.cookie;
+    delete proxyHeaders.host;
+    proxyHeaders.host = `localhost:${deps.proxyPort}`;
+    const proxyReq = httpRequest(
+      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 server = createHttpServer(async (request, response) => {
     const url = new URL(request.url, `http://${request.headers.host}`);
-    if (request.method === "GET" && url.pathname === "/healthz") {
+    if (request.method === "GET" && url.pathname === "/__tb/healthz") {
       response.statusCode = 200;
       response.end("ok");
       return;
     }
-    if (request.method === "GET" && url.pathname === "/") {
+    if (request.method === "GET" && url.pathname === "/" && !deps.proxyPort) {
       response.statusCode = 302;
-      response.setHeader("Location", "/app");
+      response.setHeader("Location", "/__tb/app");
       response.end();
       return;
     }
-    if (request.method === "GET" && url.pathname.startsWith("/s/")) {
-      const token = url.pathname.slice(3);
+    if (request.method === "GET" && url.pathname.startsWith("/__tb/s/")) {
+      const token = url.pathname.slice("/__tb/s/".length);
       const ip = getIp(request);
       if (!deps.redemptionLimiter.allow(ip)) {
         response.statusCode = 429;
@@ -2417,11 +2457,11 @@ var createAppServer = (deps) => {
       }
       response.statusCode = 302;
       response.setHeader("Set-Cookie", deps.auth.createSessionCookie(session.id));
-      response.setHeader("Location", "/app");
+      response.setHeader("Location", "/__tb/app");
       response.end();
       return;
     }
-    if (url.pathname === "/api/csrf") {
+    if (url.pathname === "/__tb/api/csrf") {
       const session = deps.auth.getSessionFromRequest(request);
       if (!session) {
         response.statusCode = 401;
@@ -2436,7 +2476,7 @@ var createAppServer = (deps) => {
       response.end("not found");
       return;
     }
-    if (url.pathname === "/api/terminals") {
+    if (url.pathname === "/__tb/api/terminals") {
       const session = deps.auth.getSessionFromRequest(request);
       if (!session) {
         response.statusCode = 401;
@@ -2467,15 +2507,48 @@ var createAppServer = (deps) => {
         return;
       }
     }
+    if (request.method === "GET" && url.pathname === "/__tb/api/config") {
+      const session = deps.auth.getSessionFromRequest(request);
+      if (!session) {
+        response.statusCode = 401;
+        response.end("unauthorized");
+        return;
+      }
+      jsonResponse(response, 200, {
+        proxyPort: deps.proxyPort ?? null,
+        devProxyUrl: deps.devProxyUrl ?? null
+      });
+      return;
+    }
     const handled = await staticHandler(request, response);
     if (!handled) {
+      if (deps.proxyPort && deps.auth.getSessionFromRequest(request)) {
+        proxyRequest(request, response, url.pathname, url.search);
+        return;
+      }
       response.statusCode = 404;
       response.end("not found");
     }
   });
   server.on("upgrade", (request, socket, head) => {
     const url = new URL(request.url, `http://${request.headers.host}`);
-    if (!url.pathname.startsWith("/ws/terminal/")) {
+    if (!url.pathname.startsWith("/__tb/ws/terminal/")) {
+      if (deps.proxyPort && deps.auth.getSessionFromRequest(request)) {
+        const targetUrl = `ws://localhost:${deps.proxyPort}${url.pathname}${url.search}`;
+        const proxyWs = new WsWebSocket(targetUrl);
+        proxyWs.on("open", () => {
+          wss.handleUpgrade(request, socket, head, (clientWs) => {
+            clientWs.on("message", (data) => proxyWs.send(data));
+            proxyWs.on("message", (data) => clientWs.send(data));
+            clientWs.on("close", () => proxyWs.close());
+            proxyWs.on("close", () => clientWs.close());
+          });
+        });
+        proxyWs.on("error", () => {
+          socket.destroy();
+        });
+        return;
+      }
       socket.destroy();
       return;
     }
@@ -2615,7 +2688,9 @@ var startCommand = async (options, deps = {}) => {
     uiDistPath: resolveUiDistPath(),
     auth,
     terminalRegistry,
-    terminalBackend
+    terminalBackend,
+    proxyPort: options.proxy,
+    devProxyUrl: options.devProxyUrl
   });
   const started = await server.listen(options.port ?? 0);
   const localUrl = `http://127.0.0.1:${started.port}`;
@@ -2640,7 +2715,7 @@ var startCommand = async (options, deps = {}) => {
     await started.close();
     throw error;
   }
-  const redeemUrl = `${publicUrl}/s/${token}`;
+  const redeemUrl = `${publicUrl}/__tb/s/${token}`;
   logger.info(`Local server: ${localUrl}`);
   logger.info(`Tunnel URL: ${redeemUrl}`);
   if (!options.noQr && deps.qr) {
@@ -2724,7 +2799,7 @@ var buildSessionName = (options, localUrl) => {
     return "termbridge";
   }
 };
-var buildRedeemUrl = (result) => `${result.publicUrl}/s/${result.token}`;
+var buildRedeemUrl = (result) => `${result.publicUrl}/__tb/s/${result.token}`;
 var generateQr = async (text) => new Promise((resolve4) => {
   qrcode.generate(text, { small: true }, (output) => resolve4(output));
 });