locadot 2.3.0 → 2.5.0

package/dist/proxy/tunnel.js

@@ -11,7 +11,7 @@ const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const constants_1 = __importDefault(require("../constants"));
 const logger_1 = __importDefault(require("../utils/logger"));
-const hub_tunnel_1 = require("./hub-tunnel");
+const cloudflare_logins_1 = require("./cloudflare-logins");
 /**
  * Public sharing through Cloudflare quick tunnels (https://<random>.trycloudflare.com, no account),
  * or through a named tunnel per mapping on the user's own hostname (`tunnelDomain`).
@@ -37,15 +37,17 @@ exports.cloudflaredPath = cloudflaredPath;
 // The dashboard polls status every few seconds; don't spawn cloudflared --version each time.
 let cached;
 const cloudflaredInfo = (fresh = false) => {
+    // Logins change when a share signs in, and reading them is cheap; only the version check is cached.
+    const zones = (0, cloudflare_logins_1.loggedInZones)();
+    const loggedIn = zones.length > 0 || fs_1.default.existsSync(path_1.default.join(os_1.default.homedir(), ".cloudflared", "cert.pem"));
     if (!fresh && cached && Date.now() - cached.at < 60000)
-        return cached.info;
+        return { ...cached.info, loggedIn, zones };
     const file = (0, exports.cloudflaredPath)();
-    const loggedIn = fs_1.default.existsSync(path_1.default.join(os_1.default.homedir(), ".cloudflared", "cert.pem"));
-    let info = { installed: false, loggedIn };
+    let info = { installed: false, loggedIn, zones };
     if (file) {
         const result = (0, child_process_1.spawnSync)(file, ["--version"], { encoding: "utf8", timeout: 5000, windowsHide: true });
         const version = `${result.stdout || ""}${result.stderr || ""}`.match(/version\s+(\S+)/i)?.[1];
-        info = { installed: result.status === 0, loggedIn, path: file, ...(version ? { version } : {}) };
+        info = { installed: result.status === 0, loggedIn, zones, path: file, ...(version ? { version } : {}) };
     }
     cached = { at: Date.now(), info };
     return info;
@@ -136,7 +138,7 @@ class TunnelManager {
         const tunnel = this.tunnels.get(host);
         if (!tunnel)
             return { enabled: false, status: "off" };
-        const { child, publicHost, ...state } = tunnel;
+        const { child, publicHost, abort, ...state } = tunnel;
         return state;
     }
     /** Starts and stops tunnels to match the registry; `retry` also restarts ones that failed. */
@@ -176,15 +178,17 @@ class TunnelManager {
     startCustom(file, host, domain, tunnel) {
         const name = `locadot-${host.replace(/[^a-z0-9-]/gi, "-")}`;
         tunnel.publicHost = domain;
-        (0, hub_tunnel_1.setupNamedTunnel)(domain, name, (loginUrl) => {
+        tunnel.abort = new AbortController();
+        (0, cloudflare_logins_1.setupDomainTunnel)(domain, name, (loginUrl) => {
             if (this.tunnels.get(host) === tunnel)
                 Object.assign(tunnel, { status: "login", loginUrl });
-        })
-            .then(() => {
+        }, tunnel.abort.signal)
+            .then(({ cert, credentials }) => {
             if (this.tunnels.get(host) !== tunnel)
                 return;
-            Object.assign(tunnel, { status: "starting", loginUrl: undefined });
-            this.run(host, tunnel, file, ["tunnel", "--no-autoupdate", "run", "--url", this.origin(), name], (text) => {
+            Object.assign(tunnel, { status: "starting", loginUrl: undefined, abort: undefined });
+            const args = ["tunnel", "--no-autoupdate", "--origincert", cert, "run", ...(credentials ? ["--credentials-file", credentials] : []), "--url", this.origin(), name];
+            this.run(host, tunnel, file, args, (text) => {
                 if (REGISTERED_PATTERN.test(text))
                     Object.assign(tunnel, { status: "up", url: `https://${domain}` });
             });
@@ -228,6 +232,7 @@ class TunnelManager {
         if (tunnel?.child || tunnel?.status === "login")
             logger_1.default.info(`🌍 ${host} is no longer public`);
         tunnel?.child?.kill();
+        tunnel?.abort?.abort();
     }
     stopAll() {
         for (const host of [...this.tunnels.keys()])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "locadot",
-  "version": "2.3.0",
+  "version": "2.5.0",
   "description": "Secure your local development environment with HTTPS and custom domains like dev.localhost.",
   "homepage": "https://www.npmjs.com/package/locadot",
   "main": "dist/index.js",