trajectories-sh 1.18.5 → 1.18.7

package/dist/cli.js

@@ -98,7 +98,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
     );
   }
   if (isZip) {
-    const { uploadZip } = await import("./upload-NBHAW2LV.js");
+    const { uploadZip } = await import("./upload-UIHU3KYE.js");
     const slug2 = opts.slug ?? pathArg.replace(/\.zip$/i, "").replace(/\/+$/, "").split("/").pop();
     console.log(chalk.bold(`
   Uploading ZIP ${pathArg} \u2192 ${chalk.cyan(slug2)}
@@ -127,7 +127,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
   Uploading trajectory ${pathArg} \u2192 ${chalk.cyan(slug)}
 `));
   try {
-    const { uploadJob } = await import("./upload-NBHAW2LV.js");
+    const { uploadJob } = await import("./upload-UIHU3KYE.js");
     const result = await uploadJob(pathArg, {
       slug,
       name: opts.name

package/dist/{upload-NBHAW2LV.js → upload-UIHU3KYE.js}

@@ -60,32 +60,56 @@ async function uploadZip(zipPath, opts) {
   const auth = await getAuthHeader();
   if (!auth) throw new Error("Not authenticated. Run: trajectories auth login");
   const apiUrl = getApiUrl();
-  console.log("  Requesting upload URL...");
-  const urlResp = await fetch(`${apiUrl}/api/cli/push/zip/upload-url`, {
+  console.log("  Requesting upload info...");
+  const infoResp = await fetch(`${apiUrl}/api/cli/push-zip/upload-url`, {
     method: "POST",
     headers: { Authorization: auth, "Content-Type": "application/json" },
     body: "{}",
     signal: AbortSignal.timeout(3e4)
   });
-  if (!urlResp.ok) {
-    throw new Error(`Failed to get upload URL: ${await urlResp.text()}`);
+  if (!infoResp.ok) {
+    throw new Error(`Failed to get upload info: ${await infoResp.text()}`);
   }
-  const { task_id, signed_url } = await urlResp.json();
-  console.log(`  Uploading ZIP to storage...`);
+  const uploadInfo = await infoResp.json();
+  const task_id = uploadInfo.task_id;
+  console.log("  Uploading ZIP via resumable upload...");
   const zipData = readFileSync2(zipPath);
-  const putResp = await fetch(signed_url, {
-    method: "PUT",
-    headers: { "Content-Type": "application/zip" },
-    body: zipData,
-    signal: AbortSignal.timeout(36e5)
+  const tus = await import("tus-js-client");
+  const projectRef = uploadInfo.supabase_url.replace("https://", "").replace(".supabase.co", "");
+  await new Promise((resolve, reject) => {
+    const upload = new tus.Upload(new Blob([zipData]), {
+      endpoint: `${uploadInfo.supabase_url}/storage/v1/upload/resumable`,
+      retryDelays: [0, 3e3, 5e3, 1e4],
+      headers: {
+        authorization: `Bearer ${uploadInfo.service_key}`,
+        "x-upsert": "true"
+      },
+      uploadDataDuringCreation: true,
+      removeFingerprintOnSuccess: true,
+      metadata: {
+        bucketName: uploadInfo.bucket,
+        objectName: uploadInfo.storage_path,
+        contentType: "application/zip"
+      },
+      chunkSize: 6 * 1024 * 1024,
+      onError(error) {
+        reject(new Error(`TUS upload failed: ${error.message}`));
+      },
+      onProgress(bytesUploaded, bytesTotal) {
+        const pct = (bytesUploaded / bytesTotal * 100).toFixed(1);
+        const uploadedMB = (bytesUploaded / (1024 * 1024)).toFixed(1);
+        const totalMB = (bytesTotal / (1024 * 1024)).toFixed(1);
+        process.stdout.write(`  \u2191 ${pct}% ${uploadedMB}/${totalMB} MB\r`);
+      },
+      onSuccess() {
+        console.log(`  \u2191 100% \u2014 ZIP uploaded to storage.`);
+        resolve();
+      }
+    });
+    upload.start();
   });
-  if (!putResp.ok) {
-    const body = await putResp.text().catch(() => "");
-    throw new Error(`ZIP upload to storage failed (${putResp.status}): ${body.slice(0, 200)}`);
-  }
-  console.log("  ZIP uploaded to storage.");
   console.log("  Enqueuing for server-side extraction...");
-  const enqueueResp = await fetch(`${apiUrl}/api/cli/push/zip/enqueue`, {
+  const enqueueResp = await fetch(`${apiUrl}/api/cli/push-zip/enqueue`, {
     method: "POST",
     headers: { Authorization: auth, "Content-Type": "application/json" },
     body: JSON.stringify({
@@ -104,7 +128,7 @@ async function uploadZip(zipPath, opts) {
   let lastStatus = "";
   while (true) {
     await new Promise((r) => setTimeout(r, 5e3));
-    const statusResp = await fetch(`${apiUrl}/api/cli/push/zip/${task_id}/status`, {
+    const statusResp = await fetch(`${apiUrl}/api/cli/push-zip/${task_id}/status`, {
       headers: { Authorization: auth },
       signal: AbortSignal.timeout(3e4)
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trajectories-sh",
-  "version": "1.18.5",
+  "version": "1.18.7",
   "description": "CLI for uploading trajectory jobs to trajectories.sh",
   "type": "module",
   "bin": {
@@ -28,10 +28,11 @@
   "dependencies": {
     "chalk": "^5.0.0",
     "commander": "^13.0.0",
-    "sharp": "^0.34.5",
     "open": "^10.0.0",
     "ora": "^8.0.0",
-    "tar": "^7.0.0"
+    "sharp": "^0.34.5",
+    "tar": "^7.0.0",
+    "tus-js-client": "^4.3.1"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",