npm - @helia/interop - Versions diffs - 10.1.4 → 10.2.1 - Mend

@helia/interop 10.1.4 → 10.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/dist/src/helia-blockstore.spec.js +4 -3
package/dist/src/helia-blockstore.spec.js.map +1 -1
package/dist/src/helia-progress-events.spec.d.ts +2 -0
package/dist/src/helia-progress-events.spec.d.ts.map +1 -0
package/dist/src/helia-progress-events.spec.js +93 -0
package/dist/src/helia-progress-events.spec.js.map +1 -0
package/dist/src/providers.spec.js +14 -28
package/dist/src/providers.spec.js.map +1 -1
package/package.json +18 -18
package/src/helia-blockstore.spec.ts +4 -3
package/src/helia-progress-events.spec.ts +105 -0
package/src/providers.spec.ts +14 -28

package/dist/src/helia-blockstore.spec.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { randomBytes } from '@libp2p/crypto';
 import { multiaddr } from '@multiformats/multiaddr';
 import { expect } from 'aegir/chai';
 import toBuffer from 'it-to-buffer';
@@ -11,9 +12,9 @@ describe('helia - blockstore', () => {
     let kubo;
     let kuboInfo;
     beforeEach(async () => {
-        helia = await createHeliaNode();
         kubo = await createKuboNode();
         kuboInfo = await kubo.info();
+        helia = await createHeliaNode();
         // connect the two nodes
         await helia.libp2p.dial(kuboInfo.multiaddrs.map(str => multiaddr(str)));
     });
@@ -26,7 +27,7 @@ describe('helia - blockstore', () => {
         }
     });
     it('should be able to send a block', async () => {
-        const input = Uint8Array.from([0, 1, 2, 3, 4]);
+        const input = randomBytes(10);
         const digest = await sha256.digest(input);
         const cid = CID.createV1(raw.code, digest);
         await helia.blockstore.put(cid, input);
@@ -34,7 +35,7 @@ describe('helia - blockstore', () => {
         expect(output).to.equalBytes(input);
     });
     it('should be able to receive a block', async () => {
-        const input = Uint8Array.from([0, 1, 2, 3, 4]);
+        const input = randomBytes(10);
         const { cid } = await kubo.api.add({ content: input }, {
             cidVersion: 1,
             rawLeaves: true

package/dist/src/helia-blockstore.spec.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"helia-blockstore.spec.js","sourceRoot":"","sources":["../../src/helia-blockstore.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,QAAQ,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAI1D,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,KAAY,CAAA;IAChB,IAAI,IAAc,CAAA;IAClB,IAAI,QAAkB,CAAA;IAEtB,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,~~KAAK~~,GAAG,MAAM,~~eAAe~~,EAAE,CAAA;~~QAC/B~~,~~IAAI~~,GAAG,MAAM,~~cAAc~~,EAAE,CAAA;~~QAC7B~~,~~QAAQ~~,GAAG,MAAM,~~IAAI~~,~~CAAC,IAAI,~~EAAE,CAAA;~~QAE5B~~,wBAAwB;QACxB,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACzE,CAAC,CAAC,CAAA;IAEF,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QACpB,CAAC;QAED,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;QACnB,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,KAAK,GAAG,~~UAAU~~,CAAC,~~IAAI,CAAC,CAAC,CAAC,~~EAAE,CAAC,~~EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,~~CAAA;~~QAC9C~~,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACzC,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAC1C,MAAM,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACtC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;QAEhD,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IACrC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACjD,MAAM,KAAK,GAAG,~~UAAU~~,CAAC,~~IAAI,CAAC,CAAC,CAAC,~~EAAE,CAAC,~~EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,~~CAAA;~~QAC9C~~,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;YACrD,UAAU,EAAE,CAAC;YACb,SAAS,EAAE,IAAI;SAChB,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAA;QAE9E,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IACrC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"helia-blockstore.spec.js","sourceRoot":"","sources":["../../src/helia-blockstore.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,QAAQ,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAI1D,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,KAAY,CAAA;IAChB,IAAI,IAAc,CAAA;IAClB,IAAI,QAAkB,CAAA;IAEtB,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,IAAI,GAAG,MAAM,cAAc,EAAE,CAAA;QAC7B,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;QAC5B,KAAK,GAAG,MAAM,eAAe,EAAE,CAAA;QAE/B,wBAAwB;QACxB,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACzE,CAAC,CAAC,CAAA;IAEF,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QACpB,CAAC;QAED,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;QACnB,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,CAAA;QAC7B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACzC,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAC1C,MAAM,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACtC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;QAEhD,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IACrC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACjD,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,CAAA;QAC7B,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;YACrD,UAAU,EAAE,CAAC;YACb,SAAS,EAAE,IAAI;SAChB,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAA;QAE9E,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IACrC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/src/helia-progress-events.spec.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export {};
2	+ //# sourceMappingURL=helia-progress-events.spec.d.ts.map

package/dist/src/helia-progress-events.spec.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"helia-progress-events.spec.d.ts","sourceRoot":"","sources":["../../src/helia-progress-events.spec.ts"],"names":[],"mappings":""}

package/dist/src/helia-progress-events.spec.js ADDED Viewed

@@ -0,0 +1,93 @@
+import { randomBytes } from '@libp2p/crypto';
+import { contentRoutingSymbol } from '@libp2p/interface';
+import { peerIdFromString } from '@libp2p/peer-id';
+import { CODE_P2P, multiaddr } from '@multiformats/multiaddr';
+import { expect } from 'aegir/chai';
+import drain from 'it-drain';
+import { CID } from 'multiformats/cid';
+import { createHeliaNode } from "./fixtures/create-helia.js";
+import { createKuboNode } from "./fixtures/create-kubo.js";
+describe('helia - progress events', () => {
+    let helia;
+    let kubo;
+    let kuboInfo;
+    beforeEach(async () => {
+        kubo = await createKuboNode();
+        kuboInfo = await kubo.info();
+        const router = {
+            get [contentRoutingSymbol]() {
+                return router;
+            },
+            findProviders: async function* (cid, options) {
+                yield {
+                    routing: 'dummy',
+                    id: peerIdFromString(kuboInfo.peerId ?? ''),
+                    multiaddrs: kuboInfo?.multiaddrs.map(ma => multiaddr(ma).decapsulateCode(CODE_P2P))
+                };
+            },
+            provide: function (cid, options) {
+                throw new Error('Function not implemented.');
+            },
+            cancelReprovide: function (key, options) {
+                throw new Error('Function not implemented.');
+            },
+            put: function (key, value, options) {
+                throw new Error('Function not implemented.');
+            },
+            get: function (key, options) {
+                throw new Error('Function not implemented.');
+            }
+        };
+        helia = await createHeliaNode({
+            services: {
+                dummyRouter: () => router
+            }
+        });
+    });
+    afterEach(async () => {
+        if (helia != null) {
+            await helia.stop();
+        }
+        if (kubo != null) {
+            await kubo.stop();
+        }
+    });
+    it('should yield routing events', async () => {
+        const input = randomBytes(10);
+        const { cid } = await kubo.api.add({ content: input }, {
+            cidVersion: 1,
+            rawLeaves: true
+        });
+        const events = new Map();
+        await drain(helia.blockstore.get(CID.parse(cid.toString()), {
+            onProgress(evt) {
+                let count = events.get(evt.type) ?? 0;
+                count++;
+                events.set(evt.type, count);
+            }
+        }));
+        expect(events.get('helia:routing:find-providers:start')).to.be.greaterThan(0);
+        expect(events.get('helia:routing:find-providers:provider')).to.be.greaterThan(0);
+        expect(events.get('helia:routing:find-providers:end')).to.be.greaterThan(0);
+    });
+    it('should yield block broker events', async () => {
+        const input = randomBytes(10);
+        const { cid } = await kubo.api.add({ content: input }, {
+            cidVersion: 1,
+            rawLeaves: true
+        });
+        const events = new Map();
+        await drain(helia.blockstore.get(CID.parse(cid.toString()), {
+            onProgress(evt) {
+                let count = events.get(evt.type) ?? 0;
+                count++;
+                events.set(evt.type, count);
+            }
+        }));
+        expect(events.get('helia:block-broker:connect')).to.be.greaterThan(0);
+        expect(events.get('helia:block-broker:connected')).to.be.greaterThan(0);
+        expect(events.get('helia:block-broker:request-block')).to.be.greaterThan(0);
+        expect(events.get('helia:block-broker:receive-block')).to.be.greaterThan(0);
+    });
+});
+//# sourceMappingURL=helia-progress-events.spec.js.map

package/dist/src/helia-progress-events.spec.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"helia-progress-events.spec.js","sourceRoot":"","sources":["../../src/helia-progress-events.spec.ts"],"names":[],"mappings":"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"}

package/dist/src/providers.spec.js CHANGED Viewed

@@ -60,10 +60,8 @@ describe('providers', () => {
                 kuboInfo.multiaddrs.map(ma => multiaddr(ma))
             ],
             onProgress(evt) {
-                // @ts-expect-error cannot derive config-based progress event types
-                if (evt.type === 'bitswap:block') {
-                    // @ts-expect-error cannot derive config-based progress event types
-                    sender = evt.detail.sender;
+                if (evt.type === 'helia:block-broker:receive-block') {
+                    sender = evt.detail.provider;
                 }
             }
         }));
@@ -82,10 +80,8 @@ describe('providers', () => {
                 kuboInfo.multiaddrs.map(ma => multiaddr(ma))
             ],
             onProgress(evt) {
-                // @ts-expect-error cannot derive config-based progress event types
-                if (evt.type === 'bitswap:block') {
-                    // @ts-expect-error cannot derive config-based progress event types
-                    sender = evt.detail.sender;
+                if (evt.type === 'helia:block-broker:receive-block') {
+                    sender = evt.detail.provider;
                 }
             }
         })).to.eventually.deep.equal(obj);
@@ -103,10 +99,8 @@ describe('providers', () => {
                 kuboInfo.multiaddrs.map(ma => multiaddr(ma))
             ],
             onProgress(evt) {
-                // @ts-expect-error cannot derive config-based progress event types
-                if (evt.type === 'bitswap:block') {
-                    // @ts-expect-error cannot derive config-based progress event types
-                    sender = evt.detail.sender;
+                if (evt.type === 'helia:block-broker:receive-block') {
+                    sender = evt.detail.provider;
                 }
             }
         })).to.eventually.deep.equal(obj);
@@ -124,10 +118,8 @@ describe('providers', () => {
                 kuboInfo.multiaddrs.map(ma => multiaddr(ma))
             ],
             onProgress(evt) {
-                // @ts-expect-error cannot derive config-based progress event types
-                if (evt.type === 'bitswap:block') {
-                    // @ts-expect-error cannot derive config-based progress event types
-                    sender = evt.detail.sender;
+                if (evt.type === 'helia:block-broker:receive-block') {
+                    sender = evt.detail.provider;
                 }
             }
         })).to.eventually.equal(JSON.stringify(obj));
@@ -141,10 +133,8 @@ describe('providers', () => {
                 kuboInfo.multiaddrs.map(ma => multiaddr(ma))
             ],
             onProgress(evt) {
-                // @ts-expect-error cannot derive config-based progress event types
-                if (evt.type === 'bitswap:block') {
-                    // @ts-expect-error cannot derive config-based progress event types
-                    sender = evt.detail.sender;
+                if (evt.type === 'helia:block-broker:receive-block') {
+                    sender = evt.detail.provider;
                 }
             }
         }));
@@ -159,10 +149,8 @@ describe('providers', () => {
                 kuboInfo.multiaddrs.map(ma => multiaddr(ma))
             ],
             onProgress(evt) {
-                // @ts-expect-error cannot derive config-based progress event types
-                if (evt.type === 'bitswap:block') {
-                    // @ts-expect-error cannot derive config-based progress event types
-                    sender = evt.detail.sender;
+                if (evt.type === 'helia:block-broker:receive-block') {
+                    sender = evt.detail.provider;
                 }
             }
         });
@@ -179,10 +167,8 @@ describe('providers', () => {
             ],
             blockFilter: createScalableCuckooFilter(10),
             onProgress(evt) {
-                // @ts-expect-error cannot derive config-based progress event types
-                if (evt.type === 'bitswap:block') {
-                    // @ts-expect-error cannot derive config-based progress event types
-                    sender = evt.detail.sender;
+                if (evt.type === 'helia:block-broker:receive-block') {
+                    sender = evt.detail.provider;
                 }
             }
         }))).to.equalBytes(await toBuffer(kubo.api.dag.export(cid)));

