runlocal 0.9.0 → 0.10.0

package/lib.js

@@ -105,16 +105,23 @@ function filterHeaders(headers) {
 }
 
 function buildWsUrl(host, apiKey, subdomain) {
-  const params = new URLSearchParams({ vsn: "2.0.0" });
+  const params = new URLSearchParams({ vsn: "2.0.0", caps: "binary-bodies" });
   if (apiKey) params.set("api_key", apiKey);
   if (subdomain) params.set("subdomain", subdomain);
   return `${host}/tunnel/websocket?${params.toString()}`;
 }
 
 function handleRequest(ws, joinRef, topic, payload, target, nextRef, log) {
-  const { request_id, method, path, query_string, headers, body } = payload;
+  const { request_id, method, path, query_string, headers, body, body_encoding } = payload;
   const fullPath = query_string ? `${path}?${query_string}` : path;
 
+  let requestBody = null;
+  if (body && body.length > 0) {
+    requestBody = body_encoding === "base64"
+      ? Buffer.from(body, "base64")
+      : Buffer.from(body);
+  }
+
   const timestamp = new Date().toLocaleTimeString();
   log(
     `${DIM}${timestamp}${RESET}  ${BOLD}${method}${RESET} ${fullPath}`
@@ -136,7 +143,7 @@ function handleRequest(ws, joinRef, topic, payload, target, nextRef, log) {
     const chunks = [];
     proxyRes.on("data", (chunk) => chunks.push(chunk));
     proxyRes.on("end", () => {
-      const respBody = Buffer.concat(chunks).toString();
+      const respBuffer = Buffer.concat(chunks);
       const respHeaders = [];
       for (const [k, v] of Object.entries(proxyRes.headers)) {
         if (Array.isArray(v)) {
@@ -164,7 +171,8 @@ function handleRequest(ws, joinRef, topic, payload, target, nextRef, log) {
             request_id,
             status: proxyRes.statusCode,
             headers: respHeaders,
-            body: respBody,
+            body: respBuffer.toString("base64"),
+            body_encoding: "base64",
           },
         ])
       );
@@ -175,6 +183,7 @@ function handleRequest(ws, joinRef, topic, payload, target, nextRef, log) {
     log(
       `${DIM}${timestamp}${RESET}  ${RED}ERR${RESET} ${fullPath} — ${err.message}`
     );
+    const errBody = `Could not connect to ${target.display} — ${err.message}`;
     ws.send(
       JSON.stringify([
         joinRef,
@@ -185,14 +194,15 @@ function handleRequest(ws, joinRef, topic, payload, target, nextRef, log) {
           request_id,
           status: 502,
           headers: [["content-type", "text/plain"]],
-          body: `Could not connect to ${target.display} — ${err.message}`,
+          body: Buffer.from(errBody, "utf8").toString("base64"),
+          body_encoding: "base64",
         },
       ])
     );
   });
 
-  if (body && body.length > 0) {
-    proxyReq.write(body);
+  if (requestBody && requestBody.length > 0) {
+    proxyReq.write(requestBody);
   }
   proxyReq.end();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runlocal",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Expose localhost to the internet — open source tunnel server",
   "bin": {
     "runlocal": "./index.js"