hypercore 10.35.4 → 10.36.1

package/README.md

@@ -1,6 +1,6 @@
 # Hypercore
 
-### [See the full API docs at docs.holepunch.to](https://docs.holepunch.to/building-blocks/hypercore)
+### [See the full API docs at docs.pears.com](https://docs.pears.com/building-blocks/hypercore)
 
 Hypercore is a secure, distributed append-only log.
 
@@ -478,3 +478,11 @@ Emitted when a new connection has been established with a peer.
 #### `core.on('peer-remove')`
 
 Emitted when a peer's connection has been closed.
+
+#### `core.on('upload', index, byteLength, peer)`
+
+Emitted when a block is uploaded to a peer.
+
+#### `core.on('download', index, byteLength, peer)`
+
+Emitted when a block is downloaded from a peer.

package/index.js

@@ -142,7 +142,8 @@ module.exports = class Hypercore extends EventEmitter {
 
   static MAX_SUGGESTED_BLOCK_SIZE = MAX_SUGGESTED_BLOCK_SIZE
 
-  static key (manifest, { compat } = {}) {
+  static key (manifest, { compat, version, namespace } = {}) {
+    if (b4a.isBuffer(manifest)) manifest = { version, signers: [{ publicKey: manifest, namespace }] }
     return compat ? manifest.signers[0].publicKey : manifestHash(createManifest(manifest))
   }
 
@@ -334,6 +335,10 @@ module.exports = class Hypercore extends EventEmitter {
       ensureEncryption(this, opts)
     }
 
+    if (opts.manifest && !this.core.header.manifest) {
+      await this.core.setManifest(opts.manifest)
+    }
+
     this.writable = this._isWritable()
 
     if (opts.valueEncoding) {

package/lib/bitfield.js

@@ -237,7 +237,7 @@ module.exports = class Bitfield {
     return buffer
   }
 
-  getBitfield (index, length) {
+  getBitfield (index) {
     const j = index & (BITS_PER_PAGE - 1)
     const i = (index - j) / BITS_PER_PAGE
 

package/lib/core.js

@@ -194,7 +194,21 @@ module.exports = class Core {
     return new this(header, compat, crypto, oplog, bigHeader, tree, blocks, bitfield, verifier, legacy, opts.onupdate || noop, opts.onconflict || noop)
   }
 
-  setManifest (manifest, keyPair) {
+  async setManifest (manifest) {
+    await this._mutex.lock()
+
+    try {
+      if (manifest && this.header.manifest === null) {
+        if (!Verifier.isValidManifest(this.header.key, manifest)) throw INVALID_CHECKSUM('Manifest hash does not match')
+        this._setManifest(Verifier.createManifest(manifest), null)
+        await this._flushOplog()
+      }
+    } finally {
+      this._mutex.unlock()
+    }
+  }
+
+  _setManifest (manifest, keyPair) {
     if (!manifest && b4a.equals(keyPair.publicKey, this.header.key)) manifest = Verifier.defaultSignerManifest(this.header.key)
     if (!manifest) return
 
@@ -430,7 +444,7 @@ module.exports = class Core {
     await this._mutex.lock()
 
     // upsert compat manifest
-    if (this.verifier === null && keyPair) this.setManifest(null, keyPair)
+    if (this.verifier === null && keyPair) this._setManifest(null, keyPair)
 
     try {
       const batch = await this.tree.truncate(length, fork)
@@ -549,7 +563,7 @@ module.exports = class Core {
 
     try {
       // upsert compat manifest
-      if (this.verifier === null && keyPair) this.setManifest(null, keyPair)
+      if (this.verifier === null && keyPair) this._setManifest(null, keyPair)
 
       if (this.tree.fork !== batch.fork) return null
 
@@ -623,7 +637,7 @@ module.exports = class Core {
 
     try {
       // upsert compat manifest
-      if (this.verifier === null && keyPair) this.setManifest(null, keyPair)
+      if (this.verifier === null && keyPair) this._setManifest(null, keyPair)
 
       if (preappend) await preappend(values)
 
@@ -790,7 +804,7 @@ module.exports = class Core {
         // if we got a manifest AND its strictly a non compat one, lets store it
         if (manifest && this.header.manifest === null) {
           if (!Verifier.isValidManifest(this.header.key, manifest)) throw INVALID_CHECKSUM('Manifest hash does not match')
-          this.setManifest(manifest, null)
+          this._setManifest(manifest, null)
         }
 
         batch.commit()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.35.4",
+  "version": "10.36.1",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {