fix: remove abort-controller deps

.github/workflows/test.yml

@@ -355,9 +355,9 @@ jobs:
           - name: ipfs browser video streaming
             repo: https://github.com/ipfs-examples/js-ipfs-browser-video-streaming.git
             deps: ipfs-core@$PWD/packages/ipfs-core/dist
-          - name: ipfs browser vue
-            repo: https://github.com/ipfs-examples/js-ipfs-browser-vue.git
-            deps: ipfs-core@$PWD/packages/ipfs-core/dist
+          #- name: ipfs browser vue
+          #  repo: https://github.com/ipfs-examples/js-ipfs-browser-vue.git
+          #  deps: ipfs-core@$PWD/packages/ipfs-core/dist
           - name: ipfs browser webpack
             repo: https://github.com/ipfs-examples/js-ipfs-browser-webpack.git
             deps: ipfs-core@$PWD/packages/ipfs-core/dist
@@ -391,21 +391,21 @@ jobs:
           - name: ipfs-client add files
             repo: https://github.com/ipfs-examples/js-ipfs-ipfs-client-add-files.git
             deps: ipfs@$PWD/packages/ipfs/dist,ipfs-client@$PWD/packages/ipfs-client/dist
-          - name: ipfs electron js
-            repo: https://github.com/ipfs-examples/js-ipfs-run-in-electron.git
-            deps: ipfs-core@$PWD/packages/ipfs-core/dist
+          #- name: ipfs electron js
+          #  repo: https://github.com/ipfs-examples/js-ipfs-run-in-electron.git
+          #  deps: ipfs-core@$PWD/packages/ipfs-core/dist
           - name: ipfs running multiple nodes
             repo: https://github.com/ipfs-examples/js-ipfs-running-multiple-nodes.git
             deps: ipfs@$PWD/packages/ipfs/dist
           #- name: ipfs traverse ipld graphs
           #  repo: https://github.com/ipfs-examples/js-ipfs-traverse-ipld-graphs.git
           #  deps: ipfs-core@$PWD/packages/ipfs-core/dist
-          - name: types with typescript
-            repo: https://github.com/ipfs-examples/js-ipfs-types-use-ipfs-from-ts.git
-            deps: ipfs-core@$PWD/packages/ipfs-core/dist
-          - name: types with typed js
-            repo: https://github.com/ipfs-examples/js-ipfs-types-use-ipfs-from-typed-js.git
-            deps: ipfs-core@$PWD/packages/ipfs-core/dist,ipfs-core-types@$PWD/packages/ipfs-core-types/dist
+          #- name: types with typescript
+          #  repo: https://github.com/ipfs-examples/js-ipfs-types-use-ipfs-from-ts.git
+          #  deps: ipfs-core@$PWD/packages/ipfs-core/dist
+          #- name: types with typed js
+          #  repo: https://github.com/ipfs-examples/js-ipfs-types-use-ipfs-from-typed-js.git
+          #  deps: ipfs-core@$PWD/packages/ipfs-core/dist,ipfs-core-types@$PWD/packages/ipfs-core-types/dist
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2

packages/interface-ipfs-core/package.json

@@ -50,7 +50,7 @@
     "clean": "rimraf ./dist",
     "build": "aegir build && copyfiles ./test/fixtures/**/*, ./dist/cjs && copyfiles ./test/fixtures/**/*, ./dist/esm",
     "lint": "aegir ts -p check && aegir lint",
