luulam/9router
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance Windows Tailscale installation process by adding support for curl and verifying installation success. Update fallback mechanism for Tailscale binary to include well-known Windows path.

Browse Source
This commit is contained in:
decolua
2026-04-14 11:52:52 +07:00
parent 1fa05eb2ab
commit 6bec1e085b
1 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/lib/tunnel/tailscale.js
View File

@@ -16,13 +16,17 @@ const TAILSCALE_DIR = path.join(os.homedir(), ".9router", "tailscale");
export const TAILSCALE_SOCKET = path.join(TAILSCALE_DIR, "tailscaled.sock"); export const TAILSCALE_SOCKET = path.join(TAILSCALE_DIR, "tailscaled.sock");
const SOCKET_FLAG = IS_WINDOWS ? [] : ["--socket", TAILSCALE_SOCKET]; const SOCKET_FLAG = IS_WINDOWS ? [] : ["--socket", TAILSCALE_SOCKET];
// Prefer system tailscale, fallback to local bin // Well-known Windows install path
const WINDOWS_TAILSCALE_BIN = "C:\\Program Files\\Tailscale\\tailscale.exe";
// Prefer system tailscale, fallback to local bin, then Windows default path
function getTailscaleBin() { function getTailscaleBin() {
try { try {
const systemPath = execSync("which tailscale 2>/dev/null || where tailscale 2>nul", { encoding: "utf8", windowsHide: true }).trim(); const systemPath = execSync("which tailscale 2>/dev/null || where tailscale 2>nul", { encoding: "utf8", windowsHide: true }).trim();
if (systemPath) return systemPath; if (systemPath) return systemPath;
} catch (e) { /* not in PATH */ } } catch (e) { /* not in PATH */ }
if (fs.existsSync(TAILSCALE_BIN)) return TAILSCALE_BIN; if (fs.existsSync(TAILSCALE_BIN)) return TAILSCALE_BIN;
if (IS_WINDOWS && fs.existsSync(WINDOWS_TAILSCALE_BIN)) return WINDOWS_TAILSCALE_BIN;
return null; return null;
} }
@@ -224,27 +228,35 @@ async function installTailscaleWindows(log) {
const msiUrl = "https://pkgs.tailscale.com/stable/tailscale-setup-latest-amd64.msi"; const msiUrl = "https://pkgs.tailscale.com/stable/tailscale-setup-latest-amd64.msi";
const msiPath = path.join(os.tmpdir(), "tailscale-setup.msi"); const msiPath = path.join(os.tmpdir(), "tailscale-setup.msi");
// Download MSI via PowerShell with streaming output // Download MSI via curl.exe (built-in on Win10+) — no PowerShell window, streams progress
log("Downloading Tailscale installer..."); log("Downloading Tailscale installer...");
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
const child = spawn("powershell", [ const child = spawn("curl.exe", ["-L", "-#", "-o", msiPath, msiUrl], {
"-NoProfile", "-NonInteractive", "-Command", stdio: ["ignore", "pipe", "pipe"],
`Invoke-WebRequest -Uri '${msiUrl}' -OutFile '${msiPath}'` windowsHide: true
], { stdio: ["ignore", "pipe", "pipe"], windowsHide: true }); });
child.stdout.on("data", (d) => { const l = d.toString().trim(); if (l) log(l); }); // curl outputs progress to stderr with -# flag
child.stderr.on("data", (d) => { const l = d.toString().trim(); if (l) log(l); }); let lastPct = "";
child.stderr.on("data", (d) => {
const text = d.toString();
const match = text.match(/(\d+\.\d)%/);
if (match && match[1] !== lastPct) {
lastPct = match[1];
log(`Downloading... ${lastPct}%`);
}
});
child.on("close", (c) => c === 0 ? resolve() : reject(new Error("Download failed"))); child.on("close", (c) => c === 0 ? resolve() : reject(new Error("Download failed")));
child.on("error", reject); child.on("error", reject);
}); });
// Install MSI silently — Windows Installer handles UAC elevation automatically // Install MSI with UAC elevation via PowerShell Start-Process -Verb RunAs
log("Installing Tailscale (UAC prompt may appear)..."); log("Installing Tailscale (UAC prompt may appear)...");
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
const child = spawn("msiexec", ["/i", msiPath, "/quiet", "/norestart"], { const args = `'/i','${msiPath}','TS_NOLAUNCH=true','/quiet','/norestart'`;
stdio: ["ignore", "pipe", "pipe"], const child = spawn("powershell", [
windowsHide: true "-NoProfile", "-NonInteractive", "-Command",
}); `Start-Process msiexec -ArgumentList ${args} -Verb RunAs -Wait`
child.stdout.on("data", (d) => { const l = d.toString().trim(); if (l) log(l); }); ], { stdio: ["ignore", "pipe", "pipe"], windowsHide: true });
child.stderr.on("data", (d) => { const l = d.toString().trim(); if (l) log(l); }); child.stderr.on("data", (d) => { const l = d.toString().trim(); if (l) log(l); });
child.on("close", (c) => { child.on("close", (c) => {
try { fs.unlinkSync(msiPath); } catch { /* ignore */ } try { fs.unlinkSync(msiPath); } catch { /* ignore */ }
@@ -253,7 +265,18 @@ async function installTailscaleWindows(log) {
child.on("error", reject); child.on("error", reject);
}); });
log("Installation complete."); // Verify tailscale.exe exists after install
log("Verifying installation...");
const maxWait = 10000;
const start = Date.now();
while (Date.now() - start < maxWait) {
if (fs.existsSync(WINDOWS_TAILSCALE_BIN)) {
log("Installation complete.");
return;
}
await new Promise((r) => setTimeout(r, 1000));
}
throw new Error("Installation finished but tailscale.exe not found");
} }
/** Start tailscaled with sudo (TUN mode required for Funnel) */ /** Start tailscaled with sudo (TUN mode required for Funnel) */