@fireproof/core 0.6.1 → 0.6.3-dev

package/src/valet.js

@@ -6,8 +6,9 @@ import * as CBW from '@ipld/car/buffer-writer'
 import * as raw from 'multiformats/codecs/raw'
 import * as Block from 'multiformats/block'
 import * as dagcbor from '@ipld/dag-cbor'
-import { openDB } from 'idb'
 import cargoQueue from 'async/cargoQueue.js'
+import { Loader } from './loader.js'
+
 // @ts-ignore
 
 // @ts-ignore
@@ -53,6 +54,7 @@ export class Valet {
   constructor (name = 'default', keyMaterial) {
     this.name = name
     this.setKeyMaterial(keyMaterial)
+    this.loader = new Loader(name, this.keyId) // todo send this config.loader, if we ever need it
     this.uploadQueue = cargoQueue(async (tasks, callback) => {
       // console.log(
       //   'queue worker',
@@ -87,6 +89,10 @@ export class Valet {
     })
   }
 
+  saveHeader (header) {
+    return this.loader.saveHeader(header)
+  }
+
   getKeyMaterial () {
     return this.keyMaterial
   }
@@ -127,19 +133,6 @@ export class Valet {
     }
   }
 
-  withDB = async dbWorkFun => {
-    if (!this.idb) {
-      this.idb = await openDB(`fp.${this.keyId}.${this.name}.valet`, 3, {
-        upgrade (db, oldVersion, newVersion, transaction) {
-          if (oldVersion < 1) {
-            db.createObjectStore('cars')
-          }
-        }
-      })
-    }
-    return await dbWorkFun(this.idb)
-  }
-
   /**
    * Iterate over all blocks in the store.
    *
@@ -180,6 +173,7 @@ export class Valet {
         blockHasher: blockOpts.hasher,
         blockCodec: blockOpts.codec
       })
+      this.valetRoot = indexNode
     }
 
     const got = await indexNode.get(cid)
@@ -226,6 +220,7 @@ export class Valet {
    * @param {*} value
    */
   async parkCar (carCid, value, cids) {
+    // const callId = Math.random().toString(36).substring(7)
     // console.log('parkCar', this.instanceId, this.name, carCid, cids)
     const combinedReader = await this.getCombinedReader(carCid)
     const mapNode = await addCidsToCarIndex(
@@ -238,7 +233,7 @@ export class Valet {
     this.valetRoot = mapNode
     this.valetRootCid = mapNode.cid
     // make a block set with all the cids of the map
-    const saveValetBlocks = new VMemoryBlockstore() //  todo this blockstore should read from the last valetCid car also
+    const saveValetBlocks = new VMemoryBlockstore()
 
     for await (const cidx of mapNode.cids()) {
       const bytes = await combinedReader.get(cidx)
@@ -251,7 +246,8 @@ export class Valet {
       newValetCidCar = await blocksToCarBlock(this.valetRootCid, saveValetBlocks)
     }
     // console.log('newValetCidCar', this.name, Math.floor(newValetCidCar.bytes.length / 1024))
-    await this.writeCars([
+    // console.log('writeCars', callId, carCid.toString(), newValetCidCar.cid.toString())
+    await this.loader.writeCars([
       {
         cid: carCid,
         bytes: value,
@@ -267,6 +263,8 @@ export class Valet {
 
     this.valetRootCarCid = newValetCidCar.cid // goes to clock
 
+    // console.log('wroteCars', callId, carCid.toString(), newValetCidCar.cid.toString())
+
     // console.log('parked car', carCid, value.length, Array.from(cids))
     // upload to web3.storage if we have credentials
     if (this.uploadFunction) {
@@ -283,29 +281,13 @@ export class Valet {
     }
   }
 
-  async writeCars (cars) {
-    return await this.withDB(async db => {
-      const tx = db.transaction(['cars'], 'readwrite')
-      for (const { cid, bytes, replaces } of cars) {
-        await tx.objectStore('cars').put(bytes, cid.toString())
-        // todo remove old maps
-        if (replaces) {
-          await tx.objectStore('cars').delete(replaces.toString())
-        }
-      }
-      return await tx.done
-    })
-  }
-
   remoteBlockFunction = null
 
   async getCarReader (carCid) {
     carCid = carCid.toString()
-    const carBytes = await this.withDB(async db => {
-      const tx = db.transaction(['cars'], 'readonly')
-      // console.log('getCarReader', carCid)
-      return await tx.objectStore('cars').get(carCid)
-    })
+    const carBytes = await this.loader.readCar(carCid)
+    // const callID = Math.random().toString(36).substring(7)
+    // console.log('getCarReader', callID, carCid)
     const reader = await CarReader.fromBytes(carBytes)
     if (this.keyMaterial) {
       const roots = await reader.getRoots()
@@ -329,7 +311,7 @@ export class Valet {
 
       // last block is the root ??? todo
       const rootBlock = blocks[blocks.length - 1]
-
+      // console.log('got reader', callID, carCid)
       return {
         root: rootBlock,
         get: async dataCID => {
@@ -456,6 +438,8 @@ const blocksFromEncryptedCarBlock = async (cid, get, keyMaterial) => {
 
 const addCidsToCarIndex = async (blockstore, valetRoot, valetRootCid, bulkOperations) => {
   let indexNode
+  // const callID = Math.random().toString(32).substring(2, 8)
+  // console.log('addCidsToCarIndex', callID, valetRootCid, bulkOperations.length)
   if (valetRootCid) {
     if (valetRoot) {
       indexNode = valetRoot
@@ -475,6 +459,7 @@ const addCidsToCarIndex = async (blockstore, valetRoot, valetRootCid, bulkOperat
     // console.log('adding', key, value)
     await indexNode.set(key, value)
   }
+  // console.log('newCidsToCarIndex', callID, indexNode.cid, bulkOperations.length)
   return indexNode
 }
 

package/src/utils.js

@@ -1,16 +0,0 @@
-
-/* global localStorage */
-let storageSupported = false
-try {
-  storageSupported = window.localStorage && true
-} catch (e) {}
-export function localGet (key) {
-  if (storageSupported) {
-    return localStorage && localStorage.getItem(key)
-  }
-}
-export function localSet (key, value) {
-  if (storageSupported) {
-    return localStorage && localStorage.setItem(key, value)
-  }
-}