autobee 1.0.0 → 1.0.3

package/lib/writers.js

@@ -3,6 +3,8 @@ const encoding = require('./encoding.js')
 const Triggers = require('./triggers.js')
 const { WriterEncryption } = require('autobee-encryption')
 
+const WRITER_PREFETCH = 10
+
 const BATCH_WRITER_SANITY = 1024
 const BATCH_OPTIMISTIC_SANITY = 32
 
@@ -80,7 +82,7 @@ class ActiveWriters {
     const info = await this.auto.system.get(this.auto.local.key)
     const writable = this.writable
 
-    w.isIndexer = info ? info.isIndexer : false
+    w.weight = info ? info.weight : 0
     this.writable = info ? !info.isRemoved : bootstrapping
 
     if (writable === this.writable) return
@@ -158,23 +160,30 @@ class Writer {
     this.core = core
     this.id = id
     this.index = 0
+    this.weight = 0
     this.pending = null
     this.waiting = null
+    this.download = null
 
     this.isPending = false
     this.isClosed = false
     this.isAttached = false
-    this.isIndexer = false
     this.isAdded = false
     this.isRemoved = false
     this.isCoupled = false
 
-    this._onappendBound = this._onappend.bind(this)
-    if (!local) this.core.on('append', this._onappendBound)
+    this._onchangeBound = this._onchange.bind(this)
+
+    if (!local) this.core.on('append', this._onchangeBound)
+    if (!local) this.core.on('download', this._onchangeBound)
 
     this.couple()
   }
 
+  get isIndexer() {
+    return this.weight === 2
+  }
+
   couple() {
     if (this.isCoupled) return
     // if we don't have coupler yet we can't add
@@ -216,7 +225,7 @@ class Writer {
     }
   }
 
-  _onappend() {
+  _onchange() {
     if (this.waiting === null) this.bump()
   }
 
@@ -236,6 +245,8 @@ class Writer {
   detach() {
     if (!this.isAttached) return
     this.isAttached = false
+    this.download.destroy()
+    this.download = null
     this.writers.active.delete(this.id)
     this.removePending()
   }
@@ -258,6 +269,17 @@ class Writer {
     return this.close()
   }
 
+  async views() {
+    const latest = await this.getLatest()
+    if (!latest || !latest.views) return []
+
+    // signedLength for autobase compat
+    return [
+      { ...latest.views.system, signedLength: latest.views.system.length },
+      { ...latest.views.view, signedLength: latest.views.view.length }
+    ]
+  }
+
   async getLatest() {
     if (this.core.length === 0) return null
     const block = await this.core.get(this.core.length - 1)
@@ -273,7 +295,7 @@ class Writer {
     } else {
       this.isAdded = true
       this.isRemoved = info.isRemoved
-      this.isIndexer = info.isIndexer
+      this.weight = info.weight
     }
 
     return info ? info.length : 0
@@ -289,10 +311,21 @@ class Writer {
     let optimistic = false
     let timestamp = 0
 
+    if (this.download) this.download.destroy()
+    this.download = this.core.download({ start: length, end: length + WRITER_PREFETCH })
+
     while (length < this.core.length) {
+      // @todo aim to prefetch when writer added, with read-ahead
+      // download the block if it's not available locally
+      // writer will be added back as pending automatically
+      if (!(await this.core.has(length))) {
+        this.removePending()
+        return null
+      }
+
       const block = await this.core.get(length++)
       const oplog = encoding.decodeOplog(block)
-      const node = createNode(this.core, length, oplog)
+      const node = createNode(this.core, length, this.weight, oplog)
       const b = oplog.batch
 
       // auto correct some batch invariants
@@ -336,6 +369,9 @@ class Writer {
     if (this.core.writable && this.pending !== null) {
       for (let i = 0; i < this.pending.length; i++) {
         const node = this.pending[i]
+
+        node.batch = { start: i, end: this.pending.length - 1 - i }
+
         if (node.length <= length) continue
 
         if (!this.writers.writable && !node.optimistic) {
@@ -409,7 +445,12 @@ class Writer {
       value
     }
 
-    const node = createNode(this.core, this.core.length + this.pending.length + 1, oplog)
+    const node = createNode(
+      this.core,
+      this.core.length + this.pending.length + 1,
+      this.weight,
+      oplog
+    )
 
     this.pending.push(node)
     this.addPending()
@@ -427,7 +468,11 @@ class Writer {
     const s = this.system.bee.head()
     const flushes = this.system.flushes
     this.pending[this.pending.length - 1].views = { system: s, flushes, view }
-    for (const node of this.pending) buffers.push(encoding.encodeOplog(node))
+    for (let i = 0; i < this.pending.length; i++) {
+      const node = this.pending[i]
+      node.batch = { start: i, end: this.pending.length - 1 - i }
+      buffers.push(encoding.encodeOplog(node))
+    }
     this.pending = null
     return this.core.append(buffers)
   }
@@ -437,11 +482,12 @@ exports.ActiveWriters = ActiveWriters
 exports.Writer = Writer
 exports.createNode = createNode
 
-function createNode(core, length, oplog) {
+function createNode(core, length, weight, oplog) {
   return {
     core,
     key: core.key,
     length,
+    weight,
     version: oplog.version,
     timestamp: oplog.timestamp,
     links: oplog.links,

package/package.json

@@ -1,19 +1,23 @@
 {
   "name": "autobee",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "Bee based autobase",
   "license": "Apache-2.0",
   "author": "Holepunch Inc.",
   "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/holepunchto/autobee.git"
+  },
   "files": [
     "index.js",
     "lib/*.js",
-    "spec"
+    "encoding"
   ],
   "scripts": {
     "format": "prettier . --write",
     "lint": "lunte && prettier . --check",
-    "test": "prettier . --check && lunte && node test/all.js",
+    "test": "node test/all.js",
     "test:bare": "bare test/all.js",
     "test:encrypted": "bare test/all.js --encrypt-all",
     "test:generate": "brittle -r test/all.js test/*.js"