blind-peer 0.0.1 → 0.0.3

package/bin.js

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+
+const { command, flag } = require('paparam')
+const goodbye = require('graceful-goodbye')
+const idEnc = require('hypercore-id-encoding')
+const BlindPeer = require('.')
+
+const cmd = command('blind-peer',
+  flag('--storage|-s [path]', 'storage path, defaults to ./blind-peer'),
+  async function ({ flags }) {
+    console.info('Starting blind peer')
+
+    const storage = flags.storage || 'blind-peer'
+    const blindPeer = new BlindPeer(storage)
+
+    console.info(`Using storage '${storage}'`)
+
+    goodbye(async () => {
+      console.info('Shutting down blind peer')
+      await blindPeer.close()
+    })
+
+    await blindPeer.listen()
+
+    console.info(`Listening at ${idEnc.normalize(blindPeer.publicKey)}`)
+  }
+)
+
+cmd.parse()

package/build.js

@@ -52,7 +52,7 @@ blind.register({
     },
     {
       name: 'message',
-      type: 'string'
+      type: 'buffer'
     }
   ]
 })
@@ -90,7 +90,7 @@ blind.register({
 
 Hyperschema.toDisk(schema)
 
-const db = HyperDB.from(SCHEMA_DIR, DB_DIR)
+const db = HyperDB.from(SCHEMA_DIR, DB_DIR, { offset: 64 })
 const blindDB = db.namespace('blind-peer')
 
 blindDB.collections.register({

package/example/autobase.mjs

@@ -4,17 +4,18 @@ import c from 'compact-encoding'
 import Corestore from 'corestore'
 import Hyperswarm from 'hyperswarm'
 import debounce from 'debounceify'
+import IdEnc from 'hypercore-id-encoding'
 
 const base = new Autobase(new Corestore('/tmp/my-corestore'), {
   encryptionKey: Buffer.alloc(30).fill('secret'),
-  valueEncoding: c.json,
   open (store) {
     return store.get('view', { valueEncoding: c.json })
   },
   async apply (nodes, view, base) {
     for (const node of nodes) {
-      if (node.value.add) await base.addWriter(Buffer.from(node.value.key, 'hex'), { indexer: false })
-      view.append(node.value)
+      const jsonValue = JSON.parse(node.value.toString())
+      if (jsonValue.add) await base.addWriter(Buffer.from(jsonValue.key, 'hex'), { indexer: false })
+      view.append(jsonValue)
     }
   }
 })
@@ -31,7 +32,7 @@ base.view.on('append', debounce(async function () {
 }))
 
 // TODO: record in autobase
-const publicKey = Buffer.from(process.argv[2], 'hex')
+const publicKey = IdEnc.decode(process.argv[2])
 
 const s = new Hyperswarm({ keyPair: await base.store.createKeyPair('tmp') })
 
@@ -45,7 +46,10 @@ s.on('connection', async c => {
   const info = await peer.addMailbox({ autobase: base.key })
 
   if (info.open === false) {
-    await base.append({ add: true, key: info.writer.toString('hex') })
+    const message = Buffer.from(
+      JSON.stringify({ add: true, key: info.writer.toString('hex') })
+    )
+    await base.append(message)
     await base.update()
 
     const core = base.store.get({ key: info.writer, active: false })

package/example/post.mjs

@@ -1,9 +1,13 @@
 import BlindPeerClient from '../client.js'
 import Hyperswarm from 'hyperswarm'
+import IdEnc from 'hypercore-id-encoding'
 
-const publicKey = Buffer.from(process.argv[2], 'hex')
-const autobase = Buffer.from(process.argv[3], 'hex')
-const message = process.argv[4]
+const publicKey = IdEnc.decode(process.argv[2])
+const autobase = IdEnc.decode(process.argv[3])
+const rawMessage = process.argv[4]
+const message = Buffer.from(
+  JSON.stringify({ mailbox: true, message: rawMessage })
+)
 
 const s = new Hyperswarm()
 

package/index.js

@@ -56,8 +56,7 @@ module.exports = class BlindPeer {
 
       const w = new AutobaseLightWriter(this.store.namespace(entry.autobase), entry.autobase, {
         active: false,
-        blockEncryptionKey: entry.blockEncryptionKey,
-        valueEncoding: c.json
+        blockEncryptionKey: entry.blockEncryptionKey
       })
 
       for (const peer of core.peers) {
@@ -120,10 +119,9 @@ module.exports = class BlindPeer {
 
     const w = new AutobaseLightWriter(this.store.namespace(autobase), autobase, {
       active: false,
-      blockEncryptionKey: entry.blockEncryptionKey,
-      valueEncoding: c.json
+      blockEncryptionKey: entry.blockEncryptionKey
     })
-    await w.append({ mailbox: true, text: message })
+    await w.append(message)
     const length = w.local.length
     await w.close()
 

package/package.json

@@ -1,14 +1,20 @@
 {
   "name": "blind-peer",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "WIP - nothing to see here",
   "main": "index.js",
+  "bin": {
+    "blind-peer": "bin.js"
+  },
   "dependencies": {
     "autobase-light-writer": "^1.1.0",
     "corestore": "^6.18.4",
+    "graceful-goodbye": "^1.3.2",
+    "hypercore-id-encoding": "^1.3.0",
     "hyperdb": "^4.1.2",
     "hyperschema": "^1.0.3",
     "hyperswarm": "^4.8.4",
+    "paparam": "^1.6.1",
     "protomux-rpc": "^1.6.0"
   },
   "devDependencies": {

package/spec/hyperdb/db.json

@@ -1,11 +1,11 @@
 {
   "version": 0,
-  "offset": 0,
+  "offset": 64,
   "schema": [
     {
       "name": "mailbox",
       "namespace": "blind-peer",
-      "id": 0,
+      "id": 64,
       "type": 1,
       "indexes": [],
       "schema": "@blind-peer/mailbox",

package/spec/hyperdb/index.js

@@ -6,18 +6,18 @@ const { IndexEncoder, c } = require('hyperdb/runtime')
 const { version, resolveStruct } = require('./messages.js')
 
 // '@blind-peer/mailbox' collection key
-const collection0_key = new IndexEncoder([
+const collection64_key = new IndexEncoder([
   IndexEncoder.BUFFER
-], { prefix: 0 })
+], { prefix: 64 })
 
-function collection0_indexify (record) {
+function collection64_indexify (record) {
   const a = record.autobase
   return a === undefined ? [] : [a]
 }
 
 // '@blind-peer/mailbox' reconstruction function
-function collection0_reconstruct (version, keyBuf, valueBuf) {
-  const key = collection0_key.decode(keyBuf)
+function collection64_reconstruct (version, keyBuf, valueBuf) {
+  const key = collection64_key.decode(keyBuf)
   const value = c.decode(resolveStruct('@blind-peer/mailbox/value', version), valueBuf)
   // TODO: This should be fully code generated
   return {
@@ -26,42 +26,42 @@ function collection0_reconstruct (version, keyBuf, valueBuf) {
   }
 }
 // '@blind-peer/mailbox' key reconstruction function
-function collection0_reconstruct_key (keyBuf) {
-  const key = collection0_key.decode(keyBuf)
+function collection64_reconstruct_key (keyBuf) {
+  const key = collection64_key.decode(keyBuf)
   return {
     autobase: key[0]
   }
 }
 
 // '@blind-peer/mailbox'
-const collection0 = {
+const collection64 = {
   name: '@blind-peer/mailbox',
-  id: 0,
+  id: 64,
   encodeKey (record) {
     const key = [record.autobase]
-    return collection0_key.encode(key)
+    return collection64_key.encode(key)
   },
   encodeKeyRange ({ gt, lt, gte, lte } = {}) {
-    return collection0_key.encodeRange({
-      gt: gt ? collection0_indexify(gt) : null,
-      lt: lt ? collection0_indexify(lt) : null,
-      gte: gte ? collection0_indexify(gte) : null,
-      lte: lte ? collection0_indexify(lte) : null
+    return collection64_key.encodeRange({
+      gt: gt ? collection64_indexify(gt) : null,
+      lt: lt ? collection64_indexify(lt) : null,
+      gte: gte ? collection64_indexify(gte) : null,
+      lte: lte ? collection64_indexify(lte) : null
     })
   },
   encodeValue (version, record) {
     return c.encode(resolveStruct('@blind-peer/mailbox/value', version), record)
   },
   trigger: null,
-  reconstruct: collection0_reconstruct,
-  reconstructKey: collection0_reconstruct_key,
+  reconstruct: collection64_reconstruct,
+  reconstructKey: collection64_reconstruct_key,
   indexes: []
 }
 
 module.exports = {
   version,
   collections: [
-    collection0
+    collection64
   ],
   indexes: [
   ],
@@ -71,7 +71,7 @@ module.exports = {
 
 function resolveCollection (name) {
   switch (name) {
-    case '@blind-peer/mailbox': return collection0
+    case '@blind-peer/mailbox': return collection64
     default: return null
   }
 }

package/spec/hyperdb/messages.js

@@ -86,7 +86,7 @@ const encoding2 = {
     c.fixed32.preencode(state, m.autobase)
     c.uint.preencode(state, flags)
 
-    if (m.message) c.string.preencode(state, m.message)
+    if (m.message) c.buffer.preencode(state, m.message)
   },
   encode (state, m) {
     let flags = 0
@@ -95,7 +95,7 @@ const encoding2 = {
     c.fixed32.encode(state, m.autobase)
     c.uint.encode(state, flags)
 
-    if (m.message) c.string.encode(state, m.message)
+    if (m.message) c.buffer.encode(state, m.message)
   },
   decode (state) {
     const res = {}
@@ -105,7 +105,7 @@ const encoding2 = {
     res.autobase = c.fixed32.decode(state)
 
     const flags = state.start < state.end ? c.uint.decode(state) : 0
-    if ((flags & 1) !== 0) res.message = c.string.decode(state)
+    if ((flags & 1) !== 0) res.message = c.buffer.decode(state)
 
     return res
   }

package/spec/hyperschema/index.js

@@ -86,7 +86,7 @@ const encoding2 = {
     c.fixed32.preencode(state, m.autobase)
     c.uint.preencode(state, flags)
 
-    if (m.message) c.string.preencode(state, m.message)
+    if (m.message) c.buffer.preencode(state, m.message)
   },
   encode (state, m) {
     let flags = 0
@@ -95,7 +95,7 @@ const encoding2 = {
     c.fixed32.encode(state, m.autobase)
     c.uint.encode(state, flags)
 
-    if (m.message) c.string.encode(state, m.message)
+    if (m.message) c.buffer.encode(state, m.message)
   },
   decode (state) {
     const res = {}
@@ -105,7 +105,7 @@ const encoding2 = {
     res.autobase = c.fixed32.decode(state)
 
     const flags = state.start < state.end ? c.uint.decode(state) : 0
-    if ((flags & 1) !== 0) res.message = c.string.decode(state)
+    if ((flags & 1) !== 0) res.message = c.buffer.decode(state)
 
     return res
   }

package/spec/hyperschema/schema.json

@@ -59,7 +59,7 @@
         },
         {
           "name": "message",
-          "type": "string",
+          "type": "buffer",
           "version": 1
         }
       ]