fix(): clean before mount; app quits gracefully

Author: Eric Jiang

kernel/daemons/afs.js

@@ -2,7 +2,6 @@ const debug = require('debug')('ara:fm:kernel:daemons:afsManager')
 
 const araContracts = require('ara-contracts')
 const araFilesystem = require('ara-filesystem')
-const onExit = require('async-exit-hook')
 const { events } = require('k')
 const fs = require('fs')
 const mirror = require('mirror-folder')
@@ -90,9 +89,6 @@ async function getAfsDownloadStatus(did, shouldBroadcast, password = null) {
 		debug('Error getting download status %o', err)
 	}
 
-  onExit(async (done) => {
-    newAfs && await newAfs.close()
-  })
 	return { downloadPercent, status }
 }
 

kernel/daemons/fuse.js

@@ -3,7 +3,10 @@ const { createAFSKeyPath } = require('ara-filesystem/key-path')
 const { mount: afsMount } = require('cfsnet/fuse')
 const { readFileMetadata } = require('./utils')
 const { getAFMDirectory } = require('./afm')
+const onExit = require('async-exit-hook')
+const { umount } = require('umount')
 const mkdirp = require('mkdirp')
+const rimraf = require('rimraf')
 const pify = require('pify')
 const path = require('path')
 
@@ -13,9 +16,11 @@ async function mount(afs) {
 
   const mntPath = path.resolve(path.join(getAFMDirectory(), '/mnt'), title)
 
-  await pify(mkdirp)(mntPath)
   debug(`mounting ${did} at ${mntPath} ...`)
 
+  await clean()
+  await pify(mkdirp)(mntPath)
+
   await afsMount(mntPath, afs, {
     displayFolder: true,
     force: true,
@@ -27,6 +32,27 @@ async function mount(afs) {
   })
 
   debug('mounted.')
+
+  onExit(async (done) => {
+    await clean()
+    done()
+  })
+
+  async function clean() {
+    debug('cleaning')
+    try{
+      await pify(umount)(mntPath)
+    } catch (err) {
+      debug(err.message)
+    }
+
+    try {
+      await pify(rimraf)(mntPath)
+    } catch (err) {
+      debug(err.message)
+    }
+    debug('cleaned.')
+  }
 }
 
 module.exports = {

package.json

@@ -63,6 +63,7 @@
     "styleUtils": "file:browser/lib/styleUtils",
     "toiletdb": "^1.4.1",
     "truffle": "^4.1.14",
+    "umount": "^1.1.6",
     "universal-analytics": "^0.4.20",
     "user-home": "^2.0.0",
     "uuid": "^3.3.2",