corestore 6.0.1-alpha.16 → 6.0.1-alpha.19

package/index.js

@@ -3,6 +3,7 @@ const safetyCatch = require('safety-catch')
 const crypto = require('hypercore-crypto')
 const sodium = require('sodium-universal')
 const Hypercore = require('hypercore')
+const Xache = require('xache')
 const b4a = require('b4a')
 
 const [NS] = crypto.namespace('corestore', 1)
@@ -20,6 +21,7 @@ module.exports = class Corestore extends EventEmitter {
     this.storage = Hypercore.defaultStorage(storage, { lock: PRIMARY_KEY_FILE_NAME })
     this.cores = opts._cores || new Map()
     this.primaryKey = null
+    this.cache = !!opts.cache
 
     this._keyStorage = null
     this._primaryKey = opts.primaryKey
@@ -153,10 +155,10 @@ module.exports = class Corestore extends EventEmitter {
     while (this.cores.has(id)) {
       const existing = this.cores.get(id)
       if (existing.opened && !existing.closing) return { from: existing, keyPair, auth }
-      if (!existing.opened) {
-        await existing.ready().catch(safetyCatch)
-      } else if (existing.closing) {
+      if (existing.closing) {
         await existing.close()
+      } else {
+        await existing.ready().catch(safetyCatch)
       }
     }
 
@@ -175,6 +177,7 @@ module.exports = class Corestore extends EventEmitter {
       encryptionKey: opts.encryptionKey || null,
       userData,
       auth,
+      cache: opts.cache,
       createIfMissing: !opts._discoveryKey,
       keyPair: keyPair && keyPair.publicKey
         ? {
@@ -211,7 +214,7 @@ module.exports = class Corestore extends EventEmitter {
       auth: {
         sign: (msg) => sign(keyPair, msg),
         verify: (signable, signature) => {
-          return sodium.crypto_sign_detached(signature, signable, keyPair.publicKey)
+          return crypto.verify(signable, signature, keyPair.publicKey)
         }
       }
     }
@@ -224,6 +227,11 @@ module.exports = class Corestore extends EventEmitter {
 
   get (opts = {}) {
     opts = validateGetOptions(opts)
+
+    if (opts.cache !== false) {
+      opts.cache = opts.cache === true || (this.cache && !opts.cache) ? defaultCache() : opts.cache
+    }
+
     const core = new Hypercore(null, {
       ...opts,
       name: null,
@@ -279,6 +287,7 @@ module.exports = class Corestore extends EventEmitter {
     return new Corestore(this.storage, {
       primaryKey: this._opening.then(() => this.primaryKey),
       namespace: generateNamespace(this._namespace, name),
+      cache: this.cache,
       _opening: this._opening,
       _cores: this.cores,
       _streams: this._replicationStreams,
@@ -321,9 +330,7 @@ module.exports = class Corestore extends EventEmitter {
 
 function sign (keyPair, message) {
   if (!keyPair.secretKey) throw new Error('Invalid key pair')
-  const signature = b4a.allocUnsafe(sodium.crypto_sign_BYTES)
-  sodium.crypto_sign_detached(signature, message, keyPair.secretKey)
-  return signature
+  return crypto.sign(message, keyPair.secretKey)
 }
 
 function validateGetOptions (opts) {
@@ -357,6 +364,10 @@ function deriveSeed (primaryKey, namespace, name) {
   return out
 }
 
+function defaultCache () {
+  return new Xache({ maxSize: 65536, maxAge: 0 })
+}
+
 function isStream (s) {
   return typeof s === 'object' && s && typeof s.pipe === 'function'
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "corestore",
-  "version": "6.0.1-alpha.16",
+  "version": "6.0.1-alpha.19",
   "description": "A Hypercore factory that simplifies managing collections of cores.",
   "main": "index.js",
   "scripts": {
@@ -30,6 +30,7 @@
     "hypercore": "next",
     "hypercore-crypto": "^3.2.1",
     "safety-catch": "^1.0.1",
-    "sodium-universal": "^3.0.4"
+    "sodium-universal": "^3.0.4",
+    "xache": "^1.1.0"
   }
 }

package/test/all.js

@@ -1,4 +1,4 @@
-const { test, configure } = require('brittle')
+const test = require('brittle')
 const crypto = require('hypercore-crypto')
 const ram = require('random-access-memory')
 const os = require('os')
@@ -8,8 +8,6 @@ const sodium = require('sodium-universal')
 
 const Corestore = require('..')
 
-configure({ serial: true })
-
 test('basic get with caching', async function (t) {
   const store = new Corestore(ram)
   const core1a = store.get({ name: 'core-1' })
@@ -287,6 +285,44 @@ test('different primary keys yield different keypairs', async function (t) {
   t.unlike(kp1.publicKey, kp2.publicKey)
 })
 
+test('keypair auth sign', async function (t) {
+  const store = new Corestore(ram)
+  const keyPair = await store.createKeyPair('foo')
+  const message = b4a.from('hello world')
+
+  const sig = keyPair.auth.sign(message)
+
+  t.is(sig.length, 64)
+  t.ok(crypto.verify(message, sig, keyPair.publicKey))
+  t.absent(crypto.verify(message, b4a.alloc(64), keyPair.publicKey))
+})
+
+test('keypair auth verify', async function (t) {
+  const store = new Corestore(ram)
+  const keyPair = await store.createKeyPair('foo')
+  const message = b4a.from('hello world')
+
+  const sig = crypto.sign(message, keyPair.secretKey)
+
+  t.is(sig.length, 64)
+  t.ok(keyPair.auth.verify(message, sig))
+  t.absent(keyPair.auth.verify(message, b4a.alloc(64)))
+})
+
+test('core caching after reopen regression', async function (t) {
+  const store = new Corestore(ram)
+  const core = store.get({ name: 'test-core' })
+  await core.ready()
+
+  core.close()
+  await core.opening
+
+  const core2 = store.get({ name: 'test-core' })
+  await core2.ready()
+
+  t.pass('did not infinite loop')
+})
+
 function tmpdir () {
   return path.join(os.tmpdir(), 'corestore-' + Math.random().toString(16).slice(2))
 }

package/test/cache.js

@@ -0,0 +1,46 @@
+const test = require('brittle')
+const RAM = require('random-access-memory')
+
+const Corestore = require('..')
+
+test('core cache', async function (t) {
+  const store = new Corestore(RAM, { cache: true })
+
+  const core = store.get({ name: 'core' })
+  await core.append(['a', 'b', 'c'])
+
+  const p = core.get(0)
+  const q = core.get(0)
+
+  t.is(await p, await q)
+})
+
+test('clear cache on truncate', async function (t) {
+  const store = new Corestore(RAM, { cache: true })
+
+  const core = store.get({ name: 'core' })
+  await core.append(['a', 'b', 'c'])
+
+  const p = core.get(0)
+
+  await core.truncate(0)
+  await core.append('d')
+
+  const q = core.get(0)
+
+  t.alike(await p, Buffer.from('a'))
+  t.alike(await q, Buffer.from('d'))
+})
+
+test('core cache on namespace', async function (t) {
+  const store = new Corestore(RAM, { cache: true })
+  const ns1 = store.namespace('test-namespace-1')
+
+  const c1 = store.get({ name: 'test-core' })
+  const c2 = ns1.get({ name: 'test-core' })
+
+  await Promise.all([c1.ready(), c2.ready()])
+
+  t.ok(c1.cache)
+  t.ok(c2.cache)
+})