pinggy 0.3.0 → 0.3.2

package/ent.plist

@@ -0,0 +1,14 @@
+<!-- Entitlement for mac os signing since allow-unsigned-executable-memory is required -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
+ "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>com.apple.security.cs.allow-jit</key>
+  <true/>
+  <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+  <true/>
+  <key>com.apple.security.cs.disable-library-validation</key>
+  <true/>
+</dict>
+</plist>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinggy",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "license": "Apache-2.0",
   "type": "module",
   "description": "Create secure, shareable tunnels to your localhost and manage them from the command line. ",
@@ -8,7 +8,7 @@
   "module": ".dist/index.js",
   "types": ".dist/index.d.ts",
   "bin": {
-    "pinggy": "dist/index.js"
+    "pinggy": "dist/index.cjs"
   },
   "scripts": {
     "build:tsc": "tsc",
@@ -18,7 +18,19 @@
     "bump": "node scripts/bumpVersion.js --bump && npm install",
     "bump:minor": "node scripts/bumpVersion.js --bump --minor && npm install",
     "bump:major": "node scripts/bumpVersion.js --bump --major && npm install",
-    "dev": "npm link @pinggy/pinggy && npm run build && npm link "
+    "dev": "npm link @pinggy/pinggy && npm run build && npm link ",
+    "pre-pkg": "node scripts/pre_pkg_processing.js remove",
+    "post-pkg": "node scripts/pre_pkg_processing.js restore",
+    "pack:linux-x64": "npm run pre-pkg && pkg . --targets node20-linux-x64 --output out/pinggy-linux-x64 && npm run post-pkg",
+    "pack:linux-arm64": "npm run pre-pkg && pkg . --targets node20-linux-arm64 --output out/pinggy-linux-arm64 && npm run post-pkg",
+    "pack:linux": "npm run pack:linux-x64 && npm run pack:linux-arm64",
+    "pack:win-x64": "npm run pre-pkg && pkg . --targets node20-win-x64 --output out/pinggy-win-x64.exe && npm run post-pkg",
+    "pack:win-arm64": "npm run pre-pkg && pkg . --targets node20-win-arm64 --output out/pinggy-win-arm64.exe && npm run post-pkg",
+    "pack:windows": "npm run pack:win-x64 && npm run pack:win-arm64",
+    "pack:macos-x64": "npm run pre-pkg && pkg . --targets node20-macos-x64 --output out/pinggy-macos-x64 && npm run post-pkg",
+    "pack:macos-arm64": "npm run pre-pkg && pkg . --targets node20-macos-arm64 --output out/pinggy-macos-arm64 && npm run post-pkg",
+    "pack:macos": "npm run pack:macos-x64 && npm run pack:macos-arm64",
+    "pack:all": "npm run pack:linux-x64 && npm run pack:linux-arm64 && npm run pack:win-x64 && npm run pack:macos-x64 && npm run pack:macos-arm64"
   },
   "exports": {
     ".": {
@@ -27,30 +39,35 @@
       "require": "./dist/index.cjs"
     }
   },
