cli-tunnel 1.2.0-beta.4 → 1.2.0-beta.6

package/dist/index.js

@@ -475,42 +475,36 @@ async function main() {
             }
         }
         if (devtunnelInstalled) {
+            // Check if logged in before attempting tunnel creation
             try {
-                // Check if logged in before attempting tunnel creation
-                try {
-                    const userInfo = execFileSync('devtunnel', ['user', 'show'], { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
-                    if (userInfo.includes('not logged in') || userInfo.includes('No user') || userInfo.includes('Anonymous')) {
-                        throw new Error('not logged in');
-                    }
+                const userInfo = execFileSync('devtunnel', ['user', 'show'], { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+                if (userInfo.includes('not logged in') || userInfo.includes('No user') || userInfo.includes('Anonymous')) {
+                    throw new Error('not logged in');
                 }
-                catch {
-                    console.log(`\n  ${YELLOW}⚠ devtunnel not authenticated.${RESET}\n`);
-                    const loginAnswer = await askUser(`  Would you like to log in now? [Y/n] `);
-                    if (loginAnswer === '' || loginAnswer === 'y' || loginAnswer === 'yes') {
-                        try {
-                            const loginProc = spawn('devtunnel', ['user', 'login'], { stdio: 'inherit' });
-                            await new Promise((resolve, reject) => {
-                                loginProc.on('close', (code) => code === 0 ? resolve() : reject(new Error(`Login exited with code ${code}`)));
-                                loginProc.on('error', reject);
-                            });
-                            console.log(`\n  ${GREEN}✓${RESET} Logged in successfully!\n`);
-                        }
-                        catch {
-                            console.log(`\n  ${YELLOW}⚠${RESET} Login failed. Run manually: ${GREEN}devtunnel user login${RESET}\n`);
-                            console.log(`  ${DIM}Continuing without tunnel (local only)...${RESET}\n`);
-                            devtunnelInstalled = false;
-                        }
+            }
+            catch {
+                console.log(`\n  ${YELLOW}⚠ devtunnel not authenticated.${RESET}\n`);
+                const loginAnswer = await askUser(`  Would you like to log in now? [Y/n] `);
+                if (loginAnswer === '' || loginAnswer === 'y' || loginAnswer === 'yes') {
+                    try {
+                        const loginProc = spawn('devtunnel', ['user', 'login'], { stdio: 'inherit' });
+                        await new Promise((resolve, reject) => {
+                            loginProc.on('close', (code) => code === 0 ? resolve() : reject(new Error(`Login exited with code ${code}`)));
+                            loginProc.on('error', reject);
+                        });
+                        console.log(`\n  ${GREEN}✓${RESET} Logged in successfully!\n`);
                     }
-                    else {
-                        console.log(`\n  ${DIM}Run this once to log in: ${GREEN}devtunnel user login${RESET}`);
+                    catch {
+                        console.log(`\n  ${YELLOW}⚠${RESET} Login failed. Run manually: ${GREEN}devtunnel user login${RESET}\n`);
                         console.log(`  ${DIM}Continuing without tunnel (local only)...${RESET}\n`);
                         devtunnelInstalled = false;
                     }
                 }
-            }
-            catch (err) {
-                console.log(`  ${YELLOW}⚠${RESET} Tunnel failed: ${err.message}\n`);
-                devtunnelInstalled = false;
+                else {
+                    console.log(`\n  ${DIM}Run this once to log in: ${GREEN}devtunnel user login${RESET}`);
+                    console.log(`  ${DIM}Continuing without tunnel (local only)...${RESET}\n`);
+                    devtunnelInstalled = false;
+                }
             }
         }
         if (devtunnelInstalled) {
@@ -553,7 +547,28 @@ async function main() {
                 catch { } });
             }
             catch (err) {
-                console.log(`  ${YELLOW}⚠${RESET} Tunnel failed: ${err.message}\n`);
+                const errMsg = err.message || '';
+                // Detect auth failure at create time (expired token, anonymous, etc.)
+                if (errMsg.includes('Anonymous') || errMsg.includes('Unauthorized') || errMsg.includes('not permitted')) {
+                    console.log(`\n  ${YELLOW}⚠ devtunnel session expired or not authenticated.${RESET}\n`);
+                    const loginAnswer = await askUser(`  Would you like to log in now? [Y/n] `);
+                    if (loginAnswer === '' || loginAnswer === 'y' || loginAnswer === 'yes') {
+                        try {
+                            const loginProc = spawn('devtunnel', ['user', 'login'], { stdio: 'inherit' });
+                            await new Promise((resolve, reject) => {
+                                loginProc.on('close', (code) => code === 0 ? resolve() : reject(new Error(`Login exited with code ${code}`)));
+                                loginProc.on('error', reject);
+                            });
+                            console.log(`\n  ${GREEN}✓${RESET} Logged in! Please run cli-tunnel again to create the tunnel.\n`);
+                        }
+                        catch {
+                            console.log(`\n  ${YELLOW}⚠${RESET} Login failed. Run manually: ${GREEN}devtunnel user login${RESET}\n`);
+                        }
+                    }
+                }
+                else {
+                    console.log(`  ${YELLOW}⚠${RESET} Tunnel failed: ${errMsg}\n`);
+                }
             }
         } // end if (devtunnelInstalled)
     }
@@ -617,44 +632,93 @@ async function main() {
         cols, rows, cwd,
         env: safeEnv,
     });
-    // Detect CSPRNG crash (Node.js 23 + node-pty issue) and retry via cmd.exe wrapper
+    // Detect CSPRNG crash (Node.js 23 + node-pty issue) and retry with fallbacks
     let ptyExitedEarly = false;
     const earlyExitCheck = new Promise((resolve) => {
         ptyProcess.onExit(({ exitCode }) => {
-            if (exitCode === 134 || exitCode === 3221226505) { // 134 = SIGABRT, 3221226505 = STATUS_BREAKPOINT
+            if (exitCode === 134 || exitCode === 3221226505) {
                 ptyExitedEarly = true;
                 resolve();
             }
         });
-        setTimeout(resolve, 2000); // Wait 2s — if still running, it's fine
+        setTimeout(resolve, 2000);
     });
     await earlyExitCheck;
     if (ptyExitedEarly && process.platform === 'win32') {
-        console.log(`  ${YELLOW}⚠${RESET} CSPRNG crash detected (Node.js + PTY issue), retrying via cmd.exe wrapper...\n`);
-        // Spawn through cmd.exe /c — this adds a shell layer that avoids the crash
-        const cmdLine = [resolvedCmd, ...commandArgs].map(a => a.includes(' ') ? `"${a}"` : a).join(' ');
-        ptyProcess = nodePty.spawn('cmd.exe', ['/c', cmdLine], {
+        // Retry 1: Use full environment — CSPRNG may need env vars we filtered out
+        console.log(`  ${YELLOW}⚠${RESET} Process crashed, retrying with full environment...\n`);
+        // Blocklist approach: pass everything EXCEPT known dangerous vars
+        const DANGEROUS_VARS = new Set(['NODE_OPTIONS', 'NODE_REPL_HISTORY', 'NODE_EXTRA_CA_CERTS',
+            'NODE_PATH', 'NODE_REDIRECT_WARNINGS', 'NODE_PENDING_DEPRECATION',
+            'UV_THREADPOOL_SIZE', 'LD_PRELOAD', 'DYLD_INSERT_LIBRARIES']);
+        const fullSafeEnv = {};
+        for (const [k, v] of Object.entries(process.env)) {
+            if (!DANGEROUS_VARS.has(k) && v !== undefined)
+                fullSafeEnv[k] = v;
+        }
+        ptyProcess = nodePty.spawn(resolvedCmd, commandArgs, {
             name: 'xterm-256color',
             cols, rows, cwd,
-            env: safeEnv,
+            env: fullSafeEnv,
         });
-        // Check if cmd.exe wrapper also fails
-        let retryFailed = false;
-        const retryCheck = new Promise((resolve) => {
+        let retry1Failed = false;
+        const retry1Check = new Promise((resolve) => {
             ptyProcess.onExit(({ exitCode }) => {
                 if (exitCode === 134 || exitCode === 3221226505) {
-                    retryFailed = true;
+                    retry1Failed = true;
                     resolve();
                 }
             });
             setTimeout(resolve, 2000);
         });
-        await retryCheck;
-        if (retryFailed) {
-            const nodeVer = process.version;
-            console.log(`  ${YELLOW}⚠${RESET} The command crashed due to a known Node.js ${nodeVer} + PTY compatibility issue.`);
-            console.log(`  ${BOLD}Fix:${RESET} Install Node.js 22 LTS: ${GREEN}nvm install 22${RESET} or ${GREEN}winget install OpenJS.NodeJS.LTS${RESET}\n`);
-            process.exit(1);
+        await retry1Check;
+        if (retry1Failed) {
+            // Retry 2: cmd.exe wrapper with full env
+            console.log(`  ${YELLOW}⚠${RESET} Still crashing, retrying via cmd.exe wrapper...\n`);
+            const cmdLine = [resolvedCmd, ...commandArgs].map(a => a.includes(' ') ? `"${a}"` : a).join(' ');
+            ptyProcess = nodePty.spawn('cmd.exe', ['/c', cmdLine], {
+                name: 'xterm-256color',
+                cols, rows, cwd,
+                env: fullSafeEnv,
+            });
+            let retry2Failed = false;
+            const retry2Check = new Promise((resolve) => {
+                ptyProcess.onExit(({ exitCode }) => {
+                    if (exitCode === 134 || exitCode === 3221226505) {
+                        retry2Failed = true;
+                        resolve();
+                    }
+                });
+                setTimeout(resolve, 2000);
+            });
+            await retry2Check;
+            if (retry2Failed) {
+                // Retry 3: useConpty: false with full env
+                console.log(`  ${YELLOW}⚠${RESET} Still crashing, retrying with legacy PTY backend...\n`);
+                ptyProcess = nodePty.spawn(resolvedCmd, commandArgs, {
+                    name: 'xterm-256color',
+                    cols, rows, cwd,
+                    env: fullSafeEnv,
+                    useConpty: false,
+                });
+                let retry3Failed = false;
+                const retry3Check = new Promise((resolve) => {
+                    ptyProcess.onExit(({ exitCode }) => {
+                        if (exitCode === 134 || exitCode === 3221226505) {
+                            retry3Failed = true;
+                            resolve();
+                        }
+                    });
+                    setTimeout(resolve, 2000);
+                });
+                await retry3Check;
+                if (retry3Failed) {
+                    const nodeVer = process.version;
+                    console.log(`  ${YELLOW}⚠${RESET} The command crashed due to a known Node.js ${nodeVer} + PTY compatibility issue.`);
+                    console.log(`  ${BOLD}Fix:${RESET} Install Node.js 22 LTS: ${GREEN}nvm install 22${RESET} or ${GREEN}winget install OpenJS.NodeJS.LTS${RESET}\n`);
+                    process.exit(1);
+                }
+            }
         }
     }
     ptyProcess.onData((data) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli-tunnel",
-  "version": "1.2.0-beta.4",
+  "version": "1.2.0-beta.6",
   "description": "Tunnel any CLI app to your phone — PTY + devtunnel + xterm.js",
   "type": "module",
   "main": "dist/index.js",