pinggy 0.3.4 → 0.3.5

package/dist/index.cjs

@@ -1281,7 +1281,7 @@ var init_options = __esm({
       v: { type: "boolean", description: "Print logs to stdout for Cli. Overrides PINGGY_LOG_STDOUT environment variable" },
       vv: { type: "boolean", description: "Enable detailed logging for the Node.js SDK and Libpinggy, including both info and debug level logs." },
       vvv: { type: "boolean", description: "Enable all logs from Cli, SDK and internal components." },
-      autoreconnect: { type: "boolean", short: "a", description: "Automatically reconnect tunnel on failure." },
+      autoreconnect: { type: "string", short: "a", description: "Automatically reconnect tunnel on failure. Use -a (defaults to true), -a true, or -a false." },
       // Save and load config
       saveconf: { type: "string", description: "Create the configuration file based on the options provided here" },
       conf: { type: "string", description: "Use the configuration file as base. Other options will be used to override this file" },
@@ -1365,7 +1365,7 @@ var init_defaults = __esm({
       originalRequestUrl: false,
       allowPreflight: false,
       reverseProxy: false,
-      autoReconnect: false
+      autoReconnect: true
     };
   }
 });
@@ -1506,33 +1506,58 @@ var init_extendedOptions = __esm({
 });
 
 // src/cli/buildConfig.ts
