shiplocal 0.1.3 → 0.1.5

package/dist/index.js

@@ -4109,6 +4109,10 @@ var errorMessageSchema = external_exports.object({
   type: external_exports.literal("error"),
   message: external_exports.string()
 });
+var terminatedMessageSchema = external_exports.object({
+  type: external_exports.literal("terminated"),
+  message: external_exports.string()
+});
 var tunnelMessageSchema = external_exports.discriminatedUnion("type", [
   registerMessageSchema,
   registeredMessageSchema,
@@ -4116,7 +4120,8 @@ var tunnelMessageSchema = external_exports.discriminatedUnion("type", [
   pongMessageSchema,
   tunnelRequestMessageSchema,
   tunnelResponseMessageSchema,
-  errorMessageSchema
+  errorMessageSchema,
+  terminatedMessageSchema
 ]);
 function parseTunnelMessage(data) {
   const parsed = typeof data === "string" ? JSON.parse(data) : data;
@@ -4153,6 +4158,7 @@ import { WebSocket } from "ws";
 
 // ../tunnel-client/dist/local-proxy.js
 import http from "node:http";
+var LOOPBACK_HOSTS = ["127.0.0.1", "::1"];
 var HOP_BY_HOP_HEADERS = /* @__PURE__ */ new Set([
   "connection",
   "keep-alive",
@@ -4168,6 +4174,9 @@ var STRIP_RESPONSE_HEADERS = /* @__PURE__ */ new Set([
   "content-encoding",
   "content-length"
 ]);
+function isConnectionRefused(err) {
+  return err instanceof Error && "code" in err && err.code === "ECONNREFUSED";
+}
 function sanitizeRequestHeaders(headers, localPort) {
   const result = {};
   for (const [key, value] of Object.entries(headers)) {
@@ -4192,12 +4201,10 @@ function sanitizeResponseHeaders(headers) {
   }
   return result;
 }
-async function forwardToLocal(localPort, message) {
-  const body = decodeBody(message.body);
-  const pathWithQuery = message.query ? `${message.path}?${message.query}` : message.path;
+function forwardToHost(hostname, localPort, message, body, pathWithQuery) {
   return new Promise((resolve, reject) => {
     const req = http.request({
-      hostname: "127.0.0.1",
+      hostname,
       port: localPort,
       method: message.method,
       path: pathWithQuery,
@@ -4234,6 +4241,23 @@ async function forwardToLocal(localPort, message) {
     req.end();
   });
 }
+async function forwardToLocal(localPort, message) {
+  const body = decodeBody(message.body);
+  const pathWithQuery = message.query ? `${message.path}?${message.query}` : message.path;
+  let lastError;
+  for (const hostname of LOOPBACK_HOSTS) {
+    try {
+      return await forwardToHost(hostname, localPort, message, body, pathWithQuery);
+    } catch (err) {
+      if (isConnectionRefused(err)) {
+        lastError = err;
+        continue;
+      }
+      throw err;
+    }
+  }
+  throw lastError ?? new Error("Local server unreachable");
+}
 
 // ../tunnel-client/dist/client.js
 function toWebSocketUrl(serverUrl) {
@@ -4247,9 +4271,11 @@ function toWebSocketUrl(serverUrl) {
 function formatLocalProxyError(err, localPort) {
   if (err instanceof Error && "code" in err && err.code === "ECONNREFUSED") {
     return [
-      `Nothing is running on http://127.0.0.1:${String(localPort)}.`,
+      `Nothing is listening on port ${String(localPort)} (tried 127.0.0.1 and ::1).`,
       "",
       "Start your local server on that port, then refresh this page.",
+      "If your browser works on localhost but the tunnel does not, your dev server may only",
+      "listen on IPv6 \u2014 bind to 0.0.0.0 or 127.0.0.1 (e.g. next dev -H 0.0.0.0).",
       `If your app uses a different port, restart the CLI with that port (e.g. shiplocal ${String(localPort)}).`
     ].join("\n");
   }
@@ -4328,6 +4354,13 @@ function createTunnelClient(options) {
       }
       return;
     }
+    if (message.type === "terminated") {
+      intentionalClose = true;
+      publicUrl = null;
+      options.onTerminated?.(message.message);
+      ws?.close();
+      return;
+    }
     if (message.type === "ping") {
       ws?.send(JSON.stringify({ type: "pong" }));
       return;
@@ -4465,7 +4498,7 @@ async function resolveToken() {
 }
 
 // src/api.ts
-function isConnectionRefused(err) {
+function isConnectionRefused2(err) {
   if (!(err instanceof Error)) return false;
   const cause = err.cause;
   if (cause instanceof Error && "code" in cause && cause.code === "ECONNREFUSED") {
@@ -4477,7 +4510,7 @@ function isConnectionRefused(err) {
   return err.message.includes("ECONNREFUSED") || err.message.includes("fetch failed");
 }
 function formatServerConnectionError(apiUrl, err) {
-  if (isConnectionRefused(err)) {
+  if (isConnectionRefused2(err)) {
     return [
       `Cannot reach ShipLocal server at ${apiUrl}.`,
       "",
@@ -4508,9 +4541,10 @@ async function postJson(path, body, apiUrl) {
 
 // src/local-port.ts
 import net from "node:net";
-function isLocalPortOpen(port, timeoutMs = 2e3) {
+var LOOPBACK_HOSTS2 = ["127.0.0.1", "::1"];
+function canConnect(host, port, timeoutMs) {
   return new Promise((resolve) => {
-    const socket = net.connect({ port, host: "127.0.0.1" });
+    const socket = net.connect({ port, host });
     const finish = (open) => {
       socket.removeAllListeners();
       socket.destroy();
@@ -4528,10 +4562,18 @@ function isLocalPortOpen(port, timeoutMs = 2e3) {
     });
   });
 }
+async function isLocalPortOpen(port, timeoutMs = 2e3) {
+  for (const host of LOOPBACK_HOSTS2) {
+    if (await canConnect(host, port, timeoutMs)) {
+      return true;
+    }
+  }
+  return false;
+}
 
 // src/index.ts
 var program = new Command();
-program.name("shiplocal").description("Share localhost with clients in seconds").version("0.1.3");
+program.name("shiplocal").description("Share localhost with clients in seconds").version("0.1.5");
 program.command("login").description("Authenticate with ShipLocal Cloud").action(async () => {
   const rl = createInterface({ input, output });
   const apiUrl = await resolveApiUrlAsync();
@@ -4612,6 +4654,12 @@ program.argument("[port]", "Local port to expose", String(DEFAULT_TUNNEL_PORT)).
     },
     onReconnecting: (attempt) => {
       console.log(`Reconnecting\u2026 (attempt ${String(attempt)})`);
+    },
+    onTerminated: (message) => {
+      console.log("");
+      console.log(message);
+      console.log("Run shiplocal again to start a new tunnel.");
+      console.log("");
     }
   });
   const shutdown = () => {