pinggy 0.4.7 → 0.4.8

package/dist/{chunk-443UO6IY.js → chunk-YFTL44B3.js}

@@ -194,9 +194,10 @@ var TunnelManager = class _TunnelManager {
    *                          status information, and statistics
    */
   async createTunnel(config) {
-    const { configId, tunnelid: requestedTunnelId, tunnelName, name, serve } = config;
+    const { configId, tunnelid: requestedTunnelId, tunnelName, name } = config;
     const tunnelid = requestedTunnelId || getRandomId();
     const autoReconnect = config.autoReconnect || false;
+    const serve = this.resolveServePath(config);
     if (!configId || typeof configId !== "string" || configId.trim() === "") {
       throw new Error("configId is required and must be a non-empty string");
     }
@@ -283,8 +284,11 @@ var TunnelManager = class _TunnelManager {
       throw error;
     }
     logger.info("Tunnel started", { tunnelId, urls });
+    logger.info("Checking serve config for tunnel", { tunnelId, serve: managed.serve });
     if (managed.serve) {
       this.startStaticFileServer(managed);
+    } else {
+      logger.debug("No serve path configured, skipping static file server", { tunnelId });
     }
     try {
       const startListeners = this.tunnelStartListeners.get(tunnelId);
@@ -616,6 +620,7 @@ var TunnelManager = class _TunnelManager {
     const currentTunnelName = existingTunnel.tunnelName;
     const currentServe = existingTunnel.serve;
     const currentAutoReconnect = existingTunnel.autoReconnect || false;
+    const requestedServe = this.resolveServePath(newConfig);
     try {
       if (!isStopped) {
         existingTunnel.instance.stop();
@@ -626,9 +631,9 @@ var TunnelManager = class _TunnelManager {
         ...newConfig,
         configId,
         tunnelName: newTunnelName !== void 0 ? newTunnelName : currentTunnelName,
-        serve: newConfig.serve !== void 0 ? newConfig.serve : currentServe
+        serve: requestedServe !== void 0 ? requestedServe : currentServe
       };
-      const effectiveServe = newConfig.serve !== void 0 ? newConfig.serve : currentServe;
+      const effectiveServe = requestedServe !== void 0 ? requestedServe : currentServe;
       const effectiveTunnelName = newTunnelName !== void 0 ? newTunnelName : currentTunnelName;
       let configWithForwarding;
       const newTunnel = await this._createTunnelWithProcessedConfig({
@@ -1387,21 +1392,35 @@ var TunnelManager = class _TunnelManager {
     const parsed = typeof value === "number" ? value : parseInt(String(value), 10);
     return isNaN(parsed) ? 0 : parsed;
   }
+  /**
+   * Read serve path only from config.optional.serve.
+   */
+  resolveServePath(config) {
+    const optional = config.optional;
+    const servePath = optional?.serve;
+    logger.debug("resolveServePath", { servePath, hasOptional: !!optional, optionalKeys: optional ? Object.keys(optional) : [] });
+    return servePath;
+  }
   startStaticFileServer(managed) {
     try {
       const __filename4 = fileURLToPath2(import.meta.url);
       const __dirname4 = path.dirname(__filename4);
       const fileServerWorkerPath = path.join(__dirname4, "workers", "file_serve_worker.cjs");
+      logger.info("Starting static file server worker", {
+        dir: managed.serve,
+        forwarding: JSON.stringify(managed.tunnelConfig?.forwarding),
+        workerPath: fileServerWorkerPath
+      });
       const staticServerWorker = new Worker(fileServerWorkerPath, {
         workerData: {
           dir: managed.serve,
-          port: managed.tunnelConfig?.forwarding
+          forwarding: managed.tunnelConfig?.forwarding
         }
       });
       staticServerWorker.on("message", (msg) => {
         switch (msg.type) {
           case "started":
-            logger.info("Static file server started", { dir: managed.serve });
+            logger.info("Static file server started", { dir: managed.serve, port: msg.portNum });
             break;
           case "warning":
             if (msg.code === "INVALID_TUNNEL_SERVE_PATH") {

package/dist/index.cjs

@@ -367,9 +367,10 @@ var init_TunnelManager = __esm({
        *                          status information, and statistics
        */
       async createTunnel(config) {
-        const { configId, tunnelid: requestedTunnelId, tunnelName, name, serve } = config;
+        const { configId, tunnelid: requestedTunnelId, tunnelName, name } = config;
         const tunnelid = requestedTunnelId || getRandomId();
         const autoReconnect = config.autoReconnect || false;
+        const serve = this.resolveServePath(config);
         if (!configId || typeof configId !== "string" || configId.trim() === "") {
           throw new Error("configId is required and must be a non-empty string");
         }
@@ -456,8 +457,11 @@ var init_TunnelManager = __esm({
           throw error;
         }
         logger.info("Tunnel started", { tunnelId, urls });
+        logger.info("Checking serve config for tunnel", { tunnelId, serve: managed.serve });
         if (managed.serve) {
           this.startStaticFileServer(managed);
+        } else {
+          logger.debug("No serve path configured, skipping static file server", { tunnelId });
         }
         try {
           const startListeners = this.tunnelStartListeners.get(tunnelId);
@@ -789,6 +793,7 @@ var init_TunnelManager = __esm({
         const currentTunnelName = existingTunnel.tunnelName;
         const currentServe = existingTunnel.serve;
         const currentAutoReconnect = existingTunnel.autoReconnect || false;
+        const requestedServe = this.resolveServePath(newConfig);
         try {
           if (!isStopped) {
             existingTunnel.instance.stop();
@@ -799,9 +804,9 @@ var init_TunnelManager = __esm({
             ...newConfig,
             configId,
             tunnelName: newTunnelName !== void 0 ? newTunnelName : currentTunnelName,
-            serve: newConfig.serve !== void 0 ? newConfig.serve : currentServe
+            serve: requestedServe !== void 0 ? requestedServe : currentServe
           };
-          const effectiveServe = newConfig.serve !== void 0 ? newConfig.serve : currentServe;
+          const effectiveServe = requestedServe !== void 0 ? requestedServe : currentServe;
           const effectiveTunnelName = newTunnelName !== void 0 ? newTunnelName : currentTunnelName;
           let configWithForwarding;
           const newTunnel = await this._createTunnelWithProcessedConfig({
@@ -1560,21 +1565,35 @@ var init_TunnelManager = __esm({
         const parsed = typeof value === "number" ? value : parseInt(String(value), 10);
         return isNaN(parsed) ? 0 : parsed;
       }
+      /**
+       * Read serve path only from config.optional.serve.
+       */
+      resolveServePath(config) {
+        const optional = config.optional;
+        const servePath = optional?.serve;
+        logger.debug("resolveServePath", { servePath, hasOptional: !!optional, optionalKeys: optional ? Object.keys(optional) : [] });
+        return servePath;
+      }
       startStaticFileServer(managed) {
         try {
           const __filename4 = (0, import_node_url.fileURLToPath)(importMetaUrl);
           const __dirname3 = import_node_path.default.dirname(__filename4);
           const fileServerWorkerPath = import_node_path.default.join(__dirname3, "workers", "file_serve_worker.cjs");
+          logger.info("Starting static file server worker", {
+            dir: managed.serve,
+            forwarding: JSON.stringify(managed.tunnelConfig?.forwarding),
+            workerPath: fileServerWorkerPath
+          });
           const staticServerWorker = new import_node_worker_threads.Worker(fileServerWorkerPath, {
             workerData: {
               dir: managed.serve,
-              port: managed.tunnelConfig?.forwarding
+              forwarding: managed.tunnelConfig?.forwarding
             }
           });
           staticServerWorker.on("message", (msg) => {
             switch (msg.type) {
               case "started":
-                logger.info("Static file server started", { dir: managed.serve });
+                logger.info("Static file server started", { dir: managed.serve, port: msg.portNum });
                 break;
               case "warning":
                 if (msg.code === "INVALID_TUNNEL_SERVE_PATH") {
@@ -3084,7 +3103,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: "string", short: "a", description: "Automatically reconnect tunnel on failure (enabled by default). Use -a false to disable." },
+      "no-autoreconnect": { type: "boolean", short: "a", description: "Disable auto reconnection on failure (enabled by default)." },
       // Save and load config (legacy file-based)
       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" },
@@ -3794,16 +3813,8 @@ function parseServe(finalConfig, values) {
   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.`);
-    }
+  if (values["no-autoreconnect"]) {
+    finalConfig.autoReconnect = false;
   }
   return null;
 }
@@ -6120,13 +6131,15 @@ async function main() {
   try {
     const rawArgs = process.argv.slice(2);
     const manager = TunnelManager.getInstance();
-    process.on("SIGINT", () => {
-      logger.info("SIGINT received: stopping tunnels and exiting");
+    const gracefulShutdown = (signal) => {
+      logger.info(`${signal} received: stopping tunnels and exiting`);
       console.log("\nStopping all tunnels...");
       manager.stopAllTunnels();
       console.log("Tunnels stopped. Exiting.");
       process.exit(0);
-    });
+    };
+    process.on("SIGINT", () => gracefulShutdown("SIGINT"));
+    process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
     if (isSubcommand(rawArgs)) {
       await handleSubcommand(rawArgs, manager);
       return;

package/dist/index.d.cts

@@ -378,6 +378,10 @@ declare class TunnelManager implements ITunnelManager {
      */
     private normalizeStats;
     private parseNumber;
+    /**
+     * Read serve path only from config.optional.serve.
+     */
+    private resolveServePath;
     private startStaticFileServer;
 }
 

package/dist/index.d.ts

@@ -378,6 +378,10 @@ declare class TunnelManager implements ITunnelManager {
      */
     private normalizeStats;
     private parseNumber;
+    /**
+     * Read serve path only from config.optional.serve.
+     */
+    private resolveServePath;
     private startStaticFileServer;
 }
 

package/dist/index.js

@@ -11,7 +11,7 @@ import {
   initiateRemoteManagement,
   printer_default,
   startRemoteManagement
-} from "./chunk-443UO6IY.js";
+} from "./chunk-YFTL44B3.js";
 import {
   enablePackageLogging
 } from "./chunk-3RTRUYNW.js";
@@ -106,7 +106,7 @@ async function verifyAndLoad() {
       process.exit(1);
     }
   }
-  await import("./main-PUM4SD6B.js");
+  await import("./main-4WTJG54V.js");
 }
 verifyAndLoad().catch((err) => {
   printer_default.fatal(`Failed to start CLI:, ${err}`);

package/dist/{main-PUM4SD6B.js → main-4WTJG54V.js}

@@ -13,7 +13,7 @@ import {
   parseRemoteManagement,
   printer_default,
   startRemoteManagement
-} from "./chunk-443UO6IY.js";
+} from "./chunk-YFTL44B3.js";
 import {
   configureLogger,
   enablePackageLogging,
@@ -46,7 +46,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: "string", short: "a", description: "Automatically reconnect tunnel on failure (enabled by default). Use -a false to disable." },
+  "no-autoreconnect": { type: "boolean", short: "a", description: "Disable auto reconnection on failure (enabled by default)." },
   // Save and load config (legacy file-based)
   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" },
@@ -744,16 +744,8 @@ function parseServe(finalConfig, values) {
   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.`);
-    }
+  if (values["no-autoreconnect"]) {
+    finalConfig.autoReconnect = false;
   }
   return null;
 }
@@ -2883,13 +2875,15 @@ async function main() {
   try {
     const rawArgs = process.argv.slice(2);
     const manager = TunnelManager.getInstance();
-    process.on("SIGINT", () => {
-      logger.info("SIGINT received: stopping tunnels and exiting");
+    const gracefulShutdown = (signal) => {
+      logger.info(`${signal} received: stopping tunnels and exiting`);
       console.log("\nStopping all tunnels...");
       manager.stopAllTunnels();
       console.log("Tunnels stopped. Exiting.");
       process.exit(0);
-    });
+    };
+    process.on("SIGINT", () => gracefulShutdown("SIGINT"));
+    process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
     if (isSubcommand(rawArgs)) {
       await handleSubcommand(rawArgs, manager);
       return;

package/dist/workers/file_serve_worker.cjs

@@ -1449,11 +1449,23 @@ async function startFileServer(dirPath, port = 8080) {
 // src/workers/file_serve_worker.ts
 (async () => {
   try {
-    const { dir, port } = import_worker_threads.workerData;
-    const portNum = parseInt(port.split(":")[1]);
+    const { dir, forwarding } = import_worker_threads.workerData;
+    logger.debug("file_serve_worker received workerData", { dir, forwarding: JSON.stringify(forwarding) });
+    let address;
+    if (typeof forwarding === "string") {
+      address = forwarding;
+    } else if (Array.isArray(forwarding) && forwarding.length > 0) {
+      address = forwarding[0]?.address;
+    }
+    logger.debug("file_serve_worker resolved address", { address });
+    const match = typeof address === "string" ? address.match(/:(\d+)\/?$/) : null;
+    const portNum = match ? parseInt(match[1], 10) : void 0;
+    logger.debug("file_serve_worker resolved port", { portNum, defaultPort: portNum ?? 8080 });
     const result = await startFileServer(dir, portNum);
+    logger.info("file_serve_worker static file server started", { dir, port: portNum ?? 8080 });
     import_worker_threads.parentPort?.postMessage({ type: "started", portNum });
     if (result.hasInvalidPath && result.error) {
+      logger.warn("file_serve_worker invalid path warning", { message: result.error.message, code: result.error.code });
       import_worker_threads.parentPort?.postMessage({
         type: "warning",
         message: result.error.message,

package/dist/workers/file_serve_worker.js

@@ -1415,11 +1415,23 @@ async function startFileServer(dirPath, port = 8080) {
 // src/workers/file_serve_worker.ts
 (async () => {
   try {
-    const { dir, port } = workerData;
-    const portNum = parseInt(port.split(":")[1]);
+    const { dir, forwarding } = workerData;
+    logger.debug("file_serve_worker received workerData", { dir, forwarding: JSON.stringify(forwarding) });
+    let address;
+    if (typeof forwarding === "string") {
+      address = forwarding;
+    } else if (Array.isArray(forwarding) && forwarding.length > 0) {
+      address = forwarding[0]?.address;
+    }
+    logger.debug("file_serve_worker resolved address", { address });
+    const match = typeof address === "string" ? address.match(/:(\d+)\/?$/) : null;
+    const portNum = match ? parseInt(match[1], 10) : void 0;
+    logger.debug("file_serve_worker resolved port", { portNum, defaultPort: portNum ?? 8080 });
     const result = await startFileServer(dir, portNum);
+    logger.info("file_serve_worker static file server started", { dir, port: portNum ?? 8080 });
     parentPort?.postMessage({ type: "started", portNum });
     if (result.hasInvalidPath && result.error) {
+      logger.warn("file_serve_worker invalid path warning", { message: result.error.message, code: result.error.code });
       parentPort?.postMessage({
         type: "warning",
         message: result.error.message,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinggy",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "license": "Apache-2.0",
   "type": "module",
   "description": "Create secure, shareable tunnels to your localhost and manage them from the command line. ",