runlocal 0.6.0 → 0.8.0

package/lib.js

@@ -31,7 +31,7 @@ function parseArgs(argv) {
   let apiKey = process.env.RUNLATER_API_KEY || readApiKeyFile();
   let subdomain = null;
   for (let i = 0; i < argv.length; i++) {
-    if (argv[i] === "--host" && argv[i + 1]) {
+    if ((argv[i] === "--server" || argv[i] === "--host") && argv[i + 1]) {
       host = argv[++i];
     } else if (argv[i] === "--api-key" && argv[i + 1]) {
       apiKey = argv[++i];
@@ -40,26 +40,27 @@ function parseArgs(argv) {
     } else if (argv[i] === "--help" || argv[i] === "-h") {
       console.log("Usage: runlocal <port> [options]");
       console.log("");
-      console.log("  Expose localhost to the internet via runlocal.eu");
+      console.log("  Expose localhost to the internet. Works with runlocal.eu");
+      console.log("  or any self-hosted runlocal server.");
       console.log("");
       console.log("Options:");
-      console.log("  --host <url>        Server URL (default: wss://runlocal.eu)");
+      console.log("  --server <url>      Server URL (default: wss://runlocal.eu)");
       console.log("  --api-key <key>     Runlater API key for stable subdomain");
-      console.log("  --subdomain <name>  Custom subdomain (Pro plan only)");
+      console.log("  --subdomain <name>  Request a specific subdomain");
       console.log("  --help, -h          Show this help");
       console.log("");
-      console.log("API key (checked in order):");
-      console.log("  1. --api-key flag");
-      console.log("  2. RUNLATER_API_KEY environment variable");
-      console.log("  3. ~/.runlater/api-key file");
+      console.log("Environment variables:");
+      console.log("  RUNLOCAL_HOST       Server URL (same as --server)");
+      console.log("  RUNLATER_API_KEY    API key (same as --api-key)");
       console.log("");
       console.log("Examples:");
       console.log("  npx runlocal 3000                              Random subdomain");
       console.log("  npx runlocal 3000 --api-key pk_xxx             Stable subdomain");
-      console.log("  npx runlocal 3000 --subdomain my-api           Custom subdomain (Pro)");
+      console.log("  npx runlocal 3000 --subdomain my-api           Custom subdomain");
+      console.log("  npx runlocal 3000 --server wss://tunnel.example.com  Self-hosted");
       console.log("");
-      console.log("A free runlater.eu account gives you a stable subdomain.");
-      console.log("Pro users can choose any available subdomain with --subdomain.");
+      console.log("Self-hosting: https://github.com/runlater-eu/runlocal-server");
+      console.log("Hosted version: https://runlocal.eu");
       process.exit(0);
     } else if (!argv[i].startsWith("-")) {
       port = parseInt(argv[i], 10);
@@ -192,6 +193,7 @@ function createConnection(options) {
   const ws = new WebSocket(wsUrl);
   let heartbeatTimer = null;
   let joinRef = null;
+  const activeWsConnections = new Map();
 
   ws.on("open", () => {
     const displayHost = host.replace(/^wss?:\/\//, "");
@@ -270,6 +272,21 @@ function createConnection(options) {
       return;
     }
 
+    if (event === "ws_upgrade") {
+      handleWsUpgrade(ws, joinRef, topic, payload, port, nextRef, log, activeWsConnections, WebSocket);
+      return;
+    }
+
+    if (event === "ws_client_frame") {
+      handleWsClientFrame(payload, activeWsConnections);
+      return;
+    }
+
+    if (event === "ws_close") {
+      handleWsClose(payload, activeWsConnections);
+      return;
+    }
+
     if (event === "phx_close") {
       log(`${YELLOW}Tunnel closed by server${RESET}`);
       if (onClose) {
@@ -282,6 +299,10 @@ function createConnection(options) {
 
   ws.on("close", () => {
     clearInterval(heartbeatTimer);
+    for (const [, localWs] of activeWsConnections) {
+      try { localWs.close(); } catch {}
+    }
+    activeWsConnections.clear();
     log(`${YELLOW}Disconnected. Reconnecting in 3s...${RESET}`);
     const reconnectTimer = setTimeout(() => createConnection(options), 3000);
     reconnectTimer.unref();
@@ -301,6 +322,85 @@ function createConnection(options) {
   return { ws, getJoinRef: () => joinRef, nextRef };
 }
 
+function handleWsUpgrade(ws, joinRef, topic, payload, port, nextRef, log, activeWsConnections, WebSocket) {
+  const { ws_id, path: wsPath, query_string, headers } = payload;
+  const fullPath = query_string ? `${wsPath}?${query_string}` : wsPath;
+  const timestamp = new Date().toLocaleTimeString();
+
+  log(`${DIM}${timestamp}${RESET}  ${BOLD}WS${RESET} ${fullPath}`);
+
+  const localWsUrl = `ws://127.0.0.1:${port}${fullPath}`;
+
+  const reqHeaders = {};
+  if (headers) {
+    for (const [k, v] of headers) {
+      const lower = k.toLowerCase();
+      if (lower !== "host" && lower !== "upgrade" && lower !== "connection" &&
+          lower !== "sec-websocket-key" && lower !== "sec-websocket-version" &&
+          lower !== "sec-websocket-extensions") {
+        reqHeaders[k] = v;
+      }
+    }
+  }
+
+  let localWs;
+  try {
+    localWs = new WebSocket(localWsUrl, { headers: reqHeaders });
+  } catch (err) {
+    log(`${DIM}${timestamp}${RESET}  ${RED}WS ERR${RESET} ${fullPath} — ${err.message}`);
+    ws.send(JSON.stringify([joinRef, nextRef(), topic, "ws_close", { ws_id }]));
+    return;
+  }
+
+  activeWsConnections.set(ws_id, localWs);
+
+  localWs.on("message", (data, isBinary) => {
+    const opcode = isBinary ? "binary" : "text";
+    const frameData = isBinary ? Buffer.from(data).toString("base64") : data.toString();
+
+    ws.send(JSON.stringify([
+      joinRef,
+      nextRef(),
+      topic,
+      "ws_frame",
+      { ws_id, data: frameData, opcode },
+    ]));
+  });
+
+  localWs.on("close", () => {
+    activeWsConnections.delete(ws_id);
+    log(`${DIM}${timestamp}${RESET}  ${DIM}WS closed${RESET} ${fullPath}`);
+    ws.send(JSON.stringify([joinRef, nextRef(), topic, "ws_close", { ws_id }]));
+  });
+
+  localWs.on("error", (err) => {
+    log(`${DIM}${timestamp}${RESET}  ${RED}WS ERR${RESET} ${fullPath} — ${err.message}`);
+    activeWsConnections.delete(ws_id);
+    ws.send(JSON.stringify([joinRef, nextRef(), topic, "ws_close", { ws_id }]));
+  });
+}
+
+function handleWsClientFrame(payload, activeWsConnections) {
+  const { ws_id, data, opcode } = payload;
+  const localWs = activeWsConnections.get(ws_id);
+  if (!localWs || localWs.readyState !== 1) return;
+
+  if (opcode === "binary") {
+    localWs.send(Buffer.from(data, "base64"));
+  } else {
+    localWs.send(data);
+  }
+}
+
+function handleWsClose(payload, activeWsConnections) {
+  const { ws_id } = payload;
+  const localWs = activeWsConnections.get(ws_id);
+  if (localWs) {
+    activeWsConnections.delete(ws_id);
+    try { localWs.close(); } catch {}
+  }
+}
+
 module.exports = {
   parseArgs,
   filterHeaders,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "runlocal",
-  "version": "0.6.0",
-  "description": "Expose localhost to the internet via runlocal.eu",
+  "version": "0.8.0",
+  "description": "Expose localhost to the internet — open source tunnel server",
   "bin": {
     "runlocal": "./index.js"
   },