Use promise API for client. Change storage defaults

Author: andrewosh

bin/start.js

@@ -1,10 +1,14 @@
 const p = require('path')
+const os = require('os')
+
 const chalk = require('chalk')
 const forever = require('forever')
 
 const { createMetadata } = require('../lib/metadata')
 const { HyperdriveClient } = require('hyperdrive-daemon-client')
 
+const HYPERDRIVE_DIR = p.join(os.homedir(), '.hyperdrive')
+
 exports.command = 'start'
 exports.desc = 'Start the Hyperdrive daemon.'
 exports.builder = {
@@ -16,7 +20,7 @@ exports.builder = {
   storage: {
     description: 'The storage directory for hyperdrives and associated metadata.',
     type: 'string',
-    default: './storage'
+    default: p.join(HYPERDRIVE_DIR, 'storage')
   },
   'log-level': {
     description: 'The log level',

index.js

@@ -163,11 +163,6 @@ function extractArguments () {
     .argv
 }
 
-function wrap (metadata, methods) {
-  const promisified = promisify(methods)
-  let authenticated = authenticate(metadata, methods)
-}
-
 function wrap (metadata, methods, opts) {
   const wrapped = {}
   const authenticate = opts && opts.authenticate

lib/metadata.js

@@ -3,8 +3,10 @@ const os = require('os')
 const fs = require('fs-extra')
 
 const sodium = require('sodium-universal')
+const mkdirp = require('mkdirp')
 
-const METADATA_FILE_PATH = p.join(os.homedir(), '.hyperdrive')
+const HYPERDRIVE_DIR = p.join(os.homedir(), '.hyperdrive')
+const METADATA_FILE_PATH = p.join(HYPERDRIVE_DIR, 'config.json')
 
 async function createMetadata (endpoint) {
   var token = process.env['HYPERDRIVE_TOKEN']
@@ -13,6 +15,12 @@ async function createMetadata (endpoint) {
     sodium.randombytes_buf(rnd)
     token = rnd.toString('hex')
   }
+  await new Promise((resolve, reject) => {
+    mkdirp(HYPERDRIVE_DIR, err => {
+      if (err) return reject(err)
+      return resolve()
+    })
+  })
   return fs.writeFile(METADATA_FILE_PATH, JSON.stringify({
     token,
     endpoint

test/replication.js

@@ -33,7 +33,7 @@ test('can replicate many mounted drives between daemons', async t => {
   const firstClient = clients[0]
   const secondClient = clients[1]
 
-  const NUM_MOUNTS = 20
+  const NUM_MOUNTS = 15
 
   try {
     const mounts = await createFirst()

test/util/create.js

@@ -5,7 +5,7 @@ const dht = require('@hyperswarm/dht')
 const loadClient = require('hyperdrive-daemon-client/lib/loader')
 const start = require('../..')
 
-const BASE_PORT = 3101
+const BASE_PORT = 4101
 const BOOTSTRAP_PORT = 3100
 const BOOTSTRAP_URL = `localhost:${BOOTSTRAP_PORT}`
 
@@ -65,10 +65,7 @@ async function createInstance (id, port, bootstrap) {
     return loadClient(endpoint, token, (err, client) => {
       if (err) return reject(err)
       return resolve({
-        client: {
-          drive: promisifyClass(client.drive),
-          fuse: promisifyClass(client.fuse)
-        },
+        client,
         cleanup
       })
     })
@@ -80,14 +77,6 @@ async function createInstance (id, port, bootstrap) {
   }
 }
 
-function promisifyClass (clazz) {
-  const methods = Object.getOwnPropertyNames(Object.getPrototypeOf(clazz)).filter(name => name !== 'constructor')
-  methods.forEach(name => {
-    clazz[name] = pify(clazz[name])
-  })
-  return clazz
-}
-
 module.exports = {
   create,
   createOne