@stackshift-cloud/sdk 1.3.0 → 1.4.0

package/dist/upload-controller.js

@@ -16,13 +16,13 @@ export class ChunkedUploadController {
         throwIfAborted(options.signal);
         const resumeKey = options.resumeKey;
         const fingerprint = fileFingerprint(file, request);
-        let session = await this.restore(resumeKey, fingerprint);
+        let session = await this.restore(resumeKey, fingerprint, options.requireMatchingFile);
         if (!session)
             session = await this.transport.create(file, request);
         validateSession(session, file.size);
         options.onSession?.(session);
         await this.persist(resumeKey, fingerprint, session);
-        const completed = await verifiedCompletedParts(file, session);
+        const completed = await verifiedCompletedParts(file, session, options.requireMatchingFile);
         const loadedByPart = new Map(completed);
         const tasks = [];
         for (let offset = 0, partNumber = 1; offset < file.size; offset += session.partSize, partNumber += 1) {
@@ -37,8 +37,9 @@ export class ChunkedUploadController {
         const concurrency = boundedInteger(options.concurrency, 4, 1, 8);
         const attempts = boundedInteger(options.retryAttempts, 4, 1, 8);
         let next = 0;
+        let workerFailed = false;
         const worker = async () => {
-            while (next < tasks.length) {
+            while (!workerFailed && next < tasks.length) {
                 throwIfAborted(options.signal);
                 const task = tasks[next++];
                 const checksum = await sha256Blob(task.chunk);
@@ -61,7 +62,16 @@ export class ChunkedUploadController {
             }
         };
         try {
-            await Promise.all(Array.from({ length: Math.min(concurrency, tasks.length || 1) }, worker));
+            const workers = await Promise.allSettled(Array.from({ length: Math.min(concurrency, tasks.length || 1) }, () => worker().catch((error) => {
+                workerFailed = true;
+                throw error;
+            })));
+            const failed = workers.find((result) => result.status === 'rejected');
+            if (failed?.status === 'rejected')
+                throw failed.reason;
+            throwIfAborted(options.signal);
+            session.completionPending = true;
+            await this.persist(resumeKey, fingerprint, session);
             const result = await retryWithBackoff(() => this.transport.complete(session), attempts, options.signal);
             if (resumeKey)
                 await this.store?.delete(resumeKey);
@@ -69,9 +79,12 @@ export class ChunkedUploadController {
         }
         catch (error) {
             if (isAbortError(error) && options.cancelOnAbort) {
-                await this.transport.cancel(session).catch(() => undefined);
-                if (resumeKey)
-                    await this.store?.delete(resumeKey);
+                try {
+                    await this.transport.cancel(session);
+                    if (resumeKey)
+                        await this.store?.delete(resumeKey);
+                }
+                catch { /* Retain recovery state when remote cancellation is uncertain. */ }
             }
             throw error;
         }
@@ -80,19 +93,24 @@ export class ChunkedUploadController {
         const record = await this.store?.get(resumeKey);
         if (!record)
             return;
-        try {
-            await this.transport.cancel(record.session);
-        }
-        finally {
-            await this.store?.delete(resumeKey);
-        }
+        await this.transport.cancel(record.session);
+        await this.store?.delete(resumeKey);
     }
-    async restore(resumeKey, fingerprint) {
+    async restore(resumeKey, fingerprint, requireMatchingFile = false) {
         if (!resumeKey || !this.store)
             return undefined;
         const record = await this.store.get(resumeKey);
         if (!record)
             return undefined;
+        if (record.fingerprint !== fingerprint && requireMatchingFile) {
+            throw new Error('Reselect the original file to resume this upload, or cancel the saved upload first');
+        }
+        if (record.fingerprint === fingerprint && record.session.completionPending) {
+            if (Date.parse(record.session.expiresAt) <= Date.now()) {
+                throw new Error('Completion is uncertain and its recovery window expired; verify the destination before clearing saved state');
+            }
+            return record.session;
+        }
         if (record.fingerprint !== fingerprint || Date.parse(record.session.expiresAt) <= Date.now()) {
             await this.transport.cancel(record.session).catch(() => undefined);
             await this.store.delete(resumeKey);
@@ -117,7 +135,7 @@ export class ChunkedUploadController {
             session: { ...session, parts: session.parts.map((part) => ({ ...part })) },
             updatedAt: new Date().toISOString(),
         };
-        this.persistence = this.persistence.then(() => this.store.set(record));
+        this.persistence = this.persistence.catch(() => undefined).then(() => this.store.set(record));
         return this.persistence;
     }
 }
@@ -154,9 +172,10 @@ export async function sha256Blob(blob) {
     return [...new Uint8Array(digest)].map((byte) => byte.toString(16).padStart(2, '0')).join('');
 }
 function validateSession(session, size) {
-    if (!session.id || !session.uploadToken || session.partSize <= 0)
+    if (!session.id || !session.uploadToken || !Number.isSafeInteger(session.partSize) || session.partSize <= 0 ||
+        !Number.isSafeInteger(session.maxBytes) || session.maxBytes < 0 || !Array.isArray(session.parts))
         throw new Error('Upload session is incomplete');
-    if (Date.parse(session.expiresAt) <= Date.now())
+    if (!Number.isFinite(Date.parse(session.expiresAt)) || Date.parse(session.expiresAt) <= Date.now())
         throw new Error('Upload session has expired');
     if (size > session.maxBytes)
         throw new Error(`File exceeds upload limit of ${session.maxBytes} bytes`);
@@ -167,7 +186,7 @@ function expectedPartSize(fileSize, partSize, partNumber) {
         return -1;
     return Math.min(partSize, fileSize - offset);
 }
-async function verifiedCompletedParts(file, session) {
+async function verifiedCompletedParts(file, session, requireMatchingFile = false) {
     const completed = new Map();
     for (const part of session.parts) {
         const expectedSize = expectedPartSize(file.size, session.partSize, part.partNumber);
@@ -178,6 +197,9 @@ async function verifiedCompletedParts(file, session) {
         if (checksum.toLowerCase() === part.checksumSHA256.toLowerCase()) {
             completed.set(part.partNumber, part.size);
         }
+        else if (requireMatchingFile) {
+            throw new Error('The selected file differs from an uploaded part; reselect the original file or cancel this upload');
+        }
     }
     return completed;
 }
@@ -195,6 +217,7 @@ function boundedInteger(value, fallback, minimum, maximum) {
 async function retryWithBackoff(operation, attempts, signal) {
     let lastError;
     for (let attempt = 0; attempt < attempts; attempt += 1) {
+        throwIfAborted(signal);
         try {
             return await operation();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackshift-cloud/sdk",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Official JavaScript and TypeScript SDK for StackShift.",
   "type": "module",
   "main": "./dist/index.js",
@@ -17,7 +17,8 @@
   ],
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "test": "npm run build && node test/mail.test.mjs && node test/mail-simulation.test.mjs && node test/mail-platform.test.mjs && node test/mail-webhooks.test.mjs && node test/mail-advanced.test.mjs && node test/mail-tracking.test.mjs && node test/mail-subscribers.test.mjs && node test/mail-exports.test.mjs && node test/mail-diagnostics.test.mjs && node test/assets.test.mjs && node test/assets-platform.test.mjs && node test/assets-video.test.mjs && node test/assets-dam.test.mjs && node test/ai-credits.test.mjs"
+    "test": "npm run build && node test/mail.test.mjs && node test/mail-simulation.test.mjs && node test/mail-platform.test.mjs && node test/mail-webhooks.test.mjs && node test/mail-advanced.test.mjs && node test/mail-tracking.test.mjs && node test/mail-subscribers.test.mjs && node test/mail-exports.test.mjs && node test/mail-mailboxes.test.mjs && node test/mail-diagnostics.test.mjs && node test/assets.test.mjs && node test/assets-platform.test.mjs && node test/assets-video.test.mjs && node test/assets-dam.test.mjs && node test/ai-credits.test.mjs && node --test test/s2-upload.test.mjs",
+    "test:support-actions": "npm run build && node --test tests/support-actions.test.mjs"
   },
   "devDependencies": {
     "typescript": "^5.4.0"