autopass 3.1.5 → 3.3.0

package/README.md

@@ -83,7 +83,7 @@ Add a writer explictly.
 
 Get the local writer key.
 
-#### `inv = await pass.createInvite()`
+#### `inv = await pass.createInvite({ readOnly })`
 
 Get invite to add a writer.
 

package/example-password.mjs

@@ -0,0 +1,34 @@
+import BlindEncryptionSodium from 'blind-encryption-sodium'
+import Autopass from './index.js'
+import Corestore from 'corestore'
+import process from 'process'
+import b4a from 'b4a'
+const store = new Corestore('example/' + process.argv[2])
+
+let pass = null
+
+const password = b4a.alloc(32, 'password')
+
+if (process.argv[3]) {
+  const pair = Autopass.pair(store, process.argv[3], {
+    blindEncryption: new BlindEncryptionSodium(password)
+  })
+  pass = await pair.finished()
+} else {
+  pass = new Autopass(store, {
+    blindEncryption: new BlindEncryptionSodium(password)
+  })
+  await pass.ready()
+}
+
+if (pass.base.writable) {
+  const inv = await pass.createInvite()
+  console.log('invite', inv)
+}
+onupdate()
+pass.on('update', onupdate)
+
+function onupdate() {
+  console.log('db changed, all entries:')
+  pass.list().on('data', console.log)
+}

package/index.js

@@ -28,6 +28,7 @@ class AutopassPairer extends ReadyResource {
     this.onreject = null
     this.pass = null
     this.relayThrough = opts.relayThrough || null
+    this.blindEncryption = opts.blindEncryption || null
 
     this.ready().catch(noop)
   }
@@ -63,19 +64,33 @@ class AutopassPairer extends ReadyResource {
             key: result.key,
             wakeup: this.wakeup,
             encryptionKey: result.encryptionKey,
-            bootstrap: this.bootstrap
+            bootstrap: this.bootstrap,
+            blindEncryption: this.blindEncryption
           })
 
           await this.pass.deleteInvite()
         }
+        const readOnly = JSON.parse(result.data.toString()).readOnly
         this.swarm = null
         this.store = null
-        if (this.onresolve) this._whenWritable()
+        if (this.onresolve && readOnly) {
+          this._whenReadable()
+        } else if (this.onresolve) {
+          this._whenWritable()
+        }
         this.candidate.close().catch(noop)
       }
     })
   }
 
