openship 0.6.7 → 0.6.8

package/dist/{chunk-GGIAIGUL.js → chunk-UAWY6X7V.js}

@@ -8,24 +8,24 @@ import {
 import {
   getTarCreateEnv,
   prepareSourceTarArgs
-} from "./chunk-2ANV5ZQ5.js";
+} from "./chunk-VAI5VOOI.js";
 import {
   connectSshClient,
   openDockerDialStdioChannel,
   openSftp,
   openSshUnixSocket,
   reconcileKnownHosts
-} from "./chunk-5T4UVOM3.js";
+} from "./chunk-TAZZZKYO.js";
 import {
   LocalExecutor
-} from "./chunk-E2X26PXR.js";
+} from "./chunk-T6DVUX4F.js";
 import {
   emitBufferedLines,
   flushBufferedLines,
   hasLocalCommand,
   logEntry,
   sq
-} from "./chunk-H3WT3A6R.js";
+} from "./chunk-P7RCYELG.js";
 import {
   HostChannelUnavailableError,
   SshDisconnectedError,
@@ -42,7 +42,7 @@ import {
   hostChannelAccount,
   hostFirewallRule,
   safeErrorMessage
-} from "./chunk-2VSW6Q6C.js";
+} from "./chunk-WEZFTL4V.js";
 
 // ../../packages/adapters/src/system/executor.ts
 import { existsSync, readFileSync } from "fs";
@@ -62,7 +62,10 @@ import { tmpdir } from "os";
 import { join } from "path";
 function packLocalArchive(tarArgs, outFile) {
   return new Promise((resolve, reject) => {
-    const tar = spawn("tar", tarArgs, { stdio: ["ignore", "pipe", "pipe"], env: getTarCreateEnv() });
+    const tar = spawn("tar", tarArgs, {
+      stdio: ["ignore", "pipe", "pipe"],
+      env: getTarCreateEnv()
+    });
     const out = createWriteStream(outFile);
     let stderr = "";
     let tarCode = null;
@@ -71,7 +74,12 @@ function packLocalArchive(tarArgs, outFile) {
     const settle = () => {
       if (!tarClosed || !outClosed) return;
       if (tarCode === 0) resolve();
-      else reject(new Error(`tar failed (exit ${tarCode})${stderr.trim() ? `: ${stderr.trim().slice(-300)}` : ""}`));
+      else
+        reject(
+          new Error(
+            `tar failed (exit ${tarCode})${stderr.trim() ? `: ${stderr.trim().slice(-300)}` : ""}`
+          )
+        );
     };
     tar.stderr.on("data", (d) => {
       stderr += d.toString();
@@ -102,9 +110,17 @@ async function extractRemoteArchive(exec, remoteArchive, remotePath, expectedByt
   );
   onLog?.(logEntry(`Transferred ${formatBytes(expectedBytes)} and extracted on the server.`));
 }
+function formatPrivateKeyForOpenSsh(privateKey) {
+  const normalized = privateKey.replace(/^\uFEFF/, "").replace(/\r\n?/g, "\n");
+  return normalized.endsWith("\n") ? normalized : `${normalized}
+`;
+}
 async function canUseRemoteRsync(deps) {
   if (deps.config.privateKey && deps.config.privateKeyPassphrase && !deps.config.sshAgent) {
-    return { ok: false, reason: "encrypted SSH keys without an agent are not supported by non-interactive rsync" };
+    return {
+      ok: false,
+      reason: "encrypted SSH keys without an agent are not supported by non-interactive rsync"
+    };
   }
   const [localRsync, localSsh, localSshpass, remoteRsync] = await Promise.all([
     hasLocalCommand("rsync"),
@@ -114,7 +130,8 @@ async function canUseRemoteRsync(deps) {
   ]);
   if (!localRsync) return { ok: false, reason: "local rsync is not installed" };
   if (!localSsh) return { ok: false, reason: "local ssh is not installed" };
-  if (!localSshpass) return { ok: false, reason: "local sshpass is not installed for password-based rsync" };
+  if (!localSshpass)
+    return { ok: false, reason: "local sshpass is not installed for password-based rsync" };
   if (!remoteRsync) return { ok: false, reason: "remote rsync is not installed" };
   return { ok: true };
 }
@@ -157,7 +174,7 @@ async function withTemporaryPrivateKey(config, fn) {
   const tempDir = await mkdtemp(join(tmpdir(), "openship-rsync-key-"));
   const keyPath = join(tempDir, "id_rsa");
   try {
-    await fsWriteFile(keyPath, config.privateKey);
+    await fsWriteFile(keyPath, formatPrivateKeyForOpenSsh(config.privateKey), { mode: 384 });
     await chmod(keyPath, 384);
     return await fn(keyPath);
   } finally {
@@ -203,7 +220,12 @@ async function uploadFileWithRsync(localFile, remoteFile, deps, onLog, opts) {
     let lastCode = 1;
     for (let attempt = 1; attempt <= retries; attempt++) {
       if (attempt > 1) {
-        onLog?.(logEntry(`Connection dropped \u2014 resuming upload (attempt ${attempt}/${retries})...`, "warn"));
+        onLog?.(
+          logEntry(
+            `Connection dropped \u2014 resuming upload (attempt ${attempt}/${retries})...`,
+            "warn"
+          )
+        );
       }
       const args = [
         "-a",
@@ -1669,7 +1691,7 @@ async function verifyHostChannelAuth(config) {
   let hint = null;
   let forwarding = "unknown";
   try {
-    const { connectSshClient: connectSshClient2 } = await import("./ssh-client-625VWGKP.js");
+    const { connectSshClient: connectSshClient2 } = await import("./ssh-client-2XWZCMGI.js");
     const client = await connectSshClient2({
       host: config.host,
       port: config.port,

package/dist/{chunk-2ANV5ZQ5.js → chunk-VAI5VOOI.js}

@@ -4,7 +4,7 @@ import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
   PACKAGE_ROOT_ONLY_EXCLUDES
-} from "./chunk-2VSW6Q6C.js";
+} from "./chunk-WEZFTL4V.js";
 
 // ../../packages/adapters/src/archive.ts
 import { execFile } from "child_process";