autopass 2.2.1 → 3.0.0

package/spec/db/messages.js

@@ -1,55 +1,72 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 2
+// Schema Version: 1
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
+/* eslint-disable space-before-function-paren */
 
-const VERSION = 2
 const { c } = require('hyperschema/runtime')
 
+const VERSION = 1
+
 // eslint-disable-next-line no-unused-vars
 let version = VERSION
 
 // @autopass/records
 const encoding0 = {
-  preencode (state, m) {
+  preencode(state, m) {
     c.string.preencode(state, m.key)
     state.end++ // max flag is 2 so always one byte
 
     if (m.value) c.string.preencode(state, m.value)
-    if (version >= 2 && m.file) c.buffer.preencode(state, m.file)
+    if (m.file) c.buffer.preencode(state, m.file)
   },
-  encode (state, m) {
-    const flags =
-      (m.value ? 1 : 0) |
-      ((version >= 2 && m.file) ? 2 : 0)
+  encode(state, m) {
+    const flags = (m.value ? 1 : 0) | (m.file ? 2 : 0)
 
     c.string.encode(state, m.key)
     c.uint.encode(state, flags)
 
     if (m.value) c.string.encode(state, m.value)
-    if (version >= 2 && m.file) c.buffer.encode(state, m.file)
+    if (m.file) c.buffer.encode(state, m.file)
   },
-  decode (state) {
+  decode(state) {
     const r0 = c.string.decode(state)
     const flags = c.uint.decode(state)
 
     return {
       key: r0,
       value: (flags & 1) !== 0 ? c.string.decode(state) : null,
-      file: (version >= 2 && (flags & 2) !== 0) ? c.buffer.decode(state) : null
+      file: (flags & 2) !== 0 ? c.buffer.decode(state) : null
     }
   }
 }
 
-// @autopass/writer
+// @autopass/mirrors
 const encoding1 = {
-  preencode (state, m) {
+  preencode(state, m) {
+    c.fixed32.preencode(state, m.key)
+  },
+  encode(state, m) {
+    c.fixed32.encode(state, m.key)
+  },
+  decode(state) {
+    const r0 = c.fixed32.decode(state)
+
+    return {
+      key: r0
+    }
+  }
+}
+
+// @autopass/writer
+const encoding2 = {
+  preencode(state, m) {
     c.buffer.preencode(state, m.key)
   },
-  encode (state, m) {
+  encode(state, m) {
     c.buffer.encode(state, m.key)
   },
-  decode (state) {
+  decode(state) {
     const r0 = c.buffer.decode(state)
 
     return {
@@ -59,14 +76,14 @@ const encoding1 = {
 }
 
 // @autopass/delete
-const encoding2 = {
-  preencode (state, m) {
+const encoding3 = {
+  preencode(state, m) {
     c.string.preencode(state, m.key)
   },
-  encode (state, m) {
+  encode(state, m) {
     c.string.encode(state, m.key)
   },
-  decode (state) {
+  decode(state) {
     const r0 = c.string.decode(state)
 
     return {
@@ -76,20 +93,20 @@ const encoding2 = {
 }
 
 // @autopass/invite
-const encoding3 = {
-  preencode (state, m) {
+const encoding4 = {
+  preencode(state, m) {
     c.buffer.preencode(state, m.id)
     c.buffer.preencode(state, m.invite)
     c.buffer.preencode(state, m.publicKey)
     c.int.preencode(state, m.expires)
   },
-  encode (state, m) {
+  encode(state, m) {
     c.buffer.encode(state, m.id)
     c.buffer.encode(state, m.invite)
     c.buffer.encode(state, m.publicKey)
     c.int.encode(state, m.expires)
   },
-  decode (state) {
+  decode(state) {
     const r0 = c.buffer.decode(state)
     const r1 = c.buffer.decode(state)
     const r2 = c.buffer.decode(state)
@@ -105,14 +122,14 @@ const encoding3 = {
 }
 
 // @autopass/del-invite
-const encoding4 = {
-  preencode (state, m) {
+const encoding5 = {
+  preencode(state, m) {
     c.buffer.preencode(state, m.id)
   },
-  encode (state, m) {
+  encode(state, m) {
     c.buffer.encode(state, m.id)
   },
-  decode (state) {
+  decode(state) {
     const r0 = c.buffer.decode(state)
 
     return {
@@ -121,48 +138,49 @@ const encoding4 = {
   }
 }
 
+// @autopass/del-mirror
+const encoding6 = encoding1
+
 // @autopass/records/hyperdb#0
-const encoding5 = {
-  preencode (state, m) {
+const encoding7 = {
+  preencode(state, m) {
     state.end++ // max flag is 2 so always one byte
 
     if (m.value) c.string.preencode(state, m.value)
-    if (version >= 2 && m.file) c.buffer.preencode(state, m.file)
+    if (m.file) c.buffer.preencode(state, m.file)
   },
-  encode (state, m) {
-    const flags =
-      (m.value ? 1 : 0) |
-      ((version >= 2 && m.file) ? 2 : 0)
+  encode(state, m) {
+    const flags = (m.value ? 1 : 0) | (m.file ? 2 : 0)
 
     c.uint.encode(state, flags)
 
     if (m.value) c.string.encode(state, m.value)
-    if (version >= 2 && m.file) c.buffer.encode(state, m.file)
+    if (m.file) c.buffer.encode(state, m.file)
   },
-  decode (state) {
+  decode(state) {
     const flags = c.uint.decode(state)
 
     return {
       key: null,
       value: (flags & 1) !== 0 ? c.string.decode(state) : null,
-      file: (version >= 2 && (flags & 2) !== 0) ? c.buffer.decode(state) : null
+      file: (flags & 2) !== 0 ? c.buffer.decode(state) : null
     }
   }
 }
 
 // @autopass/invite/hyperdb#1
-const encoding6 = {
-  preencode (state, m) {
+const encoding8 = {
+  preencode(state, m) {
     c.buffer.preencode(state, m.invite)
     c.buffer.preencode(state, m.publicKey)
     c.int.preencode(state, m.expires)
   },
-  encode (state, m) {
+  encode(state, m) {
     c.buffer.encode(state, m.invite)
     c.buffer.encode(state, m.publicKey)
     c.int.encode(state, m.expires)
   },
-  decode (state) {
+  decode(state) {
     const r1 = c.buffer.decode(state)
     const r2 = c.buffer.decode(state)
     const r3 = c.int.decode(state)
@@ -176,87 +194,105 @@ const encoding6 = {
   }
 }
 
-// @autopass/writer/hyperdb#2
-const encoding7 = {
-  preencode (state, m) {
-
-  },
-  encode (state, m) {
-
-  },
-  decode (state) {
+// @autopass/mirrors/hyperdb#2
+const encoding9 = {
+  preencode(state, m) {},
+  encode(state, m) {},
+  decode(state) {
     return {
       key: null
     }
   }
 }
 
-// @autopass/delete/hyperdb#3
-const encoding8 = encoding7
-
-// @autopass/del-invite/hyperdb#4
-const encoding9 = {
-  preencode (state, m) {
+// @autopass/writer/hyperdb#3
+const encoding10 = encoding9
 
-  },
-  encode (state, m) {
+// @autopass/delete/hyperdb#4
+const encoding11 = encoding9
 
-  },
-  decode (state) {
+// @autopass/del-invite/hyperdb#5
+const encoding12 = {
+  preencode(state, m) {},
+  encode(state, m) {},
+  decode(state) {
     return {
       id: null
     }
   }
 }
 
-function setVersion (v) {
+// @autopass/del-mirror/hyperdb#6
+const encoding13 = encoding9
+
+function setVersion(v) {
   version = v
 }
 
-function encode (name, value, v = VERSION) {
+function encode(name, value, v = VERSION) {
   version = v
   return c.encode(getEncoding(name), value)
 }
 
-function decode (name, buffer, v = VERSION) {
+function decode(name, buffer, v = VERSION) {
   version = v
   return c.decode(getEncoding(name), buffer)
 }
 
-function getEnum (name) {
+function getEnum(name) {
   switch (name) {
-    default: throw new Error('Enum not found ' + name)
+    default:
+      throw new Error('Enum not found ' + name)
   }
 }
 
-function getEncoding (name) {
+function getEncoding(name) {
   switch (name) {
-    case '@autopass/records': return encoding0
-    case '@autopass/writer': return encoding1
-    case '@autopass/delete': return encoding2
-    case '@autopass/invite': return encoding3
-    case '@autopass/del-invite': return encoding4
-    case '@autopass/records/hyperdb#0': return encoding5
-    case '@autopass/invite/hyperdb#1': return encoding6
-    case '@autopass/writer/hyperdb#2': return encoding7
-    case '@autopass/delete/hyperdb#3': return encoding8
-    case '@autopass/del-invite/hyperdb#4': return encoding9
-    default: throw new Error('Encoder not found ' + name)
+    case '@autopass/records':
+      return encoding0
+    case '@autopass/mirrors':
+      return encoding1
+    case '@autopass/writer':
+      return encoding2
+    case '@autopass/delete':
+      return encoding3
+    case '@autopass/invite':
+      return encoding4
+    case '@autopass/del-invite':
+      return encoding5
+    case '@autopass/del-mirror':
+      return encoding6
+    case '@autopass/records/hyperdb#0':
+      return encoding7
+    case '@autopass/invite/hyperdb#1':
+      return encoding8
+    case '@autopass/mirrors/hyperdb#2':
+      return encoding9
+    case '@autopass/writer/hyperdb#3':
+      return encoding10
+    case '@autopass/delete/hyperdb#4':
+      return encoding11
+    case '@autopass/del-invite/hyperdb#5':
+      return encoding12
+    case '@autopass/del-mirror/hyperdb#6':
+      return encoding13
+    default:
+      throw new Error('Encoder not found ' + name)
   }
 }
 
-function getStruct (name, v = VERSION) {
+function getStruct(name, v = VERSION) {
   const enc = getEncoding(name)
   return {
-    preencode (state, m) {
+    preencode(state, m) {
       version = v
       enc.preencode(state, m)
     },
-    encode (state, m) {
+    encode(state, m) {
       version = v
       enc.encode(state, m)
     },
-    decode (state) {
+    decode(state) {
       version = v
       return enc.decode(state)
     }
@@ -265,4 +301,13 @@ function getStruct (name, v = VERSION) {
 
 const resolveStruct = getStruct // compat
 
-module.exports = { resolveStruct, getStruct, getEnum, getEncoding, encode, decode, setVersion, version }
+module.exports = {
+  resolveStruct,
+  getStruct,
+  getEnum,
+  getEncoding,
+  encode,
+  decode,
+  setVersion,
+  version
+}

package/spec/hyperdispatch/dispatch.json

@@ -1,5 +1,6 @@
 {
   "version": 1,
+  "offset": 0,
   "schema": [
     {
       "id": 0,
@@ -21,21 +22,33 @@
     },
     {
       "id": 3,
+      "name": "@autopass/add-mirror",
+      "requestType": "@autopass/mirrors",
+      "version": 1
+    },
+    {
+      "id": 4,
+      "name": "@autopass/del-mirror",
+      "requestType": "@autopass/del-mirror",
+      "version": 1
+    },
+    {
+      "id": 5,
       "name": "@autopass/del",
       "requestType": "@autopass/delete",
       "version": 1
     },
     {
-      "id": 4,
+      "id": 6,
       "name": "@autopass/add-invite",
       "requestType": "@autopass/invite",
       "version": 1
     },
     {
-      "id": 5,
+      "id": 7,
       "name": "@autopass/del-invite",
       "requestType": "@autopass/del-invite",
       "version": 1
     }
   ]
-}
+}

package/spec/hyperdispatch/index.js

@@ -7,18 +7,20 @@ const { version, getEncoding, setVersion } = require('./messages.js')
 const defaultVersion = version
 
 class Router {
-  constructor () {
+  constructor() {
     this._handler0 = null
     this._handler1 = null
     this._handler2 = null
     this._handler3 = null
     this._handler4 = null
     this._handler5 = null
+    this._handler6 = null
+    this._handler7 = null
 
-    this._missing = 6
+    this._missing = 8
   }
 
-  add (name, handler) {
+  add(name, handler) {
     switch (name) {
       case '@autopass/remove-writer':
         this._handler0 = handler
@@ -29,106 +31,166 @@ class Router {
       case '@autopass/put':
         this._handler2 = handler
         break
-      case '@autopass/del':
+      case '@autopass/add-mirror':
         this._handler3 = handler
         break
-      case '@autopass/add-invite':
+      case '@autopass/del-mirror':
         this._handler4 = handler
         break
-      case '@autopass/del-invite':
+      case '@autopass/del':
         this._handler5 = handler
         break
+      case '@autopass/add-invite':
+        this._handler6 = handler
+        break
+      case '@autopass/del-invite':
+        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"')
+  _checkAll() {
+    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/del"')
-    assert(this._handler4 !== null, 'Missing handler for "@autopass/add-invite"')
-    assert(this._handler5 !== null, 'Missing handler for "@autopass/del-invite"')
+    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"'
+    )
   }
 
-  async dispatch (encoded, context) {
+  async dispatch(message, context) {
     if (this._missing > 0) {
       this._checkAll()
     }
 
-    const state = { buffer: encoded, start: 0, end: encoded.byteLength }
-    const id = c.uint.decode(state)
-
     setVersion(defaultVersion)
 
-    switch (id) {
+    const op = b4a.isBuffer(message) ? decode(message) : message
+
+    switch (op.id) {
       case 0:
-        return this._handler0(route0.enc.decode(state), context)
+        return this._handler0(op.value, context)
       case 1:
-        return this._handler1(route1.enc.decode(state), context)
+        return this._handler1(op.value, context)
       case 2:
-        return this._handler2(route2.enc.decode(state), context)
+        return this._handler2(op.value, context)
       case 3:
-        return this._handler3(route3.enc.decode(state), context)
+        return this._handler3(op.value, context)
       case 4:
-        return this._handler4(route4.enc.decode(state), context)
+        return this._handler4(op.value, context)
       case 5:
-        return this._handler5(route5.enc.decode(state), context)
+        return this._handler5(op.value, context)
+      case 6:
+        return this._handler6(op.value, context)
+      case 7:
+        return this._handler7(op.value, context)
       default:
-        throw new Error('Handler not found for ID:' + id)
+        throw new Error('Handler not found for ID:' + op.id)
     }
   }
 }
 
-function dispatch (name, message, { version = defaultVersion } = {}) {
+function encode(name, message, { version = defaultVersion } = {}) {
   const state = { buffer: null, start: 0, end: 0 }
 
-  const o = getEncoderAndId(name)
+  const route = getRouteByName(name)
   setVersion(version)
 
-  c.uint.preencode(state, o.id)
-  o.enc.preencode(state, message)
+  c.uint.preencode(state, route.id)
+  route.enc.preencode(state, message)
 
   state.buffer = b4a.allocUnsafe(state.end)
-  c.uint.encode(state, o.id)
-  o.enc.encode(state, message)
+  c.uint.encode(state, route.id)
+  route.enc.encode(state, message)
 
   return state.buffer
 }
 
+function decode(buffer, { version = defaultVersion } = {}) {
+  const state = { buffer, start: 0, end: buffer.length }
+
+  const id = c.uint.decode(state)
+  const route = getRouteById(id)
+  setVersion(version)
+
+  const value = route.enc.decode(state)
+  return { id, name: route.name, value }
+}
+
 const route0 = {
+  name: '@autopass/remove-writer',
   id: 0,
   enc: getEncoding('@autopass/writer')
 }
 
 const route1 = {
+  name: '@autopass/add-writer',
   id: 1,
   enc: getEncoding('@autopass/writer')
 }
 
 const route2 = {
+  name: '@autopass/put',
   id: 2,
   enc: getEncoding('@autopass/records')
 }
 
 const route3 = {
+  name: '@autopass/add-mirror',
   id: 3,
-  enc: getEncoding('@autopass/delete')
+  enc: getEncoding('@autopass/mirrors')
 }
 
 const route4 = {
+  name: '@autopass/del-mirror',
   id: 4,
-  enc: getEncoding('@autopass/invite')
+  enc: getEncoding('@autopass/del-mirror')
 }
 
 const route5 = {
+  name: '@autopass/del',
   id: 5,
+  enc: getEncoding('@autopass/delete')
+}
+
+const route6 = {
+  name: '@autopass/add-invite',
+  id: 6,
+  enc: getEncoding('@autopass/invite')
+}
+
+const route7 = {
+  name: '@autopass/del-invite',
+  id: 7,
   enc: getEncoding('@autopass/del-invite')
 }
 
-function getEncoderAndId (name) {
+function getRouteByName(name) {
   switch (name) {
     case '@autopass/remove-writer':
       return route0
@@ -136,19 +198,47 @@ function getEncoderAndId (name) {
       return route1
     case '@autopass/put':
       return route2
-    case '@autopass/del':
+    case '@autopass/add-mirror':
       return route3
-    case '@autopass/add-invite':
+    case '@autopass/del-mirror':
       return route4
-    case '@autopass/del-invite':
+    case '@autopass/del':
       return route5
+    case '@autopass/add-invite':
+      return route6
+    case '@autopass/del-invite':
+      return route7
     default:
       throw new Error('Handler not found for name: ' + name)
   }
 }
 
+function getRouteById(id) {
+  switch (id) {
+    case 0:
+      return route0
+    case 1:
+      return route1
+    case 2:
+      return route2
+    case 3:
+      return route3
+    case 4:
+      return route4
+    case 5:
+      return route5
+    case 6:
+      return route6
+    case 7:
+      return route7
+    default:
+      throw new Error('Handler not found for ID: ' + id)
+  }
+}
+
 module.exports = {
   version,
-  dispatch,
+  encode,
+  decode,
   Router
 }