+function isKeyword(str) {
+  return KEYWORDS.has(str.toLowerCase());
+}
 function parseUserAndDomain(str) {
   let token;
   let type;
   let server;
   let qrCode;
-  if (!str) return { token, type, server, qrCode };
+  let forceFlag;
+  if (!str) return { token, type, server, qrCode, forceFlag };
   if (str.includes("@")) {
     const [user, domain] = str.split("@", 2);
     if (domainRegex.test(domain)) {
+      let processKeyword2 = function(keyword) {
+        if ([import_pinggy3.TunnelType.Http, import_pinggy3.TunnelType.Tcp, import_pinggy3.TunnelType.Tls, import_pinggy3.TunnelType.Udp, import_pinggy3.TunnelType.TlsTcp].includes(keyword)) {
+          type = keyword;
+        } else if (keyword === "force") {
+          forceFlag = true;
+        } else if (keyword === "qr") {
+          qrCode = true;
+        }
+      };
+      var processKeyword = processKeyword2;
       server = domain;
       const parts = user.split("+");
-      for (const part of parts) {
-        if ([import_pinggy3.TunnelType.Http, import_pinggy3.TunnelType.Tcp, import_pinggy3.TunnelType.Tls, import_pinggy3.TunnelType.Udp, import_pinggy3.TunnelType.TlsTcp].includes(part.toLowerCase())) {
-          type = part;
-        } else if (part === "force") {
-          token = (token ? token + "+" : "") + part;
-        } else if (part === "qr") {
-          qrCode = true;
-        } else {
-          token = (token ? token + "+" : "") + part;
+      if (parts.length === 0) {
+        return { token, type, server, qrCode, forceFlag };
+      }
+      const firstPart = parts[0];
+      if (!isKeyword(firstPart)) {
+        token = firstPart;
+        for (let i = 1; i < parts.length; i++) {
+          const part = parts[i].toLowerCase();
+          if (!isKeyword(part)) {
+            throw new Error(`Invalid user format: unexpected token '${part}' when keywords are expected.`);
+          }
+          processKeyword2(part);
+        }
+      } else {
+        for (const part of parts) {
+          const lowerPart = part.toLowerCase();
+          if (!isKeyword(lowerPart)) {
+            throw new Error(`Invalid user format: unexpected token '${lowerPart}' when keywords are expected.`);
+          }
+          processKeyword2(lowerPart);
         }
       }
     }
   } else if (domainRegex.test(str)) {
     server = str;
   }
-  return { token, type, server, qrCode };
+  return { token, type, server, qrCode, forceFlag };
 }
 function parseUsers(positionalArgs, explicitToken) {
   let token;
@@ -1546,6 +1571,8 @@ function parseUsers(positionalArgs, explicitToken) {
     if (parsed.server) server = parsed.server;
     if (parsed.type) type = parsed.type;
     if (parsed.token) token = parsed.token;
+    if (parsed.forceFlag) forceFlag = true;
+    if (parsed.qrCode) qrCode = true;
   }
   if (remaining.length > 0) {
     const first = remaining[0];
@@ -1553,19 +1580,9 @@ function parseUsers(positionalArgs, explicitToken) {
     if (parsed.server) {
       server = parsed.server;
       if (parsed.type) type = parsed.type;
-      if (parsed.token) {
-        if (parsed.token.includes("+")) {
-          const parts = parsed.token.split("+");
-          const tOnly = parts.filter((p) => p !== "force").join("+");
-          if (tOnly) token = tOnly;
-          if (parts.includes("force")) forceFlag = true;
-        } else {
-          token = parsed.token;
-        }
-      }
-      if (parsed.qrCode) {
-        qrCode = true;
-      }
+      if (parsed.token) token = parsed.token;
+      if (parsed.forceFlag) forceFlag = true;
+      if (parsed.qrCode) qrCode = true;
       remaining = remaining.slice(1);
     }
   }
@@ -1747,7 +1764,7 @@ function parseLocalTunnelAddr(finalConfig, values) {
   const firstL = values.L[0];
   const parts = firstL.split(":");
   if (parts.length === 3) {
-    const lp = parseInt(parts[2], 10);
+    const lp = parseInt(parts[0], 10);
     if (!Number.isNaN(lp) && isValidPort(lp)) {
       finalConfig.webDebugger = `localhost:${lp}`;
     } else {
@@ -1816,6 +1833,20 @@ function parseServe(finalConfig, values) {
   finalConfig.serve = sv;
   return null;
 }
+function parseAutoReconnect(finalConfig, values) {
+  const autoReconnectValue = values.autoreconnect;
+  if (typeof autoReconnectValue === "string") {
+    const trimmed = autoReconnectValue.trim().toLowerCase();
+    if (trimmed === "true" || trimmed === "") {
+      finalConfig.autoReconnect = true;
+    } else if (trimmed === "false") {
+      finalConfig.autoReconnect = false;
+    } else {
+      return new Error(`Invalid autoreconnect value: ${autoReconnectValue}. Use true or false.`);
+    }
+  }
+  return null;
+}
 async function buildFinalConfig(values, positionals) {
   let token;
   let server;
@@ -1843,7 +1874,7 @@ async function buildFinalConfig(values, positionals) {
     tunnelType: initialTunnel ? [initialTunnel] : configFromFile?.tunnelType || [import_pinggy3.TunnelType.Http],
     NoTUI: values.notui || (configFromFile?.NoTUI || false),
     qrCode: qrCode || (configFromFile?.qrCode || false),
-    autoReconnect: values.autoreconnect || (configFromFile?.autoReconnect || false)
+    autoReconnect: configFromFile?.autoReconnect ? configFromFile.autoReconnect : defaultOptions.autoReconnect
   };
   parseType(finalConfig, values, type);
   parseToken(finalConfig, token || values.token);
@@ -1857,12 +1888,14 @@ async function buildFinalConfig(values, positionals) {
   if (lErr instanceof Error) throw lErr;
   const serveErr = parseServe(finalConfig, values);
   if (serveErr instanceof Error) throw serveErr;
+  const autoReconnectErr = parseAutoReconnect(finalConfig, values);
+  if (autoReconnectErr instanceof Error) throw autoReconnectErr;
   if (forceFlag) finalConfig.force = true;
   parseArgs(finalConfig, remainingPositionals);
   storeJson(finalConfig, saveconf);
   return finalConfig;
 }
-var import_pinggy3, import_fs3, import_path3, domainRegex, VALID_PROTOCOLS;
+var import_pinggy3, import_fs3, import_path3, domainRegex, KEYWORDS, VALID_PROTOCOLS;
 var init_buildConfig = __esm({
   "src/cli/buildConfig.ts"() {
     "use strict";
@@ -1875,6 +1908,15 @@ var init_buildConfig = __esm({
     import_fs3 = __toESM(require("fs"), 1);
     import_path3 = __toESM(require("path"), 1);
     domainRegex = /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
+    KEYWORDS = /* @__PURE__ */ new Set([
+      import_pinggy3.TunnelType.Http,
+      import_pinggy3.TunnelType.Tcp,
+      import_pinggy3.TunnelType.Tls,
+      import_pinggy3.TunnelType.Udp,
+      import_pinggy3.TunnelType.TlsTcp,
+      "force",
+      "qr"
+    ]);
     VALID_PROTOCOLS = ["http", "tcp", "udp", "tls"];
   }
 });
@@ -4275,52 +4317,21 @@ function checkRegistry() {
   }
   return false;
 }
-function getVCRedistVersion() {
-  if (import_os.default.platform() !== "win32") return null;
-  try {
-    for (const key of REGISTRY_KEYS) {
-      const cmd = `reg query "${key}" /v Version 2>nul`;
-      const result = (0, import_child_process.execSync)(cmd, { encoding: "utf8" });
-      const match = result.match(/Version\s+REG_SZ\s+(\S+)/);
-      if (match) {
-        return match[1];
-      }
-    }
-  } catch {
-  }
-  return null;
-}
-function hasVCRedist() {
-  if (import_os.default.platform() !== "win32") {
-    return true;
-  }
-  if (checkRegistry()) {
-    return true;
-  }
-  if (checkDLLs()) {
-    return true;
-  }
-  return false;
-}
-function getVCRedistStatus() {
+function checkVCRedist() {
   if (import_os.default.platform() !== "win32") {
     return {
       required: false,
       installed: true,
-      version: null,
-      method: "non-windows"
+      message: null
     };
   }
   const registryInstalled = checkRegistry();
   const dllsPresent = checkDLLs();
-  const version = getVCRedistVersion();
+  const installed = registryInstalled || dllsPresent;
   return {
     required: true,
-    installed: registryInstalled || dllsPresent,
-    version,
-    registryCheck: registryInstalled,
-    dllCheck: dllsPresent,
-    method: registryInstalled ? "registry" : dllsPresent ? "dll" : "none"
+    installed,
+    message: installed ? null : "Missing Microsoft Visual C++ Runtime. This application requires the Microsoft Visual C++ Runtime to run on Windows.\n"
   };
 }
 async function openDownloadPage() {
@@ -4343,27 +4354,19 @@ async function openDownloadPage() {
     printer_default.info(url + "\n");
   }
 }
-function getVCRedistMessage() {
-  const status = getVCRedistStatus();
-  if (!status.required || status.installed) {
-    return null;
-  }
-  return {
-    error: true,
-    message: "Missing Microsoft Visual C++ Runtime. This application requires the Microsoft Visual C++ Runtime to run on Windows.\nPlease download and install it using the link below, then restart this application.\n"
-  };
-}
 
 // src/index.ts
 init_printer();
 async function verifyAndLoad() {
-  if (process.platform === "win32" && !hasVCRedist()) {
-    const msg = getVCRedistMessage();
-    printer_default.warn(
-      msg?.message ?? "This application requires the Microsoft Visual C++ Runtime on Windows."
-    );
-    await openDownloadPage();
-    process.exit(1);
+  if (process.platform === "win32") {
+    const vcRedist = checkVCRedist();
+    if (!vcRedist.installed) {
+      printer_default.warn(
+        vcRedist.message ?? "This application requires the Microsoft Visual C++ Runtime on Windows."
+      );
+      await openDownloadPage();
+      process.exit(1);
+    }
   }
   await Promise.resolve().then(() => (init_main(), main_exports));
 }

package/dist/index.js

@@ -43,52 +43,21 @@ function checkRegistry() {
   }
   return false;
 }
-function getVCRedistVersion() {
-  if (os.platform() !== "win32") return null;
-  try {
-    for (const key of REGISTRY_KEYS) {
-      const cmd = `reg query "${key}" /v Version 2>nul`;
-      const result = execSync(cmd, { encoding: "utf8" });
-      const match = result.match(/Version\s+REG_SZ\s+(\S+)/);
-      if (match) {
-        return match[1];
-      }
-    }
-  } catch {
-  }
-  return null;
-}
-function hasVCRedist() {
-  if (os.platform() !== "win32") {
-    return true;
-  }
-  if (checkRegistry()) {
-    return true;
-  }
-  if (checkDLLs()) {
-    return true;
-  }
-  return false;
-}
-function getVCRedistStatus() {
+function checkVCRedist() {
   if (os.platform() !== "win32") {
     return {
       required: false,
       installed: true,
-      version: null,
-      method: "non-windows"
+      message: null
     };
   }
   const registryInstalled = checkRegistry();
   const dllsPresent = checkDLLs();
-  const version = getVCRedistVersion();
+  const installed = registryInstalled || dllsPresent;
   return {
     required: true,
-    installed: registryInstalled || dllsPresent,
-    version,
-    registryCheck: registryInstalled,
-    dllCheck: dllsPresent,
-    method: registryInstalled ? "registry" : dllsPresent ? "dll" : "none"
+    installed,
+    message: installed ? null : "Missing Microsoft Visual C++ Runtime. This application requires the Microsoft Visual C++ Runtime to run on Windows.\n"
   };
 }
 async function openDownloadPage() {
@@ -111,28 +80,20 @@ async function openDownloadPage() {
     printer_default.info(url + "\n");
   }
 }
-function getVCRedistMessage() {
-  const status = getVCRedistStatus();
-  if (!status.required || status.installed) {
-    return null;
-  }
-  return {
-    error: true,
-    message: "Missing Microsoft Visual C++ Runtime. This application requires the Microsoft Visual C++ Runtime to run on Windows.\nPlease download and install it using the link below, then restart this application.\n"
-  };
-}
 
 // src/index.ts
 async function verifyAndLoad() {
-  if (process.platform === "win32" && !hasVCRedist()) {
-    const msg = getVCRedistMessage();
-    printer_default.warn(
-      msg?.message ?? "This application requires the Microsoft Visual C++ Runtime on Windows."
-    );
-    await openDownloadPage();
-    process.exit(1);
+  if (process.platform === "win32") {
+    const vcRedist = checkVCRedist();
+    if (!vcRedist.installed) {
+      printer_default.warn(
+        vcRedist.message ?? "This application requires the Microsoft Visual C++ Runtime on Windows."
+      );
+      await openDownloadPage();
+      process.exit(1);
+    }
   }
-  await import("./main-CZY6GID4.js");
+  await import("./main-K44C44NW.js");
 }
 verifyAndLoad().catch((err) => {
   printer_default.error(`Failed to start CLI:, ${err}`);

package/dist/{main-CZY6GID4.js → main-K44C44NW.js}

@@ -995,7 +995,7 @@ var cliOptions = {
   v: { type: "boolean", description: "Print logs to stdout for Cli. Overrides PINGGY_LOG_STDOUT environment variable" },
   vv: { type: "boolean", description: "Enable detailed logging for the Node.js SDK and Libpinggy, including both info and debug level logs." },
   vvv: { type: "boolean", description: "Enable all logs from Cli, SDK and internal components." },
-  autoreconnect: { type: "boolean", short: "a", description: "Automatically reconnect tunnel on failure." },
+  autoreconnect: { type: "string", short: "a", description: "Automatically reconnect tunnel on failure. Use -a (defaults to true), -a true, or -a false." },
   // Save and load config
   saveconf: { type: "string", description: "Create the configuration file based on the options provided here" },
   conf: { type: "string", description: "Use the configuration file as base. Other options will be used to override this file" },
@@ -1065,7 +1065,7 @@ var defaultOptions = {
   originalRequestUrl: false,
   allowPreflight: false,
   reverseProxy: false,
-  autoReconnect: false
+  autoReconnect: true
 };
 
 // src/cli/extendedOptions.ts
@@ -1199,33 +1199,67 @@ import { TunnelType as TunnelType2 } from "@pinggy/pinggy";
 import fs from "fs";
 import path2 from "path";
 var domainRegex = /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
+var KEYWORDS = /* @__PURE__ */ new Set([
+  TunnelType2.Http,
+  TunnelType2.Tcp,
+  TunnelType2.Tls,
+  TunnelType2.Udp,
+  TunnelType2.TlsTcp,
+  "force",
+  "qr"
+]);
+function isKeyword(str) {
+  return KEYWORDS.has(str.toLowerCase());
+}
 function parseUserAndDomain(str) {
   let token;
   let type;
   let server;
   let qrCode;
-  if (!str) return { token, type, server, qrCode };
+  let forceFlag;
+  if (!str) return { token, type, server, qrCode, forceFlag };
   if (str.includes("@")) {
     const [user, domain] = str.split("@", 2);
     if (domainRegex.test(domain)) {
+      let processKeyword2 = function(keyword) {
+        if ([TunnelType2.Http, TunnelType2.Tcp, TunnelType2.Tls, TunnelType2.Udp, TunnelType2.TlsTcp].includes(keyword)) {
+          type = keyword;
+        } else if (keyword === "force") {
+          forceFlag = true;
+        } else if (keyword === "qr") {
+          qrCode = true;
+        }
+      };
+      var processKeyword = processKeyword2;
       server = domain;
       const parts = user.split("+");
-      for (const part of parts) {
-        if ([TunnelType2.Http, TunnelType2.Tcp, TunnelType2.Tls, TunnelType2.Udp, TunnelType2.TlsTcp].includes(part.toLowerCase())) {
-          type = part;
-        } else if (part === "force") {
-          token = (token ? token + "+" : "") + part;
-        } else if (part === "qr") {
-          qrCode = true;
-        } else {
-          token = (token ? token + "+" : "") + part;
+      if (parts.length === 0) {
+        return { token, type, server, qrCode, forceFlag };
+      }
+      const firstPart = parts[0];
+      if (!isKeyword(firstPart)) {
+        token = firstPart;
+        for (let i = 1; i < parts.length; i++) {
+          const part = parts[i].toLowerCase();
+          if (!isKeyword(part)) {
+            throw new Error(`Invalid user format: unexpected token '${part}' when keywords are expected.`);
+          }
+          processKeyword2(part);
+        }
+      } else {
+        for (const part of parts) {
+          const lowerPart = part.toLowerCase();
+          if (!isKeyword(lowerPart)) {
+            throw new Error(`Invalid user format: unexpected token '${lowerPart}' when keywords are expected.`);
+          }
+          processKeyword2(lowerPart);
         }
       }
     }
   } else if (domainRegex.test(str)) {
     server = str;
   }
-  return { token, type, server, qrCode };
+  return { token, type, server, qrCode, forceFlag };
 }
 function parseUsers(positionalArgs, explicitToken) {
   let token;
@@ -1239,6 +1273,8 @@ function parseUsers(positionalArgs, explicitToken) {
     if (parsed.server) server = parsed.server;
     if (parsed.type) type = parsed.type;
     if (parsed.token) token = parsed.token;
+    if (parsed.forceFlag) forceFlag = true;
+    if (parsed.qrCode) qrCode = true;
   }
   if (remaining.length > 0) {
     const first = remaining[0];
@@ -1246,19 +1282,9 @@ function parseUsers(positionalArgs, explicitToken) {
     if (parsed.server) {
       server = parsed.server;
       if (parsed.type) type = parsed.type;
-      if (parsed.token) {
-        if (parsed.token.includes("+")) {
-          const parts = parsed.token.split("+");
-          const tOnly = parts.filter((p) => p !== "force").join("+");
-          if (tOnly) token = tOnly;
-          if (parts.includes("force")) forceFlag = true;
-        } else {
-          token = parsed.token;
-        }
-      }
-      if (parsed.qrCode) {
-        qrCode = true;
-      }
+      if (parsed.token) token = parsed.token;
+      if (parsed.forceFlag) forceFlag = true;
+      if (parsed.qrCode) qrCode = true;
       remaining = remaining.slice(1);
     }
   }
@@ -1441,7 +1467,7 @@ function parseLocalTunnelAddr(finalConfig, values) {
   const firstL = values.L[0];
   const parts = firstL.split(":");
   if (parts.length === 3) {
-    const lp = parseInt(parts[2], 10);
+    const lp = parseInt(parts[0], 10);
     if (!Number.isNaN(lp) && isValidPort(lp)) {
       finalConfig.webDebugger = `localhost:${lp}`;
     } else {
@@ -1510,6 +1536,20 @@ function parseServe(finalConfig, values) {
   finalConfig.serve = sv;
   return null;
 }
+function parseAutoReconnect(finalConfig, values) {
+  const autoReconnectValue = values.autoreconnect;
+  if (typeof autoReconnectValue === "string") {
+    const trimmed = autoReconnectValue.trim().toLowerCase();
+    if (trimmed === "true" || trimmed === "") {
+      finalConfig.autoReconnect = true;
+    } else if (trimmed === "false") {
+      finalConfig.autoReconnect = false;
+    } else {
+      return new Error(`Invalid autoreconnect value: ${autoReconnectValue}. Use true or false.`);
+    }
+  }
+  return null;
+}
 async function buildFinalConfig(values, positionals) {
   let token;
   let server;
@@ -1537,7 +1577,7 @@ async function buildFinalConfig(values, positionals) {
     tunnelType: initialTunnel ? [initialTunnel] : configFromFile?.tunnelType || [TunnelType2.Http],
     NoTUI: values.notui || (configFromFile?.NoTUI || false),
     qrCode: qrCode || (configFromFile?.qrCode || false),
-    autoReconnect: values.autoreconnect || (configFromFile?.autoReconnect || false)
+    autoReconnect: configFromFile?.autoReconnect ? configFromFile.autoReconnect : defaultOptions.autoReconnect
   };
   parseType(finalConfig, values, type);
   parseToken(finalConfig, token || values.token);
@@ -1551,6 +1591,8 @@ async function buildFinalConfig(values, positionals) {
   if (lErr instanceof Error) throw lErr;
   const serveErr = parseServe(finalConfig, values);
   if (serveErr instanceof Error) throw serveErr;
+  const autoReconnectErr = parseAutoReconnect(finalConfig, values);
+  if (autoReconnectErr instanceof Error) throw autoReconnectErr;
   if (forceFlag) finalConfig.force = true;
   parseArgs(finalConfig, remainingPositionals);
   storeJson(finalConfig, saveconf);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinggy",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "license": "Apache-2.0",
   "type": "module",
   "description": "Create secure, shareable tunnels to your localhost and manage them from the command line. ",
@@ -50,7 +50,7 @@
     ]
   },
   "dependencies": {
-    "@pinggy/pinggy": "^0.3.2",
+    "@pinggy/pinggy": "^0.3.3",
     "blessed": "^0.1.81",
     "clipboardy": "^5.0.0",
     "mime": "^4.1.0",

package/src/cli/buildConfig.ts

@@ -11,36 +11,85 @@ import path from "path";
 
 const domainRegex = /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
 
+// Define the set of valid keywords
+const KEYWORDS = new Set([
+  TunnelType.Http,
+  TunnelType.Tcp,
+  TunnelType.Tls,
+  TunnelType.Udp,
+  TunnelType.TlsTcp,
+  'force',
+  'qr',
+] as const);
+
+type Keyword = typeof KEYWORDS extends Set<infer T> ? T : never;
+
+function isKeyword(str: string): boolean {
+  return KEYWORDS.has(str.toLowerCase() as Keyword);
+}
+
 function parseUserAndDomain(str: string) {
   let token: string | undefined;
   let type: string | undefined;
   let server: string | undefined;
   let qrCode: boolean | undefined;
+  let forceFlag: boolean | undefined;
 
-  if (!str) return { token, type, server, qrCode } as const;
+  if (!str) return { token, type, server, qrCode, forceFlag } as const;
 
   if (str.includes('@')) {
     const [user, domain] = str.split('@', 2);
     if (domainRegex.test(domain)) {
       server = domain;
+
       // parse user modifiers like token+type or just type
       const parts = user.split('+');
-      for (const part of parts) {
-        if ([TunnelType.Http, TunnelType.Tcp, TunnelType.Tls, TunnelType.Udp, TunnelType.TlsTcp].includes(part.toLowerCase() as typeof TunnelType[keyof typeof TunnelType])) {
-          type = part;
-        } else if (part === 'force') {
-          token = (token ? token + '+' : '') + part;
-        } else if (part === 'qr') {
+
+      if (parts.length === 0) {
+        return { token, type, server, qrCode, forceFlag } as const;
+      }
+
+      const firstPart = parts[0];
+
+      // If the first part is NOT a keyword, it's a token
+      // All subsequent parts must be keywords
+      if (!isKeyword(firstPart)) {
+        token = firstPart;
+        // Process remaining parts as keywords
+        for (let i = 1; i < parts.length; i++) {
+          const part = parts[i].toLowerCase();
+          if (!isKeyword(part)) {
+            throw new Error(`Invalid user format: unexpected token '${part}' when keywords are expected.`);
+          }
+          processKeyword(part);
+        }
+      } else {
+        // First part is a keyword, all parts must be keywords
+        for (const part of parts) {
+          const lowerPart = part.toLowerCase();
+          if (!isKeyword(lowerPart)) {
+            // Invalid: non-keyword when keywords are expected
+            throw new Error(`Invalid user format: unexpected token '${lowerPart}' when keywords are expected.`);
+          }
+          processKeyword(lowerPart);
+        }
+      }
+
+      function processKeyword(keyword: string) {
+        if ([TunnelType.Http, TunnelType.Tcp, TunnelType.Tls, TunnelType.Udp, TunnelType.TlsTcp].includes(keyword as TunnelType)) {
+          type = keyword;
+        } else if (keyword === 'force') {
+          forceFlag = true;
+        } else if (keyword === 'qr') {
           qrCode = true;
-        } else {
-          token = (token ? token + '+' : '') + part;
         }
       }
     }
   } else if (domainRegex.test(str)) {
     server = str;
   }
-  return { token, type, server, qrCode } as const;
+
+  return { token, type, server, qrCode, forceFlag } as const;
 }
 
 function parseUsers(positionalArgs: string[], explicitToken?: string) {
@@ -57,6 +106,8 @@ function parseUsers(positionalArgs: string[], explicitToken?: string) {
     if (parsed.server) server = parsed.server;
     if (parsed.type) type = parsed.type;
     if (parsed.token) token = parsed.token;
+    if (parsed.forceFlag) forceFlag = true;
+    if (parsed.qrCode) qrCode = true;
   }
 
   if (remaining.length > 0) {
@@ -65,19 +116,9 @@ function parseUsers(positionalArgs: string[], explicitToken?: string) {
     if (parsed.server) {
       server = parsed.server;
       if (parsed.type) type = parsed.type;
-      if (parsed.token) {
-        if (parsed.token.includes('+')) {
-          const parts = parsed.token.split('+');
-          const tOnly = parts.filter((p) => p !== 'force').join('+');
-          if (tOnly) token = tOnly;
-          if (parts.includes('force')) forceFlag = true;
-        } else {
-          token = parsed.token;
-        }
-      } if (parsed.qrCode) {
-        // QR code request detected
-        qrCode = true;
-      }
+      if (parsed.token) token = parsed.token;
+      if (parsed.forceFlag) forceFlag = true;
+      if (parsed.qrCode) qrCode = true;
       remaining = remaining.slice(1);
     }
   }
@@ -327,7 +368,7 @@ function parseLocalTunnelAddr(finalConfig: FinalConfig, values: ParsedValues<typ
   const firstL = values.L[0] as string;
   const parts = firstL.split(':');
   if (parts.length === 3) {
-    const lp = parseInt(parts[2], 10);
+    const lp = parseInt(parts[0], 10);
     if (!Number.isNaN(lp) && isValidPort(lp)) {
       finalConfig.webDebugger = `localhost:${lp}`;
     } else {
@@ -410,6 +451,22 @@ function parseServe(finalConfig: FinalConfig, values: ParsedValues<typeof cliOpt
   return null;
 }
 
+function parseAutoReconnect(finalConfig: FinalConfig, values: ParsedValues<typeof cliOptions>): Error | null {
+  const autoReconnectValue = values.autoreconnect;
+  if (typeof autoReconnectValue === 'string') {
+    const trimmed = autoReconnectValue.trim().toLowerCase();
+    if (trimmed === 'true' || trimmed === '') {
+      finalConfig.autoReconnect = true;
+    } else if (trimmed === 'false') {
+      finalConfig.autoReconnect = false;
+    } else {
+      return new Error(`Invalid autoreconnect value: ${autoReconnectValue}. Use true or false.`);
+    }
+  }
+
+  return null;
+}
+
 export async function buildFinalConfig(values: ParsedValues<typeof cliOptions>, positionals: string[]): Promise<FinalConfig> {
   let token: string | undefined;
   let server: string | undefined;
@@ -439,7 +496,7 @@ export async function buildFinalConfig(values: ParsedValues<typeof cliOptions>,
     tunnelType: initialTunnel ? [initialTunnel] : (configFromFile?.tunnelType || [TunnelType.Http]),
     NoTUI: values.notui || (configFromFile?.NoTUI || false),
     qrCode: qrCode || (configFromFile?.qrCode || false),
-    autoReconnect: values.autoreconnect || (configFromFile?.autoReconnect || false),
+    autoReconnect: configFromFile?.autoReconnect ? configFromFile.autoReconnect : defaultOptions.autoReconnect, 
   };
 
 
@@ -463,6 +520,9 @@ export async function buildFinalConfig(values: ParsedValues<typeof cliOptions>,
   const serveErr = parseServe(finalConfig, values);
   if (serveErr instanceof Error) throw serveErr;
 
+  const autoReconnectErr = parseAutoReconnect(finalConfig, values);
+  if (autoReconnectErr instanceof Error) throw autoReconnectErr;
+
   // Apply force flag if indicated via user
   if (forceFlag) finalConfig.force = true;
 

package/src/cli/defaults.ts

@@ -16,5 +16,5 @@ export const defaultOptions: Omit<PinggyOptions, 'token'> & { token: string | un
   originalRequestUrl: false,
   allowPreflight: false,
   reverseProxy: false,
-  autoReconnect: false,
+  autoReconnect: true,
 };

package/src/cli/options.ts

@@ -27,7 +27,7 @@ export const cliOptions = {
   vv: { type: 'boolean' as const, description: 'Enable detailed logging for the Node.js SDK and Libpinggy, including both info and debug level logs.' },
   vvv: { type: 'boolean' as const, description: 'Enable all logs from Cli, SDK and internal components.' },
 
-  autoreconnect: { type: 'boolean' as const, short :'a', description: 'Automatically reconnect tunnel on failure.' },
+  autoreconnect: { type: 'string' as const, short :'a', description: 'Automatically reconnect tunnel on failure. Use -a (defaults to true), -a true, or -a false.' },
 
   // Save and load config
   saveconf: { type: 'string' as const, description: 'Create the configuration file based on the options provided here' },

package/src/index.ts

@@ -1,30 +1,31 @@
 #!/usr/bin/env node
 
 import {
-    hasVCRedist,
-    getVCRedistMessage,
-    openDownloadPage,
+  checkVCRedist,
+  openDownloadPage,
 } from "./utils/detect_vc_redist_on_windows.js";
 import CLIPrinter from "./utils/printer.js";
 
 async function verifyAndLoad() {
-    if (process.platform === "win32" && !hasVCRedist()) {
-        const msg = getVCRedistMessage();
-        CLIPrinter.warn(
-            msg?.message ??
-            "This application requires the Microsoft Visual C++ Runtime on Windows."
-        );
+  if (process.platform === "win32") {
+    const vcRedist = checkVCRedist();
+    if ( !vcRedist.installed ) {
+      CLIPrinter.warn(
+        vcRedist.message ??
+          "This application requires the Microsoft Visual C++ Runtime on Windows.",
+      );
 
-        // open browser
-        await openDownloadPage();
+      // open browser
+      await openDownloadPage();
 
-        process.exit(1);
+      process.exit(1);
     }
+  }
 
-    await import("./main.js");
+  await import("./main.js");
 }
 
 verifyAndLoad().catch((err) => {
-    CLIPrinter.error(`Failed to start CLI:, ${err}`);
-    process.exit(1);
+  CLIPrinter.error(`Failed to start CLI:, ${err}`);
+  process.exit(1);
 });

package/src/utils/detect_vc_redist_on_windows.ts

@@ -56,66 +56,29 @@ function checkRegistry() {
   return false;
 }
 
-function getVCRedistVersion() {
-  if (os.platform() !== "win32") return null;
-
-  try {
-    for (const key of REGISTRY_KEYS) {
-      const cmd = `reg query "${key}" /v Version 2>nul`;
-      const result = execSync(cmd, { encoding: "utf8" });
-
-      const match = result.match(/Version\s+REG_SZ\s+(\S+)/);
-      if (match) {
-        return match[1];
-      }
-    }
-  } catch {
-    // Ignore errors
-  }
-
-  return null;
-}
 
 /**
- * Main detection function
+ * Main detection function - returns status and message for VC++ Redistributable
  */
-export function hasVCRedist() {
-  if (os.platform() !== "win32") {
-    return true; // Not Windows, assume OK
-  }
-
-  if (checkRegistry()) {
-    return true;
-  }
-
-  if (checkDLLs()) {
-    return true;
-  }
-
-  return false;
-}
-
-export function getVCRedistStatus() {
+export function checkVCRedist() {
   if (os.platform() !== "win32") {
     return {
       required: false,
       installed: true,
-      version: null,
-      method: "non-windows",
+      message: null,
     };
   }
 
   const registryInstalled = checkRegistry();
   const dllsPresent = checkDLLs();
-  const version = getVCRedistVersion();
+  const installed = registryInstalled || dllsPresent;
 
   return {
     required: true,
-    installed: registryInstalled || dllsPresent,
-    version,
-    registryCheck: registryInstalled,
-    dllCheck: dllsPresent,
-    method: registryInstalled ? "registry" : dllsPresent ? "dll" : "none",
+    installed,
+    message: installed
+      ? null
+      :   "Missing Microsoft Visual C++ Runtime. This application requires the Microsoft Visual C++ Runtime to run on Windows.\n"
   };
 }
 
@@ -128,10 +91,10 @@ export async function openDownloadPage() {
   }
   const url =
     "https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170";
-  
+
   // Use cmd.exe explicitly for better compatibility
   const command = `cmd.exe /c start "" "${url}"`;
-  
+
   try {
     await execAsync(command);
     CLIPrinter.info("\nOpening Microsoft download page in your browser...");
@@ -146,22 +109,3 @@ export async function openDownloadPage() {
     CLIPrinter.info(url + "\n");
   }
 }
-
-
-/**
- * Get error message
- */
-export function getVCRedistMessage() {
-  const status = getVCRedistStatus();
-
-  if (!status.required || status.installed) {
-    return null;
-  }
-
-  return {
-    error: true,
-    message:
-      "Missing Microsoft Visual C++ Runtime. This application requires the Microsoft Visual C++ Runtime to run on Windows.\n" +
-      "Please download and install it using the link below, then restart this application.\n",
-  };
-}