@camstack/addon-tailscale 1.2.117 → 1.2.119

package/dist/client/tailscale.addon.js

@@ -2,35 +2,13 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-//#region \0rolldown/runtime.js
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-//#endregion
-const require_dist = require("../dist-jCCe7qVD.js");
+const require_auth_key_file = require("../auth-key-file-Czokmvfx.js");
 let node_child_process = require("node:child_process");
 let node_util = require("node:util");
-let node_fs = require("node:fs");
-node_fs = __toESM(node_fs);
 let node_path = require("node:path");
-node_path = __toESM(node_path);
+node_path = require_auth_key_file.__toESM(node_path);
+let node_fs = require("node:fs");
+node_fs = require_auth_key_file.__toESM(node_fs);
 //#region src/client/tailscale-cli.ts
 /**
 * Thin wrapper around the `tailscale` CLI.
@@ -190,19 +168,20 @@ var TailscaleCli = class {
 	*  while already joined returns immediately. */
 	async up(input) {
 		const bin = await this.resolveBin();
-		const args = [
-			"up",
-			"--auth-key",
-			input.authKey,
-			"--reset"
-		];
-		if (input.hostname) args.push(`--hostname=${input.hostname}`);
-		try {
-			await execFileP(bin, this.withSocket(args), { timeout: 6e4 });
-		} catch (err) {
-			const e = err;
-			throw new TailscaleCliError(`tailscale up failed: ${e.message}`, e.stderr ?? "");
-		}
+		await require_auth_key_file.withAuthKeyFile(input.authKey, async (authKeyFlag) => {
+			const args = [
+				"up",
+				authKeyFlag,
+				"--reset"
+			];
+			if (input.hostname) args.push(`--hostname=${input.hostname}`);
+			try {
+				await execFileP(bin, this.withSocket(args), { timeout: 6e4 });
+			} catch (err) {
+				const e = err;
+				throw new TailscaleCliError(`tailscale up failed: ${require_auth_key_file.scrubSecret(e.message, input.authKey)}`, require_auth_key_file.scrubSecret(e.stderr ?? "", input.authKey));
+			}
+		});
 	}
 	/**
 	* Start an interactive `tailscale up` (no `--auth-key`) and resolve
@@ -579,8 +558,8 @@ var DEFAULT_HUB_PORT = 4443;
 * The chain still stops at the cap, until a manual join (which resets the
 * counter) or an addon restart.
 */
