Mounts are cleanly unmounted on stop and refreshed on start + Standardized

Author: andrewosh

bin/mount.js

@@ -2,7 +2,7 @@ const p = require('path')
 const request = require('request-promise-native')
 const chalk = require('chalk')
 
-const { loadMetadata, createMetadata } = require('../lib/metadata')
+const { loadMetadata } = require('../lib/metadata')
 
 exports.command = 'mount <mnt> [key]'
 exports.desc = 'Mount a hyperdrive at the specified mountpoint.'
@@ -34,7 +34,7 @@ exports.handler = async function (argv) {
         bearer: metadata.token
       },
       body,
-      resolveWithFullResponse: true,
+      resolveWithFullResponse: true
     })
     if (rsp.statusCode === 201) {
       let { key, mnt } = rsp.body
@@ -46,4 +46,3 @@ exports.handler = async function (argv) {
     console.error(chalk.red(`Could not mount hyperdrive: ${err}`))
   }
 }
-

bin/start.js

@@ -2,7 +2,6 @@ const p = require('path')
 const { URL } = require('url')
 const request = require('request-promise-native')
 const chalk = require('chalk')
-const { Monitor }  = require('forever-monitor')
 const forever = require('forever')
 
 const { loadMetadata, createMetadata } = require('../lib/metadata')
