convert pipe path to url

ngrok · Sep 26, 2023 · dc7ccac · dc7ccac
1 parent f9b2574
commit dc7ccac
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/examples/ngrok-connect-full.js b/examples/ngrok-connect-full.js
@@ -22,7 +22,7 @@ ngrok.consoleLog("INFO"); // turn on info logging
 (async function () {
   const url = await ngrok.connect({
     // session configuration
-    addr: `pipe:${UNIX_SOCKET}`,
+    addr: `unix:${UNIX_SOCKET}`,
     // addr: `localhost:8080`,
     // authtoken: "<authtoken>",
     authtoken_from_env: true,

diff --git a/examples/ngrok-labeled.js b/examples/ngrok-labeled.js
@@ -35,7 +35,7 @@ builder.connect().then((session) => {
 
 /*
 ngrok.connect({
-    addr: "pipe:" + UNIX_SOCKET,
+    addr: "unix:" + UNIX_SOCKET,
     authtoken_from_env: true,
     labels: "edge:edghts_<edge_id>",
     proto: "labeled",

diff --git a/index.d.ts b/index.d.ts
diff --git a/index.js b/index.js
diff --git a/src/config.rs b/src/config.rs
@@ -7,7 +7,7 @@ use napi_derive::napi;
 #[derive(Default)]
 pub struct Config {
     /// Port, network address, or named pipe. Defaults to 80.
-    /// Examples: "80", "localhost:8080", "pipe:/tmp/my.sock"
+    /// Examples: "80", "localhost:8080", "unix:/tmp/my.sock", "pipe://./my-pipe"
     #[napi(ts_type = "number|string")]
     pub addr: Option<String>,
     // Synonym for basic_auth

diff --git a/trailer.js b/trailer.js
@@ -216,8 +216,12 @@ async function ngrokLinkPipe(tunnel, server) {
     console.debug("Cannot change permissions of file: " + filename);
   }
   // forward tunnel
-  const proto = platform == "win32" ? "pipe:" : "unix:";
-  tunnel.forward(proto + filename);
+  var addr = "unix:" + filename;
+  if (platform == "win32") {
+    // convert pipe path to url
+    addr = "pipe:" + filename.replace("\\\\.\\pipe\\", "//./");
+  }
+  tunnel.forward(addr);
   socket.path = filename; // surface to caller
 
   return socket;