diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8c401645..ab7a3403 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: 14 + node-version: 16 - run: npm install - run: npx aegir lint - run: npx aegir build @@ -29,7 +29,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest, macos-latest] - node: [14, 16] + node: [16] fail-fast: true steps: - uses: actions/checkout@v2 @@ -44,6 +44,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: lts/* - run: npm install - run: npx aegir test -t browser -t webworker --bail test-firefox: @@ -51,6 +54,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: lts/* - run: npm install - run: npx aegir test -t browser -t webworker --bail -- --browser firefox test-ts: @@ -58,6 +64,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: lts/* - run: npm install - run: npm run test:ts test-interop: @@ -65,5 +74,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: lts/* - run: npm install - run: npm run test:interop -- --bail -- --exit diff --git a/examples/webrtc-direct/package.json b/examples/webrtc-direct/package.json index f555383b..0b912d1e 100644 --- a/examples/webrtc-direct/package.json +++ b/examples/webrtc-direct/package.json @@ -24,7 +24,7 @@ "libp2p-mplex": "^0.10.4", "@chainsafe/libp2p-noise": "^4.1.0", "libp2p-webrtc-direct": "^0.7.0", - "peer-id": "^0.15.4" + "peer-id": "^0.16.0" }, "browser": { "ipfs": "ipfs/dist/index.min.js" diff --git a/package.json b/package.json index f228f49c..e03ef754 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "homepage": "https://libp2p.io", "license": "MIT", "engines": { - "node": ">=14.0.0" + "node": ">=15.0.0" }, "browser": { "@motrix/nat-api": false @@ -80,10 +80,10 @@ ] }, "dependencies": { - "abortable-iterator": "^3.0.0", "@motrix/nat-api": "^0.3.1", "@vascosantos/moving-average": "^1.1.0", "abort-controller": "^3.0.0", + "abortable-iterator": "^3.0.0", "aggregate-error": "^3.1.0", "any-signal": "^2.1.1", "bignumber.js": "^9.0.1", @@ -105,8 +105,8 @@ "it-merge": "^1.0.0", "it-pipe": "^1.1.0", "it-take": "^1.0.0", - "libp2p-crypto": "^0.20.0", - "libp2p-interfaces": "^1.3.1", + "libp2p-crypto": "^0.21.0", + "libp2p-interfaces": "^2.0.1", "libp2p-utils": "^0.4.0", "mafmt": "^10.0.0", "merge-options": "^3.0.4", @@ -119,14 +119,14 @@ "p-fifo": "^1.0.0", "p-retry": "^4.4.0", "p-settle": "^4.1.1", - "peer-id": "^0.15.4", + "peer-id": "^0.16.0", "private-ip": "^2.1.0", "protobufjs": "^6.10.2", "retimer": "^3.0.0", "sanitize-filename": "^1.6.3", "set-delayed-interval": "^1.0.0", "streaming-iterables": "^6.0.0", - "timeout-abort-controller": "^1.1.1", + "timeout-abort-controller": "^2.0.0", "uint8arrays": "^3.0.0", "varint": "^6.0.0", "wherearewe": "^1.0.0", @@ -149,25 +149,25 @@ "it-pair": "^1.0.0", "it-pushable": "^1.4.0", "libp2p": ".", - "libp2p-bootstrap": "^0.13.0", + "libp2p-bootstrap": "^0.14.0", "libp2p-delegated-content-routing": "^0.11.0", - "libp2p-delegated-peer-routing": "^0.10.0", + "libp2p-delegated-peer-routing": "^0.11.0", "libp2p-floodsub": "^0.27.0", "libp2p-gossipsub": "^0.11.0", - "libp2p-interfaces-compliance-tests": "^1.2.1", + "libp2p-interfaces-compliance-tests": "^2.0.1", "libp2p-interop": "^0.5.0", - "libp2p-kad-dht": "^0.26.6", - "libp2p-mdns": "^0.17.0", + "libp2p-kad-dht": "^0.27.1", + "libp2p-mdns": "^0.18.0", "libp2p-mplex": "^0.10.1", "libp2p-tcp": "^0.17.0", - "libp2p-webrtc-star": "^0.24.0", + "libp2p-webrtc-star": "^0.25.0", "libp2p-websockets": "^0.16.0", "nock": "^13.0.3", "p-defer": "^3.0.0", "p-times": "^3.0.0", "p-wait-for": "^3.2.0", "rimraf": "^3.0.2", - "sinon": "^11.1.1", + "sinon": "^12.0.1", "util": "^0.12.3" }, "contributors": [ diff --git a/src/dialer/index.js b/src/dialer/index.js index 630e9c50..0cd5e088 100644 --- a/src/dialer/index.js +++ b/src/dialer/index.js @@ -6,8 +6,7 @@ const log = Object.assign(debug('libp2p:dialer'), { }) const errCode = require('err-code') const { Multiaddr } = require('multiaddr') -// @ts-ignore timeout-abourt-controles does not export types -const TimeoutController = require('timeout-abort-controller') +const { TimeoutController } = require('timeout-abort-controller') const { AbortError } = require('abortable-iterator') const { anySignal } = require('any-signal') diff --git a/test/ts-use/package.json b/test/ts-use/package.json index 612eef97..8593e192 100644 --- a/test/ts-use/package.json +++ b/test/ts-use/package.json @@ -16,7 +16,7 @@ "libp2p-record": "^0.10.4", "libp2p-tcp": "^0.17.1", "libp2p-websockets": "^0.16.1", - "peer-id": "^0.15.4" + "peer-id": "^0.16.0" }, "scripts": { "build": "npx tsc",