autopass 2.2.1 → 3.0.0

package/spec/hyperdispatch/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,49 +138,63 @@ const encoding4 = {
   }
 }
 
-function setVersion (v) {
+// @autopass/del-mirror
+const encoding6 = encoding1
+
+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
-    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
+    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)
     }
@@ -172,4 +203,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/schema/index.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,49 +138,63 @@ const encoding4 = {
   }
 }
 
-function setVersion (v) {
+// @autopass/del-mirror
+const encoding6 = encoding1
+
+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
-    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
+    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)
     }
@@ -172,4 +203,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/schema/schema.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 1,
   "schema": [
     {
       "name": "records",
@@ -23,7 +23,21 @@
           "name": "file",
           "required": false,
           "type": "buffer",
-          "version": 2
+          "version": 1
+        }
+      ]
+    },
+    {
+      "name": "mirrors",
+      "namespace": "autopass",
+      "compact": false,
+      "flagsPosition": -1,
+      "fields": [
+        {
+          "name": "key",
+          "required": true,
+          "type": "fixed32",
+          "version": 1
         }
       ]
     },
@@ -100,6 +114,20 @@
           "version": 1
         }
       ]
+    },
+    {
+      "name": "del-mirror",
+      "namespace": "autopass",
+      "compact": false,
+      "flagsPosition": -1,
+      "fields": [
+        {
+          "name": "key",
+          "required": true,
+          "type": "fixed32",
+          "version": 1
+        }
+      ]
     }
   ]
-}
+}

package/test.js

@@ -10,7 +10,7 @@ test('basic', async function (t) {
   await a.add('hello', 'world')
 
   t.ok(a.base.encryptionKey)
-  t.is(await a.get('hello'), 'world')
+  t.is((await a.get('hello')).value, 'world')
 
   await a.close()
 })
@@ -23,11 +23,13 @@ test('invites', async function (t) {
   const a = await create(t, { bootstrap: tn.bootstrap })
   t.teardown(() => {
     a.close()
-    a.removeListener('update', onUpdate)
   })
 
   const onUpdate = function () {
-    if (a.base.system.members === 2) t.pass('a has two members')
+    if (a.base.system.members === 2) {
+      t.pass('a has two members')
+      a.removeListener('update', onUpdate)
+    }
   }
 
   a.on('update', onUpdate)
@@ -53,11 +55,13 @@ test('invites', async function (t) {
   const a = await create(t, { bootstrap: tn.bootstrap })
   t.teardown(() => {
     a.close()
-    a.removeListener('update', updateListener) // Remove the listener in teardown
   })
 
   const updateListener = function () {
-    if (a.base.system.members === 2) t.pass('a has two members')
+    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)
@@ -75,14 +79,61 @@ test('invites', async function (t) {
   })
 })
 
-async function create (t, opts) {
+test('suspend and resume', async function (t) {
+  t.plan(3)
+
+  const tn = await testnet(2, t)
+
+  const a = await create(t, { bootstrap: tn.bootstrap })
+  const inv = await a.createInvite()
+  t.teardown(() => a.close())
+
+  const p = await pair(t, inv, { bootstrap: tn.bootstrap })
+  const b = await p.finished()
+  await b.ready()
+  t.teardown(() => b.close())
+
+  await new Promise((resolve) => {
+    const check = () => {
+      if (a.swarm.peers.size > 0 && b.swarm.peers.size > 0) {
+        resolve()
+      } else {
+        setTimeout(check, 100)
+      }
+    }
+    check()
+  })
+
+  t.ok(a.swarm.peers.size > 0, 'a has peers before suspend')
+
+  await a.suspend()
+
+  t.is(a.swarm.peers.size, 0, 'a has 0 peers after suspend')
+
+  await a.resume()
+
+  await new Promise((resolve) => {
+    const check = () => {
+      if (a.swarm.peers.size > 0) {
+        resolve()
+      } else {
+        setTimeout(check, 100)
+      }
+    }
+    check()
+  })
+
+  t.ok(a.swarm.peers.size > 0, 'a has peers after resume')
+})
+
+async function create(t, opts) {
   const dir = await tmp(t)
   const a = new Autopass(new Corestore(dir), opts)
   await a.ready()
   return a
 }
 
-async function pair (t, inv, opts) {
+async function pair(t, inv, opts) {
   const dir = await tmp(t)
   const a = Autopass.pair(new Corestore(dir), inv, opts)
   return a