+  _whenReadable() {
+    const check = () => {
+      this.pass.base.off('update', check)
+      this.onresolve(this.pass)
+    }
+    this.pass.base.on('update', check)
+  }
+
   _whenWritable() {
     if (this.pass.base.writable) return
     const check = () => {
@@ -171,12 +186,13 @@ class Autopass extends ReadyResource {
 
   // Initialize autobase
   _boot(opts = {}) {
-    const { encryptionKey, key, wakeup } = opts
+    const { encryptionKey, key, wakeup, blindEncryption } = opts
 
     this.base = new Autobase(this.store, key, {
       wakeup,
       encrypt: true,
       encryptionKey,
+      blindEncryption,
       open(store) {
         return HyperDB.bee(store.get('view'), db, {
           extension: false,
@@ -235,16 +251,23 @@ class Autopass extends ReadyResource {
 
   async createInvite(opts) {
     if (this.opened === false) await this.ready()
+    const readOnly = opts?.readOnly ? true : false
     const existing = await this.base.view.findOne('@autopass/invite', {})
-    if (existing) {
+
+    if (existing && existing.readOnly !== readOnly) {
+      await this.deleteInvite()
+    } else if (existing) {
       if (this.member) await this.member.flushed()
       return z32.encode(existing.invite)
     }
-    const { id, invite, publicKey, expires } = BlindPairing.createInvite(
-      this.base.key
+    const { id, invite, publicKey, expires, additional } = BlindPairing.createInvite(
+      this.base.key,
+      {
+        data: Buffer.from(JSON.stringify({ readOnly }))
+      }
     )
 
-    const record = { id, invite, publicKey, expires }
+    const record = { id, invite, publicKey, expires, readOnly, additional }
     await this.base.append(encode('@autopass/add-invite', record))
     if (this.member) await this.member.flushed()
     return z32.encode(record.invite)
@@ -312,11 +335,15 @@ class Autopass extends ReadyResource {
         if (inv === null || !b4a.equals(inv.id, id)) {
           return
         }
+        const readOnly = inv.readOnly
         candidate.open(inv.publicKey)
-        await this.addWriter(candidate.userData)
+        if (!readOnly) {
+          await this.addWriter(candidate.userData)
+        }
         candidate.confirm({
           key: this.base.key,
-          encryptionKey: this.base.encryptionKey
+          encryptionKey: this.base.encryptionKey,
+          additional: inv.additional
         })
         await this.deleteInvite()
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autopass",
-  "version": "3.1.5",
+  "version": "3.3.0",
   "main": "index.js",
   "scripts": {
     "brittle": "npx brittle test.js",
@@ -26,12 +26,13 @@
     "brittle": "^3.19.0",
     "hyperdht": "^6.23.0",
     "prettier": "^3.6.2",
-    "prettier-config-holepunch": "^1.0.0",
+    "prettier-config-holepunch": "^2.0.0",
     "test-tmp": "^1.4.0"
   },
   "dependencies": {
     "autobase": "^7.19.4",
     "b4a": "^1.7.1",
+    "blind-encryption-sodium": "^1.0.2",
     "blind-pairing": "^2.3.1",
     "blind-peering": "^1.13.0",
     "corestore": "^7.4.7",

package/schema.js

@@ -62,6 +62,14 @@ template.register({
   ]
 })
 
+template.register({
+  name: 'additional-invite-data',
+  fields: [
+    { name: 'data', type: 'buffer', required: true },
+    { name: 'signature', type: 'buffer', required: true }
+  ]
+})
+
 template.register({
   name: 'invite',
   compact: false,
@@ -85,6 +93,16 @@ template.register({
       name: 'expires',
       type: 'int',
       required: true
+    },
+    {
+      name: 'readOnly',
+      type: 'bool',
+      required: true
+    },
+    {
+      name: 'additional',
+      type: '@autopass/additional-invite-data',
+      required: false
     }
   ]
 })
@@ -159,10 +177,7 @@ blobs.collections.register({
 })
 HyperdbBuilder.toDisk(dbTemplate)
 
-const hyperdispatch = Hyperdispatch.from(
-  './spec/schema',
-  './spec/hyperdispatch'
-)
+const hyperdispatch = Hyperdispatch.from('./spec/schema', './spec/hyperdispatch')
 const namespace = hyperdispatch.namespace('autopass')
 namespace.register({
   name: 'remove-writer',

package/spec/db/db.json

@@ -7,6 +7,8 @@
       "namespace": "autopass",
       "id": 0,
       "type": 1,
+      "version": 0,
+      "versionField": null,
       "indexes": [],
       "schema": "@autopass/records",
       "derived": false,
@@ -18,6 +20,8 @@
       "namespace": "autopass",
       "id": 1,
       "type": 1,
+      "version": 0,
+      "versionField": null,
       "indexes": [],
       "schema": "@autopass/invite",
       "derived": false,
@@ -29,6 +33,8 @@
       "namespace": "autopass",
       "id": 2,
       "type": 1,
+      "version": 0,
+      "versionField": null,
       "indexes": [],
       "schema": "@autopass/mirrors",
       "derived": false,
@@ -40,6 +46,8 @@
       "namespace": "autopass",
       "id": 3,
       "type": 1,
+      "version": 0,
+      "versionField": null,
       "indexes": [],
       "schema": "@autopass/writer",
       "derived": false,
@@ -51,6 +59,8 @@
       "namespace": "autopass",
       "id": 4,
       "type": 1,
+      "version": 0,
+      "versionField": null,
       "indexes": [],
       "schema": "@autopass/delete",
       "derived": false,
@@ -62,6 +72,8 @@
       "namespace": "autopass",
       "id": 5,
       "type": 1,
+      "version": 0,
+      "versionField": null,
       "indexes": [],
       "schema": "@autopass/del-invite",
       "derived": false,
@@ -73,6 +85,8 @@
       "namespace": "autopass",
       "id": 6,
       "type": 1,
+      "version": 0,
+      "versionField": null,
       "indexes": [],
       "schema": "@autopass/del-mirror",
       "derived": false,

package/spec/db/index.js

@@ -1,9 +1,11 @@
 // This file is autogenerated by the hyperdb compiler
 /* eslint-disable camelcase */
 
-const { IndexEncoder, c } = require('hyperdb/runtime')
+const { IndexEncoder, c, b4a } = require('hyperdb/runtime')
 const { version, getEncoding, setVersion } = require('./messages.js')
 
+const versions = { schema: version, db: 0 }
+
 // '@autopass/records' collection key
 const collection0_key = new IndexEncoder([IndexEncoder.STRING], { prefix: 0 })
 
@@ -16,10 +18,11 @@ function collection0_indexify(record) {
 const collection0_enc = getEncoding('@autopass/records/hyperdb#0')
 
 // '@autopass/records' reconstruction function
-function collection0_reconstruct(version, keyBuf, valueBuf) {
+function collection0_reconstruct(schemaVersion, keyBuf, valueBuf) {
   const key = collection0_key.decode(keyBuf)
-  setVersion(version)
-  const record = c.decode(collection0_enc, valueBuf)
+  setVersion(schemaVersion)
+  const state = { start: 0, end: valueBuf.byteLength, buffer: valueBuf }
+  const record = collection0_enc.decode(state)
   record.key = key[0]
   return record
 }
@@ -35,6 +38,7 @@ function collection0_reconstruct_key(keyBuf) {
 const collection0 = {
   name: '@autopass/records',
   id: 0,
+  version: 0,
   encodeKey(record) {
     const key = [record.key]
     return collection0_key.encode(key)
@@ -47,14 +51,19 @@ const collection0 = {
       lte: lte ? collection0_indexify(lte) : null
     })
   },
-  encodeValue(version, record) {
-    setVersion(version)
-    return c.encode(collection0_enc, record)
+  encodeValue(schemaVersion, collectionVersion, record) {
+    setVersion(schemaVersion)
+    const state = { start: 0, end: 0, buffer: null }
+    collection0_enc.preencode(state, record)
+    state.buffer = b4a.allocUnsafe(state.end)
+    collection0_enc.encode(state, record)
+    return state.buffer
   },
   trigger: null,
   reconstruct: collection0_reconstruct,
   reconstructKey: collection0_reconstruct_key,
-  indexes: []
+  indexes: [],
+  decodedVersion: 0
 }
 
 // '@autopass/invite' collection key
@@ -69,10 +78,11 @@ function collection1_indexify(record) {
 const collection1_enc = getEncoding('@autopass/invite/hyperdb#1')
 
 // '@autopass/invite' reconstruction function
-function collection1_reconstruct(version, keyBuf, valueBuf) {
+function collection1_reconstruct(schemaVersion, keyBuf, valueBuf) {
   const key = collection1_key.decode(keyBuf)
-  setVersion(version)
-  const record = c.decode(collection1_enc, valueBuf)
+  setVersion(schemaVersion)
+  const state = { start: 0, end: valueBuf.byteLength, buffer: valueBuf }
+  const record = collection1_enc.decode(state)
   record.id = key[0]
   return record
 }
@@ -88,6 +98,7 @@ function collection1_reconstruct_key(keyBuf) {
 const collection1 = {
   name: '@autopass/invite',
   id: 1,
+  version: 0,
   encodeKey(record) {
     const key = [record.id]
     return collection1_key.encode(key)
@@ -100,14 +111,19 @@ const collection1 = {
       lte: lte ? collection1_indexify(lte) : null
     })
   },
-  encodeValue(version, record) {
-    setVersion(version)
-    return c.encode(collection1_enc, record)
+  encodeValue(schemaVersion, collectionVersion, record) {
+    setVersion(schemaVersion)
+    const state = { start: 0, end: 0, buffer: null }
+    collection1_enc.preencode(state, record)
+    state.buffer = b4a.allocUnsafe(state.end)
+    collection1_enc.encode(state, record)
+    return state.buffer
   },
   trigger: null,
   reconstruct: collection1_reconstruct,
   reconstructKey: collection1_reconstruct_key,
-  indexes: []
+  indexes: [],
+  decodedVersion: 0
 }
 
 // '@autopass/mirrors' collection key
@@ -122,10 +138,11 @@ function collection2_indexify(record) {
 const collection2_enc = getEncoding('@autopass/mirrors/hyperdb#2')
 
 // '@autopass/mirrors' reconstruction function
-function collection2_reconstruct(version, keyBuf, valueBuf) {
+function collection2_reconstruct(schemaVersion, keyBuf, valueBuf) {
   const key = collection2_key.decode(keyBuf)
-  setVersion(version)
-  const record = c.decode(collection2_enc, valueBuf)
+  setVersion(schemaVersion)
+  const state = { start: 0, end: valueBuf.byteLength, buffer: valueBuf }
+  const record = collection2_enc.decode(state)
   record.key = key[0]
   return record
 }
@@ -141,6 +158,7 @@ function collection2_reconstruct_key(keyBuf) {
 const collection2 = {
   name: '@autopass/mirrors',
   id: 2,
+  version: 0,
   encodeKey(record) {
     const key = [record.key]
     return collection2_key.encode(key)
@@ -153,14 +171,19 @@ const collection2 = {
       lte: lte ? collection2_indexify(lte) : null
     })
   },
-  encodeValue(version, record) {
-    setVersion(version)
-    return c.encode(collection2_enc, record)
+  encodeValue(schemaVersion, collectionVersion, record) {
+    setVersion(schemaVersion)
+    const state = { start: 0, end: 0, buffer: null }
+    collection2_enc.preencode(state, record)
+    state.buffer = b4a.allocUnsafe(state.end)
+    collection2_enc.encode(state, record)
+    return state.buffer
   },
   trigger: null,
   reconstruct: collection2_reconstruct,
   reconstructKey: collection2_reconstruct_key,
-  indexes: []
+  indexes: [],
+  decodedVersion: 0
 }
 
 // '@autopass/writer' collection key
@@ -175,10 +198,11 @@ function collection3_indexify(record) {
 const collection3_enc = getEncoding('@autopass/writer/hyperdb#3')
 
 // '@autopass/writer' reconstruction function
-function collection3_reconstruct(version, keyBuf, valueBuf) {
+function collection3_reconstruct(schemaVersion, keyBuf, valueBuf) {
   const key = collection3_key.decode(keyBuf)
-  setVersion(version)
-  const record = c.decode(collection3_enc, valueBuf)
+  setVersion(schemaVersion)
+  const state = { start: 0, end: valueBuf.byteLength, buffer: valueBuf }
+  const record = collection3_enc.decode(state)
   record.key = key[0]
   return record
 }
@@ -194,6 +218,7 @@ function collection3_reconstruct_key(keyBuf) {
 const collection3 = {
   name: '@autopass/writer',
   id: 3,
+  version: 0,
   encodeKey(record) {
     const key = [record.key]
     return collection3_key.encode(key)
@@ -206,14 +231,19 @@ const collection3 = {
       lte: lte ? collection3_indexify(lte) : null
     })
   },
-  encodeValue(version, record) {
-    setVersion(version)
-    return c.encode(collection3_enc, record)
+  encodeValue(schemaVersion, collectionVersion, record) {
+    setVersion(schemaVersion)
+    const state = { start: 0, end: 0, buffer: null }
+    collection3_enc.preencode(state, record)
+    state.buffer = b4a.allocUnsafe(state.end)
+    collection3_enc.encode(state, record)
+    return state.buffer
   },
   trigger: null,
   reconstruct: collection3_reconstruct,
   reconstructKey: collection3_reconstruct_key,
-  indexes: []
+  indexes: [],
+  decodedVersion: 0
 }
 
 // '@autopass/delete' collection key
@@ -228,10 +258,11 @@ function collection4_indexify(record) {
 const collection4_enc = getEncoding('@autopass/delete/hyperdb#4')
 
 // '@autopass/delete' reconstruction function
-function collection4_reconstruct(version, keyBuf, valueBuf) {
+function collection4_reconstruct(schemaVersion, keyBuf, valueBuf) {
   const key = collection4_key.decode(keyBuf)
-  setVersion(version)
-  const record = c.decode(collection4_enc, valueBuf)
+  setVersion(schemaVersion)
+  const state = { start: 0, end: valueBuf.byteLength, buffer: valueBuf }
+  const record = collection4_enc.decode(state)
   record.key = key[0]
   return record
 }
@@ -247,6 +278,7 @@ function collection4_reconstruct_key(keyBuf) {
 const collection4 = {
   name: '@autopass/delete',
   id: 4,
+  version: 0,
   encodeKey(record) {
     const key = [record.key]
     return collection4_key.encode(key)
@@ -259,14 +291,19 @@ const collection4 = {
       lte: lte ? collection4_indexify(lte) : null
     })
   },
-  encodeValue(version, record) {
-    setVersion(version)
-    return c.encode(collection4_enc, record)
+  encodeValue(schemaVersion, collectionVersion, record) {
+    setVersion(schemaVersion)
+    const state = { start: 0, end: 0, buffer: null }
+    collection4_enc.preencode(state, record)
+    state.buffer = b4a.allocUnsafe(state.end)
+    collection4_enc.encode(state, record)
+    return state.buffer
   },
   trigger: null,
   reconstruct: collection4_reconstruct,
   reconstructKey: collection4_reconstruct_key,
-  indexes: []
+  indexes: [],
+  decodedVersion: 0
 }
 
 // '@autopass/del-invite' collection key
@@ -281,10 +318,11 @@ function collection5_indexify(record) {
 const collection5_enc = getEncoding('@autopass/del-invite/hyperdb#5')
 
 // '@autopass/del-invite' reconstruction function
-function collection5_reconstruct(version, keyBuf, valueBuf) {
+function collection5_reconstruct(schemaVersion, keyBuf, valueBuf) {
   const key = collection5_key.decode(keyBuf)
-  setVersion(version)
-  const record = c.decode(collection5_enc, valueBuf)
+  setVersion(schemaVersion)
+  const state = { start: 0, end: valueBuf.byteLength, buffer: valueBuf }
+  const record = collection5_enc.decode(state)
   record.id = key[0]
   return record
 }
@@ -300,6 +338,7 @@ function collection5_reconstruct_key(keyBuf) {
 const collection5 = {
   name: '@autopass/del-invite',
   id: 5,
+  version: 0,
   encodeKey(record) {
     const key = [record.id]
     return collection5_key.encode(key)
@@ -312,14 +351,19 @@ const collection5 = {
       lte: lte ? collection5_indexify(lte) : null
     })
   },
-  encodeValue(version, record) {
-    setVersion(version)
-    return c.encode(collection5_enc, record)
+  encodeValue(schemaVersion, collectionVersion, record) {
+    setVersion(schemaVersion)
+    const state = { start: 0, end: 0, buffer: null }
+    collection5_enc.preencode(state, record)
+    state.buffer = b4a.allocUnsafe(state.end)
+    collection5_enc.encode(state, record)
+    return state.buffer
   },
   trigger: null,
   reconstruct: collection5_reconstruct,
   reconstructKey: collection5_reconstruct_key,
-  indexes: []
+  indexes: [],
+  decodedVersion: 0
 }
 
 // '@autopass/del-mirror' collection key
@@ -334,10 +378,11 @@ function collection6_indexify(record) {
 const collection6_enc = getEncoding('@autopass/del-mirror/hyperdb#6')
 
 // '@autopass/del-mirror' reconstruction function
-function collection6_reconstruct(version, keyBuf, valueBuf) {
+function collection6_reconstruct(schemaVersion, keyBuf, valueBuf) {
   const key = collection6_key.decode(keyBuf)
-  setVersion(version)
-  const record = c.decode(collection6_enc, valueBuf)
+  setVersion(schemaVersion)
+  const state = { start: 0, end: valueBuf.byteLength, buffer: valueBuf }
+  const record = collection6_enc.decode(state)
   record.key = key[0]
   return record
 }
@@ -353,6 +398,7 @@ function collection6_reconstruct_key(keyBuf) {
 const collection6 = {
   name: '@autopass/del-mirror',
   id: 6,
+  version: 0,
   encodeKey(record) {
     const key = [record.key]
     return collection6_key.encode(key)
@@ -365,14 +411,19 @@ const collection6 = {
       lte: lte ? collection6_indexify(lte) : null
     })
   },
-  encodeValue(version, record) {
-    setVersion(version)
-    return c.encode(collection6_enc, record)
+  encodeValue(schemaVersion, collectionVersion, record) {
+    setVersion(schemaVersion)
+    const state = { start: 0, end: 0, buffer: null }
+    collection6_enc.preencode(state, record)
+    state.buffer = b4a.allocUnsafe(state.end)
+    collection6_enc.encode(state, record)
+    return state.buffer
   },
   trigger: null,
   reconstruct: collection6_reconstruct,
   reconstructKey: collection6_reconstruct_key,
-  indexes: []
+  indexes: [],
+  decodedVersion: 0
 }
 
 const collections = [
@@ -387,13 +438,7 @@ const collections = [
 
 const indexes = []
 
-module.exports = {
-  version,
-  collections,
-  indexes,
-  resolveCollection,
-  resolveIndex
-}
+module.exports = { versions, collections, indexes, resolveCollection, resolveIndex }
 
 function resolveCollection(name) {
   switch (name) {

package/spec/db/messages.js

@@ -1,12 +1,12 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 1
+// Schema Version: 3
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 /* eslint-disable space-before-function-paren */
 
 const { c } = require('hyperschema/runtime')
 
-const VERSION = 1
+const VERSION = 3
 
 // eslint-disable-next-line no-unused-vars
 let version = VERSION
@@ -99,24 +99,35 @@ const encoding4 = {
     c.buffer.preencode(state, m.invite)
     c.buffer.preencode(state, m.publicKey)
     c.int.preencode(state, m.expires)
+    state.end++ // max flag is 2 so always one byte
+
+    if (version >= 3 && m.additional) encoding4_5.preencode(state, m.additional)
   },
   encode(state, m) {
+    const flags = (version >= 2 && m.readOnly ? 1 : 0) | (version >= 3 && m.additional ? 2 : 0)
+
     c.buffer.encode(state, m.id)
     c.buffer.encode(state, m.invite)
     c.buffer.encode(state, m.publicKey)
     c.int.encode(state, m.expires)
+    c.uint.encode(state, flags)
+
+    if (version >= 3 && m.additional) encoding4_5.encode(state, m.additional)
   },
   decode(state) {
     const r0 = c.buffer.decode(state)
     const r1 = c.buffer.decode(state)
     const r2 = c.buffer.decode(state)
     const r3 = c.int.decode(state)
+    const flags = state.start < state.end ? c.uint.decode(state) : 0
 
     return {
       id: r0,
       invite: r1,
       publicKey: r2,
-      expires: r3
+      expires: r3,
+      readOnly: version >= 2 && (flags & 1) !== 0,
+      additional: version >= 3 && (flags & 2) !== 0 ? encoding4_5.decode(state) : null
     }
   }
 }
@@ -141,8 +152,29 @@ const encoding5 = {
 // @autopass/del-mirror
 const encoding6 = encoding1
 
-// @autopass/records/hyperdb#0
+// @autopass/additional-invite-data
 const encoding7 = {
+  preencode(state, m) {
+    c.buffer.preencode(state, m.data)
+    c.buffer.preencode(state, m.signature)
+  },
+  encode(state, m) {
+    c.buffer.encode(state, m.data)
+    c.buffer.encode(state, m.signature)
+  },
+  decode(state) {
+    const r0 = c.buffer.decode(state)
+    const r1 = c.buffer.decode(state)
+
+    return {
+      data: r0,
+      signature: r1
+    }
+  }
+}
+
+// @autopass/records/hyperdb#0
+const encoding8 = {
   preencode(state, m) {
     state.end++ // max flag is 2 so always one byte
 
@@ -169,33 +201,44 @@ const encoding7 = {
 }
 
 // @autopass/invite/hyperdb#1
-const encoding8 = {
+const encoding9 = {
   preencode(state, m) {
     c.buffer.preencode(state, m.invite)
     c.buffer.preencode(state, m.publicKey)
     c.int.preencode(state, m.expires)
+    state.end++ // max flag is 2 so always one byte
+
+    if (version >= 3 && m.additional) encoding9_5.preencode(state, m.additional)
   },
   encode(state, m) {
+    const flags = (version >= 2 && m.readOnly ? 1 : 0) | (version >= 3 && m.additional ? 2 : 0)
+
     c.buffer.encode(state, m.invite)
     c.buffer.encode(state, m.publicKey)
     c.int.encode(state, m.expires)
+    c.uint.encode(state, flags)
+
+    if (version >= 3 && m.additional) encoding9_5.encode(state, m.additional)
   },
   decode(state) {
     const r1 = c.buffer.decode(state)
     const r2 = c.buffer.decode(state)
     const r3 = c.int.decode(state)
+    const flags = state.start < state.end ? c.uint.decode(state) : 0
 
     return {
       id: null,
       invite: r1,
       publicKey: r2,
-      expires: r3
+      expires: r3,
+      readOnly: version >= 2 && (flags & 1) !== 0,
+      additional: version >= 3 && (flags & 2) !== 0 ? encoding9_5.decode(state) : null
     }
   }
 }
 
 // @autopass/mirrors/hyperdb#2
-const encoding9 = {
+const encoding10 = {
   preencode(state, m) {},
   encode(state, m) {},
   decode(state) {
@@ -206,13 +249,13 @@ const encoding9 = {
 }
 
 // @autopass/writer/hyperdb#3
-const encoding10 = encoding9
+const encoding11 = encoding10
 
 // @autopass/delete/hyperdb#4
-const encoding11 = encoding9
+const encoding12 = encoding10
 
 // @autopass/del-invite/hyperdb#5
-const encoding12 = {
+const encoding13 = {
   preencode(state, m) {},
   encode(state, m) {},
   decode(state) {
@@ -223,7 +266,12 @@ const encoding12 = {
 }
 
 // @autopass/del-mirror/hyperdb#6
-const encoding13 = encoding9
+const encoding14 = encoding10
+
+// @autopass/invite.additional, deferred due to recusive use
+const encoding4_5 = c.frame(encoding7)
+// @autopass/invite/hyperdb#1.additional, deferred due to recusive use
+const encoding9_5 = encoding4_5
 
 function setVersion(v) {
   version = v
@@ -262,20 +310,22 @@ function getEncoding(name) {
       return encoding5
     case '@autopass/del-mirror':
       return encoding6
-    case '@autopass/records/hyperdb#0':
+    case '@autopass/additional-invite-data':
       return encoding7
-    case '@autopass/invite/hyperdb#1':
+    case '@autopass/records/hyperdb#0':
       return encoding8
-    case '@autopass/mirrors/hyperdb#2':
+    case '@autopass/invite/hyperdb#1':
       return encoding9
-    case '@autopass/writer/hyperdb#3':
+    case '@autopass/mirrors/hyperdb#2':
       return encoding10
-    case '@autopass/delete/hyperdb#4':
+    case '@autopass/writer/hyperdb#3':
       return encoding11
-    case '@autopass/del-invite/hyperdb#5':
+    case '@autopass/delete/hyperdb#4':
       return encoding12
-    case '@autopass/del-mirror/hyperdb#6':
+    case '@autopass/del-invite/hyperdb#5':
       return encoding13
+    case '@autopass/del-mirror/hyperdb#6':
+      return encoding14
     default:
       throw new Error('Encoder not found ' + name)
   }

package/spec/hyperdispatch/index.js

@@ -47,40 +47,20 @@ class Router {
         this._handler7 = handler
         break
       default:
-        throw new Error(
-          'Cannot register a handler for a nonexistent route: ' + name
-        )
+        throw new Error('Cannot register a handler for a nonexistent route: ' + name)
     }
     this._missing--
   }
 
   _checkAll() {
-    assert(
-      this._handler0 !== null,
-      'Missing handler for "@autopass/remove-writer"'
-    )
-    assert(
-      this._handler1 !== null,
-      'Missing handler for "@autopass/add-writer"'
-    )
+    assert(this._handler0 !== null, 'Missing handler for "@autopass/remove-writer"')
+    assert(this._handler1 !== null, 'Missing handler for "@autopass/add-writer"')
     assert(this._handler2 !== null, 'Missing handler for "@autopass/put"')
-    assert(
-      this._handler3 !== null,
-      'Missing handler for "@autopass/add-mirror"'
-    )
-    assert(
-      this._handler4 !== null,
-      'Missing handler for "@autopass/del-mirror"'
-    )
+    assert(this._handler3 !== null, 'Missing handler for "@autopass/add-mirror"')
+    assert(this._handler4 !== null, 'Missing handler for "@autopass/del-mirror"')
     assert(this._handler5 !== null, 'Missing handler for "@autopass/del"')
-    assert(
-      this._handler6 !== null,
-      'Missing handler for "@autopass/add-invite"'
-    )
-    assert(
-      this._handler7 !== null,
-      'Missing handler for "@autopass/del-invite"'
-    )
+    assert(this._handler6 !== null, 'Missing handler for "@autopass/add-invite"')
+    assert(this._handler7 !== null, 'Missing handler for "@autopass/del-invite"')
   }
 
   async dispatch(message, context) {

package/spec/hyperdispatch/messages.js

@@ -1,12 +1,12 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 1
+// Schema Version: 3
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 /* eslint-disable space-before-function-paren */
 
 const { c } = require('hyperschema/runtime')
 
-const VERSION = 1
+const VERSION = 3
 
 // eslint-disable-next-line no-unused-vars
 let version = VERSION
@@ -99,24 +99,35 @@ const encoding4 = {
     c.buffer.preencode(state, m.invite)
     c.buffer.preencode(state, m.publicKey)
     c.int.preencode(state, m.expires)
+    state.end++ // max flag is 2 so always one byte
+
+    if (version >= 3 && m.additional) encoding4_5.preencode(state, m.additional)
   },
   encode(state, m) {
+    const flags = (version >= 2 && m.readOnly ? 1 : 0) | (version >= 3 && m.additional ? 2 : 0)
+
     c.buffer.encode(state, m.id)
     c.buffer.encode(state, m.invite)
     c.buffer.encode(state, m.publicKey)
     c.int.encode(state, m.expires)
+    c.uint.encode(state, flags)
+
+    if (version >= 3 && m.additional) encoding4_5.encode(state, m.additional)
   },
   decode(state) {
     const r0 = c.buffer.decode(state)
     const r1 = c.buffer.decode(state)
     const r2 = c.buffer.decode(state)
     const r3 = c.int.decode(state)
+    const flags = state.start < state.end ? c.uint.decode(state) : 0
 
     return {
       id: r0,
       invite: r1,
       publicKey: r2,
-      expires: r3
+      expires: r3,
+      readOnly: version >= 2 && (flags & 1) !== 0,
+      additional: version >= 3 && (flags & 2) !== 0 ? encoding4_5.decode(state) : null
     }
   }
 }
@@ -141,6 +152,30 @@ const encoding5 = {
 // @autopass/del-mirror
 const encoding6 = encoding1
 
+// @autopass/additional-invite-data
+const encoding7 = {
+  preencode(state, m) {
+    c.buffer.preencode(state, m.data)
+    c.buffer.preencode(state, m.signature)
+  },
+  encode(state, m) {
+    c.buffer.encode(state, m.data)
+    c.buffer.encode(state, m.signature)
+  },
+  decode(state) {
+    const r0 = c.buffer.decode(state)
+    const r1 = c.buffer.decode(state)
+
+    return {
+      data: r0,
+      signature: r1
+    }
+  }
+}
+
+// @autopass/invite.additional, deferred due to recusive use
+const encoding4_5 = c.frame(encoding7)
+
 function setVersion(v) {
   version = v
 }
@@ -178,6 +213,8 @@ function getEncoding(name) {
       return encoding5
     case '@autopass/del-mirror':
       return encoding6
+    case '@autopass/additional-invite-data':
+      return encoding7
     default:
       throw new Error('Encoder not found ' + name)
   }

package/spec/schema/index.js

@@ -1,12 +1,12 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 1
+// Schema Version: 3
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 /* eslint-disable space-before-function-paren */
 
 const { c } = require('hyperschema/runtime')
 
-const VERSION = 1
+const VERSION = 3
 
 // eslint-disable-next-line no-unused-vars
 let version = VERSION
@@ -99,24 +99,35 @@ const encoding4 = {
     c.buffer.preencode(state, m.invite)
     c.buffer.preencode(state, m.publicKey)
     c.int.preencode(state, m.expires)
+    state.end++ // max flag is 2 so always one byte
+
+    if (version >= 3 && m.additional) encoding4_5.preencode(state, m.additional)
   },
   encode(state, m) {
+    const flags = (version >= 2 && m.readOnly ? 1 : 0) | (version >= 3 && m.additional ? 2 : 0)
+
     c.buffer.encode(state, m.id)
     c.buffer.encode(state, m.invite)
     c.buffer.encode(state, m.publicKey)
     c.int.encode(state, m.expires)
+    c.uint.encode(state, flags)
+
+    if (version >= 3 && m.additional) encoding4_5.encode(state, m.additional)
   },
   decode(state) {
     const r0 = c.buffer.decode(state)
     const r1 = c.buffer.decode(state)
     const r2 = c.buffer.decode(state)
     const r3 = c.int.decode(state)
+    const flags = state.start < state.end ? c.uint.decode(state) : 0
 
     return {
       id: r0,
       invite: r1,
       publicKey: r2,
-      expires: r3
+      expires: r3,
+      readOnly: version >= 2 && (flags & 1) !== 0,
+      additional: version >= 3 && (flags & 2) !== 0 ? encoding4_5.decode(state) : null
     }
   }
 }
@@ -141,6 +152,30 @@ const encoding5 = {
 // @autopass/del-mirror
 const encoding6 = encoding1
 
+// @autopass/additional-invite-data
+const encoding7 = {
+  preencode(state, m) {
+    c.buffer.preencode(state, m.data)
+    c.buffer.preencode(state, m.signature)
+  },
+  encode(state, m) {
+    c.buffer.encode(state, m.data)
+    c.buffer.encode(state, m.signature)
+  },
+  decode(state) {
+    const r0 = c.buffer.decode(state)
+    const r1 = c.buffer.decode(state)
+
+    return {
+      data: r0,
+      signature: r1
+    }
+  }
+}
+
+// @autopass/invite.additional, deferred due to recusive use
+const encoding4_5 = c.frame(encoding7)
+
 function setVersion(v) {
   version = v
 }
@@ -178,6 +213,8 @@ function getEncoding(name) {
       return encoding5
     case '@autopass/del-mirror':
       return encoding6
+    case '@autopass/additional-invite-data':
+      return encoding7
     default:
       throw new Error('Encoder not found ' + name)
   }

package/spec/schema/schema.json

@@ -1,5 +1,5 @@
 {
-  "version": 1,
+  "version": 3,
   "schema": [
     {
       "name": "records",
@@ -73,7 +73,7 @@
       "name": "invite",
       "namespace": "autopass",
       "compact": false,
-      "flagsPosition": -1,
+      "flagsPosition": 4,
       "fields": [
         {
           "name": "id",
@@ -98,6 +98,18 @@
           "required": true,
           "type": "int",
           "version": 1
+        },
+        {
+          "name": "readOnly",
+          "required": false,
+          "type": "bool",
+          "version": 2
+        },
+        {
+          "name": "additional",
+          "required": false,
+          "type": "@autopass/additional-invite-data",
+          "version": 3
         }
       ]
     },
@@ -128,6 +140,26 @@
           "version": 1
         }
       ]
+    },
+    {
+      "name": "additional-invite-data",
+      "namespace": "autopass",
+      "compact": false,
+      "flagsPosition": -1,
+      "fields": [
+        {
+          "name": "data",
+          "required": true,
+          "type": "buffer",
+          "version": 3
+        },
+        {
+          "name": "signature",
+          "required": true,
+          "type": "buffer",
+          "version": 3
+        }
+      ]
     }
   ]
 }

package/test.js

@@ -3,6 +3,8 @@ const Autopass = require('./')
 const Corestore = require('corestore')
 const testnet = require('hyperdht/testnet')
 const tmp = require('test-tmp')
+const b4a = require('b4a')
+const BlindEncryptionSodium = require('blind-encryption-sodium')
 
 test('basic', async function (t) {
   const a = await create(t, { replicate: false })
@@ -21,8 +23,8 @@ test('invites', async function (t) {
   const tn = await testnet(10, t)
 
   const a = await create(t, { bootstrap: tn.bootstrap })
-  t.teardown(() => {
-    a.close()
+  t.teardown(async () => {
+    await a.close()
   })
 
   const onUpdate = function () {
@@ -41,7 +43,7 @@ test('invites', async function (t) {
   const b = await p.finished()
   await b.ready()
 
-  t.teardown(() => b.close())
+  t.teardown(async () => await b.close())
   b.on('update', function () {
     if (b.base.system.members === 2) t.pass('b has two members')
   })
@@ -53,8 +55,8 @@ test('invites', async function (t) {
   const tn = await testnet(10, t)
 
   const a = await create(t, { bootstrap: tn.bootstrap })
-  t.teardown(() => {
-    a.close()
+  t.teardown(async () => {
+    await a.close()
   })
 
   const updateListener = function () {
@@ -73,7 +75,74 @@ test('invites', async function (t) {
   const b = await p.finished()
   await b.ready()
 
-  t.teardown(() => b.close())
+  t.teardown(async () => await b.close())
+  b.on('update', function () {
+    if (b.base.system.members === 2) t.pass('b has two members')
+  })
+})
+
+test('invite resets when createInvite type is different than previous', async function (t) {
+  t.plan(1)
+
+  const tn = await testnet(10, t)
+
+  const a = await create(t, { bootstrap: tn.bootstrap })
+  t.teardown(async () => {
+    await a.close()
+  })
+
+  const inv = await a.createInvite()
+  const invReadOnly = await a.createInvite({ readOnly: true })
+
+  if (inv !== invReadOnly) {
+    t.pass('invite is reset ')
+  } else {
+    t.fail()
+  }
+})
+
+test('blind encryption', async function (t) {
+  t.plan(4)
+
+  const password = b4a.alloc(32, 'password')
+  const tn = await testnet(10, t)
+
+  const a = await create(t, {
+    bootstrap: tn.bootstrap,
+    blindEncryption: new BlindEncryptionSodium(password)
+  })
+  t.teardown(async () => {
+    await a.close()
+  })
+
+  const updateListener = function () {
+    if (a.base.system.members === 2) {
+      t.pass('a has two members')
+      a.removeListener('update', updateListener) // Remove the listener in teardown
+    }
+  }
+
+  a.on('update', updateListener)
+
+  const inv = await a.createInvite()
+
+  const p = await pair(t, inv, {
+    bootstrap: tn.bootstrap,
+    blindEncryption: new BlindEncryptionSodium(password)
+  })
+
+  const b = await p.finished()
+  await b.ready()
+
+  const [encryptionKeyBuffer, encryptionKeyEncryptedBuffer] = await Promise.all([
+    b.base.local.getUserData('autobase/encryption'),
+    b.base.local.getUserData('autobase/blind-encryption')
+  ])
+
+  t.absent(encryptionKeyBuffer)
+  t.ok(encryptionKeyEncryptedBuffer)
+
+  t.teardown(async () => await b.close())
   b.on('update', function () {
     if (b.base.system.members === 2) t.pass('b has two members')
   })
@@ -86,12 +155,12 @@ test('suspend and resume', async function (t) {
 
   const a = await create(t, { bootstrap: tn.bootstrap })
   const inv = await a.createInvite()
-  t.teardown(() => a.close())
+  t.teardown(async () => await a.close())
 
   const p = await pair(t, inv, { bootstrap: tn.bootstrap })
   const b = await p.finished()
   await b.ready()
-  t.teardown(() => b.close())
+  t.teardown(async () => await b.close())
 
   await new Promise((resolve) => {
     const check = () => {