hypercore-storage 1.1.6 → 1.2.1

package/migrations/0/index.js

@@ -605,24 +605,35 @@ function readOplog (oplog) {
       result.header = header ? h2.message : h1.message
 
       if (result.header.external) {
-        throw new Error('External headers not migrate-able atm')
+        fs.readFile(path.join(oplog, '../header'), function (err, buffer) {
+          if (err) return resolve(null)
+          const start = result.header.external.start
+          const end = start + result.header.external.length
+          result.header = m.oplog.header.decode({ buffer, start, end })
+          finish()
+        })
+        return
       }
 
-      while (true) {
-        const entry = decodeOplogEntry(state)
-        if (!entry) break
-        if (entry.header !== header) break
+      finish()
 
-        decoded.push(entry)
-      }
+      function finish () {
+        while (true) {
+          const entry = decodeOplogEntry(state)
+          if (!entry) break
+          if (entry.header !== header) break
 
-      while (decoded.length > 0 && decoded[decoded.length - 1].partial) decoded.pop()
+          decoded.push(entry)
+        }
 
-      for (const e of decoded) {
-        result.entries.push(e.message)
-      }
+        while (decoded.length > 0 && decoded[decoded.length - 1].partial) decoded.pop()
 
-      resolve(result)
+        for (const e of decoded) {
+          result.entries.push(e.message)
+        }
+
+        resolve(result)
+      }
     })
   })
 }

package/migrations/0/messages.js

@@ -180,7 +180,7 @@ const manifest = exports.manifest = {
     c.uint.encode(state, m.version)
     if (m.version === 0) return manifestv0.encode(state, m)
 
-    c.uint.encode(state, (m.allowPatch ? 1 : 0) | (m.prologue ? 2 : 0))
+    c.uint.encode(state, (m.allowPatch ? 1 : 0) | (m.prologue ? 2 : 0) | (m.unencrypted ? 4 : 0))
     hashes.encode(state, m.hash)
 
     c.uint.encode(state, m.quorum)
@@ -196,6 +196,7 @@ const manifest = exports.manifest = {
     const hash = hashes.decode(state)
     const quorum = c.uint.decode(state)
     const signers = signerArray.decode(state)
+    const unencrypted = (flags & 4) !== 0
 
     return {
       version: 1,
@@ -203,7 +204,8 @@ const manifest = exports.manifest = {
       allowPatch: (flags & 1) !== 0,
       quorum,
       signers,
-      prologue: (flags & 2) === 0 ? null : prologue.decode(state)
+      prologue: (flags & 2) === 0 ? null : prologue.decode(state),
+      unencrypted
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore-storage",
-  "version": "1.1.6",
+  "version": "1.2.1",
   "main": "index.js",
   "files": [
     "index.js",

package/spec/hyperschema/index.js

@@ -250,7 +250,7 @@ const encoding9_4 = c.array(encoding7)
 const encoding9 = {
   preencode (state, m) {
     c.uint.preencode(state, m.version)
-    state.end++ // max flag is 2 so always one byte
+    state.end++ // max flag is 4 so always one byte
     encoding4.preencode(state, m.hash)
     c.uint.preencode(state, m.quorum)
     encoding9_4.preencode(state, m.signers)
@@ -260,7 +260,8 @@ const encoding9 = {
   encode (state, m) {
     const flags =
       (m.allowPatch ? 1 : 0) |
-      (m.prologue ? 2 : 0)
+      (m.prologue ? 2 : 0) |
+      (m.unencrypted ? 4 : 0)
 
     c.uint.encode(state, m.version)
     c.uint.encode(state, flags)
@@ -280,7 +281,8 @@ const encoding9 = {
       quorum: c.uint.decode(state),
       allowPatch: (flags & 1) !== 0,
       signers: encoding9_4.decode(state),
-      prologue: (flags & 2) !== 0 ? encoding8.decode(state) : null
+      prologue: (flags & 2) !== 0 ? encoding8.decode(state) : null,
+      unencrypted: (flags & 4) !== 0
     }
   }
 }