@fireproof/core 0.7.2-dev.5 → 0.7.2-dev.7

package/dist/storage/base.js

@@ -89,10 +89,12 @@ export class Base {
             const block = await this.getLoaderBlock(cid);
             allBlocks.set(cid, block);
         }
+        cidMap.clear();
         const blocks = {
             lastCid: clock[0],
             get: cid => allBlocks.get(cid.toString())
         };
+        console.log('compact', this.instanceId, this.name, blocks.lastCid.toString(), dataCids.length);
         await this.parkCar(blocks, dataCids);
     }
     async parkCar(innerBlockstore, cids) {
@@ -230,6 +232,7 @@ export class Base {
     }
     async mapForIPLDHashmapCarCid(carCid) {
         // console.log('mapForIPLDHashmapCarCid', carCid)
+        // todo why is this writeable?
         const carMapReader = await this.getWriteableCarReader(carCid);
         const indexNode = await load(carMapReader, carMapReader.root.cid, {
             blockHasher: blockOpts.hasher,
@@ -268,7 +271,19 @@ export class Base {
         };
         return combinedReader;
     }
+    async xgetCarReader(carCid) {
+        return this.getCarReaderImpl(carCid);
+    }
+    carReaderCache = new Map();
     async getCarReader(carCid) {
+        if (this.carReaderCache.has(carCid)) {
+            return this.carReaderCache.get(carCid);
+        }
+        const result = await this.getCarReaderImpl(carCid);
+        this.carReaderCache.set(carCid, result);
+        return result;
+    }
+    async getCarReaderImpl(carCid) {
         carCid = carCid.toString();
         const carBytes = await this.readCar(carCid);
         // console.log('getCarReader', this.constructor.name, carCid, carBytes.length)

package/dist/valet.js

@@ -49,18 +49,6 @@ export class Valet {
             throw new Error('missing lastCid for car header');
         }
     }
-    // async compact() {
-    //   const carCids = []
-    //   // for await (const { cid } of this.valet.cids()) {
-    //   //   yield { cid }
-    //   // }
-    //   // create a blockstore with all data
-    //   {
-    //     entries: () => syncCIDs.map(cid => ({ cid })),
-    //     get: async cid => await blocks.get(cid)
-    //   }
-    //   // park it
-    // }
     /**
      * Iterate over all blocks in the store.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fireproof/core",
-  "version": "0.7.2-dev.5",
+  "version": "0.7.2-dev.7",
   "description": "Live data for React, accelerated by proofs, powered by IPFS",
   "main": "dist/src/fireproof.js",
   "module": "dist/src/fireproof.mjs",

package/src/storage/base.js

@@ -99,10 +99,12 @@ export class Base {
       const block = await this.getLoaderBlock(cid)
       allBlocks.set(cid, block)
     }
+    cidMap.clear()
     const blocks = {
       lastCid: clock[0],
       get: cid => allBlocks.get(cid.toString())
     }
+    console.log('compact', this.instanceId, this.name, blocks.lastCid.toString(), dataCids.length)
     await this.parkCar(blocks, dataCids)
   }
 
@@ -248,6 +250,7 @@ export class Base {
 
   async mapForIPLDHashmapCarCid (carCid) {
     // console.log('mapForIPLDHashmapCarCid', carCid)
+    // todo why is this writeable?
     const carMapReader = await this.getWriteableCarReader(carCid)
     const indexNode = await load(carMapReader, carMapReader.root.cid, {
       blockHasher: blockOpts.hasher,
@@ -286,7 +289,21 @@ export class Base {
     return combinedReader
   }
 
+  async xgetCarReader (carCid) {
+    return this.getCarReaderImpl(carCid)
+  }
+
+  carReaderCache = new Map()
   async getCarReader (carCid) {
+    if (this.carReaderCache.has(carCid)) {
+      return this.carReaderCache.get(carCid)
+    }
+    const result = await this.getCarReaderImpl(carCid)
+    this.carReaderCache.set(carCid, result)
+    return result
+  }
+
+  async getCarReaderImpl (carCid) {
     carCid = carCid.toString()
     const carBytes = await this.readCar(carCid)
     // console.log('getCarReader', this.constructor.name, carCid, carBytes.length)

package/src/valet.js

@@ -52,19 +52,6 @@ export class Valet {
     }
   }
 
-  // async compact() {
-  //   const carCids = []
-  //   // for await (const { cid } of this.valet.cids()) {
-  //   //   yield { cid }
-  //   // }
-  //   // create a blockstore with all data
-  //   {
-  //     entries: () => syncCIDs.map(cid => ({ cid })),
-  //     get: async cid => await blocks.get(cid)
-  //   }
-  //   // park it
-  // }
-
   /**
    * Iterate over all blocks in the store.
    *