refactor: remove special case of signal merging (#1140)

* refactor: remove special case of signal merging

* test: update test coverage

* chore: push fix to lib layer

* test: update test coverage

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: Cafe137

package-lock.json

@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "axios": "^0.30.2",
-    "cafe-utility": "^33.3.4",
+    "cafe-utility": "^33.6.1",
     "debug": "^4.4.1",
     "isomorphic-ws": "^4.0.1",
     "semver": "^7.3.5",

package.json

@@ -2693,12 +2693,6 @@ export class Bee {
       requestOptions = prepareBeeRequestOptions(requestOptions)
     }
 
-    const merged = requestOptions ? Objects.deepMerge2(this.requestOptions, requestOptions) : this.requestOptions
-
-    if (requestOptions?.signal) {
-      merged.signal = requestOptions.signal
-    }
-
-    return merged
+    return requestOptions ? Objects.deepMerge2(this.requestOptions, requestOptions) : this.requestOptions
   }
 }

src/bee.ts

@@ -80,6 +80,7 @@ export async function streamFiles(
       const readNextChunk = async () => {
         if (signal?.aborted) {
           reject(new Error('Request aborted'))
+
           return
         }
 

src/utils/chunk-stream.browser.ts

@@ -22,4 +22,3 @@ export class BeeResponseError extends BeeError {
     super(message)
   }
 }
-

src/utils/error.ts

@@ -1,12 +1,12 @@
-{"total": {"lines":{"total":2487,"covered":2029,"skipped":0,"pct":81.58},"statements":{"total":2532,"covered":2070,"skipped":0,"pct":81.75},"functions":{"total":612,"covered":478,"skipped":0,"pct":78.1},"branches":{"total":794,"covered":544,"skipped":0,"pct":68.51},"branchesTrue":{"total":0,"covered":0,"skipped":0,"pct":100}}
+{"total": {"lines":{"total":2512,"covered":2051,"skipped":0,"pct":81.64},"statements":{"total":2557,"covered":2092,"skipped":0,"pct":81.81},"functions":{"total":613,"covered":488,"skipped":0,"pct":79.6},"branches":{"total":816,"covered":554,"skipped":0,"pct":67.89},"branchesTrue":{"total":0,"covered":0,"skipped":0,"pct":100}}
 ,"/home/runner/work/bee-js/bee-js/src/bee-dev.ts": {"lines":{"total":14,"covered":5,"skipped":0,"pct":35.71},"functions":{"total":2,"covered":0,"skipped":0,"pct":0},"statements":{"total":14,"covered":5,"skipped":0,"pct":35.71},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
-,"/home/runner/work/bee-js/bee-js/src/bee.ts": {"lines":{"total":453,"covered":375,"skipped":0,"pct":82.78},"functions":{"total":132,"covered":107,"skipped":0,"pct":81.06},"statements":{"total":456,"covered":378,"skipped":0,"pct":82.89},"branches":{"total":170,"covered":112,"skipped":0,"pct":65.88}}
+,"/home/runner/work/bee-js/bee-js/src/bee.ts": {"lines":{"total":453,"covered":377,"skipped":0,"pct":83.22},"functions":{"total":132,"covered":108,"skipped":0,"pct":81.81},"statements":{"total":456,"covered":380,"skipped":0,"pct":83.33},"branches":{"total":170,"covered":113,"skipped":0,"pct":66.47}}
 ,"/home/runner/work/bee-js/bee-js/src/index.ts": {"lines":{"total":16,"covered":16,"skipped":0,"pct":100},"functions":{"total":10,"covered":7,"skipped":0,"pct":70},"statements":{"total":25,"covered":25,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
 ,"/home/runner/work/bee-js/bee-js/src/chunk/bmt.ts": {"lines":{"total":16,"covered":15,"skipped":0,"pct":93.75},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":17,"covered":16,"skipped":0,"pct":94.11},"branches":{"total":2,"covered":1,"skipped":0,"pct":50}}
 ,"/home/runner/work/bee-js/bee-js/src/chunk/cac.ts": {"lines":{"total":21,"covered":20,"skipped":0,"pct":95.23},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":21,"covered":20,"skipped":0,"pct":95.23},"branches":{"total":10,"covered":8,"skipped":0,"pct":80}}
 ,"/home/runner/work/bee-js/bee-js/src/chunk/soc.ts": {"lines":{"total":59,"covered":58,"skipped":0,"pct":98.3},"functions":{"total":8,"covered":8,"skipped":0,"pct":100},"statements":{"total":59,"covered":58,"skipped":0,"pct":98.3},"branches":{"total":4,"covered":2,"skipped":0,"pct":50}}
 ,"/home/runner/work/bee-js/bee-js/src/feed/identifier.ts": {"lines":{"total":5,"covered":5,"skipped":0,"pct":100},"functions":{"total":1,"covered":1,"skipped":0,"pct":100},"statements":{"total":5,"covered":5,"skipped":0,"pct":100},"branches":{"total":2,"covered":1,"skipped":0,"pct":50}}
-,"/home/runner/work/bee-js/bee-js/src/feed/index.ts": {"lines":{"total":85,"covered":83,"skipped":0,"pct":97.64},"functions":{"total":13,"covered":13,"skipped":0,"pct":100},"statements":{"total":85,"covered":83,"skipped":0,"pct":97.64},"branches":{"total":39,"covered":29,"skipped":0,"pct":74.35}}
+,"/home/runner/work/bee-js/bee-js/src/feed/index.ts": {"lines":{"total":85,"covered":83,"skipped":0,"pct":97.64},"functions":{"total":13,"covered":13,"skipped":0,"pct":100},"statements":{"total":85,"covered":83,"skipped":0,"pct":97.64},"branches":{"total":39,"covered":30,"skipped":0,"pct":76.92}}
 ,"/home/runner/work/bee-js/bee-js/src/feed/retrievable.ts": {"lines":{"total":19,"covered":18,"skipped":0,"pct":94.73},"functions":{"total":5,"covered":5,"skipped":0,"pct":100},"statements":{"total":21,"covered":20,"skipped":0,"pct":95.23},"branches":{"total":4,"covered":3,"skipped":0,"pct":75}}
 ,"/home/runner/work/bee-js/bee-js/src/manifest/manifest.ts": {"lines":{"total":237,"covered":222,"skipped":0,"pct":93.67},"functions":{"total":25,"covered":25,"skipped":0,"pct":100},"statements":{"total":240,"covered":225,"skipped":0,"pct":93.75},"branches":{"total":124,"covered":111,"skipped":0,"pct":89.51}}
 ,"/home/runner/work/bee-js/bee-js/src/modules/bytes.ts": {"lines":{"total":25,"covered":21,"skipped":0,"pct":84},"functions":{"total":4,"covered":3,"skipped":0,"pct":75},"statements":{"total":25,"covered":21,"skipped":0,"pct":84},"branches":{"total":8,"covered":7,"skipped":0,"pct":87.5}}
@@ -24,9 +24,9 @@
 ,"/home/runner/work/bee-js/bee-js/src/modules/stewardship.ts": {"lines":{"total":11,"covered":11,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":11,"covered":11,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
 ,"/home/runner/work/bee-js/bee-js/src/modules/tag.ts": {"lines":{"total":20,"covered":19,"skipped":0,"pct":95},"functions":{"total":7,"covered":6,"skipped":0,"pct":85.71},"statements":{"total":22,"covered":21,"skipped":0,"pct":95.45},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
 ,"/home/runner/work/bee-js/bee-js/src/modules/debug/balance.ts": {"lines":{"total":26,"covered":26,"skipped":0,"pct":100},"functions":{"total":8,"covered":8,"skipped":0,"pct":100},"statements":{"total":28,"covered":28,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
-,"/home/runner/work/bee-js/bee-js/src/modules/debug/chequebook.ts": {"lines":{"total":58,"covered":35,"skipped":0,"pct":60.34},"functions":{"total":18,"covered":5,"skipped":0,"pct":27.77},"statements":{"total":58,"covered":35,"skipped":0,"pct":60.34},"branches":{"total":4,"covered":2,"skipped":0,"pct":50}}
+,"/home/runner/work/bee-js/bee-js/src/modules/debug/chequebook.ts": {"lines":{"total":58,"covered":40,"skipped":0,"pct":68.96},"functions":{"total":18,"covered":9,"skipped":0,"pct":50},"statements":{"total":58,"covered":40,"skipped":0,"pct":68.96},"branches":{"total":4,"covered":2,"skipped":0,"pct":50}}
 ,"/home/runner/work/bee-js/bee-js/src/modules/debug/connectivity.ts": {"lines":{"total":35,"covered":28,"skipped":0,"pct":80},"functions":{"total":11,"covered":7,"skipped":0,"pct":63.63},"statements":{"total":36,"covered":29,"skipped":0,"pct":80.55},"branches":{"total":4,"covered":3,"skipped":0,"pct":75}}
-,"/home/runner/work/bee-js/bee-js/src/modules/debug/settlements.ts": {"lines":{"total":18,"covered":13,"skipped":0,"pct":72.22},"functions":{"total":4,"covered":1,"skipped":0,"pct":25},"statements":{"total":18,"covered":13,"skipped":0,"pct":72.22},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
+,"/home/runner/work/bee-js/bee-js/src/modules/debug/settlements.ts": {"lines":{"total":18,"covered":18,"skipped":0,"pct":100},"functions":{"total":4,"covered":4,"skipped":0,"pct":100},"statements":{"total":18,"covered":18,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
 ,"/home/runner/work/bee-js/bee-js/src/modules/debug/stake.ts": {"lines":{"total":32,"covered":21,"skipped":0,"pct":65.62},"functions":{"total":6,"covered":3,"skipped":0,"pct":50},"statements":{"total":32,"covered":21,"skipped":0,"pct":65.62},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
 ,"/home/runner/work/bee-js/bee-js/src/modules/debug/stamps.ts": {"lines":{"total":45,"covered":43,"skipped":0,"pct":95.55},"functions":{"total":14,"covered":14,"skipped":0,"pct":100},"statements":{"total":49,"covered":47,"skipped":0,"pct":95.91},"branches":{"total":4,"covered":2,"skipped":0,"pct":50}}
 ,"/home/runner/work/bee-js/bee-js/src/modules/debug/states.ts": {"lines":{"total":29,"covered":24,"skipped":0,"pct":82.75},"functions":{"total":5,"covered":4,"skipped":0,"pct":80},"statements":{"total":29,"covered":24,"skipped":0,"pct":82.75},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
@@ -37,7 +37,7 @@
 ,"/home/runner/work/bee-js/bee-js/src/types/index.ts": {"lines":{"total":21,"covered":21,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":21,"covered":21,"skipped":0,"pct":100},"branches":{"total":4,"covered":4,"skipped":0,"pct":100}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/bytes.ts": {"lines":{"total":53,"covered":41,"skipped":0,"pct":77.35},"functions":{"total":15,"covered":12,"skipped":0,"pct":80},"statements":{"total":53,"covered":41,"skipped":0,"pct":77.35},"branches":{"total":24,"covered":19,"skipped":0,"pct":79.16}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/chunk-size.ts": {"lines":{"total":9,"covered":9,"skipped":0,"pct":100},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":9,"covered":9,"skipped":0,"pct":100},"branches":{"total":2,"covered":2,"skipped":0,"pct":100}}
-,"/home/runner/work/bee-js/bee-js/src/utils/chunk-stream.browser.ts": {"lines":{"total":55,"covered":0,"skipped":0,"pct":0},"functions":{"total":10,"covered":0,"skipped":0,"pct":0},"statements":{"total":55,"covered":0,"skipped":0,"pct":0},"branches":{"total":12,"covered":0,"skipped":0,"pct":0}}
+,"/home/runner/work/bee-js/bee-js/src/utils/chunk-stream.browser.ts": {"lines":{"total":71,"covered":0,"skipped":0,"pct":0},"functions":{"total":10,"covered":0,"skipped":0,"pct":0},"statements":{"total":71,"covered":0,"skipped":0,"pct":0},"branches":{"total":24,"covered":0,"skipped":0,"pct":0}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/chunk-stream.ts": {"lines":{"total":63,"covered":57,"skipped":0,"pct":90.47},"functions":{"total":6,"covered":5,"skipped":0,"pct":83.33},"statements":{"total":63,"covered":57,"skipped":0,"pct":90.47},"branches":{"total":23,"covered":14,"skipped":0,"pct":60.86}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/cid.ts": {"lines":{"total":23,"covered":22,"skipped":0,"pct":95.65},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":23,"covered":22,"skipped":0,"pct":95.65},"branches":{"total":4,"covered":3,"skipped":0,"pct":75}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/collection.browser.ts": {"lines":{"total":4,"covered":0,"skipped":0,"pct":0},"functions":{"total":2,"covered":0,"skipped":0,"pct":0},"statements":{"total":4,"covered":0,"skipped":0,"pct":0},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
@@ -51,7 +51,7 @@
 ,"/home/runner/work/bee-js/bee-js/src/utils/expose.ts": {"lines":{"total":16,"covered":16,"skipped":0,"pct":100},"functions":{"total":18,"covered":14,"skipped":0,"pct":77.77},"statements":{"total":23,"covered":23,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/file.ts": {"lines":{"total":12,"covered":8,"skipped":0,"pct":66.66},"functions":{"total":4,"covered":2,"skipped":0,"pct":50},"statements":{"total":13,"covered":8,"skipped":0,"pct":61.53},"branches":{"total":10,"covered":7,"skipped":0,"pct":70}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/headers.ts": {"lines":{"total":71,"covered":62,"skipped":0,"pct":87.32},"functions":{"total":5,"covered":5,"skipped":0,"pct":100},"statements":{"total":71,"covered":62,"skipped":0,"pct":87.32},"branches":{"total":64,"covered":54,"skipped":0,"pct":84.37}}
-,"/home/runner/work/bee-js/bee-js/src/utils/http.ts": {"lines":{"total":37,"covered":32,"skipped":0,"pct":86.48},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":37,"covered":32,"skipped":0,"pct":86.48},"branches":{"total":27,"covered":19,"skipped":0,"pct":70.37}}
+,"/home/runner/work/bee-js/bee-js/src/utils/http.ts": {"lines":{"total":46,"covered":41,"skipped":0,"pct":89.13},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":46,"covered":41,"skipped":0,"pct":89.13},"branches":{"total":37,"covered":27,"skipped":0,"pct":72.97}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/mime.ts": {"lines":{"total":1,"covered":1,"skipped":0,"pct":100},"functions":{"total":0,"covered":0,"skipped":0,"pct":100},"statements":{"total":1,"covered":1,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/pss.ts": {"lines":{"total":5,"covered":5,"skipped":0,"pct":100},"functions":{"total":1,"covered":1,"skipped":0,"pct":100},"statements":{"total":5,"covered":5,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/redundancy.ts": {"lines":{"total":44,"covered":32,"skipped":0,"pct":72.72},"functions":{"total":4,"covered":4,"skipped":0,"pct":100},"statements":{"total":45,"covered":33,"skipped":0,"pct":73.33},"branches":{"total":29,"covered":14,"skipped":0,"pct":48.27}}
@@ -65,7 +65,7 @@
 ,"/home/runner/work/bee-js/bee-js/src/utils/tar.browser.ts": {"lines":{"total":40,"covered":0,"skipped":0,"pct":0},"functions":{"total":10,"covered":0,"skipped":0,"pct":0},"statements":{"total":41,"covered":0,"skipped":0,"pct":0},"branches":{"total":6,"covered":0,"skipped":0,"pct":0}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/tar.ts": {"lines":{"total":39,"covered":36,"skipped":0,"pct":92.3},"functions":{"total":11,"covered":10,"skipped":0,"pct":90.9},"statements":{"total":40,"covered":37,"skipped":0,"pct":92.5},"branches":{"total":8,"covered":4,"skipped":0,"pct":50}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/tokens.ts": {"lines":{"total":37,"covered":24,"skipped":0,"pct":64.86},"functions":{"total":32,"covered":19,"skipped":0,"pct":59.37},"statements":{"total":37,"covered":24,"skipped":0,"pct":64.86},"branches":{"total":8,"covered":5,"skipped":0,"pct":62.5}}
-,"/home/runner/work/bee-js/bee-js/src/utils/type.ts": {"lines":{"total":100,"covered":78,"skipped":0,"pct":78},"functions":{"total":50,"covered":36,"skipped":0,"pct":72},"statements":{"total":100,"covered":78,"skipped":0,"pct":78},"branches":{"total":27,"covered":21,"skipped":0,"pct":77.77}}
+,"/home/runner/work/bee-js/bee-js/src/utils/type.ts": {"lines":{"total":100,"covered":79,"skipped":0,"pct":79},"functions":{"total":50,"covered":37,"skipped":0,"pct":74},"statements":{"total":100,"covered":79,"skipped":0,"pct":79},"branches":{"total":27,"covered":21,"skipped":0,"pct":77.77}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/typed-bytes.ts": {"lines":{"total":86,"covered":85,"skipped":0,"pct":98.83},"functions":{"total":31,"covered":30,"skipped":0,"pct":96.77},"statements":{"total":86,"covered":85,"skipped":0,"pct":98.83},"branches":{"total":12,"covered":12,"skipped":0,"pct":100}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/url.ts": {"lines":{"total":15,"covered":11,"skipped":0,"pct":73.33},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":15,"covered":11,"skipped":0,"pct":73.33},"branches":{"total":8,"covered":4,"skipped":0,"pct":50}}
 ,"/home/runner/work/bee-js/bee-js/src/utils/workaround.ts": {"lines":{"total":14,"covered":11,"skipped":0,"pct":78.57},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":14,"covered":11,"skipped":0,"pct":78.57},"branches":{"total":10,"covered":7,"skipped":0,"pct":70}}