Merge branch 'main' into fix-duplicate-blocks

ipfs · Jul 22, 2024 · 6ec36e3 · 6ec36e3
2 parents ee666f0 + f16c9ea
commit 6ec36e3
Show file tree

Hide file tree

Showing 29 changed files with 42 additions and 34 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -46,7 +46,7 @@ jobs:
           node-version: ${{ matrix.node }}
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npm run --if-present test:node
-      - uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
         with:
           flags: node
           files: .coverage/*,packages/*/.coverage/*
@@ -62,7 +62,7 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npm run --if-present test:chrome
-      - uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
         with:
           flags: chrome
           files: .coverage/*,packages/*/.coverage/*
@@ -78,7 +78,7 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npm run --if-present test:chrome-webworker
-      - uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
         with:
           flags: chrome-webworker
           files: .coverage/*,packages/*/.coverage/*
@@ -94,7 +94,7 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npm run --if-present test:firefox
-      - uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
         with:
           flags: firefox
           files: .coverage/*,packages/*/.coverage/*
@@ -110,7 +110,7 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npm run --if-present test:firefox-webworker
-      - uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
         with:
           flags: firefox-webworker
           files: .coverage/*,packages/*/.coverage/*
@@ -126,7 +126,7 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npm run --if-present test:webkit
-      - uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
         with:
           flags: webkit
           files: .coverage/*,packages/*/.coverage/*
@@ -142,7 +142,7 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npx xvfb-maybe npm run --if-present test:electron-main
-      - uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
         with:
           flags: electron-main
           files: .coverage/*,packages/*/.coverage/*
@@ -158,7 +158,7 @@ jobs:
           node-version: lts/*
       - uses: ipfs/aegir/actions/cache-node-modules@master
       - run: npx xvfb-maybe npm run --if-present test:electron-renderer
-      - uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
         with:
           flags: electron-renderer
           files: .coverage/*,packages/*/.coverage/*

diff --git a/benchmarks/add-dir/package.json b/benchmarks/add-dir/package.json
@@ -17,7 +17,7 @@
     "@helia/unixfs": "^3.0.4",
     "@ipld/dag-pb": "^4.0.2",
     "@libp2p/websockets": "^8.0.9",
-    "aegir": "^42.1.0",
+    "aegir": "^43.0.1",
     "blockstore-fs": "^1.0.1",
     "datastore-level": "^10.0.1",
     "execa": "^8.0.1",

diff --git a/benchmarks/gc/package.json b/benchmarks/gc/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@ipld/dag-pb": "^4.0.6",
-    "aegir": "^42.2.5",
+    "aegir": "^43.0.1",
     "blockstore-fs": "^1.1.8",
     "datastore-level": "^10.1.5",
     "execa": "^8.0.1",

diff --git a/benchmarks/transfer/package.json b/benchmarks/transfer/package.json
@@ -17,7 +17,7 @@
     "@helia/unixfs": "^3.0.3",
     "@ipld/dag-pb": "^4.0.2",
     "@libp2p/websockets": "^8.0.19",
-    "aegir": "^42.2.5",
+    "aegir": "^43.0.1",
     "blockstore-fs": "^1.0.1",
     "datastore-level": "^10.0.1",
     "execa": "^8.0.1",

diff --git a/benchmarks/transports/package.json b/benchmarks/transports/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@chainsafe/libp2p-noise": "^15.0.0",
     "@chainsafe/libp2p-yamux": "^6.0.2",
-    "@helia/block-brokers": "^2.1.1",
+    "@helia/block-brokers": "^3.0.2",
     "@helia/routers": "^1.0.3",
     "@helia/unixfs": "^3.0.3",
     "@ipld/dag-pb": "^4.1.0",
@@ -27,7 +27,7 @@
     "@libp2p/websockets": "^8.0.19",
     "@libp2p/webtransport": "^4.0.29",
     "@multiformats/multiaddr": "^12.2.1",
-    "aegir": "^42.2.5",
+    "aegir": "^43.0.1",
     "blockstore-fs": "^1.1.10",
     "blockstore-idb": "^1.1.8",
     "datastore-idb": "^2.1.9",

diff --git a/packages/bitswap/README.md b/packages/bitswap/README.md
@@ -34,7 +34,7 @@ $ npm i @helia/bitswap
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaBitswap` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaBitswap` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/bitswap/dist/index.min.js"></script>

diff --git a/packages/bitswap/src/network.ts b/packages/bitswap/src/network.ts
@@ -242,7 +242,7 @@ export class Network extends TypedEventEmitter<NetworkEvents> {
    * Find bitswap providers for a given `cid`.
    */
   async * findProviders (cid: CID, options?: AbortOptions & ProgressOptions<BitswapNetworkWantProgressEvents>): AsyncIterable<Provider> {
-    options?.onProgress?.(new CustomProgressEvent<PeerId>('bitswap:network:find-providers', cid))
+    options?.onProgress?.(new CustomProgressEvent<CID>('bitswap:network:find-providers', cid))
 
     for await (const provider of this.routing.findProviders(cid, options)) {
       // make sure we can dial the provider

diff --git a/packages/block-brokers/README.md b/packages/block-brokers/README.md
@@ -21,7 +21,7 @@ $ npm i @helia/block-brokers
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaBlockBrokers` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaBlockBrokers` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/block-brokers/dist/index.min.js"></script>

diff --git a/packages/car/README.md b/packages/car/README.md
@@ -94,7 +94,7 @@ $ npm i @helia/car
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaCar` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaCar` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/car/dist/index.min.js"></script>

diff --git a/packages/dag-cbor/README.md b/packages/dag-cbor/README.md
@@ -59,7 +59,7 @@ $ npm i @helia/dag-cbor
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaDagCbor` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaDagCbor` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/dag-cbor/dist/index.min.js"></script>

diff --git a/packages/dag-json/README.md b/packages/dag-json/README.md
@@ -59,7 +59,7 @@ $ npm i @helia/dag-json
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaDagJson` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaDagJson` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/dag-json/dist/index.min.js"></script>

diff --git a/packages/helia/README.md b/packages/helia/README.md
@@ -55,7 +55,7 @@ $ npm i helia
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `Helia` in the global namespace.
+Loading this module through a script tag will make its exports available as `Helia` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/helia/dist/index.min.js"></script>

diff --git a/packages/helia/src/index.ts b/packages/helia/src/index.ts
@@ -65,7 +65,7 @@ export interface HeliaInit<T extends Libp2p = Libp2p> extends HeliaClassInit {
    * The libp2p `start` option is not supported, instead please pass `start` in
    * the root of the HeliaInit object.
    */
-  libp2p?: T | Omit<Libp2pOptions, 'start'>
+  libp2p?: T | Omit<Libp2pOptions<any>, 'start'>
 
   /**
    * Pass `false` to not start the Helia node

diff --git a/packages/helia/src/utils/libp2p-defaults.browser.ts b/packages/helia/src/utils/libp2p-defaults.browser.ts
@@ -31,7 +31,7 @@ export interface DefaultLibp2pServices extends Record<string, unknown> {
   ping: PingService
 }
 
-export function libp2pDefaults (options: Libp2pDefaultsOptions = {}): Libp2pOptions<DefaultLibp2pServices> {
+export function libp2pDefaults (options: Libp2pDefaultsOptions = {}): Libp2pOptions<DefaultLibp2pServices> & Required<Pick<Libp2pOptions<DefaultLibp2pServices>, 'services'>> {
   const agentVersion = `${name}/${version} ${libp2pInfo.name}/${libp2pInfo.version} UserAgent=${globalThis.navigator.userAgent}`
 
   return {

diff --git a/packages/helia/src/utils/libp2p-defaults.ts b/packages/helia/src/utils/libp2p-defaults.ts
@@ -35,7 +35,7 @@ export interface DefaultLibp2pServices extends Record<string, unknown> {
   upnp: unknown
 }
 
-export function libp2pDefaults (options: Libp2pDefaultsOptions = {}): Libp2pOptions<DefaultLibp2pServices> {
+export function libp2pDefaults (options: Libp2pDefaultsOptions = {}): Libp2pOptions<DefaultLibp2pServices> & Required<Pick<Libp2pOptions<DefaultLibp2pServices>, 'services'>> {
   const agentVersion = `${name}/${version} ${libp2pInfo.name}/${libp2pInfo.version} UserAgent=${process.version}`
 
   return {

diff --git a/packages/helia/test/libp2p.spec.ts b/packages/helia/test/libp2p.spec.ts
@@ -25,6 +25,8 @@ describe('libp2p', () => {
 
   it('allows overriding libp2p config', async () => {
     const config = {
+      addresses: {},
+      transports: [],
       services: {}
     }
 

diff --git a/packages/http/README.md b/packages/http/README.md
@@ -81,7 +81,7 @@ $ npm i @helia/http
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaHttp` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaHttp` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/http/dist/index.min.js"></script>

diff --git a/packages/interface/src/blocks.ts b/packages/interface/src/blocks.ts
@@ -84,7 +84,7 @@ export interface BlockRetrievalOptions <ProgressEvents extends ProgressEvent<any
   /**
    * A function that blockBrokers should call prior to returning a block to ensure it can maintain control
    * of the block request flow. e.g. TrustedGatewayBlockBroker will use this to ensure that the block
-   * is valid from one of the gateways before assuming it's work is done. If the block is not valid, it should try another gateway
+   * is valid from one of the gateways before assuming its work is done. If the block is not valid, it should try another gateway
    * and WILL consider the gateway that returned the invalid blocks completely unreliable.
    */
   validateFn?(block: Uint8Array): Promise<void>

diff --git a/packages/interop/README.md b/packages/interop/README.md
@@ -32,7 +32,7 @@ $ npm i @helia/interop
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaInterop` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaInterop` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/interop/dist/index.min.js"></script>

diff --git a/packages/interop/src/fixtures/create-helia.browser.ts b/packages/interop/src/fixtures/create-helia.browser.ts
@@ -52,8 +52,11 @@ export async function createHeliaNode (libp2pOptions?: Libp2pOptions): Promise<H
   defaults.peerDiscovery = []
 
   // remove services that are not used in tests
+  // @ts-expect-error services.autoNAT is not optional
   delete defaults.services.autoNAT
+  // @ts-expect-error services.dcutr is not optional
   delete defaults.services.dcutr
+  // @ts-expect-error services.delegatedRouting is not optional
   delete defaults.services.delegatedRouting
 
   return createHelia<Libp2p<DefaultLibp2pServices>>({

diff --git a/packages/interop/src/fixtures/create-helia.ts b/packages/interop/src/fixtures/create-helia.ts
@@ -39,8 +39,11 @@ export async function createHeliaNode (libp2pOptions?: Libp2pOptions): Promise<H
   defaults.peerDiscovery = []
 
   // remove services that are not used in tests
+  // @ts-expect-error services.autoNAT is not optional
   delete defaults.services.autoNAT
+  // @ts-expect-error services.dcutr is not optional
   delete defaults.services.dcutr
+  // @ts-expect-error services.delegatedRouting is not optional
   delete defaults.services.delegatedRouting
 
   return createHelia<Libp2p<DefaultLibp2pServices>>({

diff --git a/packages/ipns/README.md b/packages/ipns/README.md
@@ -263,7 +263,7 @@ $ npm i @helia/ipns
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaIpns` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaIpns` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/ipns/dist/index.min.js"></script>

diff --git a/packages/json/README.md b/packages/json/README.md
@@ -59,7 +59,7 @@ $ npm i @helia/json
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaJson` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaJson` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/json/dist/index.min.js"></script>

diff --git a/packages/mfs/README.md b/packages/mfs/README.md
@@ -65,7 +65,7 @@ $ npm i @helia/mfs
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaMfs` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaMfs` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/mfs/dist/index.min.js"></script>

diff --git a/packages/routers/README.md b/packages/routers/README.md
@@ -40,7 +40,7 @@ $ npm i @helia/routers
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaRouters` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaRouters` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/routers/dist/index.min.js"></script>

diff --git a/packages/strings/README.md b/packages/strings/README.md
@@ -57,7 +57,7 @@ $ npm i @helia/strings
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaStrings` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaStrings` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/strings/dist/index.min.js"></script>

diff --git a/packages/unixfs/README.md b/packages/unixfs/README.md
@@ -79,7 +79,7 @@ $ npm i @helia/unixfs
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaUnixfs` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaUnixfs` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/unixfs/dist/index.min.js"></script>

diff --git a/packages/utils/README.md b/packages/utils/README.md
@@ -53,7 +53,7 @@ $ npm i @helia/utils
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `HeliaUtils` in the global namespace.
+Loading this module through a script tag will make its exports available as `HeliaUtils` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@helia/utils/dist/index.min.js"></script>

diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -254,7 +254,7 @@ export class Helia implements HeliaInterface {
             yield cid
 
             options.onProgress?.(new CustomProgressEvent<CID>('helia:gc:deleted', cid))
-          } catch (err) {
+          } catch (err: any) {
             helia.log.error('Error during gc', err)
             options.onProgress?.(new CustomProgressEvent<Error>('helia:gc:error', err))
           }