Updated components to use mini-megastore

Author: andrewosh

index.js

@@ -9,7 +9,7 @@ const argv = require('yargs').argv
 const grpc = require('grpc')
 const { rpc, loadMetadata } = require('hyperdrive-daemon-client')
 
-const Megastore = require('megastore')
+const Megastore = require('mini-megastore')
 const SwarmNetworker = require('megastore-swarm-networking')
 
 const { DriveManager, createDriveHandlers } = require('./lib/drives')
@@ -31,19 +31,18 @@ class HyperdriveDaemon extends EventEmitter {
     this.opts = opts
 
     const dbs = {
-      megastore: sub(this.db, 'megastore'),
       fuse: sub(this.db, 'fuse', { valueEncoding: 'json' }),
       drives: sub(this.db, 'drives', { valueEncoding: 'json' })
     }
 
     const megastoreOpts = {
       storage: path => raf(`${storage}/cores/${path}`),
-      db: dbs.megastore,
-      networker: new SwarmNetworker(opts.network)
+      sparse: true
     }
 
-    this.megastore = new Megastore(megastoreOpts.storage, megastoreOpts.db , megastoreOpts.networker)
-    this.drives = new DriveManager(this.megastore, dbs.drives, this.opts)
+    this.megastore = new Megastore(megastoreOpts.storage, megastoreOpts)
+    this.networking = new SwarmNetworker(this.megastore, opts.network)
+    this.drives = new DriveManager(this.megastore, this.networking, dbs.drives, this.opts)
     this.fuse = hyperfuse ? new FuseManager(this.megastore, this.drives, dbs.fuse, this.opts) : null
 
     this.drives.on('error', err => this.emit('error', err))
@@ -62,6 +61,7 @@ class HyperdriveDaemon extends EventEmitter {
     return Promise.all([
       this.db.open(),
       this.megastore.ready(),
+      this.networking.listen(),
       this.drives.ready(),
       this.fuse ? this.fuse.ready() : Promise.resolve()
     ]).then(() => {

lib/drives/index.js

@@ -3,22 +3,24 @@ const { EventEmitter } = require('events')
 
 const hyperdrive = require('hyperdrive')
 const sub = require('subleveldown')
-const collect = require('stream-collector')
+const collectStream = require('stream-collector')
 const datEncoding = require('dat-encoding')
 
 const { fromHyperdriveOptions, toHyperdriveOptions } = require('hyperdrive-daemon-client/lib/common')
 const log = require('../log').child({ component: 'drive-manager' })
 
 class DriveManager extends EventEmitter {
-  constructor (megastore, db, opts) {
+  constructor (megastore, networking, db, opts) {
     super()
 
     this.megastore = megastore
+    this.networking = networking
     this.db = db
     this.opts = opts || {}
 
     this._driveIndex = sub(this.db, 'drives', { valueEncoding: 'json' })
-    this._nameIndex = sub(this.db, 'names', { valueEncoding: 'utf-8' })
+    this._seedIndex = sub(this.db, 'seeding', { valueEncoding: 'utf8' })
+    this._nameIndex = sub(this.db, 'names', { valueEncoding: 'utf8' })
 
     if (this.opts.stats) {
       this._statsIndex = sub(this.db, 'stats', { valueEncoding: 'json' })
@@ -27,8 +29,18 @@ class DriveManager extends EventEmitter {
 
     // TODO: Replace with an LRU cache.
     this._drives = new Map()
-    // TODO: Any ready behavior here?
-    this.ready = () => Promise.resolve()
+    this._ready = new Promise(async resolve => {
+      await this._reseed()
+      return resolve()
+    })
+    this.ready = () => this._ready
+  }
+
+  async _reseed () {
+    const driveList = await collect(this._driveIndex)
+    for (const { key: discoveryKey } of driveList) {
+      this.networking.seed(discoveryKey)
+    }
   }
 
   _configureDrive (drive, opts) {
@@ -147,11 +159,15 @@ class DriveManager extends EventEmitter {
   }
 
   async publish (drive) {
-    return this.megastore.seed(drive.discoveryKey)
+    const encodedKey = datEncoding.encode(drive.discoveryKey)
+    this.networking.seed(drive.discoveryKey)
+    await this._seedIndex.put(encodedKey, '')
   }
 
   async unpublish (drive) {
-    return this.megastore.unseed(drive.discoveryKey)
+    const encodedKey = datEncoding.encode(drive.discoveryKey)
+    this.networking.unseed(drive.discoveryKey)
+    await this._seedIndex.del(encodedKey)
   }
 
   // TODO: Retrieving stats from managed hyperdrives is trickier with corestores/mounts.
@@ -206,6 +222,15 @@ function createDriveHandlers (driveManager) {
   }
 }
 
+function collect (index, opts) {
+  return new Promise((resolve, reject) => {
+    collectStream(index.createReadStream(opts), (err, list) => {
+      if (err) return reject(err)
+      return resolve(list)
+    })
+  })
+}
+
 module.exports = {
   DriveManager,
   createDriveHandlers