@@ -42,6 +41,7 @@ async function start (argv) {
   let endpoint = `http://localhost:${argv.port}`
   await createMetadata(endpoint)
   forever.startDaemon(p.join(__dirname, '..', 'index.js'), {
+    uid: 'hypermount',
     max: 1,
     logFile: './hypermount.log',
     outFile: './hypermount.log',

bin/status.js

@@ -1,7 +1,7 @@
 const request = require('request-promise-native')
 const chalk = require('chalk')
 
-const { loadMetadata, createMetadata } = require('../lib/metadata')
+const { loadMetadata } = require('../lib/metadata')
 
 exports.command = 'status'
 exports.desc = 'Get information about the hypermount daemon.'
@@ -23,4 +23,3 @@ exports.handler = async function (argv) {
     console.error(chalk.red(`Could not get server status: ${err}`))
   }
 }
-

bin/stop.js

@@ -1,6 +1,24 @@
+const { URL } = require('url')
+const request = require('request-promise-native')
+const chalk = require('chalk')
+
+const { loadMetadata } = require('../lib/metadata')
+
 exports.command = 'stop'
 exports.desc = 'Stop the Hypermount daemon.'
-exports.handler = function (argv) {
-  console.log('stop called for args', argv)
+exports.handler = async function (argv) {
+  let metadata = await loadMetadata()
+  if (metadata) {
+    try {
+      await request.post(new URL('/close', metadata.endpoint).toString(), {
+        auth: {
+          bearer: metadata.token
+        }
+      })
+      console.log(chalk.green(`The Hypermount daemon has been stopped.`))
+    } catch (err) {
+      console.log('err:', err)
+      console.error(chalk.red(`Could not stop the daemon.`))
+    }
+  }
 }
-

bin/unmount.js

@@ -2,7 +2,7 @@ const p = require('path')
 const request = require('request-promise-native')
 const chalk = require('chalk')
 
-const { loadMetadata, createMetadata } = require('../lib/metadata')
+const { loadMetadata } = require('../lib/metadata')
 
 exports.command = 'unmount <mnt>'
 exports.desc = 'Unmount the hyperdrive that was mounted at the specified mountpoint.'
@@ -19,7 +19,7 @@ exports.handler = async function (argv) {
         bearer: metadata.token
       },
       body,
-      resolveWithFullResponse: true,
+      resolveWithFullResponse: true
     })
     if (rsp.statusCode === 200) {
       console.log(chalk.green(`Unmounted hyperdrive at ${argv.mnt}`))

cli.js

@@ -1,7 +1,4 @@
 #!/usr/bin/env node
-
-const datEncoding = require('dat-encoding')
-const forever = require('forever-monitor')
 const yargs = require('yargs')
 
 yargs.commandDir('bin')

index.js

@@ -1,13 +1,22 @@
-const datEncoding = require('dat-encoding')
+const p = require('path')
+
 const corestore = require('corestore')
 const hyperdrive = require('hyperdrive')
 const hyperfuse = require('hyperdrive-fuse')
 const express = require('express')
 const level = require('level')
+const through = require('through2')
+const pump = require('pump')
+const mkdirp = require('mkdirp')
 const argv = require('yargs').argv
 
 const { loadMetadata } = require('./lib/metadata')
 
+const Status = {
+  UNMOUNTED: 0,
+  MOUNTED: 1
+}
+
 class Hypermount {
   constructor (store) {
     this.store = store
@@ -28,11 +37,11 @@ class Hypermount {
       sparseMetadata: (opts.sparseMetadata !== undefined) ? opts.sparseMetadata : true
     })
 
-    return hyperfuse.mount(drive, mnt) 
+    return hyperfuse.mount(drive, mnt)
   }
 
   unmount (mnt) {
-    return hyperfuse.unmount(mnt) 
+    return hyperfuse.unmount(mnt)
   }
 
   close () {
@@ -42,11 +51,25 @@ class Hypermount {
 
 async function start () {
   const metadata = await loadMetadata()
-  const store = corestore(argv.storage || './storage', {
+  const storageRoot = argv.storage || './storage'
+
+  await (() => {
+    return new Promise((resolve, reject) => {
+      mkdirp(storageRoot, err => {
+        if (err) return reject(err)
+        return resolve()
+      })
+    })
+  })()
+
+  const store = corestore(p.join(storageRoot, 'cores'), {
     network: {
       port: argv.replicationPort || 3006
     }
   })
+  const db = level(p.join(storageRoot, 'db'), {
+    valueEncoding: 'json'
+  })
   const hypermount = new Hypermount(store)
   const app = express()
 
@@ -60,40 +83,119 @@ async function start () {
   app.post('/mount', async (req, res) => {
     try {
       console.log('req.body:', req.body)
-      let { key, mnt } = await hypermount.mount(req.body.key, req.body.mnt, req.body)
+      let { key, mnt } = req.body
+      key = await mount(hypermount, db, key, mnt, req.body)
       return res.status(201).json({ key, mnt })
     } catch (err) {
       console.error('Mount error:', err)
       return res.sendStatus(500)
     }
   })
+
   app.post('/unmount', async (req, res) => {
     try {
-      await hypermount.unmount(req.body.mnt)
+      const mnt = req.body.mnt
+      await unmount(hypermount, db, mnt)
+
       return res.sendStatus(200)
     } catch (err) {
       console.error('Unmount error:', err)
       return res.sendStatus(500)
     }
   })
+
   app.post('/close', async (req, res) => {
     try {
+      await unmountAll(hypermount, db)
+      console.log('unmounted them all')
       await store.close()
+      await db.close()
       server.close()
-      return res.sendStatus(200)
+
+      res.sendStatus(200)
     } catch (err) {
       console.error('Close error:', err)
       return res.sendStatus(500)
     }
   })
+
   app.get('/status', async (req, res) => {
     return res.sendStatus(200)
   })
 
   await store.ready()
+  await refreshMounts(hypermount, db)
+
   var server = app.listen(argv.port || 3005)
 }
 
+async function mount (hypermount, db, key, mnt, opts) {
+  let { key: mountedKey } = await hypermount.mount(key, mnt, opts)
+
+  await db.put(mnt, {
+    ...opts,
+    key: mountedKey,
+    mnt,
+    status: Status.MOUNTED
+  })
+
+  return mountedKey
+}
+
+async function unmount (hypermount, db, mnt) {
+  await hypermount.unmount(mnt)
+
+  let record = await db.get(mnt)
+  if (!record) return
+  record.status = Status.UNMOUNTED
+
+  await db.put(mnt, record)
+}
+
+function unmountAll (hypermount, db) {
+  return new Promise((resolve, reject) => {
+    pump(
+      db.createReadStream(),
+      through.obj(({ key, value: record }, enc, cb) => {
+        if (record.status === Status.MOUNTED) {
+          console.log('UNMOUNTING in unmountAll:', key)
+          let unmountPromise = unmount(hypermount, db, key)
+          unmountPromise.then(() => cb(null))
+          unmountPromise.catch(err => cb(err))
+        } else {
+          return cb(null)
+        }
+      }),
+      err => {
+        if (err) return reject(err)
+        return resolve()
+      }
+    )
+  })
+}
+
+function refreshMounts (hypermount, db) {
+  return new Promise((resolve, reject) => {
+    pump(
+      db.createReadStream(),
+      through.obj(({ key, value: record }, enc, cb) => {
+        if (record.status === Status.UNMOUNTED) {
+          console.log(`Refreshing mount for ${JSON.stringify(record)}`)
+          const mountPromise = mount(hypermount, db, record.key, key, record)
+          mountPromise.then(() => cb(null))
+          mountPromise.catch(cb)
+        } else {
+          return cb(null)
+        }
+      }),
+      err => {
+        if (err) return reject(err)
+        return resolve()
+      }
+    )
+  })
+}
+
 if (require.main === module) {
   start()
 }

package.json

@@ -35,9 +35,11 @@
     "hyperdrive": "git+https://github.com/mafintosh/hyperdrive.git#v10",
     "hyperdrive-fuse": "git+https://github.com/andrewosh/hyperdrive-fuse",
     "level": "^4.0.0",
+    "mkdirp": "^0.5.1",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.7",
     "sodium-universal": "^2.0.0",
+    "through2": "^3.0.1",
     "yargs": "^13.2.1"
   },
   "devDependencies": {