@staff0rd/assist 0.755.1 → 0.756.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.755.1",
+  version: "0.756.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -10992,7 +10992,7 @@ function tailnetSuffix(status2) {
 }
 
 // src/commands/sessions/nodes/planServe.ts
-function planServe(status2, serveConfig, port) {
+function planServe(status2, serveConfig, port, httpsPort = port) {
   tailnetSuffix(status2);
   const fqdn = status2.Self?.DNSName?.replace(/\.$/, "");
   if (!fqdn)
@@ -11000,13 +11000,13 @@ function planServe(status2, serveConfig, port) {
       `\`${tailscaleCli()} status --json\` reports no DNS name for this machine`
     );
   const target = `http://127.0.0.1:${port}`;
-  const served = serveConfig.Web?.[`${fqdn}:${port}`]?.Handlers?.["/"]?.Proxy;
+  const served = serveConfig.Web?.[`${fqdn}:${httpsPort}`]?.Handlers?.["/"]?.Proxy;
   return {
     host: fqdn.split(".")[0],
-    url: `https://${fqdn}:${port}`,
+    url: `https://${fqdn}:${httpsPort}`,
     target,
     alreadyServing: served?.replace(/\/$/, "") === target,
-    args: ["serve", "--bg", `--https=${port}`, target]
+    args: ["serve", "--bg", `--https=${httpsPort}`, target]
   };
 }
 
@@ -11036,6 +11036,12 @@ async function runTailscale(args) {
   return stdout;
 }
 
+// src/commands/sessions/nodes/tailnetHttpsPort.ts
+var MIRRORED_WSL_OWNS_PORT_OFFSET = 1e3;
+function tailnetHttpsPort(port) {
+  return detectPlatform() === "wsl" ? port + MIRRORED_WSL_OWNS_PORT_OFFSET : port;
+}
+
 // src/commands/sessions/nodes/ensureTailscaleServe.ts
 var SERVE_WRITE_ATTEMPTS = 5;
 var defaultDeps = {
@@ -11048,10 +11054,11 @@ var defaultDeps = {
   serve: async (args) => {
     await runTailscale(args);
   },
-  sleep: (ms) => new Promise((resolve26) => setTimeout(resolve26, ms))
+  sleep: (ms) => new Promise((resolve26) => setTimeout(resolve26, ms)),
+  httpsPort: tailnetHttpsPort
 };
 async function ensureTailscaleServe(port, deps2 = {}) {
-  const { enabled, status: status2, serveStatus, serve, sleep: sleep2 } = {
+  const { enabled, status: status2, serveStatus, serve, sleep: sleep2, httpsPort } = {
     ...defaultDeps,
     ...deps2
   };
@@ -11059,7 +11066,7 @@ async function ensureTailscaleServe(port, deps2 = {}) {
   const current = await runningStatus(status2);
   if (typeof current === "string") return current;
   for (let attempt = 1; ; attempt++) {
-    const plan2 = planServe(current, await serveStatus(), port);
+    const plan2 = planServe(current, await serveStatus(), port, httpsPort(port));
     if (plan2.alreadyServing) return `${plan2.url} already serves ${plan2.target}`;
     try {
       await serve(plan2.args);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.755.1",
+	"version": "0.756.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {