Merge branch 'main' into feat/customer-fallback

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@filecoin-saturn/js-client",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Filecoin Saturn Client",
   "homepage": "https://github.com/filecoin-saturn/js-client",
   "main": "src/index.js",
@@ -61,4 +61,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

src/client.js

@@ -242,6 +242,9 @@ export class Saturn {
    * @returns {Promise<AsyncIterable<Uint8Array>>}
    */
   async * fetchContentWithFallback (cidPath, opts = {}) {
+    const upstreamController = opts.controller
+    delete opts.controller
+
     let lastError = null
     let skipNodes = false
     // we use this to checkpoint at which chunk a request failed.
@@ -253,6 +256,13 @@ export class Saturn {
     }
 
     const fetchContent = async function * (options) {
+      const controller = new AbortController()
+      opts.controller = controller
+      if (upstreamController) {
+        upstreamController.signal.addEventListener('abort', () => {
+          controller.abort()
+        })
+      }
       let byteCount = 0
       const fetchOptions = Object.assign(opts, { format: 'car' }, options)
       const byteChunks = await this.fetchContent(cidPath, fetchOptions)
@@ -293,7 +303,7 @@ export class Saturn {
     let fallbackCount = 0
     const nodes = this.nodes
     for (let i = 0; i < nodes.length; i++) {
-      if (fallbackCount > this.config.fallbackLimit || skipNodes) {
+      if (fallbackCount > this.config.fallbackLimit || skipNodes || upstreamController?.signal.aborted) {
         break
       }
       if (opts.raceNodes) {

src/types.js

@@ -23,6 +23,7 @@
  * @property {string} [customerFallbackURL] - Customer Origin that is a fallback.
  * @property {number} [connectTimeout=5000] - Connection timeout in milliseconds.
  * @property {number} [downloadTimeout=0] - Download timeout in milliseconds.
+ * @property {AbortController} [controller]
  */
 
 export {}