Remove unused file + standardize + remove ora dep

Author: andrewosh

bin/setup.js

@@ -1,14 +1,13 @@
 const p = require('path')
 const fs = require('fs')
-const { spawn, exec } = require('child_process')
+const { exec } = require('child_process')
 
 try {
   var hyperfuse = require('hyperdrive-fuse')
 } catch (err) {
   console.warn('FUSE installation failed. You will be unable to mount your hyperdrives.')
 }
 
-const ora = require('ora')
 const chalk = require('chalk')
 
 exports.command = 'setup'

bin/start.js

@@ -1,5 +1,4 @@
 const p = require('path')
-const os = require('os')
 
 const chalk = require('chalk')
 const forever = require('forever')
@@ -19,7 +18,7 @@ exports.builder = {
   storage: {
     description: 'The storage directory for hyperdrives and associated metadata.',
     type: 'string',
-    default: constants.storage,
+    default: constants.storage
   },
   'log-level': {
     description: 'The log level',

cli.js

@@ -5,6 +5,3 @@ client.commandDir('bin')
   .demandCommand()
   .help()
   .argv
-
-
-

index.js

@@ -1,5 +1,3 @@
-const p = require('path')
-const os = require('os')
 const { EventEmitter } = require('events')
 
 const mkdirp = require('mkdirp')
@@ -10,12 +8,11 @@ const grpc = require('@grpc/grpc-js')
 const corestore = require('corestore')
 const SwarmNetworker = require('corestore-swarm-networking')
 
-
 const { rpc, loadMetadata } = require('hyperdrive-daemon-client')
 const constants = require('hyperdrive-daemon-client/lib/constants')
 
 const DriveManager = require('./lib/drives')
-const { catchErrors, serverError, requestError } = require('./lib/errors')
+const { serverError } = require('./lib/errors')
 
 try {
   var hyperfuse = require('hyperdrive-fuse')
@@ -143,6 +140,7 @@ class HyperdriveDaemon extends EventEmitter {
 
   async stop () {
     if (this._isClosed) return Promise.resolve()
+    if (this.server) this.server.forceShutdown()
 
     if (this.fuse && this.fuse.fuseConfigured) await this.fuse.unmount()
     if (this.networking) await this.networking.close()

lib/drives/index.js

@@ -1,4 +1,3 @@
-const crypto = require('crypto')
 const { EventEmitter } = require('events')
 
 const hyperdrive = require('hyperdrive')
@@ -14,7 +13,6 @@ const {
   toHyperdriveOptions,
   fromStat,
   toStat,
-  toMount,
   fromMount,
   toDriveStats,
   toChunks
@@ -135,7 +133,7 @@ class DriveManager extends EventEmitter {
 
   async getAllStats () {
     const allStats = []
-    for (const [keyString, drive] of this._drives) {
+    for (const [, drive] of this._drives) {
       const driveStats = await this.getDriveStats(drive)
       allStats.push(driveStats)
     }
@@ -574,7 +572,7 @@ class DriveManager extends EventEmitter {
       close: async (call) => {
         const id = call.request.getId()
 
-        const drive = this.driveForSession(id)
+        this.driveForSession(id)
         this.closeSession(id)
         const rsp = new rpc.drive.messages.CloseSessionResponse()
 

lib/fuse/index.js

@@ -2,12 +2,10 @@ const p = require('path')
 const { EventEmitter } = require('events')
 const crypto = require('crypto')
 
-const hyperdrive = require('hyperdrive')
 const datEncoding = require('dat-encoding')
 const Stat = require('hyperdrive/lib/stat')
 const hyperfuse = require('hyperdrive-fuse')
 
-
 const { rpc } = require('hyperdrive-daemon-client')
 const { fromHyperdriveOptions, toHyperdriveOptions } = require('hyperdrive-daemon-client/lib/common')
 const constants = require('hyperdrive-daemon-client/lib/constants')
@@ -59,7 +57,6 @@ class FuseManager extends EventEmitter {
   }
 
   _wrapHandlers (handlers) {
-    const self = this
     const interceptorIndex = new Map()
 
     const RootListHandler = {
@@ -96,7 +93,7 @@ class FuseManager extends EventEmitter {
         if (!match.groups['key']) {
           if (op === 'readdir') return cb(0, [])
           if (op === 'releasedir') return cb(0)
-          if (op === 'getattr') return cb(0, Stat.directory({ uid: process.getuid(), gid: process.getgid()}))
+          if (op === 'getattr') return cb(0, Stat.directory({ uid: process.getuid(), gid: process.getgid() }))
           return handlers[op].apply(null, [...args, cb])
         }
 
@@ -204,7 +201,7 @@ class FuseManager extends EventEmitter {
 
     function wrapHandler (handlerName, handler) {
       log.debug({ handlerName }, 'wrapping handler')
-      const activeInterceptors = interceptors.filter(({ ops }) => ops === '*'  || (ops.indexOf(handlerName) !== -1))
+      const activeInterceptors = interceptors.filter(({ ops }) => ops === '*' || (ops.indexOf(handlerName) !== -1))
       if (!activeInterceptors.length) return handler
 
       const matcher = new RegExp(activeInterceptors.map(({ test, id }) => `(?<${id}>${test})`).join('|'))
@@ -239,7 +236,7 @@ class FuseManager extends EventEmitter {
     if (!this._rootDrive && path !== constants.mountpoint) {
       throw new Error(`You can only mount the root drive at ${constants.mountpoint}`)
     }
-    if (!this._rootDrive) return { path: constants.mountpoint, root: true}
+    if (!this._rootDrive) return { path: constants.mountpoint, 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.')
@@ -309,13 +306,13 @@ class FuseManager extends EventEmitter {
     }
 
     async function mountRoot (drive) {
-      log.debug({ key: drive.key.toString('hex')}, 'mounting the root drive')
+      log.debug({ key: drive.key.toString('hex') }, 'mounting the root drive')
       const fuseLogger = log.child({ component: 'fuse' })
 
       const handlers = hyperfuse.getHandlers(drive, mnt)
       const wrappedHandlers = self._wrapHandlers(handlers)
 
-      var mountInfo = await hyperfuse.mount(drive, wrappedHandlers, mnt, {
+      await hyperfuse.mount(drive, wrappedHandlers, mnt, {
         force: true,
         displayFolder: true,
         log: fuseLogger.trace.bind(fuseLogger),

lib/log.js

@@ -1,6 +1,3 @@
-const os = require('os')
-const p = require('path')
-
 const pino = require('pino')
 const argv = require('yargs').argv
 const constants = require('hyperdrive-daemon-client/lib/constants')
@@ -9,5 +6,5 @@ const constants = require('hyperdrive-daemon-client/lib/constants')
 module.exports = pino({
   name: 'hyperdrive',
   level: argv['log-level'] || 'info',
-  enabled: true,
+  enabled: true
 }, (process.env['NODE_ENV'] === 'test') ? pino.destination(2) : constants.structuredLog)

lib/metadata.js

@@ -1,5 +1,3 @@
-const p = require('path')
-const os = require('os')
 const fs = require('fs-extra')
 
 const sodium = require('sodium-universal')