trajectories-sh 1.10.0 → 1.10.2

package/dist/cli.js

@@ -81,7 +81,7 @@ async function uploadTrajectoryAction(directory, opts) {
   Uploading trajectory ${directory} \u2192 ${chalk.cyan(slug)}
 `));
   try {
-    const { uploadJob } = await import("./upload-EHVKRW64.js");
+    const { uploadJob } = await import("./upload-K2GBG3J3.js");
     const result = await uploadJob(directory, {
       slug,
       name: opts.name,

package/dist/{upload-EHVKRW64.js → upload-K2GBG3J3.js}

@@ -355,8 +355,6 @@ async function uploadJob(dir, opts) {
 }
 async function uploadArchive(jobId, dir) {
   const tar = await import("tar");
-  const { createReadStream } = await import("fs");
-  const { ProgressBar } = await import("./progress-H7WNKHDR.js");
   const tmpArchive = join(tmpdir(), `trajectories-archive-${randomBytes(4).toString("hex")}.tar.gz`);
   const entries = collectFiles(dir).map((f) => f.relPath);
   await tar.create(
@@ -371,98 +369,110 @@ async function uploadArchive(jobId, dir) {
   const archiveSize = statSync(tmpArchive).size;
   console.log(`  Archive: ${(archiveSize / 1024 / 1024).toFixed(1)} MB (gzipped, ${entries.length} entries)`);
   try {
-    const urlResp = await apiPost(`/api/cli/push/${jobId}/upload-url`, {});
-    if (!urlResp.ok) {
-      throw new Error(`Failed to get archive upload URL: ${await urlResp.text()}`);
-    }
-    const { signed_url: signedUrl } = await urlResp.json();
-    if (!signedUrl) {
-      throw new Error("Server returned no signed URL for archive upload");
-    }
-    let putError = null;
-    for (let attempt = 0; attempt < 3; attempt++) {
-      const bar = new ProgressBar({ total: 1, totalBytes: archiveSize, label: "\u2191 archive" });
-      const stream = createReadStream(tmpArchive);
-      let bytesSent = 0;
-      stream.on("data", (chunk) => {
-        bytesSent += chunk.length;
-        bar.setBytes(bytesSent);
-      });
+    const maxAttempts = 3;
+    let lastError = null;
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      if (attempt > 1) {
+        console.log(`  Retrying archive upload (attempt ${attempt}/${maxAttempts})\u2026`);
+      }
       try {
-        const resp = await fetch(signedUrl, {
-          method: "PUT",
-          headers: {
-            "Content-Type": "application/gzip",
-            "Content-Length": String(archiveSize)
-          },
-          // undici accepts Node streams here
-          body: stream,
-          duplex: "half",
-          signal: AbortSignal.timeout(30 * 60 * 1e3)
-        });
-        bar.setCount(1);
-        bar.done();
-        if (resp.ok) {
-          putError = null;
-          break;
+        await uploadArchiveOnce(jobId, tmpArchive, archiveSize, entries.length);
+        return;
+      } catch (e) {
+        lastError = e;
+        const msg = e?.message ?? String(e);
+        if (!/failed to store|extraction failed|extraction timed out/i.test(msg)) {
+          throw e;
         }
-        putError = `HTTP ${resp.status} ${resp.statusText}`;
-        try {
-          const body = await resp.text();
-          if (body) putError += ` \u2014 ${body.slice(0, 200).replace(/\s+/g, " ")}`;
-        } catch {
+        if (attempt < maxAttempts) {
+          console.log(`  \u26A0 ${msg}`);
+          await sleep(3e3 * attempt);
         }
-      } catch (e) {
-        bar.done();
-        putError = `fetch error: ${e?.name ?? "Error"} ${e?.message ?? e}`;
-      }
-      try {
-        stream.destroy?.();
-      } catch {
       }
-      if (attempt < 2) await sleep(2e3 * (attempt + 1));
-    }
-    if (putError) {
-      throw new Error(`Archive upload failed: ${putError}`);
     }
-    const extractResp = await apiPost(`/api/cli/push/${jobId}/extract`, {});
-    if (!extractResp.ok) {
-      throw new Error(`Failed to start extraction: ${await extractResp.text()}`);
+    throw lastError instanceof Error ? lastError : new Error(`Archive upload failed after ${maxAttempts} attempts`);
+  } finally {
+    try {
+      unlinkSync(tmpArchive);
+    } catch {
     }
-    const extractBar = new ProgressBar({ total: entries.length, totalBytes: 0, label: "\u2699 extract" });
-    const pollStart = Date.now();
-    const pollTimeoutMs = 30 * 60 * 1e3;
-    let lastStatus = null;
-    while (Date.now() - pollStart < pollTimeoutMs) {
-      await sleep(1500);
-      const statusResp = await apiGet(`/api/cli/push/${jobId}/extract-status`);
-      if (!statusResp.ok) {
-        throw new Error(`Failed to poll extract status: ${await statusResp.text()}`);
+  }
+}
+async function uploadArchiveOnce(jobId, archivePath, archiveSize, entryCount) {
+  const { ProgressBar } = await import("./progress-H7WNKHDR.js");
+  const urlResp = await apiPost(`/api/cli/push/${jobId}/upload-url`, {});
+  if (!urlResp.ok) {
+    throw new Error(`Failed to get archive upload URL: ${await urlResp.text()}`);
+  }
+  const { signed_url: signedUrl } = await urlResp.json();
+  if (!signedUrl) {
+    throw new Error("Server returned no signed URL for archive upload");
+  }
+  const archiveData = readFileSync(archivePath);
+  let putError = null;
+  for (let attempt = 0; attempt < 3; attempt++) {
+    const bar = new ProgressBar({ total: 1, totalBytes: archiveSize, label: "\u2191 archive" });
+    bar.setBytes(archiveSize);
+    try {
+      const resp = await fetch(signedUrl, {
+        method: "PUT",
+        headers: { "Content-Type": "application/gzip" },
+        body: archiveData,
+        signal: AbortSignal.timeout(30 * 60 * 1e3)
+      });
+      bar.setCount(1);
+      bar.done();
+      if (resp.ok) {
+        putError = null;
+        break;
       }
-      lastStatus = await statusResp.json();
-      const uploaded = Number(lastStatus?.uploaded ?? 0);
-      const errors = Number(lastStatus?.errors ?? 0);
-      extractBar.setCount(uploaded + errors);
-      if (lastStatus?.status === "done") break;
-      if (lastStatus?.status === "error") {
-        throw new Error(`Archive extraction failed: ${lastStatus?.detail ?? "unknown"}`);
+      putError = `HTTP ${resp.status} ${resp.statusText}`;
+      try {
+        const body = await resp.text();
+        if (body) putError += ` \u2014 ${body.slice(0, 200).replace(/\s+/g, " ")}`;
+      } catch {
       }
+    } catch (e) {
+      bar.done();
+      putError = `fetch error: ${e?.name ?? "Error"} ${e?.message ?? e}`;
     }
-    extractBar.done();
-    if (!lastStatus || lastStatus.status !== "done") {
-      throw new Error("Archive extraction timed out");
-    }
-    if (lastStatus.errors && lastStatus.errors > 0) {
-      throw new Error(
-        `Archive extraction completed but ${lastStatus.errors} file(s) failed to store. Retry the upload or check server logs.`
-      );
+    if (attempt < 2) await sleep(2e3 * (attempt + 1));
+  }
+  if (putError) {
+    throw new Error(`Archive upload failed: ${putError}`);
+  }
+  const extractResp = await apiPost(`/api/cli/push/${jobId}/extract`, {});
+  if (!extractResp.ok) {
+    throw new Error(`Failed to start extraction: ${await extractResp.text()}`);
+  }
+  const extractBar = new ProgressBar({ total: entryCount, totalBytes: 0, label: "\u2699 extract" });
+  const pollStart = Date.now();
+  const pollTimeoutMs = 30 * 60 * 1e3;
+  let lastStatus = null;
+  while (Date.now() - pollStart < pollTimeoutMs) {
+    await sleep(1500);
+    const statusResp = await apiGet(`/api/cli/push/${jobId}/extract-status`);
+    if (!statusResp.ok) {
+      throw new Error(`Failed to poll extract status: ${await statusResp.text()}`);
     }
-  } finally {
-    try {
-      unlinkSync(tmpArchive);
-    } catch {
+    lastStatus = await statusResp.json();
+    const uploaded = Number(lastStatus?.uploaded ?? 0);
+    const errors = Number(lastStatus?.errors ?? 0);
+    extractBar.setCount(uploaded + errors);
+    if (lastStatus?.status === "done") break;
+    if (lastStatus?.status === "error") {
+      throw new Error(`Archive extraction failed: ${lastStatus?.detail ?? "unknown"}`);
     }
   }
+  extractBar.done();
+  if (!lastStatus || lastStatus.status !== "done") {
+    throw new Error("Archive extraction timed out");
+  }
+  if (lastStatus.errors && lastStatus.errors > 0) {
+    throw new Error(
+      `Archive extraction completed but ${lastStatus.errors} file(s) failed to store. Retry the upload or check server logs.`
+    );
+  }
 }
 async function apiGet(path, timeout = 6e4) {
   const auth = await getAuthHeader();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trajectories-sh",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "description": "CLI for uploading trajectory jobs to trajectories.sh",
   "type": "module",
   "bin": {