-    "dep-check": "aegir dep-check -i abort-controller -i ipfs-core-types -i rimraf -i copyfiles"
+    "dep-check": "aegir dep-check -i ipfs-core-types -i rimraf -i copyfiles"
   },
   "repository": {
     "type": "git",
@@ -66,7 +66,6 @@
     "@ipld/dag-pb": "^2.1.3",
     "@types/pako": "^1.0.2",
     "@types/readable-stream": "^2.3.11",
-    "abort-controller": "^3.0.0",
     "aegir": "^36.0.1",
     "blockstore-core": "^1.0.2",
     "copyfiles": "^2.4.1",
@@ -95,7 +94,6 @@
     "multiaddr": "^10.0.0",
     "multiformats": "^9.4.13",
     "nanoid": "^3.1.23",
-    "native-abort-controller": "^1.0.3",
     "p-map": "^4.0.0",
     "p-retry": "^4.5.0",
     "pako": "^1.0.2",

packages/interface-ipfs-core/src/bitswap/wantlist.js

@@ -5,7 +5,6 @@ import { getDescribe, getIt } from '../utils/mocha.js'
 import { waitForWantlistKey, waitForWantlistKeyToBeRemoved } from './utils.js'
 import { isWebWorker } from 'ipfs-utils/src/env.js'
 import testTimeout from '../utils/test-timeout.js'
-import { AbortController } from 'native-abort-controller'
 import { CID } from 'multiformats/cid'
 import delay from 'delay'
 import { ipfsOptionsWebsocketsFilterAll } from '../utils/ipfs-options-websockets-filter-all.js'

packages/interface-ipfs-core/src/pubsub/subscribe.js

@@ -9,7 +9,6 @@ import { waitForPeers, getTopic } from './utils.js'
 import { expect } from 'aegir/utils/chai.js'
 import { getDescribe, getIt } from '../utils/mocha.js'
 import delay from 'delay'
-import { AbortController } from 'native-abort-controller'
 import { isWebWorker, isNode } from 'ipfs-utils/src/env.js'
 import { ipfsOptionsWebsocketsFilterAll } from '../utils/ipfs-options-websockets-filter-all.js'
 import first from 'it-first'

packages/ipfs-core-config/package.json

@@ -79,7 +79,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@chainsafe/libp2p-noise": "^5.0.0",
+    "@chainsafe/libp2p-noise": "^5.0.1",
     "blockstore-datastore-adapter": "^2.0.2",
     "datastore-core": "^6.0.7",
     "datastore-fs": "^6.0.1",

packages/ipfs-core-utils/package.json

@@ -112,7 +112,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "any-signal": "^2.1.2",
+    "any-signal": "^3.0.0",
     "blob-to-it": "^1.0.1",
     "browser-readablestream-to-it": "^1.0.1",
     "debug": "^4.1.1",
@@ -130,7 +130,7 @@
     "multiformats": "^9.4.13",
     "nanoid": "^3.1.23",
     "parse-duration": "^1.0.0",
-    "timeout-abort-controller": "^2.0.0",
+    "timeout-abort-controller": "^3.0.0",
     "uint8arrays": "^3.0.0"
   },
   "devDependencies": {

packages/ipfs-core/package.json

@@ -62,7 +62,7 @@
     "test:electron-renderer": "aegir build --esm-tests && aegir test -t electron-renderer -f ./dist/cjs/browser-test/*.spec.js",
     "test:bootstrapers": "IPFS_TEST=bootstrapers aegir test -t browser -f test/bootstrapers.js",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i interface-ipfs-core -i ipfs-core-types -i abort-controller -i npm-run-all --i interface-blockstore"
+    "dep-check": "aegir dep-check -i interface-ipfs-core -i ipfs-core-types -i npm-run-all --i interface-blockstore"
   },
   "dependencies": {
     "@chainsafe/libp2p-noise": "^5.0.0",
@@ -71,7 +71,7 @@
     "@ipld/dag-json": "^8.0.1",
     "@ipld/dag-pb": "^2.1.3",
     "@multiformats/murmur3": "^1.0.1",
-    "any-signal": "^2.1.2",
+    "any-signal": "^3.0.0",
     "array-shuffle": "^2.0.0",
     "blockstore-core": "^1.0.2",
     "blockstore-datastore-adapter": "^2.0.2",
@@ -123,11 +123,10 @@
     "multiaddr": "^10.0.0",
     "multiaddr-to-uri": "^8.0.0",
     "multiformats": "^9.4.13",
-    "native-abort-controller": "^1.0.3",
     "pako": "^1.0.2",
     "parse-duration": "^1.0.0",
     "peer-id": "^0.16.0",
-    "timeout-abort-controller": "^2.0.0",
+    "timeout-abort-controller": "^3.0.0",
     "uint8arrays": "^3.0.0"
   },
   "devDependencies": {

packages/ipfs-core/src/preload.js

@@ -3,7 +3,6 @@
 import toUri from 'multiaddr-to-uri'
 import debug from 'debug'
 import shuffle from 'array-shuffle'
-import { AbortController } from 'native-abort-controller'
 import { preload } from 'ipfs-core-config/preload'
 /** @type {typeof import('hashlru').default} */
 // @ts-ignore - hashlru has incorrect typedefs

packages/ipfs-core/src/version.js

@@ -1,4 +1,4 @@
 
 export const ipfsCore = '0.13.0'
-export const commit = '7375caa8805298fc671ed4080e1023aafe756151'
+export const commit = ''
 export const interfaceIpfsCore = '^0.153.0'

packages/ipfs-http-client/package.json

@@ -51,14 +51,13 @@
     "test:electron-renderer": "aegir build --esm-tests && aegir test -t electron-renderer -f ./dist/cjs/browser-test/*.spec.js",
     "lint": "aegir ts -p check && aegir lint",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i ipfs-core -i rimraf -i ipfs-core-types -i abort-controller"
+    "dep-check": "aegir dep-check -i ipfs-core -i rimraf -i ipfs-core-types"
   },
   "dependencies": {
     "@ipld/dag-cbor": "^7.0.0",
     "@ipld/dag-json": "^8.0.1",
     "@ipld/dag-pb": "^2.1.3",
-    "abort-controller": "^3.0.0",
-    "any-signal": "^2.1.2",
+    "any-signal": "^3.0.0",
     "debug": "^4.1.1",
     "err-code": "^3.0.1",
     "ipfs-core-types": "^0.9.0",
@@ -69,7 +68,6 @@
     "merge-options": "^3.0.4",
     "multiaddr": "^10.0.0",
     "multiformats": "^9.4.13",
-    "native-abort-controller": "^1.0.3",
     "parse-duration": "^1.0.0",
     "stream-to-it": "^0.2.2",
     "uint8arrays": "^3.0.0"

packages/ipfs-http-client/src/add-all.js

@@ -4,7 +4,6 @@ import { configure } from './lib/configure.js'
 import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { toUrlSearchParams } from './lib/to-url-search-params.js'
 import { abortSignal } from './lib/abort-signal.js'
-import { AbortController } from 'native-abort-controller'
 
 /**
  * @typedef {import('ipfs-utils/src/types').ProgressFn} IPFSUtilsHttpUploadProgressFn

packages/ipfs-http-client/src/block/put.js

@@ -3,7 +3,6 @@ import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { abortSignal } from '../lib/abort-signal.js'
-import { AbortController } from 'native-abort-controller'
 
 /**
  * @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/config/replace.js

@@ -3,7 +3,6 @@ import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { abortSignal } from '../lib/abort-signal.js'
-import { AbortController } from 'native-abort-controller'
 
 /**
  * @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/dag/import.js

@@ -2,7 +2,6 @@ import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { abortSignal } from '../lib/abort-signal.js'
 import { multipartRequest } from 'ipfs-core-utils/multipart-request'
-import { AbortController } from 'native-abort-controller'
 import { CID } from 'multiformats/cid'
 
 /**

packages/ipfs-http-client/src/dag/put.js

@@ -3,7 +3,6 @@ import { configure } from '../lib/configure.js'
 import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { abortSignal } from '../lib/abort-signal.js'
-import { AbortController } from 'native-abort-controller'
 
 /**
  * @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/dht/put.js

@@ -2,7 +2,6 @@ import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { abortSignal } from '../lib/abort-signal.js'
-import { AbortController } from 'native-abort-controller'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { mapEvent } from './map-event.js'
 

packages/ipfs-http-client/src/files/write.js

@@ -4,7 +4,6 @@ import { configure } from '../lib/configure.js'
 import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { abortSignal } from '../lib/abort-signal.js'
-import { AbortController } from 'native-abort-controller'
 
 /**
  * @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/object/patch/append-data.js

@@ -3,7 +3,6 @@ import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { configure } from '../../lib/configure.js'
 import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
 import { abortSignal } from '../../lib/abort-signal.js'
-import { AbortController } from 'native-abort-controller'
 
 /**
  * @typedef {import('../../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/object/patch/set-data.js

@@ -3,7 +3,6 @@ import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { configure } from '../../lib/configure.js'
 import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
 import { abortSignal } from '../../lib/abort-signal.js'
-import { AbortController } from 'native-abort-controller'
 
 /**
  * @typedef {import('../../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/pubsub/publish.js

@@ -3,7 +3,6 @@ import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { abortSignal } from '../lib/abort-signal.js'
 import { textToUrlSafeRpc } from '../lib/http-rpc-wire-format.js'
-import { AbortController } from 'native-abort-controller'
 
 /**
  * @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/pubsub/subscription-tracker.js

@@ -1,4 +1,3 @@
-import { AbortController } from 'native-abort-controller'
 
 /**
  * @typedef {import('ipfs-core-types/src/pubsub').MessageHandlerFn} MessageHandlerFn

packages/ipfs-http-client/test/pubsub.spec.js

@@ -1,7 +1,6 @@
 /* eslint-env mocha */
 
 import { expect } from 'aegir/utils/chai.js'
-import { AbortController } from 'native-abort-controller'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import defer from 'p-defer'
 import { factory } from './utils/factory.js'

packages/ipfs-http-server/package.json

@@ -39,7 +39,7 @@
     "test": "aegir test -t node",
     "test:node": "aegir test -t node",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i ipfs-http-client -i rimraf -i abort-controller -i ipfs-core-types -i npm-run-all",
+    "dep-check": "aegir dep-check -i ipfs-http-client -i rimraf -i ipfs-core-types -i npm-run-all",
     "build": "run-s build:*",
     "build:update-version": "node scripts/update-version.js",
     "build:aegir": "aegir build --no-bundle"
@@ -49,8 +49,7 @@
     "@hapi/content": "^5.0.2",
     "@hapi/hapi": "^20.0.0",
     "@ipld/dag-pb": "^2.1.3",
-    "abort-controller": "^3.0.0",
-    "any-signal": "^2.1.2",
+    "any-signal": "^3.0.0",
     "debug": "^4.1.1",
     "dlv": "^1.1.3",
     "err-code": "^3.0.1",
@@ -74,10 +73,9 @@
     "just-safe-set": "^2.2.1",
     "multiaddr": "^10.0.0",
     "multiformats": "^9.4.13",
-    "native-abort-controller": "^1.0.3",
     "parse-duration": "^1.0.0",
     "stream-to-it": "^0.2.2",
-    "timeout-abort-controller": "^2.0.0",
+    "timeout-abort-controller": "^3.0.0",
     "uint8arrays": "^3.0.0",
     "uri-to-multiaddr": "^6.0.0"
   },

