@fireproof/core 0.0.4 → 0.0.6

package/src/prolly.js

@@ -3,7 +3,7 @@ import {
   EventFetcher,
   EventBlock,
   findCommonAncestorWithSortedEvents,
-  findUnknownSortedEvents
+  findEventsToSync
 } from './clock.js'
 import { create, load } from 'prolly-trees/map'
 import * as codec from '@ipld/dag-cbor'
@@ -12,7 +12,7 @@ import { MemoryBlockstore, MultiBlockFetcher } from './block.js'
 import { doTransaction } from './blockstore.js'
 
 import { nocache as cache } from 'prolly-trees/cache'
-import { bf, simpleCompare as compare } from 'prolly-trees/utils'
+import { CIDCounter, bf, simpleCompare as compare } from 'prolly-trees/utils'
 import { create as createBlock } from 'multiformats/block'
 const opts = { cache, chunker: bf(3), codec, hasher, compare }
 
@@ -22,9 +22,18 @@ const withLog = async (label, fn) => {
   return resp
 }
 
-const makeGetBlock = (blocks) => async (address) => {
-  const { cid, bytes } = await withLog(address, () => blocks.get(address))
-  return createBlock({ cid, bytes, hasher, codec })
+// todo should also return a CIDCounter
+export const makeGetBlock = (blocks) => {
+  // const cids = new CIDCounter() // todo this could be used for proofs of mutations
+  const getBlockFn = async (address) => {
+    const { cid, bytes } = await withLog(address, () => blocks.get(address))
+    // cids.add({ address: cid })
+    return createBlock({ cid, bytes, hasher, codec })
+  }
+  return {
+    // cids,
+    getBlock: getBlockFn
+  }
 }
 
 /**
@@ -57,6 +66,7 @@ async function createAndSaveNewEvent (
   additions,
   removals = []
 ) {
+  let cids
   const data = {
     type: 'put',
     root: {
@@ -77,13 +87,14 @@ async function createAndSaveNewEvent (
 
   const event = await EventBlock.create(data, head)
   bigPut(event)
-  head = await advance(inBlocks, head, event.cid)
+  ;({ head, cids } = await advance(inBlocks, head, event.cid))
 
   return {
     root,
     additions,
     removals,
     head,
+    clockCIDs: cids,
     event
   }
 }
@@ -91,7 +102,7 @@ async function createAndSaveNewEvent (
 const makeGetAndPutBlock = (inBlocks) => {
   const mblocks = new MemoryBlockstore()
   const blocks = new MultiBlockFetcher(mblocks, inBlocks)
-  const getBlock = makeGetBlock(blocks)
+  const { getBlock, cids } = makeGetBlock(blocks)
   const put = inBlocks.put.bind(inBlocks)
   const bigPut = async (block, additions) => {
     // console.log('bigPut', block.cid.toString())
@@ -102,7 +113,7 @@ const makeGetAndPutBlock = (inBlocks) => {
       additions.set(cid.toString(), block)
     }
   }
-  return { getBlock, bigPut, mblocks, blocks }
+  return { getBlock, bigPut, mblocks, blocks, cids }
 }
 
 const bulkFromEvents = (sorted) =>
@@ -166,7 +177,7 @@ export async function put (inBlocks, head, event, options) {
   for (const nb of newBlocks) {
     bigPut(nb, additions)
   }
-
+  // additions are new blocks
   return createAndSaveNewEvent(
     inBlocks,
     mblocks,
@@ -175,7 +186,7 @@ export async function put (inBlocks, head, event, options) {
     prollyRootBlock,
     event,
     head,
-    Array.from(additions.values()) /*, Array.from(removals.values()) */
+    Array.from(additions.values()) /*, todo? Array.from(removals.values()) */
   )
 }
 
@@ -207,8 +218,7 @@ export async function root (inBlocks, head) {
     }
     bigPut(prollyRootBlock)
   })
-
-  return newProllyRootNode // .block).cid // todo return live object not cid
+  return { cids: events.cids, node: newProllyRootNode }
 }
 
 /**
@@ -223,12 +233,8 @@ export async function eventsSince (blocks, head, since) {
     throw new Error('no head')
   }
   const sinceHead = [...since, ...head]
-  const unknownSorted3 = await findUnknownSortedEvents(
-    blocks,
-    sinceHead,
-    await findCommonAncestorWithSortedEvents(blocks, sinceHead)
-  )
-  return unknownSorted3.map(({ value: { data } }) => data)
+  const { cids, events: unknownSorted3 } = await findEventsToSync(blocks, sinceHead)
+  return { clockCIDs: cids, result: unknownSorted3.map(({ value: { data } }) => data) }
 }
 
 /**
@@ -243,11 +249,11 @@ export async function getAll (blocks, head) {
   // todo use the root node left around from put, etc
   // move load to a central place
   if (!head.length) {
-    return []
+    return { clockCIDs: new CIDCounter(), cids: new CIDCounter(), result: [] }
   }
-  const prollyRootNode = await root(blocks, head)
-  const { result } = await prollyRootNode.getAllEntries()
-  return result.map(({ key, value }) => ({ key, value }))
+  const { node: prollyRootNode, cids: clockCIDs } = await root(blocks, head)
+  const { result, cids } = await prollyRootNode.getAllEntries() // todo params
+  return { clockCIDs, cids, result: result.map(({ key, value }) => ({ key, value })) }
 }
 
 /**
@@ -258,9 +264,9 @@ export async function getAll (blocks, head) {
 export async function get (blocks, head, key) {
   // instead pass root from db? and always update on change
   if (!head.length) {
-    return null
+    return { cids: new CIDCounter(), result: null }
   }
-  const prollyRootNode = await root(blocks, head)
-  const { result } = await prollyRootNode.get(key)
-  return result
+  const { node: prollyRootNode, cids: clockCIDs } = await root(blocks, head)
+  const { result, cids } = await prollyRootNode.get(key)
+  return { result, cids, clockCIDs }
 }

package/src/valet.js

@@ -32,9 +32,15 @@ export default class Valet {
       )
       if (this.uploadFunction) {
         // todo we can coalesce these into a single car file
-        for (const task of tasks) {
-          await this.uploadFunction(task.carCid, task.value)
-        }
+        return await this.withDB(async (db) => {
+          for (const task of tasks) {
+            await this.uploadFunction(task.carCid, task.value)
+            // update the indexedb to mark this car as no longer pending
+            const carMeta = await db.get('cidToCar', task.carCid)
+            delete carMeta.pending
+            await db.put('cidToCar', carMeta)
+          }
+        })
       }
       callback()
     })