[refactor] Store -> HyperDB

hyperdb/db/db.json

@@ -3,11 +3,24 @@
   "offset": 0,
   "schema": [
     {
-      "name": "dht",
+      "name": "bundle",
       "namespace": "pear",
       "id": 0,
       "type": 1,
       "indexes": [],
+      "schema": "@pear/bundle",
+      "derived": false,
+      "key": [
+        "key"
+      ],
+      "trigger": null
+    },
+    {
+      "name": "dht",
+      "namespace": "pear",
+      "id": 1,
+      "type": 1,
+      "indexes": [],
       "schema": "@pear/dht",
       "derived": false,
       "key": [],

hyperdb/db/index.js

@@ -5,30 +5,40 @@ const { IndexEncoder, c } = require('hyperdb/runtime')
 
 const { version, resolveStruct } = require('./messages.js')
 
-// '@pear/dht' collection key
+// '@pear/bundle' collection key
 const collection0_key = new IndexEncoder([
+  IndexEncoder.STRING
 ], { prefix: 0 })
 
 function collection0_indexify (record) {
-  return []
+  const a = record.key
+  return a === undefined ? [] : [a]
 }
 
-// '@pear/dht' reconstruction function
+// '@pear/bundle' reconstruction function
 function collection0_reconstruct (version, keyBuf, valueBuf) {
-  const value = c.decode(resolveStruct('@pear/dht/value', version), valueBuf)
-  return value
+  const key = collection0_key.decode(keyBuf)
+  const value = c.decode(resolveStruct('@pear/bundle/value', version), valueBuf)
+  // TODO: This should be fully code generated
+  return {
+    key: key[0],
+    ...value
+  }
 }
-// '@pear/dht' key reconstruction function
+// '@pear/bundle' key reconstruction function
 function collection0_reconstruct_key (keyBuf) {
-  return {}
+  const key = collection0_key.decode(keyBuf)
+  return {
+    key: key[0]
+  }
 }
 
-// '@pear/dht'
+// '@pear/bundle'
 const collection0 = {
-  name: '@pear/dht',
+  name: '@pear/bundle',
   id: 0,
   encodeKey (record) {
-    const key = []
+    const key = [record.key]
     return collection0_key.encode(key)
   },
   encodeKeyRange ({ gt, lt, gte, lte } = {}) {
@@ -40,18 +50,62 @@ const collection0 = {
     })
   },
   encodeValue (version, record) {
-    return c.encode(resolveStruct('@pear/dht/value', version), record)
+    return c.encode(resolveStruct('@pear/bundle/value', version), record)
   },
   trigger: null,
   reconstruct: collection0_reconstruct,
   reconstructKey: collection0_reconstruct_key,
   indexes: []
 }
 
+// '@pear/dht' collection key
+const collection1_key = new IndexEncoder([
+], { prefix: 1 })
+
+function collection1_indexify (record) {
+  return []
+}
+
+// '@pear/dht' reconstruction function
+function collection1_reconstruct (version, keyBuf, valueBuf) {
+  const value = c.decode(resolveStruct('@pear/dht/value', version), valueBuf)
+  return value
+}
+// '@pear/dht' key reconstruction function
+function collection1_reconstruct_key (keyBuf) {
+  return {}
+}
+
+// '@pear/dht'
+const collection1 = {
+  name: '@pear/dht',
+  id: 1,
+  encodeKey (record) {
+    const key = []
+    return collection1_key.encode(key)
+  },
+  encodeKeyRange ({ gt, lt, gte, lte } = {}) {
+    return collection1_key.encodeRange({
+      gt: gt ? collection1_indexify(gt) : null,
+      lt: lt ? collection1_indexify(lt) : null,
+      gte: gte ? collection1_indexify(gte) : null,
+      lte: lte ? collection1_indexify(lte) : null
+    })
+  },
+  encodeValue (version, record) {
+    return c.encode(resolveStruct('@pear/dht/value', version), record)
+  },
+  trigger: null,
+  reconstruct: collection1_reconstruct,
+  reconstructKey: collection1_reconstruct_key,
+  indexes: []
+}
+
 module.exports = {
   version,
   collections: [
-    collection0
+    collection0,
+    collection1
   ],
   indexes: [
   ],
@@ -61,7 +115,8 @@ module.exports = {
 
 function resolveCollection (name) {
   switch (name) {
-    case '@pear/dht': return collection0
+    case '@pear/bundle': return collection0
+    case '@pear/dht': return collection1
     default: return null
   }
 }

hyperdb/db/messages.js

@@ -31,65 +31,146 @@ const encoding0 = {
   }
 }
 
+// @pear/bundle.tags
+const encoding1_2 = c.array(c.string)
+
+// @pear/bundle
+const encoding1 = {
+  preencode (state, m) {
+    let flags = 0
+    if (m.encryptionKey) flags |= 1
+    if (m.tags) flags |= 2
+
+    c.string.preencode(state, m.key)
+    c.uint.preencode(state, flags)
+
+    if (m.encryptionKey) c.string.preencode(state, m.encryptionKey)
+    if (m.tags) encoding1_2.preencode(state, m.tags)
+  },
+  encode (state, m) {
+    let flags = 0
+    if (m.encryptionKey) flags |= 1
+    if (m.tags) flags |= 2
+
+    c.string.encode(state, m.key)
+    c.uint.encode(state, flags)
+
+    if (m.encryptionKey) c.string.encode(state, m.encryptionKey)
+    if (m.tags) encoding1_2.encode(state, m.tags)
+  },
+  decode (state) {
+    const res = {}
+    res.key = null
+    res.encryptionKey = null
+    res.tags = null
+
+    res.key = c.string.decode(state)
+
+    const flags = state.start < state.end ? c.uint.decode(state) : 0
+    if ((flags & 1) !== 0) res.encryptionKey = c.string.decode(state)
+    if ((flags & 2) !== 0) res.tags = encoding1_2.decode(state)
+
+    return res
+  }
+}
+
 // @pear/dht.nodes
-const encoding1_0 = c.frame(c.array(encoding0))
+const encoding2_0 = c.frame(c.array(encoding0))
 
 // @pear/dht
-const encoding1 = {
+const encoding2 = {
   preencode (state, m) {
     let flags = 0
     if (m.nodes) flags |= 1
 
     c.uint.preencode(state, flags)
 
-    if (m.nodes) encoding1_0.preencode(state, m.nodes)
+    if (m.nodes) encoding2_0.preencode(state, m.nodes)
   },
   encode (state, m) {
     let flags = 0
     if (m.nodes) flags |= 1
 
     c.uint.encode(state, flags)
 
-    if (m.nodes) encoding1_0.encode(state, m.nodes)
+    if (m.nodes) encoding2_0.encode(state, m.nodes)
   },
   decode (state) {
     const res = {}
     res.nodes = null
 
     const flags = state.start < state.end ? c.uint.decode(state) : 0
-    if ((flags & 1) !== 0) res.nodes = encoding1_0.decode(state)
+    if ((flags & 1) !== 0) res.nodes = encoding2_0.decode(state)
+
+    return res
+  }
+}
+
+// @pear/bundle/value.tags
+const encoding3_1 = c.array(c.string)
+
+// @pear/bundle/value
+const encoding3 = {
+  preencode (state, m) {
+    let flags = 0
+    if (m.encryptionKey) flags |= 1
+    if (m.tags) flags |= 2
+
+    c.uint.preencode(state, flags)
+
+    if (m.encryptionKey) c.string.preencode(state, m.encryptionKey)
+    if (m.tags) encoding3_1.preencode(state, m.tags)
+  },
+  encode (state, m) {
+    let flags = 0
+    if (m.encryptionKey) flags |= 1
+    if (m.tags) flags |= 2
+
+    c.uint.encode(state, flags)
+
+    if (m.encryptionKey) c.string.encode(state, m.encryptionKey)
+    if (m.tags) encoding3_1.encode(state, m.tags)
+  },
+  decode (state) {
+    const res = {}
+    res.encryptionKey = null
+    res.tags = null
+
+    const flags = state.start < state.end ? c.uint.decode(state) : 0
+    if ((flags & 1) !== 0) res.encryptionKey = c.string.decode(state)
+    if ((flags & 2) !== 0) res.tags = encoding3_1.decode(state)
 
     return res
   }
 }
 
 // @pear/dht/value.nodes
-const encoding2_0 = c.frame(c.array(encoding0))
+const encoding4_0 = c.frame(c.array(encoding0))
 
 // @pear/dht/value
-const encoding2 = {
+const encoding4 = {
   preencode (state, m) {
     let flags = 0
     if (m.nodes) flags |= 1
 
     c.uint.preencode(state, flags)
 
-    if (m.nodes) encoding2_0.preencode(state, m.nodes)
+    if (m.nodes) encoding4_0.preencode(state, m.nodes)
   },
   encode (state, m) {
     let flags = 0
     if (m.nodes) flags |= 1
 
     c.uint.encode(state, flags)
 
-    if (m.nodes) encoding2_0.encode(state, m.nodes)
+    if (m.nodes) encoding4_0.encode(state, m.nodes)
   },
   decode (state) {
     const res = {}
     res.nodes = null
 
     const flags = state.start < state.end ? c.uint.decode(state) : 0
-    if ((flags & 1) !== 0) res.nodes = encoding2_0.decode(state)
+    if ((flags & 1) !== 0) res.nodes = encoding4_0.decode(state)
 
     return res
   }
@@ -98,8 +179,10 @@ const encoding2 = {
 function getStructByName (name) {
   switch (name) {
     case '@pear/node': return encoding0
-    case '@pear/dht': return encoding1
-    case '@pear/dht/value': return encoding2
+    case '@pear/bundle': return encoding1
+    case '@pear/dht': return encoding2
+    case '@pear/bundle/value': return encoding3
+    case '@pear/dht/value': return encoding4
     default: throw new Error('Encoder not found ' + name)
   }
 }

hyperdb/generate.js

@@ -4,9 +4,12 @@ const Builder = require('hyperdb/builder')
 
 const SCHEMA_DIR = path.join(__dirname, 'schema')
 const DB_DIR = path.join(__dirname, 'db')
+
+// hyperdb/schema
 const schema = Hyperschema.from(SCHEMA_DIR)
 const pearSchema = schema.namespace('pear')
 
+// custom types
 pearSchema.register({
   name: 'node',
   fields: [
@@ -23,6 +26,27 @@ pearSchema.register({
   ]
 })
 
+// structs
+pearSchema.register({
+  name: 'bundle',
+  fields: [
+    {
+      name: 'key',
+      type: 'string',
+      required: true
+    },
+    {
+      name: 'encryptionKey',
+      type: 'string'
+    },
+    {
+      name: 'tags',
+      type: 'string',
+      array: true
+    }
+  ]
+})
+
 pearSchema.register({
   name: 'dht',
   fields: [
@@ -36,9 +60,16 @@ pearSchema.register({
 
 Hyperschema.toDisk(schema)
 
+// hyperdb/db
 const db = Builder.from(SCHEMA_DIR, DB_DIR)
 const pearDB = db.namespace('pear')
 
+pearDB.collections.register({
+  name: 'bundle',
+  schema: '@pear/bundle',
+  key: ['key']
+})
+
 pearDB.collections.register({
   name: 'dht',
   schema: '@pear/dht'