hypercore-storage 3.0.0 → 3.0.1

package/encoding/spec/hyperschema/index.js

@@ -1,5 +1,5 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 1
+// Schema Version: 2
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 /* eslint-disable space-before-function-paren */
@@ -7,7 +7,7 @@
 const { c } = require('hyperschema/runtime')
 const external0 = require('../../external.js')
 
-const VERSION = 1
+const VERSION = 2
 
 // eslint-disable-next-line no-unused-vars
 let version = VERSION
@@ -64,8 +64,99 @@ const encoding1 = {
   }
 }
 
-// @corestore/alias
+// @corestore/head-v2
 const encoding2 = {
+  preencode(state, m) {
+    c.uint.preencode(state, m.cores)
+    c.uint.preencode(state, m.datas)
+    c.uint.preencode(state, m.groups)
+    state.end++ // max flag is 2 so always one byte
+
+    if (m.seed) c.fixed32.preencode(state, m.seed)
+    if (m.defaultDiscoveryKey) c.fixed32.preencode(state, m.defaultDiscoveryKey)
+  },
+  encode(state, m) {
+    const flags = (m.seed ? 1 : 0) | (m.defaultDiscoveryKey ? 2 : 0)
+
+    c.uint.encode(state, m.cores)
+    c.uint.encode(state, m.datas)
+    c.uint.encode(state, m.groups)
+    c.uint.encode(state, flags)
+
+    if (m.seed) c.fixed32.encode(state, m.seed)
+    if (m.defaultDiscoveryKey) c.fixed32.encode(state, m.defaultDiscoveryKey)
+  },
+  decode(state) {
+    const v = c.uint.decode(state)
+    const r0 = c.uint.decode(state)
+    const r1 = c.uint.decode(state)
+    const r2 = c.uint.decode(state)
+    const flags = c.uint.decode(state)
+
+    return {
+      version: v,
+      cores: r0,
+      datas: r1,
+      groups: r2,
+      seed: (flags & 1) !== 0 ? c.fixed32.decode(state) : null,
+      defaultDiscoveryKey: (flags & 2) !== 0 ? c.fixed32.decode(state) : null
+    }
+  }
+}
+
+// @corestore/head
+const encoding3 = {
+  preencode(state, m) {
+    c.uint.preencode(state, m.version)
+    switch (m.version) {
+      case 0:
+      case 1:
+        encoding1.preencode(state, m)
+        break
+      case 2:
+        encoding2.preencode(state, m)
+        break
+      default:
+        throw new Error('Unsupported version')
+    }
+  },
+  encode(state, m) {
+    c.uint.encode(state, m.version)
+    switch (m.version) {
+      case 0:
+      case 1:
+        encoding1.encode(state, m)
+        break
+      case 2:
+        encoding2.encode(state, m)
+        break
+      default:
+        throw new Error('Unsupported version')
+    }
+  },
+  decode(state) {
+    const start = state.start
+    const v = c.uint.decode(state)
+    state.start = start
+    switch (v) {
+      case 0:
+      case 1: {
+        const decoded = encoding1.decode(state)
+        const map = external0.headLegacyMap
+        return map(decoded)
+      }
+      case 2: {
+        const decoded = encoding2.decode(state)
+        return decoded
+      }
+      default:
+        throw new Error('Unsupported version')
+    }
+  }
+}
+
+// @corestore/alias
+const encoding4 = {
   preencode(state, m) {
     c.string.preencode(state, m.name)
     c.fixed32.preencode(state, m.namespace)
@@ -86,14 +177,14 @@ const encoding2 = {
 }
 
 // @corestore/core
-const encoding3 = {
+const encoding5 = {
   preencode(state, m) {
     c.uint.preencode(state, m.version)
     c.uint.preencode(state, m.corePointer)
     c.uint.preencode(state, m.dataPointer)
     state.end++ // max flag is 1 so always one byte
 
-    if (m.alias) encoding2.preencode(state, m.alias)
+    if (m.alias) encoding4.preencode(state, m.alias)
   },
   encode(state, m) {
     const flags = m.alias ? 1 : 0
@@ -103,7 +194,7 @@ const encoding3 = {
     c.uint.encode(state, m.dataPointer)
     c.uint.encode(state, flags)
 
-    if (m.alias) encoding2.encode(state, m.alias)
+    if (m.alias) encoding4.encode(state, m.alias)
   },
   decode(state) {
     const r0 = c.uint.decode(state)
@@ -115,17 +206,17 @@ const encoding3 = {
       version: r0,
       corePointer: r1,
       dataPointer: r2,
-      alias: (flags & 1) !== 0 ? encoding2.decode(state) : null
+      alias: (flags & 1) !== 0 ? encoding4.decode(state) : null
     }
   }
 }
 
-const encoding4_enum = {
+const encoding6_enum = {
   blake2b: 'blake2b'
 }
 
 // @core/hashes enum
-const encoding4 = {
+const encoding6 = {
   preencode(state, m) {
     state.end++ // max enum is 0 so always one byte
   },
@@ -148,12 +239,12 @@ const encoding4 = {
   }
 }
 
-const encoding5_enum = {
+const encoding7_enum = {
   ed25519: 'ed25519'
 }
 
 // @core/signatures enum
-const encoding5 = {
+const encoding7 = {
   preencode(state, m) {
     state.end++ // max enum is 0 so always one byte
   },
@@ -177,7 +268,7 @@ const encoding5 = {
 }
 
 // @core/tree-node
-const encoding6 = {
+const encoding8 = {
   preencode(state, m) {
     c.uint.preencode(state, m.index)
     c.uint.preencode(state, m.size)
@@ -202,19 +293,19 @@ const encoding6 = {
 }
 
 // @core/signer
-const encoding7 = {
+const encoding9 = {
   preencode(state, m) {
-    encoding5.preencode(state, m.signature)
+    encoding7.preencode(state, m.signature)
     c.fixed32.preencode(state, m.namespace)
     c.fixed32.preencode(state, m.publicKey)
   },
   encode(state, m) {
-    encoding5.encode(state, m.signature)
+    encoding7.encode(state, m.signature)
     c.fixed32.encode(state, m.namespace)
     c.fixed32.encode(state, m.publicKey)
   },
   decode(state) {
-    const r0 = encoding5.decode(state)
+    const r0 = encoding7.decode(state)
     const r1 = c.fixed32.decode(state)
     const r2 = c.fixed32.decode(state)
 
@@ -227,7 +318,7 @@ const encoding7 = {
 }
 
 // @core/prologue
-const encoding8 = {
+const encoding10 = {
   preencode(state, m) {
     c.fixed32.preencode(state, m.hash)
     c.uint.preencode(state, m.length)
@@ -248,21 +339,21 @@ const encoding8 = {
 }
 
 // @core/manifest.signers
-const encoding9_4 = c.array(encoding7)
+const encoding11_4 = c.array(encoding9)
 // @core/manifest.linked
-const encoding9_6 = c.array(c.fixed32)
+const encoding11_6 = c.array(c.fixed32)
 
 // @core/manifest
-const encoding9 = {
+const encoding11 = {
   preencode(state, m) {
     c.uint.preencode(state, m.version)
     state.end++ // max flag is 8 so always one byte
-    encoding4.preencode(state, m.hash)
+    encoding6.preencode(state, m.hash)
     c.uint.preencode(state, m.quorum)
-    encoding9_4.preencode(state, m.signers)
+    encoding11_4.preencode(state, m.signers)
 
-    if (m.prologue) encoding8.preencode(state, m.prologue)
-    if (m.linked) encoding9_6.preencode(state, m.linked)
+    if (m.prologue) encoding10.preencode(state, m.prologue)
+    if (m.linked) encoding11_6.preencode(state, m.linked)
     if (m.userData) c.buffer.preencode(state, m.userData)
   },
   encode(state, m) {
@@ -271,12 +362,12 @@ const encoding9 = {
 
     c.uint.encode(state, m.version)
     c.uint.encode(state, flags)
-    encoding4.encode(state, m.hash)
+    encoding6.encode(state, m.hash)
     c.uint.encode(state, m.quorum)
-    encoding9_4.encode(state, m.signers)
+    encoding11_4.encode(state, m.signers)
 
-    if (m.prologue) encoding8.encode(state, m.prologue)
-    if (m.linked) encoding9_6.encode(state, m.linked)
+    if (m.prologue) encoding10.encode(state, m.prologue)
+    if (m.linked) encoding11_6.encode(state, m.linked)
     if (m.userData) c.buffer.encode(state, m.userData)
   },
   decode(state) {
@@ -285,19 +376,19 @@ const encoding9 = {
 
     return {
       version: r0,
-      hash: encoding4.decode(state),
+      hash: encoding6.decode(state),
       quorum: c.uint.decode(state),
       allowPatch: (flags & 1) !== 0,
-      signers: encoding9_4.decode(state),
-      prologue: (flags & 2) !== 0 ? encoding8.decode(state) : null,
-      linked: (flags & 4) !== 0 ? encoding9_6.decode(state) : null,
+      signers: encoding11_4.decode(state),
+      prologue: (flags & 2) !== 0 ? encoding10.decode(state) : null,
+      linked: (flags & 4) !== 0 ? encoding11_6.decode(state) : null,
       userData: (flags & 8) !== 0 ? c.buffer.decode(state) : null
     }
   }
 }
 
 // @core/keyPair
-const encoding10 = {
+const encoding12 = {
   preencode(state, m) {
     c.buffer.preencode(state, m.publicKey)
     c.optionalBuffer.preencode(state, m.secretKey)
@@ -318,7 +409,7 @@ const encoding10 = {
 }
 
 // @core/group
-const encoding11 = {
+const encoding13 = {
   preencode(state, m) {
     state.end++ // max flag is 2 so always one byte
 
@@ -344,17 +435,17 @@ const encoding11 = {
 }
 
 // @core/auth.manifest
-const encoding12_2 = c.frame(encoding9)
+const encoding14_2 = c.frame(encoding11)
 
 // @core/auth
-const encoding12 = {
+const encoding14 = {
   preencode(state, m) {
     c.fixed32.preencode(state, m.key)
     c.fixed32.preencode(state, m.discoveryKey)
     state.end++ // max flag is 4 so always one byte
 
-    if (m.manifest) encoding12_2.preencode(state, m.manifest)
-    if (m.keyPair) encoding10.preencode(state, m.keyPair)
+    if (m.manifest) encoding14_2.preencode(state, m.manifest)
+    if (m.keyPair) encoding12.preencode(state, m.keyPair)
     if (m.encryptionKey) c.buffer.preencode(state, m.encryptionKey)
   },
   encode(state, m) {
@@ -364,8 +455,8 @@ const encoding12 = {
     c.fixed32.encode(state, m.discoveryKey)
     c.uint.encode(state, flags)
 
-    if (m.manifest) encoding12_2.encode(state, m.manifest)
-    if (m.keyPair) encoding10.encode(state, m.keyPair)
+    if (m.manifest) encoding14_2.encode(state, m.manifest)
+    if (m.keyPair) encoding12.encode(state, m.keyPair)
     if (m.encryptionKey) c.buffer.encode(state, m.encryptionKey)
   },
   decode(state) {
@@ -376,15 +467,15 @@ const encoding12 = {
     return {
       key: r0,
       discoveryKey: r1,
-      manifest: (flags & 1) !== 0 ? encoding12_2.decode(state) : null,
-      keyPair: (flags & 2) !== 0 ? encoding10.decode(state) : null,
+      manifest: (flags & 1) !== 0 ? encoding14_2.decode(state) : null,
+      keyPair: (flags & 2) !== 0 ? encoding12.decode(state) : null,
       encryptionKey: (flags & 4) !== 0 ? c.buffer.decode(state) : null
     }
   }
 }
 
 // @core/head
-const encoding13 = {
+const encoding15 = {
   preencode(state, m) {
     c.uint.preencode(state, m.fork)
     c.uint.preencode(state, m.length)
@@ -392,10 +483,10 @@ const encoding13 = {
     c.optionalBuffer.preencode(state, m.signature)
     state.end++ // max flag is 1 so always one byte
 
-    if (m.timestamp) c.uint64.preencode(state, m.timestamp)
+    if (version >= 2 && m.timestamp) c.uint64.preencode(state, m.timestamp)
   },
   encode(state, m) {
-    const flags = m.timestamp ? 1 : 0
+    const flags = version >= 2 && m.timestamp ? 1 : 0
 
     c.uint.encode(state, m.fork)
     c.uint.encode(state, m.length)
@@ -403,27 +494,27 @@ const encoding13 = {
     c.optionalBuffer.encode(state, m.signature)
     c.uint.encode(state, flags)
 
-    if (m.timestamp) c.uint64.encode(state, m.timestamp)
+    if (version >= 2 && m.timestamp) c.uint64.encode(state, m.timestamp)
   },
   decode(state) {
     const r0 = c.uint.decode(state)
     const r1 = c.uint.decode(state)
     const r2 = c.fixed32.decode(state)
     const r3 = c.optionalBuffer.decode(state)
-    const flags = c.uint.decode(state)
+    const flags = state.start < state.end ? c.uint.decode(state) : 0
 
     return {
       fork: r0,
       length: r1,
       rootHash: r2,
       signature: r3,
-      timestamp: (flags & 1) !== 0 ? c.uint64.decode(state) : 0
+      timestamp: version >= 2 && (flags & 1) !== 0 ? c.uint64.decode(state) : 0
     }
   }
 }
 
 // @core/hints
-const encoding14 = {
+const encoding16 = {
   preencode(state, m) {
     state.end++ // max flag is 4 so always one byte
 
@@ -453,7 +544,7 @@ const encoding14 = {
 }
 
 // @core/session
-const encoding15 = {
+const encoding17 = {
   preencode(state, m) {
     c.string.preencode(state, m.name)
     c.uint.preencode(state, m.dataPointer)
@@ -474,10 +565,10 @@ const encoding15 = {
 }
 
 // @core/sessions
-const encoding16 = c.array(encoding15)
+const encoding18 = c.array(encoding17)
 
 // @core/dependency
-const encoding17 = {
+const encoding19 = {
   preencode(state, m) {
     c.uint.preencode(state, m.dataPointer)
     c.uint.preencode(state, m.length)
@@ -497,97 +588,6 @@ const encoding17 = {
   }
 }
 
-// @corestore/head-v2
-const encoding18 = {
-  preencode(state, m) {
-    c.uint.preencode(state, m.cores)
-    c.uint.preencode(state, m.datas)
-    c.uint.preencode(state, m.groups)
-    state.end++ // max flag is 2 so always one byte
-
-    if (m.seed) c.fixed32.preencode(state, m.seed)
-    if (m.defaultDiscoveryKey) c.fixed32.preencode(state, m.defaultDiscoveryKey)
-  },
-  encode(state, m) {
-    const flags = (m.seed ? 1 : 0) | (m.defaultDiscoveryKey ? 2 : 0)
-
-    c.uint.encode(state, m.cores)
-    c.uint.encode(state, m.datas)
-    c.uint.encode(state, m.groups)
-    c.uint.encode(state, flags)
-
-    if (m.seed) c.fixed32.encode(state, m.seed)
-    if (m.defaultDiscoveryKey) c.fixed32.encode(state, m.defaultDiscoveryKey)
-  },
-  decode(state) {
-    const v = c.uint.decode(state)
-    const r0 = c.uint.decode(state)
-    const r1 = c.uint.decode(state)
-    const r2 = c.uint.decode(state)
-    const flags = c.uint.decode(state)
-
-    return {
-      version: v,
-      cores: r0,
-      datas: r1,
-      groups: r2,
-      seed: (flags & 1) !== 0 ? c.fixed32.decode(state) : null,
-      defaultDiscoveryKey: (flags & 2) !== 0 ? c.fixed32.decode(state) : null
-    }
-  }
-}
-
-// @corestore/head
-const encoding19 = {
-  preencode(state, m) {
-    c.uint.preencode(state, m.version)
-    switch (m.version) {
-      case 0:
-      case 1:
-        encoding1.preencode(state, m)
-        break
-      case 2:
-        encoding18.preencode(state, m)
-        break
-      default:
-        throw new Error('Unsupported version')
-    }
-  },
-  encode(state, m) {
-    c.uint.encode(state, m.version)
-    switch (m.version) {
-      case 0:
-      case 1:
-        encoding1.encode(state, m)
-        break
-      case 2:
-        encoding18.encode(state, m)
-        break
-      default:
-        throw new Error('Unsupported version')
-    }
-  },
-  decode(state) {
-    const start = state.start
-    const v = c.uint.decode(state)
-    state.start = start
-    switch (v) {
-      case 0:
-      case 1: {
-        const decoded = encoding1.decode(state)
-        const map = external0.headLegacyMap
-        return map(decoded)
-      }
-      case 2: {
-        const decoded = encoding18.decode(state)
-        return decoded
-      }
-      default:
-        throw new Error('Unsupported version')
-    }
-  }
-}
-
 function setVersion(v) {
   version = v
 }
@@ -605,9 +605,9 @@ function decode(name, buffer, v = VERSION) {
 function getEnum(name) {
   switch (name) {
     case '@core/hashes':
-      return encoding4_enum
+      return encoding6_enum
     case '@core/signatures':
-      return encoding5_enum
+      return encoding7_enum
     default:
       throw new Error('Enum not found ' + name)
   }
@@ -619,41 +619,41 @@ function getEncoding(name) {
       return encoding0
     case '@corestore/head-v1':
       return encoding1
-    case '@corestore/alias':
+    case '@corestore/head-v2':
       return encoding2
-    case '@corestore/core':
+    case '@corestore/head':
       return encoding3
-    case '@core/hashes':
+    case '@corestore/alias':
       return encoding4
-    case '@core/signatures':
+    case '@corestore/core':
       return encoding5
-    case '@core/tree-node':
+    case '@core/hashes':
       return encoding6
-    case '@core/signer':
+    case '@core/signatures':
       return encoding7
-    case '@core/prologue':
+    case '@core/tree-node':
       return encoding8
-    case '@core/manifest':
+    case '@core/signer':
       return encoding9
-    case '@core/keyPair':
+    case '@core/prologue':
       return encoding10
-    case '@core/group':
+    case '@core/manifest':
       return encoding11
-    case '@core/auth':
+    case '@core/keyPair':
       return encoding12
-    case '@core/head':
+    case '@core/group':
       return encoding13
-    case '@core/hints':
+    case '@core/auth':
       return encoding14
-    case '@core/session':
+    case '@core/head':
       return encoding15
-    case '@core/sessions':
+    case '@core/hints':
       return encoding16
-    case '@core/dependency':
+    case '@core/session':
       return encoding17
-    case '@corestore/head-v2':
+    case '@core/sessions':
       return encoding18
-    case '@corestore/head':
+    case '@core/dependency':
       return encoding19
     default:
       throw new Error('Encoder not found ' + name)

package/encoding/spec/hyperschema/schema.json

@@ -1,5 +1,5 @@
 {
-  "version": 1,
+  "version": 2,
   "schema": [
     {
       "name": "allocated",
@@ -44,6 +44,58 @@
         }
       ]
     },
+    {
+      "name": "head-v2",
+      "namespace": "corestore",
+      "compact": false,
+      "flagsPosition": 3,
+      "fields": [
+        {
+          "name": "cores",
+          "required": true,
+          "type": "uint",
+          "version": 1
+        },
+        {
+          "name": "datas",
+          "required": true,
+          "type": "uint",
+          "version": 1
+        },
+        {
+          "name": "groups",
+          "required": true,
+          "type": "uint",
+          "version": 1
+        },
+        {
+          "name": "seed",
+          "type": "fixed32",
+          "version": 1
+        },
+        {
+          "name": "defaultDiscoveryKey",
+          "type": "fixed32",
+          "version": 1
+        }
+      ]
+    },
+    {
+      "name": "head",
+      "namespace": "corestore",
+      "versions": [
+        {
+          "type": "@corestore/head-v1",
+          "map": "headLegacyMap",
+          "version": 1
+        },
+        {
+          "type": "@corestore/head-v2",
+          "map": null,
+          "version": 2
+        }
+      ]
+    },
     {
       "name": "alias",
       "namespace": "corestore",
@@ -352,7 +404,7 @@
           "name": "timestamp",
           "required": false,
           "type": "uint64",
-          "version": 1
+          "version": 2
         }
       ]
     },
@@ -424,58 +476,6 @@
           "version": 1
         }
       ]
-    },
-    {
-      "name": "head-v2",
-      "namespace": "corestore",
-      "compact": false,
-      "flagsPosition": 3,
-      "fields": [
-        {
-          "name": "cores",
-          "required": true,
-          "type": "uint",
-          "version": 1
-        },
-        {
-          "name": "datas",
-          "required": true,
-          "type": "uint",
-          "version": 1
-        },
-        {
-          "name": "groups",
-          "required": true,
-          "type": "uint",
-          "version": 1
-        },
-        {
-          "name": "seed",
-          "type": "fixed32",
-          "version": 1
-        },
-        {
-          "name": "defaultDiscoveryKey",
-          "type": "fixed32",
-          "version": 1
-        }
-      ]
-    },
-    {
-      "name": "head",
-      "namespace": "corestore",
-      "versions": [
-        {
-          "type": "@corestore/head-v1",
-          "map": "headLegacyMap",
-          "version": 1
-        },
-        {
-          "type": "@corestore/head-v2",
-          "map": null,
-          "version": 2
-        }
-      ]
     }
   ]
 }

package/index.js

@@ -679,6 +679,10 @@ class CorestoreStorage {
           await require('./migrations/0').core(core, target)
           break
         }
+        case 1: {
+          await require('./migrations/1').core(core, target)
+          break
+        }
         default: {
           throw new Error(
             'Unsupported version: ' + version + ' - you should probably upgrade your dependencies'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore-storage",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "main": "index.js",
   "files": [
     "index.js",
@@ -24,6 +24,14 @@
       "bare": "bare-fs",
       "default": "fs"
     },
+    "fs/*": {
+      "bare": "bare-fs/*",
+      "default": "fs/*"
+    },
+    "os": {
+      "bare": "bare-os",
+      "default": "os"
+    },
     "path": {
       "bare": "bare-path",
       "default": "path"
@@ -39,7 +47,6 @@
   "homepage": "https://github.com/holepunchto/hypercore-storage#readme",
   "dependencies": {
     "b4a": "^1.6.7",
-    "bare-fs": "^4.0.1",
     "bare-path": "^3.0.0",
     "compact-encoding": "^3.1.0",
     "device-file": "^2.1.2",
@@ -53,7 +60,9 @@
     "streamx": "^2.21.1"
   },
   "devDependencies": {
+    "bare-os": "^3.9.1",
     "brittle": "^3.7.0",
+    "hypercore-storage-2.9.0": "npm:hypercore-storage@^2.9.0",
     "lunte": "^1.3.0",
     "prettier": "^3.6.2",
     "prettier-config-holepunch": "^2.0.0",