Added _getMountPath

Author: andrewosh

lib/drives/index.js

@@ -112,6 +112,7 @@ class DriveManager extends EventEmitter {
       newDrive = true
     }
 
+    console.error('GETTING CORESTORE WITH OPTS:', { ...this.opts, ...opts })
     const corestore = this.megastore.get(name, { ...this.opts, ...opts })
     const driveOpts = {
       ...opts,

lib/fuse/index.js

@@ -236,24 +236,39 @@ class FuseManager extends EventEmitter {
     }
   }
 
+  _getMountPath (path) {
+    if (!this._rootDrive && path !== '/hyperdrive') throw new Error('You can only mount the root drive at /hyperdrive')
+    if (!this._rootDrive) return { path: '/hyperdrive', 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.')
+      return { path: relativePath, root: false }
+    }
+  }
+
   async _driveForPath (path, opts = {}) {
+    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 (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)
         })
       }
+      console.error('path:', path, 'rootMnt:', this._rootMnt, 'claiming it is root')
       return resolve({ drive: this._rootDrive, root: true })
     })
   }

package.json

@@ -38,7 +38,7 @@
     "hyperdrive-fuse": "^1.1.0",
     "level": "^4.0.0",
     "mkdirp": "^0.5.1",
-    "megastore": "^0.9.8",
+    "mini-megastore": "^1.0.0",
     "megastore-swarm-networking": "^1.0.0",
     "ora": "^3.4.0",
     "pino": "^5.12.6",