@droponair/sdk-js 0.35.0 → 0.36.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.36.0
+
+### Added
+
+- **Downloads carry on where they stopped.** A download that breaks keeps what it
+  already had and asks the storage for the rest by range, retrying six times with a
+  growing wait. Nothing to change in an app: it happens inside `downloadAttachment`.
+
 ## 0.35.0
 
 ### Added

package/dist/attachment/attachment-client.js

@@ -40,6 +40,9 @@ async function readWithProgress(resp, expectedBytes, onProgress) {
     }
     return out;
 }
+/** How many times a broken download is tried again, and how long between tries. */
+const DOWNLOAD_ATTEMPTS = 6;
+const DOWNLOAD_BACKOFF_MS = [2000, 4000, 8000, 15000, 30000];
 async function sha256Hex(bytes) {
     const digest = await crypto.subtle.digest('SHA-256', asBufferSource(bytes));
     const hex = [];
@@ -225,18 +228,49 @@ class AttachmentClient {
      * current device, unwraps it, then decrypts the stored bytes.
      */
     async downloadAttachment(ref, opts = {}) {
-        const info = await this.getDownloadUrl(ref.attachmentId);
-        const resp = await this.deps.fetchFn(info.url, { method: info.method, headers: info.headers });
-        if (!resp.ok) {
-            const text = await resp.text().catch(() => '');
-            const message = `Failed to download attachment bytes (HTTP ${resp.status}): ${text}`;
-            // The link was good and the bytes are not there: deleted from storage
-            // underneath a record that still existed.
-            if (resp.status === 404)
-                throw new attachment_types_1.AttachmentUnavailableError(ref.attachmentId, 404, message);
-            throw new Error(message);
+        // What has already arrived is kept between attempts, and the rest asked for by
+        // range, so a download that breaks does not start the file again. A fresh link
+        // is asked for each attempt, since a link lasts minutes.
+        let had = new Uint8Array(0);
+        let info;
+        for (let attempt = 1;; attempt++) {
+            try {
+                info = await this.getDownloadUrl(ref.attachmentId);
+                const headers = { ...info.headers };
+                if (had.length > 0)
+                    headers.Range = `bytes=${had.length}-`;
+                const resp = await this.deps.fetchFn(info.url, { method: info.method, headers });
+                if (resp.status === 416 && had.length > 0)
+                    break;
+                if (!resp.ok) {
+                    const text = await resp.text().catch(() => '');
+                    const message = `Failed to download attachment bytes (HTTP ${resp.status}): ${text}`;
+                    // The link was good and the bytes are not there: deleted from storage
+                    // underneath a record that still existed.
+                    if (resp.status === 404)
+                        throw new attachment_types_1.AttachmentUnavailableError(ref.attachmentId, 404, message);
+                    throw new Error(message);
+                }
+                const resuming = resp.status === 206 && had.length > 0;
+                const base = resuming ? had : new Uint8Array(0);
+                const rest = await readWithProgress(resp, Math.max(0, info.sizeBytes - base.length), opts.onProgress
+                    ? (received, total) => opts.onProgress(base.length + received, base.length + total)
+                    : undefined);
+                const joined = new Uint8Array(base.length + rest.length);
+                joined.set(base, 0);
+                joined.set(rest, base.length);
+                had = joined;
+                break;
+            }
+            catch (error) {
+                if (error instanceof attachment_types_1.AttachmentUnavailableError)
+                    throw error;
+                if (attempt >= DOWNLOAD_ATTEMPTS)
+                    throw error;
+                await new Promise((resolve) => setTimeout(resolve, DOWNLOAD_BACKOFF_MS[Math.min(attempt - 1, DOWNLOAD_BACKOFF_MS.length - 1)]));
+            }
         }
-        let stored = await readWithProgress(resp, info.sizeBytes, opts.onProgress);
+        let stored = had;
         if (ref.encryptionType === 'CLEARTEXT') {
             await this.confirmReceived(ref.attachmentId);
             return { attachmentId: ref.attachmentId, mimeType: info.mimeType, sizeBytes: info.sizeBytes, sha256: info.sha256, bytes: stored };

package/dist/version.d.ts

@@ -7,7 +7,7 @@
  *   MINOR, additive feature (e.g. multi-device payloads, new call event type)
  *   PATCH, bug-fix / perf improvement with no wire or API change
  */
-export declare const SDK_VERSION = "0.35.0";
+export declare const SDK_VERSION = "0.36.0";
 /**
  * Binary encrypted-payload format version.
  * Included as the first byte of every encrypted payload so receivers can

package/dist/version.js

@@ -10,7 +10,7 @@ exports.PROTOCOL_VERSION = exports.PAYLOAD_FORMAT_VERSION = exports.SDK_VERSION
  *   MINOR, additive feature (e.g. multi-device payloads, new call event type)
  *   PATCH, bug-fix / perf improvement with no wire or API change
  */
-exports.SDK_VERSION = '0.35.0';
+exports.SDK_VERSION = '0.36.0';
 /**
  * Binary encrypted-payload format version.
  * Included as the first byte of every encrypted payload so receivers can

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@droponair/sdk-js",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "description": "End-to-end encrypted messaging, voice and video calling SDK. The relay never sees your keys or message content.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",