+  "pkg": {
+    "scripts": [
+      "dist/index.cjs"
+    ],
+    "assets": [
+      "node_modules/@pinggy/pinggy/**/*",
+      "node_modules/blessed/lib/**/*",
+      "node_modules/blessed/usr/**/*"
+    ]
+  },
   "dependencies": {
-    "@pinggy/pinggy": "^0.3.1",
-    "chalk": "^5.6.2",
+    "@pinggy/pinggy": "^0.3.2",
+    "blessed": "^0.1.81",
     "clipboardy": "^5.0.0",
-    "fullscreen-ink": "^0.1.0",
-    "ink": "^6.3.1",
-    "ink-big-text": "^2.0.0",
-    "ink-gradient": "^3.0.0",
     "mime": "^4.1.0",
-    "ora": "^9.0.0",
-    "qrcode-terminal": "^0.12.0",
-    "react": "^19.1.1",
-    "uuid": "^12.0.0",
+    "picocolors": "^1.1.1",
+    "qrcode": "^1.5.4",
     "winston": "^3.17.0",
     "ws": "^8.18.0",
     "zod": "^4.1.5"
   },
   "devDependencies": {
     "@appthreat/caxa": "^1.0.13",
+    "@types/blessed": "^0.1.25",
     "@types/jest": "^30.0.0",
     "@types/node": "^24.3.0",
     "@types/qrcode-terminal": "^0.12.2",
-    "@types/react": "^19.2.0",
     "@types/ws": "^8.18.1",
+    "@yao-pkg/pkg": "^6.11.0",
     "jest": "^30.1.2",
     "ts-jest": "^29.4.1",
     "ts-node": "^10.9.2",

package/scripts/pre_pkg_processing.js

@@ -0,0 +1,74 @@
+#!/usr/bin/env node
+
+/**
+ * Script to temporarily remove "type": "module" from package.json before running pkg
+ */
+
+import { readFileSync, writeFileSync, existsSync, unlinkSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const packageJsonPath = join(__dirname, '..', 'package.json');
+const backupPath = join(__dirname, '..', 'package.json.backup');
+
+function main() {
+    const action = process.argv[2] || 'remove';
+
+    if (action === 'remove') {
+        removeTypeModule();
+    } else if (action === 'restore') {
+        restoreTypeModule();
+    } else {
+        console.error('Usage: node pre-pkg.js [remove|restore]');
+        process.exit(1);
+    }
+}
+
+function removeTypeModule() {
+    try {
+        // Read package.json
+        const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
+        
+        // Create backup if type module exists
+        if (packageJson.type === 'module') {
+            writeFileSync(backupPath, JSON.stringify(packageJson, null, 2));
+            console.log('Backup created at package.json.backup');
+            
+            // Remove type module
+            delete packageJson.type;
+            
+            // Write back to package.json
+            writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n');
+            console.log('Removed "type": "module" from package.json');
+        } else {
+            console.log('No "type": "module" found in package.json');
+        }
+    } catch (error) {
+        console.error('Error removing type module:', error.message);
+        process.exit(1);
+    }
+}
+
+function restoreTypeModule() {
+    try {
+        if (existsSync(backupPath)) {
+            // Restore from backup
+            const backupContent = readFileSync(backupPath, 'utf8');
+            writeFileSync(packageJsonPath, backupContent);
+            
+            // Remove backup file
+            unlinkSync(backupPath);
+            
+            console.log('Restored package.json from backup');
+        } else {
+            console.log('No backup file found, nothing to restore');
+        }
+    } catch (error) {
+        console.error('Error restoring package.json:', error.message);
+        process.exit(1);
+    }
+}
+
+main();

package/src/cli/buildConfig.ts

@@ -4,11 +4,10 @@ import { logger } from "../logger.js";
 import { FinalConfig, Forwarding } from "../types.js";
 import { ParsedValues } from "../utils/parseArgs.js";
 import { cliOptions } from "./options.js";
-import { isValidPort } from "../utils/util.js";
+import { getRandomId, isValidPort } from "../utils/util.js";
 import { TunnelType } from "@pinggy/pinggy";
 import fs from "fs";
 import path from "path";
-import { getUuid } from "../utils/esmOnlyPackageLoader.js";
 
 const domainRegex = /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
 
@@ -188,7 +187,7 @@ function parseForwarding(forwarding: string): Forwarding | Error {
 
 function parseReverseTunnelAddr(finalConfig: FinalConfig, values: ParsedValues<typeof cliOptions>): Error | null {
   const reverseTunnel = values.R;
-  if ((!Array.isArray(reverseTunnel) || reverseTunnel.length === 0) && !values.localport) {
+  if ((!Array.isArray(reverseTunnel) || reverseTunnel.length === 0) && !values.localport && !finalConfig.forwarding) {
     return new Error("local port not specified. Please use '-h' option for help.");
   }
 
@@ -314,9 +313,6 @@ export async function buildFinalConfig(values: ParsedValues<typeof cliOptions>,
   let saveconf = isSaveConfOption(values);
 
   const configFromFile = loadJsonConfig(values);
-  if (configFromFile !== null) {
-    finalConfig = { ...configFromFile };
-  }
 
   const userParse = parseUsers(positionals, values.token);
   token = userParse.token;
@@ -329,13 +325,14 @@ export async function buildFinalConfig(values: ParsedValues<typeof cliOptions>,
   const initialTunnel = (type || values.type) as TunnelType;
   finalConfig = {
     ...defaultOptions,
-    configid: await getUuid(),
-    token: token || (typeof values.token === 'string' ? values.token : ''),
-    serverAddress: server || defaultOptions.serverAddress,
-    tunnelType: initialTunnel ? [initialTunnel] : [TunnelType.Http],
-    NoTUI: values.notui || false,
-    qrCode: qrCode || false,
-    autoReconnect: values.autoreconnect || false,
+    ...(configFromFile || {}),  // Apply loaded config on top of defaults
+    configid: getRandomId(),
+    token: token || (configFromFile?.token || (typeof values.token === 'string' ? values.token : '')),
+    serverAddress: server || (configFromFile?.serverAddress || defaultOptions.serverAddress),
+    tunnelType: initialTunnel ? [initialTunnel] : (configFromFile?.tunnelType || [TunnelType.Http]),
+    NoTUI: values.notui || (configFromFile?.NoTUI || false),
+    qrCode: qrCode || (configFromFile?.qrCode || false),
+    autoReconnect: values.autoreconnect || (configFromFile?.autoReconnect || false),
   };
 
 

package/src/cli/{starCli.tsx → starCli.ts}

@@ -1,9 +1,10 @@
 import CLIPrinter from "../utils/printer.js";
-import { TunnelManager } from "../tunnel_manager/TunnelManager.js";
-import { loadChalk } from "../utils/esmOnlyPackageLoader.js";
+import { ManagedTunnel, TunnelManager } from "../tunnel_manager/TunnelManager.js";
 import { FinalConfig } from "../types.js";
 import { getFreePort } from "../utils/getFreePort.js";
 import { logger } from "../logger.js";
+import pico from "picocolors";
+import { TunnelTui } from "../tui/blessed/index.js"
 
 interface TunnelData {
     urls: string[] | null;
@@ -17,12 +18,7 @@ const TunnelData: TunnelData = {
     usage: null,
 };
 
-let activeTui: {
-    instance?: { unmount?: () => void };
-    start: () => Promise<void>;
-    waitUntilExit: () => Promise<void>;
-} | null = null;
-
+let activeTui: any = null; // TunnelTui type - loaded dynamically
 
 let disconnectState: {
     disconnected: boolean;
@@ -30,72 +26,47 @@ let disconnectState: {
     messages?: string[];
 } | null = null;
 
-let updateDisconnectState: ((state: typeof disconnectState) => void) | null = null;
-
 declare global {
     var __PINGGY_TUNNEL_STATS__: ((stats: any) => void) | undefined;
 }
 
-async function launchTui(finalConfig: FinalConfig, urls: string[] | null, greet: string | null) {
+async function launchTui(finalConfig: FinalConfig, urls: string[] | null, greet: string | null, tunnel: ManagedTunnel) {
     try {
-        const { withFullScreen } = await import("fullscreen-ink");
-        const { default: TunnelTui } = await import("../tui/index.js");
-        const React = await import("react");
         const isTTYEnabled = process.stdin.isTTY;
 
-        const TunnelTuiWrapper = ({ finalConfig, urls, greet }: any) => {
-            const [disconnectInfo, setDisconnectInfo] = React.useState<typeof disconnectState>(null);
+        if (!isTTYEnabled) {
+            CLIPrinter.warn("Unable to initiate the TUI: your terminal does not support the required input mode.");
+            return;
+        }
 
-            React.useEffect(() => {
-                updateDisconnectState = setDisconnectInfo;
-                return () => {
-                    updateDisconnectState = null;
-                };
-            }, []);
-
-            return (
-                <TunnelTui
-                    urls={urls ?? []}
-                    greet={greet ?? ""}
-                    tunnelConfig={finalConfig}
-                    disconnectInfo={disconnectInfo}
-                />
-            );
-        };
-
-        const tui = withFullScreen(
-            <TunnelTuiWrapper
-                finalConfig={finalConfig}
-                urls={urls}
-                greet={greet}
-            />
-        );
+
+        const tui = new TunnelTui({
+            urls: urls ?? [],
+            greet: greet ?? "",
+            tunnelConfig: finalConfig,
+            disconnectInfo: null,
+            tunnelInstance: tunnel,
+        });
 
         activeTui = tui;
 
-        if (isTTYEnabled) {
-            try {
-                await tui.start();
-                await tui.waitUntilExit();
-            } catch (e) {
-                logger.warn("TUI error", e);
-            } finally {
-                activeTui = null;
-            }
-        } else {
-            CLIPrinter.warn("Unable to initiate the TUI: your terminal does not support the required input mode.");
+        try {
+            tui.start();
+            await tui.waitUntilExit();
+        } catch (e) {
+            logger.warn("TUI error", e);
+        } finally {
+            activeTui = null;
         }
     } catch (e) {
         logger.warn("Failed to (re-)initiate TUI", e);
     }
-};
+}
 
 
 
 export async function startCli(finalConfig: FinalConfig, manager: TunnelManager) {
 
-    await CLIPrinter.ensureDeps();
-    const chalk = await loadChalk();
 
     if (!finalConfig.NoTUI && finalConfig.webDebugger === "") {
         // Need a webdebugger port 
@@ -128,46 +99,46 @@ export async function startCli(finalConfig: FinalConfig, manager: TunnelManager)
 
 
         await manager.startTunnel(tunnel.tunnelid);
-        CLIPrinter.stopSpinnerSuccess("Connected to Pinggy");
-        CLIPrinter.success(chalk.bold("Tunnel established!"));
-        CLIPrinter.print(chalk.gray("───────────────────────────────"));
+        CLIPrinter.stopSpinnerSuccess(" Connected to Pinggy");
+        CLIPrinter.success(pico.bold("Tunnel established!"));
+        CLIPrinter.print(pico.gray("───────────────────────────────"));
 
         TunnelData.urls = await manager.getTunnelUrls(tunnel.tunnelid);
         TunnelData.greet = await manager.getTunnelGreetMessage(tunnel.tunnelid);
 
-        CLIPrinter.info(chalk.cyanBright("Remote URLs:"));
+        CLIPrinter.info(pico.cyanBright("Remote URLs:"));
         (TunnelData.urls ?? []).forEach((url: string) =>
-            CLIPrinter.print("  " + chalk.magentaBright(url))
+            CLIPrinter.print("  " + pico.magentaBright(url))
         );
-        CLIPrinter.print(chalk.gray("───────────────────────────────"));
+        CLIPrinter.print(pico.gray("───────────────────────────────"));
 
 
         if (TunnelData.greet?.includes("not authenticated")) {
             // show unauthenticated warning
-            CLIPrinter.warn(chalk.yellowBright(TunnelData.greet));
+            CLIPrinter.warn(pico.yellowBright(TunnelData.greet));
         } else if (TunnelData.greet?.includes("authenticated as")) {
             // extract email
             const emailMatch = /authenticated as (.+)/.exec(TunnelData.greet);
             if (emailMatch) {
                 const email = emailMatch[1];
-                CLIPrinter.info(chalk.cyanBright("Authenticated as: " + email));
+                CLIPrinter.info(pico.cyanBright("Authenticated as: " + email));
             }
         }
 
-        CLIPrinter.print(chalk.gray("───────────────────────────────"));
-        CLIPrinter.print(chalk.gray("\nPress Ctrl+C to stop the tunnel.\n"));
+        CLIPrinter.print(pico.gray("───────────────────────────────"));
+        CLIPrinter.print(pico.gray("\nPress Ctrl+C to stop the tunnel.\n"));
 
         manager.registerDisconnectListener(tunnel.tunnelid, async (tunnelId, error, messages) => {
-            if (activeTui && updateDisconnectState) {
+            if (activeTui) {
                 disconnectState = {
                     disconnected: true,
                     error: error,
                     messages: messages
                 };
-                updateDisconnectState(disconnectState);
+                activeTui.updateDisconnectInfo(disconnectState);
 
                 try {
-                    // Wait for Ink to fully exit
+                    // Wait for Blessed TUI to fully exit
                     await activeTui.waitUntilExit();
                 } catch (e) {
                     logger.warn("Failed to wait for TUI exit", e);
@@ -175,10 +146,10 @@ export async function startCli(finalConfig: FinalConfig, manager: TunnelManager)
                     activeTui = null;
                     CLIPrinter.warn(`Error in tunnel:`);
                     messages?.forEach(function (m) {
-                        CLIPrinter.warn(m)
+                        CLIPrinter.warnTxt(m)
                     });
 
-                    // Exit ONLY after fullscreen ink has restored the terminal
+                    // Exit ONLY after blessed has restored the terminal
                     // On disconnect only exit if autoReconnect is false otherwise retry will not work
                     if (!finalConfig.autoReconnect) {
                         process.exit(0);
@@ -210,34 +181,34 @@ export async function startCli(finalConfig: FinalConfig, manager: TunnelManager)
                     // ignore
                 }
 
-                CLIPrinter.success(chalk.bold("Tunnel re-established!"));
-                CLIPrinter.print(chalk.gray("───────────────────────────────"));
+                CLIPrinter.success(pico.bold("Tunnel re-established!"));
+                CLIPrinter.print(pico.gray("───────────────────────────────"));
 
                 TunnelData.urls = urls;
                 TunnelData.greet = await manager.getTunnelGreetMessage(tunnel.tunnelid);
 
-                CLIPrinter.info(chalk.cyanBright("Remote URLs:"));
+                CLIPrinter.info(pico.cyanBright("Remote URLs:"));
                 (TunnelData.urls ?? []).forEach((url: string) =>
-                    CLIPrinter.print("  " + chalk.magentaBright(url))
+                    CLIPrinter.print("  " + pico.magentaBright(url))
                 );
-                CLIPrinter.print(chalk.gray("───────────────────────────────"));
+                CLIPrinter.print(pico.gray("───────────────────────────────"));
 
                 if (TunnelData.greet?.includes("not authenticated")) {
-                    CLIPrinter.warn(chalk.yellowBright(TunnelData.greet));
+                    CLIPrinter.warn(pico.yellowBright(TunnelData.greet));
                 } else if (TunnelData.greet?.includes("authenticated as")) {
                     const emailMatch = /authenticated as (.+)/.exec(TunnelData.greet);
                     if (emailMatch) {
                         const email = emailMatch[1];
-                        CLIPrinter.info(chalk.cyanBright("Authenticated as: " + email));
+                        CLIPrinter.info(pico.cyanBright("Authenticated as: " + email));
                     }
                 }
 
-                CLIPrinter.print(chalk.gray("───────────────────────────────"));
-                CLIPrinter.print(chalk.gray("\nPress Ctrl+C to stop the tunnel.\n"));
+                CLIPrinter.print(pico.gray("───────────────────────────────"));
+                CLIPrinter.print(pico.gray("\nPress Ctrl+C to stop the tunnel.\n"));
 
                 // If the TUI was enabled previously, re-create and start it
                 if (!finalConfig.NoTUI) {
-                    await launchTui(finalConfig, TunnelData.urls, TunnelData.greet);
+                    await launchTui(finalConfig, TunnelData.urls, TunnelData.greet, tunnel);
                 }
             });
         } catch (e) {
@@ -245,7 +216,7 @@ export async function startCli(finalConfig: FinalConfig, manager: TunnelManager)
         }
 
         if (!finalConfig.NoTUI) {
-            await launchTui(finalConfig, TunnelData.urls, TunnelData.greet);
+            await launchTui(finalConfig, TunnelData.urls, TunnelData.greet,tunnel);
         }
 
 

package/src/index.ts

@@ -15,16 +15,11 @@ import { argv } from 'process';
 import { realpathSync } from 'fs';
 import { enablePackageLogging } from "./logger.js"
 import { getRemoteManagementState, initiateRemoteManagement, closeRemoteManagement } from "./remote_management/remoteManagement.js";
-import { loadChalk } from "./utils/esmOnlyPackageLoader.js";
-
 
 export { TunnelManager, TunnelOperations, TunnelResponse, enablePackageLogging, getRemoteManagementState, initiateRemoteManagement, closeRemoteManagement };
 
-
 async function main() {
     try {
-         await CLIPrinter.ensureDeps();
-         await loadChalk();
         // Parse arguments from the command line
         const { values, positionals, hasAnyArgs } = parseCliArgs(cliOptions);
 
@@ -65,7 +60,6 @@ async function main() {
         logger.debug("Building final config from CLI values and positionals", { values, positionals });
         const finalConfig = await buildFinalConfig(values, positionals);
         logger.debug("Final configuration built", finalConfig);
-
         await startCli(finalConfig, manager);
 
     } catch (error) {

package/src/remote_management/remoteManagement.ts

@@ -2,7 +2,6 @@ import WebSocket from "ws";
 import { logger } from "../logger.js";
 import { handleConnectionStatusMessage, WebSocketCommandHandler, WebSocketRequest } from "./websocket_handlers.js";
 import CLIPrinter from "../utils/printer.js";
-import { loadChalk } from "../utils/esmOnlyPackageLoader.js";
 import { RemoteManagementState, RemoteManagementStatus } from "../types.js";
 
 const RECONNECT_SLEEP_MS = 5000; // 5 seconds
@@ -70,8 +69,6 @@ export async function parseRemoteManagement(values: RemoteManagementValues): Pro
  * - Keep running until closed or SIGINT
  */
 export async function initiateRemoteManagement(token: string, manage?: string): Promise<RemoteManagementState> {
-  await CLIPrinter.ensureDeps();
-  await loadChalk();
 
   if (!token || token.trim().length === 0) {
     throw new Error("Remote management token is required (use --remote-management <TOKEN>)");

package/src/remote_management/remote_schema.ts

@@ -25,7 +25,7 @@ export const TunnelConfigSchema = z
     autoreconnect: z.boolean(),
     basicauth: z.array(z.object({ username: z.string(), password: z.string() })).nullable(),
     bearerauth: z.string().nullable(),
-    configid: z.string().uuid(),
+    configid: z.string(),
     configname: z.string(),
     greetmsg: z.string().optional(),
     force: z.boolean(),
@@ -83,7 +83,7 @@ export const TunnelConfigSchema = z
  */
 
 export const StartSchema = z.object({
-  tunnelID: z.string().uuid().nullable().optional(),
+  tunnelID: z.string().nullable().optional(),
   tunnelConfig: TunnelConfigSchema,
 });