cli-tunnel 1.0.0 → 1.0.2

package/dist/index.js

@@ -220,47 +220,87 @@ async function main() {
     console.log(`  ${DIM}Port:${RESET}     ${actualPort}`);
     // Tunnel
     if (hasTunnel) {
+        // Check if devtunnel is installed
+        let devtunnelInstalled = false;
         try {
             execSync('devtunnel --version', { stdio: 'pipe' });
-            const labels = ['cli-tunnel', sanitizeLabel(sessionName || command), sanitizeLabel(repo), sanitizeLabel(branch), sanitizeLabel(machine), `port-${actualPort}`]
-                .map(l => `--labels ${l}`).join(' ');
-            const createOut = execSync(`devtunnel create ${labels} --expiration 1d --json`, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
-            const tunnelId = JSON.parse(createOut).tunnel?.tunnelId?.split('.')[0];
-            const cluster = JSON.parse(createOut).tunnel?.tunnelId?.split('.')[1] || 'euw';
-            execSync(`devtunnel port create ${tunnelId} -p ${actualPort} --protocol http`, { stdio: 'pipe' });
-            const hostProc = spawn('devtunnel', ['host', tunnelId], { stdio: 'pipe', detached: false });
-            const url = await new Promise((resolve, reject) => {
-                const timeout = setTimeout(() => reject(new Error('Tunnel timeout')), 15000);
-                let out = '';
-                hostProc.stdout?.on('data', (d) => {
-                    out += d.toString();
-                    const match = out.match(/https:\/\/[^\s]+/);
-                    if (match) {
-                        clearTimeout(timeout);
-                        resolve(match[0]);
-                    }
-                });
-                hostProc.on('error', (e) => { clearTimeout(timeout); reject(e); });
-            });
-            console.log(`  ${GREEN}✓${RESET} Tunnel: ${BOLD}${url}${RESET}\n`);
-            try {
-                // @ts-ignore
-                const qr = (await import('qrcode-terminal'));
-                qr.default.generate(url, { small: true }, (code) => console.log(code));
+            devtunnelInstalled = true;
+        }
+        catch {
+            console.log(`\n  ${YELLOW}⚠ devtunnel CLI not found!${RESET}\n`);
+            console.log(`  ${BOLD}To enable remote access, install Microsoft Dev Tunnels:${RESET}\n`);
+            if (process.platform === 'win32') {
+                console.log(`    ${GREEN}winget install Microsoft.devtunnel${RESET}`);
             }
-            catch { }
-            process.on('SIGINT', () => { hostProc.kill(); try {
-                execSync(`devtunnel delete ${tunnelId} --force`, { stdio: 'pipe' });
+            else if (process.platform === 'darwin') {
+                console.log(`    ${GREEN}brew install --cask devtunnel${RESET}`);
             }
-            catch { } });
-            process.on('exit', () => { hostProc.kill(); try {
-                execSync(`devtunnel delete ${tunnelId} --force`, { stdio: 'pipe' });
+            else {
+                console.log(`    ${GREEN}curl -sL https://aka.ms/DevTunnelCliInstall | bash${RESET}`);
             }
-            catch { } });
+            console.log(`\n  Then authenticate once:\n`);
+            console.log(`    ${GREEN}devtunnel user login${RESET}\n`);
+            console.log(`  ${DIM}More info: https://aka.ms/devtunnels/doc${RESET}\n`);
+            console.log(`  ${DIM}Continuing without tunnel (local only)...${RESET}\n`);
         }
-        catch (err) {
-            console.log(`  ${YELLOW}⚠${RESET} Tunnel failed: ${err.message}\n`);
+        // Check if logged in
+        if (devtunnelInstalled) {
+            try {
+                const userInfo = execSync('devtunnel user show', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+                if (userInfo.includes('not logged in') || userInfo.includes('No user')) {
+                    throw new Error('not logged in');
+                }
+            }
+            catch {
+                console.log(`\n  ${YELLOW}⚠ devtunnel not authenticated!${RESET}\n`);
+                console.log(`  Run this once to log in:\n`);
+                console.log(`    ${GREEN}devtunnel user login${RESET}\n`);
+                console.log(`  ${DIM}Continuing without tunnel (local only)...${RESET}\n`);
+                devtunnelInstalled = false;
+            }
         }
+        if (devtunnelInstalled) {
+            try {
+                const labels = ['cli-tunnel', sanitizeLabel(sessionName || command), sanitizeLabel(repo), sanitizeLabel(branch), sanitizeLabel(machine), `port-${actualPort}`]
+                    .map(l => `--labels ${l}`).join(' ');
+                const createOut = execSync(`devtunnel create ${labels} --expiration 1d --json`, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+                const tunnelId = JSON.parse(createOut).tunnel?.tunnelId?.split('.')[0];
+                const cluster = JSON.parse(createOut).tunnel?.tunnelId?.split('.')[1] || 'euw';
+                execSync(`devtunnel port create ${tunnelId} -p ${actualPort} --protocol http`, { stdio: 'pipe' });
+                const hostProc = spawn('devtunnel', ['host', tunnelId], { stdio: 'pipe', detached: false });
+                const url = await new Promise((resolve, reject) => {
+                    const timeout = setTimeout(() => reject(new Error('Tunnel timeout')), 15000);
+                    let out = '';
+                    hostProc.stdout?.on('data', (d) => {
+                        out += d.toString();
+                        const match = out.match(/https:\/\/[^\s]+/);
+                        if (match) {
+                            clearTimeout(timeout);
+                            resolve(match[0]);
+                        }
+                    });
+                    hostProc.on('error', (e) => { clearTimeout(timeout); reject(e); });
+                });
+                console.log(`  ${GREEN}✓${RESET} Tunnel: ${BOLD}${url}${RESET}\n`);
+                try {
+                    // @ts-ignore
+                    const qr = (await import('qrcode-terminal'));
+                    qr.default.generate(url, { small: true }, (code) => console.log(code));
+                }
+                catch { }
+                process.on('SIGINT', () => { hostProc.kill(); try {
+                    execSync(`devtunnel delete ${tunnelId} --force`, { stdio: 'pipe' });
+                }
+                catch { } });
+                process.on('exit', () => { hostProc.kill(); try {
+                    execSync(`devtunnel delete ${tunnelId} --force`, { stdio: 'pipe' });
+                }
+                catch { } });
+            }
+            catch (err) {
+                console.log(`  ${YELLOW}⚠${RESET} Tunnel failed: ${err.message}\n`);
+            }
+        } // end if (devtunnelInstalled)
     }
     console.log(`  ${DIM}Starting ${command}...${RESET}\n`);
     // Spawn PTY

package/package.json

@@ -1,23 +1,35 @@
 {
   "name": "cli-tunnel",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Tunnel any CLI app to your phone - PTY + devtunnel + xterm.js",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
-    "cli-tunnel": "./dist/index.js"
+    "cli-tunnel": "dist/index.js"
   },
-  "files": ["dist", "remote-ui"],
+  "files": [
+    "dist",
+    "remote-ui"
+  ],
   "scripts": {
     "build": "tsc",
     "test": "vitest run"
   },
-  "keywords": ["cli", "tunnel", "remote", "pty", "xterm", "devtunnel", "copilot", "terminal"],
+  "keywords": [
+    "cli",
+    "tunnel",
+    "remote",
+    "pty",
+    "xterm",
+    "devtunnel",
+    "copilot",
+    "terminal"
+  ],
   "author": "Tamir Dresher",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/tamirdresher/cli-tunnel.git"
+    "url": "git+https://github.com/tamirdresher/cli-tunnel.git"
   },
   "engines": {
     "node": ">=22.0.0"