package/dist/src/providers.spec.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"providers.spec.js","sourceRoot":"","sources":["../../src/providers.spec.ts"],"names":[],"mappings":"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~~mEAAmE;gBACnE,~~IAAI,GAAG,CAAC,IAAI,KAAK,~~eAAe~~,EAAE,CAAC;~~oBACjC~~,~~mEAAmE;oBACnE,~~MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,~~MAAM~~,CAAA;~~gBAC5B~~,CAAC;YACH,CAAC;SACF,CAAC,CAAC,CAAA;QAEH,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAClC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACnF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACtD,IAAI,MAA0B,CAAA;QAC9B,MAAM,GAAG,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;QAC9B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE;YACtC,UAAU,EAAE,UAAU;SACvB,CAAC,CAAA;QAEF,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;QAExB,MAAM,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE;YACtB,SAAS,EAAE;gBACT,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;aAC7C;YACD,UAAU,CAAE,GAAG;gBACb,~~mEAAmE;gBACnE,~~IAAI,GAAG,CAAC,IAAI,KAAK,~~eAAe~~,EAAE,CAAC;~~oBACjC~~,~~mEAAmE;oBACnE,~~MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,~~MAAM~~,CAAA;~~gBAC5B~~,CAAC;YACH,CAAC;SACF,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACjC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACnF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACtD,IAAI,MAA0B,CAAA;QAC9B,MAAM,GAAG,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;QAC9B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE;YACtC,UAAU,EAAE,UAAU;SACvB,CAAC,CAAA;QAEF,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;QAExB,MAAM,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE;YACtB,SAAS,EAAE;gBACT,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;aAC7C;YACD,UAAU,CAAE,GAAG;gBACb,~~mEAAmE;gBACnE,~~IAAI,GAAG,CAAC,IAAI,KAAK,~~eAAe~~,EAAE,CAAC;~~oBACjC~~,~~mEAAmE;oBACnE,~~MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,~~MAAM~~,CAAA;~~gBAC5B~~,CAAC;YACH,CAAC;SACF,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACjC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACnF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QACpD,IAAI,MAA0B,CAAA;QAC9B,MAAM,GAAG,GAAG,aAAa,CAAA;QACzB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE;YACtC,UAAU,EAAE,UAAU;SACvB,CAAC,CAAA;QAEF,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;QAExB,MAAM,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE;YACtB,SAAS,EAAE;gBACT,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;aAC7C;YACD,UAAU,CAAE,GAAG;gBACb,~~mEAAmE;gBACnE,~~IAAI,GAAG,CAAC,IAAI,KAAK,~~eAAe~~,EAAE,CAAC;~~oBACjC~~,~~mEAAmE;oBACnE,~~MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,~~MAAM~~,CAAA;~~gBAC5B~~,CAAC;YACH,CAAC;SACF,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;QAC5C,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACnF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,IAAI,MAA0B,CAAA;QAC9B,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAExB,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE;YACvC,SAAS,EAAE;gBACT,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;aAC7C;YACD,UAAU,CAAE,GAAG;gBACb,~~mEAAmE;gBACnE,~~IAAI,GAAG,CAAC,IAAI,KAAK,~~eAAe~~,EAAE,CAAC;~~oBACjC~~,~~mEAAmE;oBACnE,~~MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,~~MAAM~~,CAAA;~~gBAC5B~~,CAAC;YACH,CAAC;SACF,CAAC,CAAC,CAAA;QAEH,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;QAC5C,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACnF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,IAAI,MAA0B,CAAA;QAC9B,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAA;QAErB,MAAM,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE;YAC5B,SAAS,EAAE;gBACT,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;aAC7C;YACD,UAAU,CAAE,GAAG;gBACb,~~mEAAmE;gBACnE,~~IAAI,GAAG,CAAC,IAAI,KAAK,~~eAAe~~,EAAE,CAAC;~~oBACjC~~,~~mEAAmE;oBACnE,~~MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,~~MAAM~~,CAAA;~~gBAC5B~~,CAAC;YACH,CAAC;SACF,CAAC,CAAA;QAEF,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAA;QAEjD,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;QAC5C,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACnF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,IAAI,MAA0B,CAAA;QAC9B,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAA;QAEpB,MAAM,CAAC,MAAM,QAAQ,CACnB,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;YACZ,SAAS,EAAE;gBACT,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;aAC7C;YACD,WAAW,EAAE,0BAA0B,CAAC,EAAE,CAAC;YAC3C,UAAU,CAAE,GAAG;gBACb,~~mEAAmE;gBACnE,~~IAAI,GAAG,CAAC,IAAI,KAAK,~~eAAe~~,EAAE,CAAC;~~oBACjC~~,~~mEAAmE;oBACnE,~~MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,~~MAAM~~,CAAA;~~gBAC5B~~,CAAC;YACH,CAAC;SACF,CAAC,CAAC,CACJ,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,QAAQ,CAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CACzB,CAAC,CAAA;QACF,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACnF,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"providers.spec.js","sourceRoot":"","sources":["../../src/providers.spec.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@helia/interop",
-  "version": "10.1.4",
+  "version": "10.2.1",
   "description": "Interop tests for Helia",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/ipfs/helia/tree/main/packages/interop#readme",