-var AUTO_REJOIN_BACKOFF_MS = require_dist.BOOT_RECOVERY_BACKOFF_MS;
-var TailscaleClientAddon = class extends require_dist.BaseAddon {
+var AUTO_REJOIN_BACKOFF_MS = require_auth_key_file.BOOT_RECOVERY_BACKOFF_MS;
+var TailscaleClientAddon = class extends require_auth_key_file.BaseAddon {
 	/**
 	* The Tailscale CLI wrapper. `null` only in the degraded state where
 	* the addon loaded but `clientMode: 'onboard'` failed to start its
@@ -700,10 +679,10 @@ var TailscaleClientAddon = class extends require_dist.BaseAddon {
 		};
 		const networkAccessProvider = this.buildNetworkAccessProvider();
 		return [{
-			capability: require_dist.meshNetworkCapability,
+			capability: require_auth_key_file.meshNetworkCapability,
 			provider: meshProvider
 		}, {
-			capability: require_dist.networkAccessCapability,
+			capability: require_auth_key_file.networkAccessCapability,
 			provider: networkAccessProvider
 		}];
 	}
@@ -912,7 +891,7 @@ var TailscaleClientAddon = class extends require_dist.BaseAddon {
 				type: "addon",
 				id: this.ctx.id
 			},
-			category: require_dist.EventCategory.MeshNetworkChanged,
+			category: require_auth_key_file.EventCategory.MeshNetworkChanged,
 			data: {
 				host,
 				port,
@@ -1294,15 +1273,15 @@ var TailscaleClientAddon = class extends require_dist.BaseAddon {
 							type: "boolean",
 							key: "acceptRoutes",
 							label: "Accept routes from peers",
-							description: "Install subnet routes other peers advertise (e.g. a peer router exposing `192.168.x.x/24`).",
+							description: "Install subnet routes other peers advertise (e.g. a peer router exposing `192.168.60.0/24`).",
 							default: false
 						}),
 						this.field({
 							type: "text",
 							key: "advertisedRoutes",
 							label: "Advertise subnet routes",
-							description: "Comma-separated CIDRs this host exposes to peers (e.g. `192.168.x.x/24,10.x.x.x/8`). Requires approval in the Tailscale admin console.",
-							placeholder: "192.168.x.x/24"
+							description: "Comma-separated CIDRs this host exposes to peers (e.g. `192.168.10.0/24,10.0.0.0/8`). Requires approval in the Tailscale admin console.",
+							placeholder: "192.168.10.0/24"
 						}),
 						this.field({
 							type: "text",

package/dist/client/tailscale.addon.mjs

@@ -1,8 +1,8 @@
-import { a as EventCategory, i as BaseAddon, n as networkAccessCapability, r as BOOT_RECOVERY_BACKOFF_MS, t as meshNetworkCapability } from "../dist-DOnpd-Z8.mjs";
+import { a as BOOT_RECOVERY_BACKOFF_MS, i as networkAccessCapability, n as withAuthKeyFile, o as BaseAddon, r as meshNetworkCapability, s as EventCategory, t as scrubSecret } from "../auth-key-file-CVMhmHD4.mjs";
 import { execFile, spawn } from "node:child_process";
 import { promisify } from "node:util";
-import * as fs from "node:fs";
 import * as path from "node:path";
+import * as fs from "node:fs";
 //#region src/client/tailscale-cli.ts
 /**
 * Thin wrapper around the `tailscale` CLI.
@@ -162,19 +162,20 @@ var TailscaleCli = class {
 	*  while already joined returns immediately. */
 	async up(input) {
 		const bin = await this.resolveBin();
-		const args = [
-			"up",
-			"--auth-key",
-			input.authKey,
-			"--reset"
-		];
-		if (input.hostname) args.push(`--hostname=${input.hostname}`);
-		try {
-			await execFileP(bin, this.withSocket(args), { timeout: 6e4 });
-		} catch (err) {
-			const e = err;
-			throw new TailscaleCliError(`tailscale up failed: ${e.message}`, e.stderr ?? "");
-		}
+		await withAuthKeyFile(input.authKey, async (authKeyFlag) => {
+			const args = [
+				"up",
+				authKeyFlag,
+				"--reset"
+			];
+			if (input.hostname) args.push(`--hostname=${input.hostname}`);
+			try {
+				await execFileP(bin, this.withSocket(args), { timeout: 6e4 });
+			} catch (err) {
+				const e = err;
+				throw new TailscaleCliError(`tailscale up failed: ${scrubSecret(e.message, input.authKey)}`, scrubSecret(e.stderr ?? "", input.authKey));
+			}
+		});
 	}
 	/**
 	* Start an interactive `tailscale up` (no `--auth-key`) and resolve
@@ -1266,15 +1267,15 @@ var TailscaleClientAddon = class extends BaseAddon {
 							type: "boolean",
 							key: "acceptRoutes",
 							label: "Accept routes from peers",
-							description: "Install subnet routes other peers advertise (e.g. a peer router exposing `192.168.x.x/24`).",
+							description: "Install subnet routes other peers advertise (e.g. a peer router exposing `192.168.60.0/24`).",
 							default: false
 						}),
 						this.field({
 							type: "text",
 							key: "advertisedRoutes",
 							label: "Advertise subnet routes",
-							description: "Comma-separated CIDRs this host exposes to peers (e.g. `192.168.x.x/24,10.x.x.x/8`). Requires approval in the Tailscale admin console.",
-							placeholder: "192.168.x.x/24"
+							description: "Comma-separated CIDRs this host exposes to peers (e.g. `192.168.10.0/24,10.0.0.0/8`). Requires approval in the Tailscale admin console.",
+							placeholder: "192.168.10.0/24"
 						}),
 						this.field({
 							type: "text",

package/dist/ingress/tailscale-ingress.addon.js

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_dist = require("../dist-jCCe7qVD.js");
+const require_auth_key_file = require("../auth-key-file-Czokmvfx.js");
 let node_crypto = require("node:crypto");
 let node_child_process = require("node:child_process");
 //#region src/ingress/tailscale-cli.ts
@@ -139,19 +139,20 @@ var TailscaleCli = class {
 	*  while already joined returns immediately. */
 	async up(input) {
 		const bin = await this.resolveBin();
-		const args = [
-			"up",
-			"--auth-key",
-			input.authKey,
-			"--reset"
-		];
-		if (input.hostname) args.push(`--hostname=${input.hostname}`);
-		try {
-			await execFileP(bin, this.withSocket(args), { timeout: 6e4 });
-		} catch (err) {
-			const e = err;
-			throw new TailscaleCliError(`tailscale up failed: ${e.message}`, e.stderr ?? "");
-		}
+		await require_auth_key_file.withAuthKeyFile(input.authKey, async (authKeyFlag) => {
+			const args = [
+				"up",
+				authKeyFlag,
+				"--reset"
+			];
+			if (input.hostname) args.push(`--hostname=${input.hostname}`);
+			try {
+				await execFileP(bin, this.withSocket(args), { timeout: 6e4 });
+			} catch (err) {
+				const e = err;
+				throw new TailscaleCliError(`tailscale up failed: ${require_auth_key_file.scrubSecret(e.message, input.authKey)}`, require_auth_key_file.scrubSecret(e.stderr ?? "", input.authKey));
+			}
+		});
 	}
 	/** Leave the tailnet. After this the host's `100.x` address is
 	*  released until the next `up`. */
@@ -297,7 +298,7 @@ var DEFAULT_CONFIG = {
 	targetPath: "",
 	upstreamScheme: "https+insecure"
 };
-var TailscaleIngressAddon = class extends require_dist.BaseAddon {
+var TailscaleIngressAddon = class extends require_auth_key_file.BaseAddon {
 	cli;
 	/**
 	* Snapshot of the running ingress params so stop()/disposer can issue
@@ -326,7 +327,7 @@ var TailscaleIngressAddon = class extends require_dist.BaseAddon {
 		};
 		this.ctx.addDisposer(() => this.gracefulShutdown());
 		return [{
-			capability: require_dist.networkAccessCapability,
+			capability: require_auth_key_file.networkAccessCapability,
 			provider
 		}];
 	}
@@ -379,7 +380,7 @@ var TailscaleIngressAddon = class extends require_dist.BaseAddon {
 				type: "addon",
 				id: this.ctx.id
 			},
-			category: require_dist.EventCategory.NetworkTunnelStarted,
+			category: require_auth_key_file.EventCategory.NetworkTunnelStarted,
 			data: { url: endpoint.url }
 		});
 		return {
@@ -413,7 +414,7 @@ var TailscaleIngressAddon = class extends require_dist.BaseAddon {
 				type: "addon",
 				id: this.ctx.id
 			},
-			category: require_dist.EventCategory.NetworkTunnelStopped,
+			category: require_auth_key_file.EventCategory.NetworkTunnelStopped,
 			data: {}
 		});
 	}

package/dist/ingress/tailscale-ingress.addon.mjs

@@ -1,4 +1,4 @@
-import { a as EventCategory, i as BaseAddon, n as networkAccessCapability } from "../dist-DOnpd-Z8.mjs";
+import { i as networkAccessCapability, n as withAuthKeyFile, o as BaseAddon, s as EventCategory, t as scrubSecret } from "../auth-key-file-CVMhmHD4.mjs";
 import { randomUUID } from "node:crypto";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
@@ -136,19 +136,20 @@ var TailscaleCli = class {
 	*  while already joined returns immediately. */
 	async up(input) {
 		const bin = await this.resolveBin();
-		const args = [
-			"up",
-			"--auth-key",
-			input.authKey,
-			"--reset"
-		];
-		if (input.hostname) args.push(`--hostname=${input.hostname}`);
-		try {
-			await execFileP(bin, this.withSocket(args), { timeout: 6e4 });
-		} catch (err) {
-			const e = err;
-			throw new TailscaleCliError(`tailscale up failed: ${e.message}`, e.stderr ?? "");
-		}
+		await withAuthKeyFile(input.authKey, async (authKeyFlag) => {
+			const args = [
+				"up",
+				authKeyFlag,
+				"--reset"
+			];
+			if (input.hostname) args.push(`--hostname=${input.hostname}`);
+			try {
+				await execFileP(bin, this.withSocket(args), { timeout: 6e4 });
+			} catch (err) {
+				const e = err;
+				throw new TailscaleCliError(`tailscale up failed: ${scrubSecret(e.message, input.authKey)}`, scrubSecret(e.stderr ?? "", input.authKey));
+			}
+		});
 	}
 	/** Leave the tailnet. After this the host's `100.x` address is
 	*  released until the next `up`. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-tailscale",
-  "version": "1.2.117",
+  "version": "1.2.119",
   "description": "Tailscale bundle for CamStack — joins the host to a tailnet (client) and exposes the hub via Serve/Funnel (ingress). Multi-entry npm package shipping 2 addons under a single bundle.",
   "keywords": [
     "camstack",