autopass 2.0.0 → 2.2.0

package/README.md

@@ -6,6 +6,9 @@ Distributed notes/password manager
 npm install autopass
 ```
 
+> [!NOTE]
+> Autopass needs Corestore 7, our latest major version that is backed by RocksDB for storage and atomicity.
+
 ## Usage
 
 First choose if you wanna pair or make a new instance.
@@ -56,6 +59,10 @@ Triggered when it updates, ie something added/removed an entry
 
 Get an entry.
 
+#### `value = await pass.getFile(name)`
+
+Get a file.
+
 #### `stream = pass.list()`
 
 Get all entries.
@@ -64,6 +71,11 @@ Get all entries.
 
 Add new entry
 
+#### `await pass.addFIle(name, buffer)`
+
+Add new file
+
+
 #### `await pass.remove(key)`
 
 Remove an entry.
@@ -84,6 +96,10 @@ Get the local writer key.
 
 Get invite to add a writer.
 
+#### `await deleteInvite()`
+
+Delete the current invite.
+
 #### `await pass.ready()`
 
 Wait for the pass to load fully

package/example.mjs

@@ -1,6 +1,6 @@
 import Autopass from './index.js'
 import Corestore from 'corestore'
-
+import process from 'process'
 const store = new Corestore('example/' + process.argv[2])
 
 let pass = null
@@ -17,7 +17,6 @@ if (pass.base.writable) {
   const inv = await pass.createInvite()
   console.log('invite', inv)
 }
-
 onupdate()
 pass.on('update', onupdate)
 

package/index.js

@@ -135,6 +135,10 @@ class Autopass extends ReadyResource {
       await context.view.insert('@autopass/invite', data)
     })
 
+    this.router.add('@autopass/del-invite', async (data, context) => {
+      await context.view.delete('@autopass/invite', { id: data.id })
+    })
+
     this._boot(opts)
     this.ready().catch(noop)
   }
@@ -215,6 +219,14 @@ class Autopass extends ReadyResource {
     return z32.encode(record.invite)
   }
 
+  async deleteInvite () {
+    if (this.opened === false) await this.ready()
+    const existing = await this.base.view.findOne('@autopass/invite', {})
+    if (existing) {
+      await this.base.append(dispatch('@autopass/del-invite', existing))
+    }
+  }
+
   list (opts) {
     return this.base.view.find('@autopass/records', {})
   }
@@ -275,6 +287,18 @@ class Autopass extends ReadyResource {
     await this.base.append(dispatch('@autopass/put', { key, value }))
   }
 
+  async addFile (key, file) {
+    await this.base.append(dispatch('@autopass/put', { key, file }))
+  }
+
+  async getFile (key) {
+    const data = await this.base.view.get('@autopass/records', { key })
+    if (data === null) {
+      return null
+    }
+    return data.file
+  }
+
   async remove (key) {
     await this.base.append(dispatch('@autopass/del', { key }))
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autopass",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "main": "index.js",
   "scripts": {
     "test": "standard && brittle test.js"
@@ -8,23 +8,35 @@
   "author": "Holepunch Inc",
   "license": "Apache-2.0",
   "description": "",
+  "imports": {
+    "fs": {
+      "bare": "bare-fs",
+      "default": "fs"
+    },
+    "process": {
+      "bare": "bare-process",
+      "default": "process"
+    }
+  },
   "devDependencies": {
     "brittle": "^3.7.0",
-    "corestore": "^6.18.4",
     "hyperdht": "^6.20.1",
     "standard": "^17.1.2",
     "test-tmp": "^1.3.0"
   },
   "dependencies": {
-    "autobase": "^6.5.12",
+    "autobase": "^7.0.34",
     "b4a": "^1.6.7",
+    "bare-fs": "^4.1.2",
+    "bare-process": "^4.2.1",
     "blind-pairing": "^2.3.1",
     "compact-encoding": "^2.16.0",
-    "hyperbee": "^2.21.2",
-    "hypercore": "^10.38.2",
-    "hyperdb": "^4.8.0",
+    "corestore": "^7.0.7",
+    "hyperbee": "^2.22.2",
+    "hypercore": "^11.0.9",
+    "hyperdb": "^4.9.4",
     "hyperdispatch": "^1.0.2",
-    "hyperschema": "^1.7.2",
+    "hyperschema": "^1.10.4",
     "hyperswarm": "^4.8.4",
     "ready-resource": "^1.1.1"
   }

package/schema.js

@@ -17,6 +17,10 @@ template.register({
     name: 'value',
     type: 'string',
     required: false
+  }, {
+    name: 'file',
+    type: 'buffer',
+    required: false
   }
   ]
 })
@@ -65,6 +69,17 @@ template.register({
   }
   ]
 })
+
+template.register({
+  name: 'del-invite',
+  compact: false,
+  fields: [{
+    name: 'id',
+    type: 'buffer',
+    required: true
+  }
+  ]
+})
 Hyperschema.toDisk(autopass)
 
 const dbTemplate = HyperdbBuilder.from('./spec/schema', './spec/db')
@@ -91,6 +106,12 @@ blobs.collections.register({
   key: ['key']
 })
 
+blobs.collections.register({
+  name: 'del-invite',
+  schema: '@autopass/del-invite',
+  key: ['id']
+})
+
 HyperdbBuilder.toDisk(dbTemplate)
 
 const hyperdispatch = Hyperdispatch.from('./spec/schema', './spec/hyperdispatch')
@@ -115,4 +136,8 @@ namespace.register(({
   name: 'add-invite',
   requestType: '@autopass/invite'
 }))
+namespace.register(({
+  name: 'del-invite',
+  requestType: '@autopass/del-invite'
+}))
 Hyperdispatch.toDisk(hyperdispatch)

package/spec/db/db.json

@@ -53,6 +53,19 @@
         "key"
       ],
       "trigger": null
+    },
+    {
+      "name": "del-invite",
+      "namespace": "autopass",
+      "id": 4,
+      "type": 1,
+      "indexes": [],
+      "schema": "@autopass/del-invite",
+      "derived": false,
+      "key": [
+        "id"
+      ],
+      "trigger": null
     }
   ]
 }

package/spec/db/index.js

@@ -224,11 +224,67 @@ const collection3 = {
   indexes: []
 }
 
+// '@autopass/del-invite' collection key
+const collection4_key = new IndexEncoder([
+  IndexEncoder.BUFFER
+], { prefix: 4 })
+
+function collection4_indexify (record) {
+  const a = record.id
+  return a === undefined ? [] : [a]
+}
+
+// '@autopass/del-invite' value encoding
+const collection4_enc = getEncoding('@autopass/del-invite/hyperdb#4')
+
+// '@autopass/del-invite' reconstruction function
+function collection4_reconstruct (version, keyBuf, valueBuf) {
+  const key = collection4_key.decode(keyBuf)
+  setVersion(version)
+  const record = c.decode(collection4_enc, valueBuf)
+  record.id = key[0]
+  return record
+}
+// '@autopass/del-invite' key reconstruction function
+function collection4_reconstruct_key (keyBuf) {
+  const key = collection4_key.decode(keyBuf)
+  return {
+    id: key[0]
+  }
+}
+
+// '@autopass/del-invite'
+const collection4 = {
+  name: '@autopass/del-invite',
+  id: 4,
+  encodeKey (record) {
+    const key = [record.id]
+    return collection4_key.encode(key)
+  },
+  encodeKeyRange ({ gt, lt, gte, lte } = {}) {
+    return collection4_key.encodeRange({
+      gt: gt ? collection4_indexify(gt) : null,
+      lt: lt ? collection4_indexify(lt) : null,
+      gte: gte ? collection4_indexify(gte) : null,
+      lte: lte ? collection4_indexify(lte) : null
+    })
+  },
+  encodeValue (version, record) {
+    setVersion(version)
+    return c.encode(collection4_enc, record)
+  },
+  trigger: null,
+  reconstruct: collection4_reconstruct,
+  reconstructKey: collection4_reconstruct_key,
+  indexes: []
+}
+
 const collections = [
   collection0,
   collection1,
   collection2,
-  collection3
+  collection3,
+  collection4
 ]
 
 const indexes = [
@@ -242,6 +298,7 @@ function resolveCollection (name) {
     case '@autopass/invite': return collection1
     case '@autopass/writer': return collection2
     case '@autopass/delete': return collection3
+    case '@autopass/del-invite': return collection4
     default: return null
   }
 }

package/spec/db/messages.js

@@ -1,9 +1,9 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 1
+// Schema Version: 2
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 
-const VERSION = 1
+const VERSION = 2
 const { c } = require('hyperschema/runtime')
 
 // eslint-disable-next-line no-unused-vars
@@ -13,17 +13,21 @@ let version = VERSION
 const encoding0 = {
   preencode (state, m) {
     c.string.preencode(state, m.key)
-    state.end++ // max flag is 1 so always one byte
+    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)
   },
   encode (state, m) {
-    const flags = m.value ? 1 : 0
+    const flags =
+      (m.value ? 1 : 0) |
+      ((version >= 2 && 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)
   },
   decode (state) {
     const r0 = c.string.decode(state)
@@ -31,7 +35,8 @@ const encoding0 = {
 
     return {
       key: r0,
-      value: (flags & 1) !== 0 ? c.string.decode(state) : null
+      value: (flags & 1) !== 0 ? c.string.decode(state) : null,
+      file: (version >= 2 && (flags & 2) !== 0) ? c.buffer.decode(state) : null
     }
   }
 }
@@ -99,32 +104,54 @@ const encoding3 = {
   }
 }
 
-// @autopass/records/hyperdb#0
+// @autopass/del-invite
 const encoding4 = {
   preencode (state, m) {
-    state.end++ // max flag is 1 so always one byte
+    c.buffer.preencode(state, m.id)
+  },
+  encode (state, m) {
+    c.buffer.encode(state, m.id)
+  },
+  decode (state) {
+    const r0 = c.buffer.decode(state)
+
+    return {
+      id: r0
+    }
+  }
+}
+
+// @autopass/records/hyperdb#0
+const encoding5 = {
+  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)
   },
   encode (state, m) {
-    const flags = m.value ? 1 : 0
+    const flags =
+      (m.value ? 1 : 0) |
+      ((version >= 2 && 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)
   },
   decode (state) {
     const flags = c.uint.decode(state)
 
     return {
       key: null,
-      value: (flags & 1) !== 0 ? c.string.decode(state) : null
+      value: (flags & 1) !== 0 ? c.string.decode(state) : null,
+      file: (version >= 2 && (flags & 2) !== 0) ? c.buffer.decode(state) : null
     }
   }
 }
 
 // @autopass/invite/hyperdb#1
-const encoding5 = {
+const encoding6 = {
   preencode (state, m) {
     c.buffer.preencode(state, m.invite)
     c.buffer.preencode(state, m.publicKey)
@@ -150,7 +177,7 @@ const encoding5 = {
 }
 
 // @autopass/writer/hyperdb#2
-const encoding6 = {
+const encoding7 = {
   preencode (state, m) {
 
   },
@@ -165,7 +192,22 @@ const encoding6 = {
 }
 
 // @autopass/delete/hyperdb#3
-const encoding7 = encoding6
+const encoding8 = encoding7
+
+// @autopass/del-invite/hyperdb#4
+const encoding9 = {
+  preencode (state, m) {
+
+  },
+  encode (state, m) {
+
+  },
+  decode (state) {
+    return {
+      id: null
+    }
+  }
+}
 
 function setVersion (v) {
   version = v
@@ -193,10 +235,12 @@ function getEncoding (name) {
     case '@autopass/writer': return encoding1
     case '@autopass/delete': return encoding2
     case '@autopass/invite': return encoding3
-    case '@autopass/records/hyperdb#0': return encoding4
-    case '@autopass/invite/hyperdb#1': return encoding5
-    case '@autopass/writer/hyperdb#2': return encoding6
-    case '@autopass/delete/hyperdb#3': return encoding7
+    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)
   }
 }

package/spec/hyperdispatch/dispatch.json

@@ -30,6 +30,12 @@
       "name": "@autopass/add-invite",
       "requestType": "@autopass/invite",
       "version": 1
+    },
+    {
+      "id": 5,
+      "name": "@autopass/del-invite",
+      "requestType": "@autopass/del-invite",
+      "version": 1
     }
   ]
 }

package/spec/hyperdispatch/index.js

@@ -13,8 +13,9 @@ class Router {
     this._handler2 = null
     this._handler3 = null
     this._handler4 = null
+    this._handler5 = null
 
-    this._missing = 5
+    this._missing = 6
   }
 
   add (name, handler) {
@@ -34,6 +35,9 @@ class Router {
       case '@autopass/add-invite':
         this._handler4 = handler
         break
+      case '@autopass/del-invite':
+        this._handler5 = handler
+        break
       default:
         throw new Error('Cannot register a handler for a nonexistent route: ' + name)
     }
@@ -46,6 +50,7 @@ class Router {
     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"')
   }
 
   async dispatch (encoded, context) {
@@ -69,6 +74,8 @@ class Router {
         return this._handler3(route3.enc.decode(state), context)
       case 4:
         return this._handler4(route4.enc.decode(state), context)
+      case 5:
+        return this._handler5(route5.enc.decode(state), context)
       default:
         throw new Error('Handler not found for ID:' + id)
     }
@@ -116,6 +123,11 @@ const route4 = {
   enc: getEncoding('@autopass/invite')
 }
 
+const route5 = {
+  id: 5,
+  enc: getEncoding('@autopass/del-invite')
+}
+
 function getEncoderAndId (name) {
   switch (name) {
     case '@autopass/remove-writer':
@@ -128,6 +140,8 @@ function getEncoderAndId (name) {
       return route3
     case '@autopass/add-invite':
       return route4
+    case '@autopass/del-invite':
+      return route5
     default:
       throw new Error('Handler not found for name: ' + name)
   }

package/spec/hyperdispatch/messages.js

@@ -1,9 +1,9 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 1
+// Schema Version: 2
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 
-const VERSION = 1
+const VERSION = 2
 const { c } = require('hyperschema/runtime')
 
 // eslint-disable-next-line no-unused-vars
@@ -13,17 +13,21 @@ let version = VERSION
 const encoding0 = {
   preencode (state, m) {
     c.string.preencode(state, m.key)
-    state.end++ // max flag is 1 so always one byte
+    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)
   },
   encode (state, m) {
-    const flags = m.value ? 1 : 0
+    const flags =
+      (m.value ? 1 : 0) |
+      ((version >= 2 && 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)
   },
   decode (state) {
     const r0 = c.string.decode(state)
@@ -31,7 +35,8 @@ const encoding0 = {
 
     return {
       key: r0,
-      value: (flags & 1) !== 0 ? c.string.decode(state) : null
+      value: (flags & 1) !== 0 ? c.string.decode(state) : null,
+      file: (version >= 2 && (flags & 2) !== 0) ? c.buffer.decode(state) : null
     }
   }
 }
@@ -99,6 +104,23 @@ const encoding3 = {
   }
 }
 
+// @autopass/del-invite
+const encoding4 = {
+  preencode (state, m) {
+    c.buffer.preencode(state, m.id)
+  },
+  encode (state, m) {
+    c.buffer.encode(state, m.id)
+  },
+  decode (state) {
+    const r0 = c.buffer.decode(state)
+
+    return {
+      id: r0
+    }
+  }
+}
+
 function setVersion (v) {
   version = v
 }
@@ -125,6 +147,7 @@ function getEncoding (name) {
     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)
   }
 }

package/spec/schema/index.js

@@ -1,9 +1,9 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 1
+// Schema Version: 2
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 
-const VERSION = 1
+const VERSION = 2
 const { c } = require('hyperschema/runtime')
 
 // eslint-disable-next-line no-unused-vars
@@ -13,17 +13,21 @@ let version = VERSION
 const encoding0 = {
   preencode (state, m) {
     c.string.preencode(state, m.key)
-    state.end++ // max flag is 1 so always one byte
+    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)
   },
   encode (state, m) {
-    const flags = m.value ? 1 : 0
+    const flags =
+      (m.value ? 1 : 0) |
+      ((version >= 2 && 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)
   },
   decode (state) {
     const r0 = c.string.decode(state)
@@ -31,7 +35,8 @@ const encoding0 = {
 
     return {
       key: r0,
-      value: (flags & 1) !== 0 ? c.string.decode(state) : null
+      value: (flags & 1) !== 0 ? c.string.decode(state) : null,
+      file: (version >= 2 && (flags & 2) !== 0) ? c.buffer.decode(state) : null
     }
   }
 }
@@ -99,6 +104,23 @@ const encoding3 = {
   }
 }
 
+// @autopass/del-invite
+const encoding4 = {
+  preencode (state, m) {
+    c.buffer.preencode(state, m.id)
+  },
+  encode (state, m) {
+    c.buffer.encode(state, m.id)
+  },
+  decode (state) {
+    const r0 = c.buffer.decode(state)
+
+    return {
+      id: r0
+    }
+  }
+}
+
 function setVersion (v) {
   version = v
 }
@@ -125,6 +147,7 @@ function getEncoding (name) {
     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)
   }
 }

package/spec/schema/schema.json

@@ -1,5 +1,5 @@
 {
-  "version": 1,
+  "version": 2,
   "schema": [
     {
       "name": "records",
@@ -18,6 +18,12 @@
           "required": false,
           "type": "string",
           "version": 1
+        },
+        {
+          "name": "file",
+          "required": false,
+          "type": "buffer",
+          "version": 2
         }
       ]
     },
@@ -80,6 +86,20 @@
           "version": 1
         }
       ]
+    },
+    {
+      "name": "del-invite",
+      "namespace": "autopass",
+      "compact": false,
+      "flagsPosition": -1,
+      "fields": [
+        {
+          "name": "id",
+          "required": true,
+          "type": "buffer",
+          "version": 1
+        }
+      ]
     }
   ]
 }