@@ -51,34 +51,34 @@
     "test:electron-main": "aegir test -t electron-main"
   },
   "dependencies": {
-    "@helia/block-brokers": "^5.1.4",
-    "@helia/dnslink": "^1.1.4",
-    "@helia/car": "^5.3.10",
-    "@helia/dag-cbor": "^5.0.7",
-    "@helia/dag-json": "^5.0.7",
-    "@helia/http": "^3.0.22",
-    "@helia/interface": "^6.1.1",
-    "@helia/ipns": "^9.1.9",
-    "@helia/json": "^5.0.7",
-    "@helia/mfs": "^7.0.5",
-    "@helia/routers": "^5.0.3",
-    "@helia/strings": "^5.0.7",
-    "@helia/unixfs": "^7.1.0",
+    "@helia/block-brokers": "^5.2.1",
+    "@helia/car": "^5.4.0",
+    "@helia/dag-cbor": "^5.1.0",
+    "@helia/dag-json": "^5.1.0",
+    "@helia/dnslink": "^1.2.0",
+    "@helia/http": "^3.1.1",
+    "@helia/interface": "^6.2.0",
+    "@helia/ipns": "^9.2.0",
+    "@helia/json": "^5.1.0",
+    "@helia/mfs": "^7.1.0",
+    "@helia/routers": "^5.1.0",
+    "@helia/strings": "^5.1.0",
+    "@helia/unixfs": "^7.2.0",
     "@ipld/car": "^5.4.2",
     "@ipld/dag-cbor": "^9.2.5",
     "@ipld/dag-pb": "^4.1.5",
     "@libp2p/crypto": "^5.1.12",
     "@libp2p/floodsub": "^11.0.6",
-    "@libp2p/interface": "^3.1.0",
+    "@libp2p/interface": "^3.2.0",
     "@libp2p/kad-dht": "^16.1.0",
     "@libp2p/keychain": "^6.0.5",
-    "@libp2p/peer-id": "^6.0.3",
+    "@libp2p/peer-id": "^6.0.6",
     "@libp2p/utils": "^7.0.5",
     "@libp2p/websockets": "^10.0.6",
     "@multiformats/multiaddr": "^13.0.1",
     "@multiformats/sha3": "^3.0.2",
     "aegir": "^47.0.22",
-    "helia": "^6.0.22",
+    "helia": "^6.1.1",
     "ipfs-unixfs-importer": "^16.0.1",
     "ipfsd-ctl": "^16.0.0",
     "ipns": "^10.1.2",
@@ -89,7 +89,7 @@
     "it-to-buffer": "^4.0.10",
     "kubo": "^0.40.1",
     "kubo-rpc-client": "^6.0.2",
-    "libp2p": "^3.0.6",
+    "libp2p": "^3.2.0",
     "multiformats": "^13.4.1",
     "uint8arrays": "^5.1.0",
     "wherearewe": "^2.0.1"

package/src/helia-blockstore.spec.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { randomBytes } from '@libp2p/crypto'
 import { multiaddr } from '@multiformats/multiaddr'
 import { expect } from 'aegir/chai'
 import toBuffer from 'it-to-buffer'
@@ -15,9 +16,9 @@ describe('helia - blockstore', () => {
   let kuboInfo: KuboInfo
   beforeEach(async () => {
-    helia = await createHeliaNode()
     kubo = await createKuboNode()
     kuboInfo = await kubo.info()
+    helia = await createHeliaNode()
     // connect the two nodes
     await helia.libp2p.dial(kuboInfo.multiaddrs.map(str => multiaddr(str)))
@@ -34,7 +35,7 @@ describe('helia - blockstore', () => {
   })
   it('should be able to send a block', async () => {
-    const input = Uint8Array.from([0, 1, 2, 3, 4])
+    const input = randomBytes(10)
     const digest = await sha256.digest(input)
     const cid = CID.createV1(raw.code, digest)
     await helia.blockstore.put(cid, input)
@@ -44,7 +45,7 @@ describe('helia - blockstore', () => {
   })
   it('should be able to receive a block', async () => {
-    const input = Uint8Array.from([0, 1, 2, 3, 4])
+    const input = randomBytes(10)
     const { cid } = await kubo.api.add({ content: input }, {
       cidVersion: 1,
       rawLeaves: true

package/src/helia-progress-events.spec.ts ADDED Viewed

@@ -0,0 +1,105 @@
+import { randomBytes } from '@libp2p/crypto'
+import { contentRoutingSymbol } from '@libp2p/interface'
+import { peerIdFromString } from '@libp2p/peer-id'
+import { CODE_P2P, multiaddr } from '@multiformats/multiaddr'
+import { expect } from 'aegir/chai'
+import drain from 'it-drain'
+import { CID } from 'multiformats/cid'
+import { createHeliaNode } from './fixtures/create-helia.ts'
+import { createKuboNode } from './fixtures/create-kubo.ts'
+import type { Provider, RoutingOptions } from '@libp2p/interface'
+import type { Helia } from 'helia'
+import type { KuboInfo, KuboNode } from 'ipfsd-ctl'
+describe('helia - progress events', () => {
+  let helia: Helia
+  let kubo: KuboNode
+  let kuboInfo: KuboInfo
+  beforeEach(async () => {
+    kubo = await createKuboNode()
+    kuboInfo = await kubo.info()
+    const router = {
+      get [contentRoutingSymbol] () {
+        return router
+      },
+      findProviders: async function * (cid: CID, options?: RoutingOptions): AsyncIterable<Provider> {
+        yield {
+          routing: 'dummy',
+          id: peerIdFromString(kuboInfo.peerId ?? ''),
+          multiaddrs: kuboInfo?.multiaddrs.map(ma => multiaddr(ma).decapsulateCode(CODE_P2P))
+        }
+      },
+      provide: function (cid: CID, options?: RoutingOptions): Promise<void> {
+        throw new Error('Function not implemented.')
+      },
+      cancelReprovide: function (key: CID, options?: RoutingOptions): Promise<void> {
+        throw new Error('Function not implemented.')
+      },
+      put: function (key: Uint8Array, value: Uint8Array, options?: RoutingOptions): Promise<void> {
+        throw new Error('Function not implemented.')
+      },
+      get: function (key: Uint8Array, options?: RoutingOptions): Promise<Uint8Array> {
+        throw new Error('Function not implemented.')
+      }
+    }
+    helia = await createHeliaNode({
+      services: {
+        dummyRouter: () => router
+      }
+    })
+  })
+  afterEach(async () => {
+    if (helia != null) {
+      await helia.stop()
+    }
+    if (kubo != null) {
+      await kubo.stop()
+    }
+  })
+  it('should yield routing events', async () => {
+    const input = randomBytes(10)
+    const { cid } = await kubo.api.add({ content: input }, {
+      cidVersion: 1,
+      rawLeaves: true
+    })
+    const events = new Map<string, number>()
+    await drain(helia.blockstore.get(CID.parse(cid.toString()), {
+      onProgress (evt) {
+        let count = events.get(evt.type) ?? 0
+        count++
+        events.set(evt.type, count)
+      }
+    }))
+    expect(events.get('helia:routing:find-providers:start')).to.be.greaterThan(0)
+    expect(events.get('helia:routing:find-providers:provider')).to.be.greaterThan(0)
+    expect(events.get('helia:routing:find-providers:end')).to.be.greaterThan(0)
+  })
+  it('should yield block broker events', async () => {
+    const input = randomBytes(10)
+    const { cid } = await kubo.api.add({ content: input }, {
+      cidVersion: 1,
+      rawLeaves: true
+    })
+    const events = new Map<string, number>()
+    await drain(helia.blockstore.get(CID.parse(cid.toString()), {
+      onProgress (evt) {
+        let count = events.get(evt.type) ?? 0
+        count++
+        events.set(evt.type, count)
+      }
+    }))
+    expect(events.get('helia:block-broker:connect')).to.be.greaterThan(0)
+    expect(events.get('helia:block-broker:connected')).to.be.greaterThan(0)
+    expect(events.get('helia:block-broker:request-block')).to.be.greaterThan(0)
+    expect(events.get('helia:block-broker:receive-block')).to.be.greaterThan(0)
+  })
+})

package/src/providers.spec.ts CHANGED Viewed

@@ -75,10 +75,8 @@ describe('providers', () => {
         kuboInfo.multiaddrs.map(ma => multiaddr(ma))
       ],
       onProgress (evt) {
-        // @ts-expect-error cannot derive config-based progress event types
-        if (evt.type === 'bitswap:block') {
-          // @ts-expect-error cannot derive config-based progress event types
-          sender = evt.detail.sender
+        if (evt.type === 'helia:block-broker:receive-block') {
+          sender = evt.detail.provider
         }
       }
     }))
@@ -101,10 +99,8 @@ describe('providers', () => {
         kuboInfo.multiaddrs.map(ma => multiaddr(ma))
       ],
       onProgress (evt) {
-        // @ts-expect-error cannot derive config-based progress event types
-        if (evt.type === 'bitswap:block') {
-          // @ts-expect-error cannot derive config-based progress event types
-          sender = evt.detail.sender
+        if (evt.type === 'helia:block-broker:receive-block') {
+          sender = evt.detail.provider
         }
       }
     })).to.eventually.deep.equal(obj)
@@ -125,10 +121,8 @@ describe('providers', () => {
         kuboInfo.multiaddrs.map(ma => multiaddr(ma))
       ],
       onProgress (evt) {
-        // @ts-expect-error cannot derive config-based progress event types
-        if (evt.type === 'bitswap:block') {
-          // @ts-expect-error cannot derive config-based progress event types
-          sender = evt.detail.sender
+        if (evt.type === 'helia:block-broker:receive-block') {
+          sender = evt.detail.provider
         }
       }
     })).to.eventually.deep.equal(obj)
@@ -149,10 +143,8 @@ describe('providers', () => {
         kuboInfo.multiaddrs.map(ma => multiaddr(ma))
       ],
       onProgress (evt) {
-        // @ts-expect-error cannot derive config-based progress event types
-        if (evt.type === 'bitswap:block') {
-          // @ts-expect-error cannot derive config-based progress event types
-          sender = evt.detail.sender
+        if (evt.type === 'helia:block-broker:receive-block') {
+          sender = evt.detail.provider
         }
       }
     })).to.eventually.equal(JSON.stringify(obj))
@@ -168,10 +160,8 @@ describe('providers', () => {
         kuboInfo.multiaddrs.map(ma => multiaddr(ma))
       ],
       onProgress (evt) {
-        // @ts-expect-error cannot derive config-based progress event types
-        if (evt.type === 'bitswap:block') {
-          // @ts-expect-error cannot derive config-based progress event types
-          sender = evt.detail.sender
+        if (evt.type === 'helia:block-broker:receive-block') {
+          sender = evt.detail.provider
         }
       }
     }))
@@ -189,10 +179,8 @@ describe('providers', () => {
         kuboInfo.multiaddrs.map(ma => multiaddr(ma))
       ],
       onProgress (evt) {
-        // @ts-expect-error cannot derive config-based progress event types
-        if (evt.type === 'bitswap:block') {
-          // @ts-expect-error cannot derive config-based progress event types
-          sender = evt.detail.sender
+        if (evt.type === 'helia:block-broker:receive-block') {
+          sender = evt.detail.provider
         }
       }
     })
@@ -214,10 +202,8 @@ describe('providers', () => {
         ],
         blockFilter: createScalableCuckooFilter(10),
         onProgress (evt) {
-          // @ts-expect-error cannot derive config-based progress event types
-          if (evt.type === 'bitswap:block') {
-            // @ts-expect-error cannot derive config-based progress event types
-            sender = evt.detail.sender
+          if (evt.type === 'helia:block-broker:receive-block') {
+            sender = evt.detail.provider
           }
         }
       }))