packages/ipfs-http-server/src/index.js

@@ -5,9 +5,9 @@ import { Multiaddr } from 'multiaddr'
 // @ts-expect-error no types
 import toMultiaddr from 'uri-to-multiaddr'
 import Boom from '@hapi/boom'
-import { AbortController } from 'native-abort-controller'
 import { routes } from './api/routes/index.js'
 import { errorHandler } from './error-handler.js'
+
 const LOG = 'ipfs:http-api'
 const LOG_ERROR = 'ipfs:http-api:error'
 

packages/ipfs-http-server/test/inject/bitswap.js

@@ -5,7 +5,6 @@ import { CID } from 'multiformats/cid'
 import sinon from 'sinon'
 import { testHttpMethod } from '../utils/test-http-method.js'
 import { http } from '../utils/http.js'
-import { AbortSignal } from 'native-abort-controller'
 import { base58btc } from 'multiformats/bases/base58'
 import { base64 } from 'multiformats/bases/base64'
 

packages/ipfs-http-server/test/inject/block.js

@@ -8,7 +8,6 @@ import { testHttpMethod } from '../utils/test-http-method.js'
 import { http } from '../utils/http.js'
 import sinon from 'sinon'
 import { CID } from 'multiformats/cid'
-import { AbortSignal } from 'native-abort-controller'
 import { base58btc } from 'multiformats/bases/base58'
 import { base64 } from 'multiformats/bases/base64'
 import { base32 } from 'multiformats/bases/base32'

