Use seedIndex instead of driveIndex for seeding

Author: andrewosh

lib/drives/index.js

@@ -37,7 +37,7 @@ class DriveManager extends EventEmitter {
   }
 
   async _reseed () {
-    const driveList = await collect(this._driveIndex)
+    const driveList = await collect(this._seedIndex)
     for (const { key: discoveryKey } of driveList) {
       this.networking.seed(discoveryKey)
     }
@@ -158,16 +158,16 @@ class DriveManager extends EventEmitter {
     return drive
   }
 
-  async publish (drive) {
+  publish (drive) {
     const encodedKey = datEncoding.encode(drive.discoveryKey)
     this.networking.seed(drive.discoveryKey)
-    await this._seedIndex.put(encodedKey, '')
+    return this._seedIndex.put(encodedKey, '')
   }
 
-  async unpublish (drive) {
+  unpublish (drive) {
     const encodedKey = datEncoding.encode(drive.discoveryKey)
     this.networking.unseed(drive.discoveryKey)
-    await this._seedIndex.del(encodedKey)
+    return this._seedIndex.del(encodedKey)
   }
 
   // TODO: Retrieving stats from managed hyperdrives is trickier with corestores/mounts.

lib/fuse/index.js

@@ -122,7 +122,7 @@ class FuseManager extends EventEmitter {
             })
         }
 
-        return this.driveManager.get(key, { ...this.opts, seed: false })
+        return this.driveManager.get(key, { ...this.opts })
           .then(drive => {
             var handlers = this._handlers.get(drive)
             if (!handlers) {
@@ -247,30 +247,41 @@ class FuseManager extends EventEmitter {
   }
 
   async _driveForPath (path, opts = {}) {
+    const self = this
     console.error('GETTING DRIVE FOR PATH:', path)
-    return new Promise(async (resolve, reject) => {
-      if (!this._rootDrive) {
-        console.log('NO ROOT DRIVE')
-        const drive = await this.driveManager.get(opts.key, { ...opts, seed: false, configure: { rootDrive: true } })
-        return resolve({ drive, root: true })
-      }
-      if (path.startsWith(this._rootMnt) && path !== this._rootMnt) {
-        const relativePath = path.slice(this._rootMnt.length)
-        if (!relativePath.startsWith('/home')) throw new Error('You can only mount sub-hyperdrives within the home directory.')
 
-        console.error('IT IS A SUBDRIVE, RELATIVE:', relativePath)
-        return this._rootDrive.readFile(p.join(relativePath, '.key'), (err, key) => {
+    if (!this._rootDrive) {
+      console.log('NO ROOT DRIVE')
+      const drive = await this.driveManager.get(opts.key, { ...opts, configure: { rootDrive: true } })
+      return { drive, root: true }
+    }
+
+    if (path.startsWith(this._rootMnt) && path !== this._rootMnt) {
+      const relativePath = path.slice(this._rootMnt.length)
+      if (!relativePath.startsWith('/home')) throw new Error('You can only mount sub-hyperdrives within the home directory.')
+      console.error('IT IS A SUBDRIVE, RELATIVE:', relativePath)
+      return getSubdrive(relativePath)
+    }
+
+    console.error('path:', path, 'rootMnt:', this._rootMnt, 'claiming it is root')
+    return { drive: this._rootDrive, root: true }
+
+    async function getSubdrive (relativePath) {
+      const key = await new Promise((resolve, reject) => {
+        self._rootDrive.readFile(p.join(relativePath, '.key'), (err, key) => {
           if (err && err.errno !== 2) return reject(err)
           key = key ? datEncoding.decode(key.toString('utf8')) : opts.key
-          console.error('KEY HERE:', key, 'OPTS:', opts)
-          return this.driveManager.get(key, { ...opts, seed: !!opts.key })
-            .then(drive => resolve({ drive, root: false, relativePath }))
-            .catch(reject)
+          return resolve(key)
         })
+      })
+      const drive = await self.driveManager.get(key, { ...opts })
+      if (opts.key) {
+        console.error('PUBLISHING DRIVE BY KEY')
+        await self.driveManager.publish(drive)
+        console.error('PUBLISHED')
       }
-      console.error('path:', path, 'rootMnt:', this._rootMnt, 'claiming it is root')
-      return resolve({ drive: this._rootDrive, root: true })
-    })
+      return { drive, relativePath, root: false }
+    }
   }
 
   async mount (mnt, mountOpts = {}) {
@@ -284,6 +295,7 @@ class FuseManager extends EventEmitter {
       await this.unmount()
       return mountRoot(drive)
     }
+    console.error('MOUNTING SUBDRIVE HERE')
     return mountSubdrive(relativePath, drive)
 
     async function mountSubdrive (relativePath, drive) {