@helia/interop 7.1.3 → 8.0.0

package/dist/src/unixfs-files.spec.js

@@ -1,9 +1,14 @@
 /* eslint-env mocha */
 import { unixfs } from '@helia/unixfs';
+import * as dagPb from '@ipld/dag-pb';
+import { multiaddr } from '@multiformats/multiaddr';
 import { expect } from 'aegir/chai';
 import { fixedSize } from 'ipfs-unixfs-importer/chunker';
 import { balanced } from 'ipfs-unixfs-importer/layout';
+import drain from 'it-drain';
+import last from 'it-last';
 import { CID } from 'multiformats/cid';
+import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
 import { createHeliaNode } from './fixtures/create-helia.js';
 import { createKuboNode } from './fixtures/create-kubo.js';
 describe('@helia/unixfs - files', () => {
@@ -14,10 +19,24 @@ describe('@helia/unixfs - files', () => {
         const cid = await unixFs.addByteStream(data, opts);
         return cid;
     }
+    async function importDirectoryToHelia(data, opts) {
+        const result = await last(unixFs.addAll(data, opts));
+        if (result == null) {
+            throw new Error('Nothing imported');
+        }
+        return CID.parse(result.cid.toString());
+    }
     async function importToKubo(data, opts) {
         const result = await kubo.api.add(data, opts);
         return CID.parse(result.cid.toString());
     }
+    async function importDirectoryToKubo(data, opts) {
+        const result = await last(kubo.api.addAll(data, opts));
+        if (result == null) {
+            throw new Error('Nothing imported');
+        }
+        return CID.parse(result.cid.toString());
+    }
     async function expectSameCid(data, heliaOpts = {}, kuboOpts = {}) {
         const heliaCid = await importToHelia(data(), {
             // these are the default kubo options
@@ -63,5 +82,83 @@ describe('@helia/unixfs - files', () => {
         }());
         await expectSameCid(candidate);
     });
+    it('should return the same directory stats', async () => {
+        const candidates = [{
+                path: '/foo1.txt',
+                content: uint8ArrayFromString('Hello World!')
+            }, {
+                path: '/foo2.txt',
+                content: uint8ArrayFromString('Hello World!')
+            }];
+        const heliaCid = await importDirectoryToHelia(candidates, {
+            wrapWithDirectory: true
+        });
+        const kuboCid = await importDirectoryToKubo(candidates, {
+            cidVersion: 1,
+            chunker: `size-${1024 * 1024}`,
+            rawLeaves: true,
+            wrapWithDirectory: true
+        });
+        expect(heliaCid.toString()).to.equal(kuboCid.toString());
+        const heliaStat = await unixFs.stat(heliaCid, {
+            extended: true
+        });
+        const kuboStat = await kubo.api.files.stat(`/ipfs/${kuboCid}`, {
+            withLocal: true
+        });
+        expect(heliaStat.dagSize.toString()).to.equal(kuboStat.cumulativeSize.toString());
+        expect(heliaStat.dagSize.toString()).to.equal(kuboStat.sizeLocal?.toString());
+        // +1 because kubo doesn't count the root directory block
+        expect(heliaStat.blocks.toString()).to.equal((kuboStat.blocks + 1).toString());
+    });
+    it('fetches missing blocks during stat', async () => {
+        const chunkSize = 1024 * 1024;
+        const size = chunkSize * 10;
+        const candidate = () => (async function* () {
+            for (let i = 0; i < size; i += chunkSize) {
+                yield new Uint8Array(new Array(chunkSize).fill(0).map((val, index) => {
+                    return Math.floor(Math.random() * 256);
+                }));
+            }
+        }());
+        const largeFileCid = await importToKubo(candidate());
+        const info = await kubo.info();
+        await helia.libp2p.dial(info.multiaddrs.map(ma => multiaddr(ma)));
+        // pull all blocks from kubo
+        await drain(unixFs.cat(largeFileCid));
+        // check the root block
+        const block = await helia.blockstore.get(largeFileCid);
+        const node = dagPb.decode(block);
+        expect(node.Links).to.have.lengthOf(40);
+        const stats = await unixFs.stat(largeFileCid, {
+            extended: true
+        });
+        expect(stats.unixfs?.fileSize()).to.equal(10485760n);
+        expect(stats.blocks).to.equal(41n);
+        expect(stats.dagSize).to.equal(10488250n);
+        expect(stats.localSize).to.equal(10485760n);
+        // remove one of the blocks so we now have an incomplete DAG
+        await helia.blockstore.delete(node.Links[0].Hash);
+        // block count and local file/dag sizes should be smaller
+        const updatedStats = await unixFs.stat(largeFileCid, {
+            extended: true,
+            offline: true
+        });
+        expect(updatedStats.unixfs?.fileSize()).to.equal(10485760n);
+        expect(updatedStats.blocks).to.equal(40n);
+        expect(updatedStats.dagSize).to.equal(10226092n);
+        expect(updatedStats.localSize).to.equal(10223616n);
+        await new Promise((resolve) => {
+            setTimeout(() => {
+                resolve();
+            }, 1_000);
+        });
+        // block count and local file/dag sizes should be smaller
+        const finalStats = await unixFs.stat(largeFileCid, {
+            extended: true
+        });
+        // should have fetched missing block from Kubo
+        expect(finalStats).to.deep.equal(stats, 'did not fetch missing block');
+    });
 });
 //# sourceMappingURL=unixfs-files.spec.js.map

package/dist/src/unixfs-files.spec.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helia/interop",
-  "version": "7.1.3",
+  "version": "8.0.0",
   "description": "Interop tests for Helia",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/ipfs/helia/tree/main/packages/interop#readme",
@@ -60,25 +60,27 @@
   "dependencies": {
     "@chainsafe/libp2p-gossipsub": "^14.1.0",
     "@helia/block-brokers": "^4.1.0",
-    "@helia/car": "^4.0.3",
+    "@helia/car": "^4.0.4",
     "@helia/dag-cbor": "^4.0.3",
     "@helia/dag-json": "^4.0.3",
     "@helia/http": "^2.0.5",
     "@helia/interface": "^5.2.1",
     "@helia/ipns": "^8.2.0",
     "@helia/json": "^4.0.3",
-    "@helia/mfs": "^4.0.3",
+    "@helia/mfs": "^5.0.0",
     "@helia/routers": "^3.0.1",
     "@helia/strings": "^4.0.3",
-    "@helia/unixfs": "^4.0.3",
+    "@helia/unixfs": "^5.0.0",
     "@ipld/car": "^5.3.3",
     "@ipld/dag-cbor": "^9.2.2",
+    "@ipld/dag-pb": "^4.1.3",
     "@libp2p/crypto": "^5.0.7",
     "@libp2p/interface": "^2.2.1",
     "@libp2p/kad-dht": "^14.1.3",
     "@libp2p/keychain": "^5.0.10",
     "@libp2p/peer-id": "^5.0.8",
     "@libp2p/websockets": "^9.0.13",
+    "@multiformats/multiaddr": "^12.4.0",
     "@multiformats/sha3": "^3.0.2",
     "aegir": "^45.1.1",
     "helia": "^5.3.0",

package/src/unixfs-files.spec.ts

@@ -1,15 +1,20 @@
 /* eslint-env mocha */
 
 import { unixfs } from '@helia/unixfs'
+import * as dagPb from '@ipld/dag-pb'
+import { multiaddr } from '@multiformats/multiaddr'
 import { expect } from 'aegir/chai'
 import { fixedSize } from 'ipfs-unixfs-importer/chunker'
 import { balanced } from 'ipfs-unixfs-importer/layout'
+import drain from 'it-drain'
+import last from 'it-last'
 import { CID } from 'multiformats/cid'
+import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { createHeliaNode } from './fixtures/create-helia.js'
 import { createKuboNode } from './fixtures/create-kubo.js'
 import type { AddOptions, UnixFS } from '@helia/unixfs'
 import type { HeliaLibp2p } from 'helia'
-import type { ByteStream } from 'ipfs-unixfs-importer'
+import type { ByteStream, ImportCandidateStream } from 'ipfs-unixfs-importer'
 import type { KuboNode } from 'ipfsd-ctl'
 import type { AddOptions as KuboAddOptions } from 'kubo-rpc-client'
 
@@ -24,12 +29,32 @@ describe('@helia/unixfs - files', () => {
     return cid
   }
 
+  async function importDirectoryToHelia (data: ImportCandidateStream, opts?: Partial<AddOptions>): Promise<CID> {
+    const result = await last(unixFs.addAll(data, opts))
+
+    if (result == null) {
+      throw new Error('Nothing imported')
+    }
+
+    return CID.parse(result.cid.toString())
+  }
+
   async function importToKubo (data: ByteStream, opts?: KuboAddOptions): Promise<CID> {
     const result = await kubo.api.add(data, opts)
 
     return CID.parse(result.cid.toString())
   }
 
+  async function importDirectoryToKubo (data: ImportCandidateStream, opts?: KuboAddOptions): Promise<CID> {
+    const result = await last(kubo.api.addAll(data, opts))
+
+    if (result == null) {
+      throw new Error('Nothing imported')
+    }
+
+    return CID.parse(result.cid.toString())
+  }
+
   async function expectSameCid (data: () => ByteStream, heliaOpts: Partial<AddOptions> = {}, kuboOpts: KuboAddOptions = {}): Promise<void> {
     const heliaCid = await importToHelia(data(), {
       // these are the default kubo options
@@ -85,4 +110,103 @@ describe('@helia/unixfs - files', () => {
 
     await expectSameCid(candidate)
   })
+
+  it('should return the same directory stats', async () => {
+    const candidates = [{
+      path: '/foo1.txt',
+      content: uint8ArrayFromString('Hello World!')
+    }, {
+      path: '/foo2.txt',
+      content: uint8ArrayFromString('Hello World!')
+    }]
+
+    const heliaCid = await importDirectoryToHelia(candidates, {
+      wrapWithDirectory: true
+    })
+    const kuboCid = await importDirectoryToKubo(candidates, {
+      cidVersion: 1,
+      chunker: `size-${1024 * 1024}`,
+      rawLeaves: true,
+      wrapWithDirectory: true
+    })
+
+    expect(heliaCid.toString()).to.equal(kuboCid.toString())
+
+    const heliaStat = await unixFs.stat(heliaCid, {
+      extended: true
+    })
+    const kuboStat = await kubo.api.files.stat(`/ipfs/${kuboCid}`, {
+      withLocal: true
+    })
+
+    expect(heliaStat.dagSize.toString()).to.equal(kuboStat.cumulativeSize.toString())
+    expect(heliaStat.dagSize.toString()).to.equal(kuboStat.sizeLocal?.toString())
+
+    // +1 because kubo doesn't count the root directory block
+    expect(heliaStat.blocks.toString()).to.equal((kuboStat.blocks + 1).toString())
+  })
+
+  it('fetches missing blocks during stat', async () => {
+    const chunkSize = 1024 * 1024
+    const size = chunkSize * 10
+
+    const candidate = (): ByteStream => (async function * () {
+      for (let i = 0; i < size; i += chunkSize) {
+        yield new Uint8Array(new Array(chunkSize).fill(0).map((val, index) => {
+          return Math.floor(Math.random() * 256)
+        }))
+      }
+    }())
+
+    const largeFileCid = await importToKubo(candidate())
+    const info = await kubo.info()
+
+    await helia.libp2p.dial(info.multiaddrs.map(ma => multiaddr(ma)))
+
+    // pull all blocks from kubo
+    await drain(unixFs.cat(largeFileCid))
+
+    // check the root block
+    const block = await helia.blockstore.get(largeFileCid)
+    const node = dagPb.decode(block)
+
+    expect(node.Links).to.have.lengthOf(40)
+
+    const stats = await unixFs.stat(largeFileCid, {
+      extended: true
+    })
+
+    expect(stats.unixfs?.fileSize()).to.equal(10485760n)
+    expect(stats.blocks).to.equal(41n)
+    expect(stats.dagSize).to.equal(10488250n)
+    expect(stats.localSize).to.equal(10485760n)
+
+    // remove one of the blocks so we now have an incomplete DAG
+    await helia.blockstore.delete(node.Links[0].Hash)
+
+    // block count and local file/dag sizes should be smaller
+    const updatedStats = await unixFs.stat(largeFileCid, {
+      extended: true,
+      offline: true
+    })
+
+    expect(updatedStats.unixfs?.fileSize()).to.equal(10485760n)
+    expect(updatedStats.blocks).to.equal(40n)
+    expect(updatedStats.dagSize).to.equal(10226092n)
+    expect(updatedStats.localSize).to.equal(10223616n)
+
+    await new Promise<void>((resolve) => {
+      setTimeout(() => {
+        resolve()
+      }, 1_000)
+    })
+
+    // block count and local file/dag sizes should be smaller
+    const finalStats = await unixFs.stat(largeFileCid, {
+      extended: true
+    })
+
+    // should have fetched missing block from Kubo
+    expect(finalStats).to.deep.equal(stats, 'did not fetch missing block')
+  })
 })