runcloud 0.1.114 → 0.1.115

package/dist/commands/boxAccess.js

@@ -1,7 +1,7 @@
 import { spawn, spawnSync } from 'node:child_process';
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync, } from 'node:fs';
 import { homedir, hostname as localHostname } from 'node:os';
-import { join } from 'node:path';
+import { dirname, join } from 'node:path';
 import WebSocket, { createWebSocketStream } from 'ws';
 import { ApiClient, friendlyApiError } from '../api.js';
 import { requireCredentials } from '../config.js';
@@ -85,6 +85,22 @@ function sshHome() {
 function keyPath() {
     return join(sshHome(), 'id_ed25519');
 }
+function sshConfigPath() {
+    return join(homedir(), '.ssh', 'config');
+}
+export function sshCommandArgs(configPath, alias, command = []) {
+    return ['-F', configPath, alias, ...command];
+}
+export function scpCommandArgs(configPath, recursive, source, destination) {
+    return [
+        '-F',
+        configPath,
+        ...(recursive ? ['-r'] : []),
+        '--',
+        source,
+        destination,
+    ];
+}
 function exec(command, args) {
     return new Promise((resolve, reject) => {
         const child = spawn(command, args, { stdio: 'inherit' });
@@ -119,8 +135,8 @@ function sshAlias(box) {
     return `runcloud-${box.name}`;
 }
 function writeSshConfig(box, privateKey) {
-    const sshDir = join(homedir(), '.ssh');
-    const configPath = join(sshDir, 'config');
+    const configPath = sshConfigPath();
+    const sshDir = dirname(configPath);
     mkdirSync(sshDir, { recursive: true, mode: 0o700 });
     const current = existsSync(configPath) ? readFileSync(configPath, 'utf8') : '';
     const start = `# BEGIN RUN CLOUD ${box.id}`;
@@ -147,7 +163,7 @@ async function setupSsh(reference) {
     const client = api();
     const box = await resolveBox(client, reference);
     const privateKey = await ensureSshKey(client, box);
-    return { box, alias: writeSshConfig(box, privateKey) };
+    return { box, alias: writeSshConfig(box, privateKey), configPath: sshConfigPath() };
 }
 function output(value, opts) {
     if (opts.json)
@@ -221,7 +237,7 @@ export function registerAccessCommands(parent, opts = {}) {
         note('ssh');
         return action(async () => {
             const configured = await setupSsh(reference);
-            const code = await exec('ssh', [configured.alias, ...command]);
+            const code = await exec('ssh', sshCommandArgs(configured.configPath, configured.alias, command));
             if (code !== 0)
                 process.exitCode = code;
         });
@@ -252,12 +268,7 @@ export function registerAccessCommands(parent, opts = {}) {
             }
             const configured = await setupSsh(reference);
             const remote = (path) => path.startsWith(':') ? `${configured.alias}:${path.slice(1)}` : path;
-            const args = [
-                ...(cmdOpts.recursive ? ['-r'] : []),
-                '--',
-                remote(source),
-                remote(destination),
-            ];
+            const args = scpCommandArgs(configured.configPath, cmdOpts.recursive === true, remote(source), remote(destination));
             const code = await exec('scp', args);
             if (code !== 0)
                 process.exitCode = code;

package/dist/version.js

@@ -1 +1 @@
-export const CLI_VERSION = '0.1.114';
+export const CLI_VERSION = '0.1.115';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runcloud",
-  "version": "0.1.114",
+  "version": "0.1.115",
   "description": "Create and control run.cloud remote mobile simulators and cloud sandboxes",
   "license": "Apache-2.0",
   "keywords": [