schema-builder fixes, HyperDB proper integration

scripts/schema-builder.js

@@ -1,10 +1,8 @@
-const path = require('bare-path')
-const { PLATFORM_DIR } = require('../constants')
 const Hyperschema = require('hyperschema')
-const HyperDB = require('@holepunchto/hyperdb/builder')
+const Builder = require('@holepunchto/hyperdb/builder')
 
-const SCHEMA_DIR = './schema'
-const DB_DIR = path.join(PLATFORM_DIR, 'metrics.hyperdb')
+const SCHEMA_DIR = './spec/schema'
+const DB_DIR = './spec/db'
 
 const schema = Hyperschema.from(SCHEMA_DIR)
 const pearSchema = schema.namespace('pear')
@@ -78,13 +76,12 @@ pearSchema.register({
 
 Hyperschema.toDisk(schema)
 
-const db = HyperDB.from(SCHEMA_DIR, DB_DIR)
+const db = Builder.from(SCHEMA_DIR, DB_DIR)
 const pearDB = db.namespace('pear')
 
 pearDB.collections.register({
   name: 'dht-nodes',
-  schema: '@pear/dht-nodes',
-  key: ['host', 'port']
+  schema: '@pear/dht-nodes'
 })
 
 pearDB.collections.register({
@@ -137,15 +134,7 @@ pearDB.collections.register({
 
 pearDB.collections.register({
   name: 'perf-stats',
-  schema: '@pear/perf-stats',
-  key: ['uptimeSeconds', 'os']
+  schema: '@pear/perf-stats'
 })
 
-pearDB.indexes.register({
-  name: 'error-logs-by-type',
-  collection: '@pear/error-logs',
-  key: ['type', 'trace'],
-  unique: false
-})
-
-HyperDB.toDisk(db)
+Builder.toDisk(db)

spec/db/db.json

@@ -0,0 +1,132 @@
+{
+  "version": 0,
+  "offset": 0,
+  "schema": [
+    {
+      "name": "dht-nodes",
+      "namespace": "pear",
+      "id": 0,
+      "type": 1,
+      "indexes": [],
+      "schema": "@pear/dht-nodes",
+      "derived": false,
+      "key": [],
+      "trigger": null
+    },
+    {
+      "name": "encryption-keys",
+      "namespace": "pear",
+      "id": 1,
+      "type": 1,
+      "indexes": [],
+      "schema": "@pear/encryption-keys",
+      "derived": false,
+      "key": [
+        "publicKey"
+      ],
+      "trigger": null
+    },
+    {
+      "name": "permits",
+      "namespace": "pear",
+      "id": 2,
+      "type": 1,
+      "indexes": [],
+      "schema": "@pear/permits",
+      "derived": false,
+      "key": [
+        "z32"
+      ],
+      "trigger": null
+    },
+    {
+      "name": "identity",
+      "namespace": "pear",
+      "id": 3,
+      "type": 1,
+      "indexes": [],
+      "schema": "@pear/identity",
+      "derived": false,
+      "key": [
+        "publicKey"
+      ],
+      "trigger": null
+    },
+    {
+      "name": "apps",
+      "namespace": "pear",
+      "id": 4,
+      "type": 1,
+      "indexes": [],
+      "schema": "@pear/apps",
+      "derived": false,
+      "key": [
+        "key"
+      ],
+      "trigger": null
+    },
+    {
+      "name": "apps-owned",
+      "namespace": "pear",
+      "id": 5,
+      "type": 1,
+      "indexes": [],
+      "schema": "@pear/apps-owned",
+      "derived": false,
+      "key": [
+        "key"
+      ],
+      "trigger": null
+    },
+    {
+      "name": "app-storage",
+      "namespace": "pear",
+      "id": 6,
+      "type": 1,
+      "indexes": [],
+      "schema": "@pear/app-storage",
+      "derived": false,
+      "key": [
+        "app"
+      ],
+      "trigger": null
+    },
+    {
+      "name": "channels",
+      "namespace": "pear",
+      "id": 7,
+      "type": 1,
+      "indexes": [],
+      "schema": "@pear/channels",
+      "derived": false,
+      "key": [
+        "key"
+      ],
+      "trigger": null
+    },
+    {
+      "name": "error-logs",
+      "namespace": "pear",
+      "id": 8,
+      "type": 1,
+      "indexes": [],
+      "schema": "@pear/error-logs",
+      "derived": false,
+      "key": [
+        "type"
+      ],
+      "trigger": null
+    },
+    {
+      "name": "perf-stats",
+      "namespace": "pear",
+      "id": 9,
+      "type": 1,
+      "indexes": [],
+      "schema": "@pear/perf-stats",
+      "derived": false,
+      "key": [],
+      "trigger": null
+    }
+  ]
+}