@miraj181/ipingyou 2.1.9 → 2.1.18

package/src/modes/client.js

@@ -24,9 +24,9 @@ import { getConfig, saveAlias } from '../lib/config.js';
 import { pushTelemetry, requestHostApproval, resolveUID, revokeUID, waitForApproval } from '../lib/broker.js';
 import { calculateChecksum } from '../lib/checksum.js';
 import { promptLocalPath, promptRemotePath } from '../lib/path-browser.js';
-import { buildSshArgs, extractHostname, formatScpRemotePath, getKnownHostsOptions, getSshControlOptions, quoteRemoteShell } from '../lib/ssh.js';
+import { buildProxyCommandOption, buildSshArgs, extractHostname, formatScpRemotePath, getKnownHostsOptions, getSshControlOptions, quoteRemoteShell } from '../lib/ssh.js';
 import { buildTmuxSessionName, TMUX_SOCKET_PATH } from '../lib/tmux.js';
-import open from 'open';
+import { openUrl } from '../lib/open-url.js';
 import { secureSensitiveUrl } from '../lib/secure-print.js';
 import { cleanupSessionLog, initSessionLog, logSessionEvent, recordEvent } from '../lib/session-log.js';
 
@@ -187,12 +187,10 @@ async function performSCP(username, hostname, direction, privateKeyPath, sharedD
 
   await showConnectionTrace('Local', 'Remote SCP');
 
-  const proxyCommand = `cloudflared access tcp --hostname ${hostname}`;
-
   // Construct SCP args
   const scpArgs = [
     '-r', // recursive just in case
-    '-o', `ProxyCommand=${proxyCommand}`,
+    ...buildProxyCommandOption(hostname),
     ...getKnownHostsOptions(persistKnownHosts),
     '-o', 'IdentitiesOnly=yes',
     ...getSshControlOptions(hostname)
@@ -223,6 +221,16 @@ async function performSCP(username, hostname, direction, privateKeyPath, sharedD
     const child = execa('scp', scpArgs, {
       stdio: ['inherit', 'pipe', 'pipe'],
       reject: false,
+      buffer: false,
+    });
+    const maxDiagnosticBytes = 64 * 1024;
+    let stderrOutput = Buffer.alloc(0);
+    child.stdout?.resume();
+    child.stderr?.on('data', (chunk) => {
+      const next = Buffer.concat([stderrOutput, Buffer.from(chunk)]);
+      stderrOutput = next.length > maxDiagnosticBytes
+        ? next.subarray(next.length - maxDiagnosticBytes)
+        : next;
     });
 
     trackPID(child.pid);
@@ -262,9 +270,10 @@ async function performSCP(username, hostname, direction, privateKeyPath, sharedD
       console.log(chalk.green(`  ✅ Transfer completed successfully!`));
       recordEvent('scp_transfer_success', { direction, localPath, remotePath, hostname });
     } else {
+      const stderr = stderrOutput.toString('utf8');
       console.error(chalk.red('  ❌ SCP transfer failed'));
-      if (result.stderr) console.error(chalk.dim(`     ${result.stderr.trim()}`));
-      recordEvent('scp_transfer_failed', { direction, localPath, remotePath, hostname, error: result.stderr });
+      if (stderr) console.error(chalk.dim(`     ${stderr.trim()}`));
+      recordEvent('scp_transfer_failed', { direction, localPath, remotePath, hostname, error: stderr });
     }
   } catch (err) {
     console.error(chalk.red(`  ❌ SCP error: ${err.message}`));
@@ -273,10 +282,9 @@ async function performSCP(username, hostname, direction, privateKeyPath, sharedD
 
 async function downloadSpecificRemotePath(username, hostname, privateKeyPath, remotePath, localPath, persistKnownHosts = true) {
   await showConnectionTrace('Local', 'Remote SCP');
-  const proxyCommand = `cloudflared access tcp --hostname ${hostname}`;
   const scpArgs = [
     '-r',
-    '-o', `ProxyCommand=${proxyCommand}`,
+    ...buildProxyCommandOption(hostname),
     ...getKnownHostsOptions(persistKnownHosts),
     '-o', 'IdentitiesOnly=yes',
     ...getSshControlOptions(hostname),
@@ -471,7 +479,7 @@ export async function startClientMode(options = {}) {
     console.log('');
     logSessionEvent('client_http_mode', { uid: targetUid, port: payload.port || null });
     try {
-      await open(payload.url);
+      await openUrl(payload.url);
     } catch {
       console.log(chalk.dim(`  Could not auto-open. Please visit: ${payload.url}`));
     }
@@ -667,8 +675,7 @@ export async function performSCPNonInteractive(params = {}) {
   const privateKeyPath = payload.privateKey ? await writeEphemeralPrivateKey(payload.privateKey) : null;
 
   // Build scp args similar to performSCP
-  const proxyCommand = `cloudflared access tcp --hostname ${hostname}`;
-  const scpArgs = ['-r', '-o', `ProxyCommand=${proxyCommand}`, ...getKnownHostsOptions(persistKnownHosts), '-o', 'IdentitiesOnly=yes', ...getSshControlOptions(hostname)];
+  const scpArgs = ['-r', ...buildProxyCommandOption(hostname), ...getKnownHostsOptions(persistKnownHosts), '-o', 'IdentitiesOnly=yes', ...getSshControlOptions(hostname)];
   if (privateKeyPath) scpArgs.push('-i', privateKeyPath, '-o', 'IdentityAgent=none');
 
   const remoteSpec = `${username}@${hostname}:${formatScpRemotePath(remotePath)}`;
@@ -704,7 +711,7 @@ async function handleClientChat(uid, password, cachedChatUrl) {
     spinner.succeed('Chat Room found! Opening browser...');
     try {
       const fullUrl = `${chatUrl}#${password}`;
-      await open(fullUrl);
+      await openUrl(fullUrl);
     } catch {
       console.log(chalk.cyan(`  👉 Please open: ${secureSensitiveUrl(chatUrl, password)}`));
     }