packages/ipfs-http-server/test/inject/bootstrap.js

@@ -5,7 +5,6 @@ import qs from 'qs'
 import { testHttpMethod } from '../utils/test-http-method.js'
 import { http } from '../utils/http.js'
 import sinon from 'sinon'
-import { AbortSignal } from 'native-abort-controller'
 
 const defaultList = [
   'server0',

packages/ipfs-http-server/test/inject/config.js

@@ -7,7 +7,6 @@ import streamToPromise from 'stream-to-promise'
 import { testHttpMethod } from '../utils/test-http-method.js'
 import { http } from '../utils/http.js'
 import sinon from 'sinon'
-import { AbortSignal } from 'native-abort-controller'
 
 const profiles = {
   profile1: {

packages/ipfs-http-server/test/inject/dag.js

@@ -10,7 +10,6 @@ import { testHttpMethod } from '../utils/test-http-method.js'
 import { http } from '../utils/http.js'
 import { matchIterable } from '../utils/match-iterable.js'
 import sinon from 'sinon'
-import { AbortSignal } from 'native-abort-controller'
 import { base58btc } from 'multiformats/bases/base58'
 import { base32 } from 'multiformats/bases/base32'
 import drain from 'it-drain'

packages/ipfs-http-server/test/inject/dht.js

@@ -7,7 +7,6 @@ import { http } from '../utils/http.js'
 import sinon from 'sinon'
 import errCode from 'err-code'
 import { CID } from 'multiformats/cid'
-import { AbortSignal } from 'native-abort-controller'
 import { allNdjson } from '../utils/all-ndjson.js'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import FormData from 'form-data'

packages/ipfs-http-server/test/inject/dns.js

@@ -4,7 +4,6 @@ import { expect } from 'aegir/utils/chai.js'
 import { testHttpMethod } from '../utils/test-http-method.js'
 import { http } from '../utils/http.js'
 import sinon from 'sinon'
-import { AbortSignal } from 'native-abort-controller'
 
 const defaultOptions = {
   recursive: false,

packages/ipfs-http-server/test/inject/files.js

@@ -11,7 +11,6 @@ import sinon from 'sinon'
 import { CID } from 'multiformats/cid'
 import first from 'it-first'
 import toBuffer from 'it-to-buffer'
-import { AbortSignal } from 'native-abort-controller'
 import { base58btc } from 'multiformats/bases/base58'
 import { base64 } from 'multiformats/bases/base64'
 import { matchIterable } from '../utils/match-iterable.js'

packages/ipfs-http-server/test/inject/id.js

@@ -4,7 +4,6 @@ import { expect } from 'aegir/utils/chai.js'
 import { testHttpMethod } from '../utils/test-http-method.js'
 import { http } from '../utils/http.js'
 import sinon from 'sinon'
-import { AbortSignal } from 'native-abort-controller'
 
 const defaultOptions = {
   signal: sinon.match.instanceOf(AbortSignal),

packages/ipfs-http-server/test/inject/key.js

@@ -5,7 +5,6 @@ import { expect } from 'aegir/utils/chai.js'
 import { testHttpMethod } from '../utils/test-http-method.js'
 import { http } from '../utils/http.js'
 import sinon from 'sinon'
-import { AbortSignal } from 'native-abort-controller'
 
 describe('/key', function () {
   let ipfs