Better cleanup + nested mount test

Author: andrewosh

index.js

@@ -8,7 +8,7 @@ const sub = require('subleveldown')
 const grpc = require('grpc')
 
 const { rpc, loadMetadata } = require('hyperdrive-daemon-client')
-const corestore = require('random-access-corestore')
+const corestore = require('corestore')
 const SwarmNetworker = require('corestore-swarm-networking')
 
 const { DriveManager, createDriveHandlers } = require('./lib/drives')
@@ -96,7 +96,6 @@ module.exports = async function start (opts = {}) {
 
   const daemonOpts = {}
   const bootstrapOpts = opts.bootstrap || argv.bootstrap
-  console.log('BOOTSTRAP OPTS:', opts.bootstrap)
   if (bootstrapOpts.length) {
     if (bootstrapOpts === false && bootstrapOpts[0] === 'false') {
       daemonOpts.network = { bootstrap: false }
@@ -126,16 +125,19 @@ module.exports = async function start (opts = {}) {
   server.start()
   log.info({ port: port }, 'server listening')
 
-  process.once('SIGINT', cleanup)
-  process.once('SIGTERM', cleanup)
-  process.once('unhandledRejection', cleanup)
-  process.once('uncaughtException', cleanup)
+  const cleanupEvents = ['SIGINT', 'SIGTERM', 'unhandledRejection', 'uncaughtException']
+  for (const event of cleanupEvents) {
+   process.once(event, cleanup)
+  }
 
   return cleanup
 
   async function cleanup () {
     await daemon.close()
     server.forceShutdown()
+    for (const event of cleanupEvents) {
+      process.removeListener(event, cleanup)
+    }
   }
 
   function ensureStorage () {

lib/drives/index.js

@@ -150,12 +150,10 @@ class DriveManager extends EventEmitter {
     key = datEncoding.encode(drive.key)
     keyString = this._generateKeyString(key, opts)
 
-
     if (drive.writable) {
       await this._configureDrive(drive, opts && opts.configure)
     } else {
       // All read-only drives are currently published by default.
-      console.log('PUBLISHING READ-ONLY DRIVE')
       await this.publish(drive)
     }
     if (this.opts.stats) {
@@ -235,13 +233,11 @@ function createDriveHandlers (driveManager) {
     },
 
     publish: async (call) => {
-      console.error('IN SERVER PUBLISH')
       const id = call.request.getId()
 
       if (!id) throw new Error('A publish request must specify a session ID.')
       const drive = driveManager.driveForSession(id)
 
-      console.log('PUBLISHING DRIVE WITH KEY:', drive.key)
       await driveManager.publish(drive)
 
       const rsp = new rpc.drive.messages.PublishDriveResponse()
@@ -353,7 +349,6 @@ function createDriveHandlers (driveManager) {
 
       return new Promise((resolve, reject) => {
         drive.mount(path, opts.key, opts, err => {
-          console.error('after server mount, err:', err)
           if (err) return reject(err)
           const rsp = new rpc.drive.messages.MountDriveResponse()
           return resolve(rsp)

package.json

@@ -28,6 +28,7 @@
     "buffer-json-encoding": "^1.0.2",
     "chalk": "^2.4.2",
     "collect-stream": "^1.2.1",
+    "corestore-swarm-networking": "^1.0.0",
     "dat-encoding": "^5.0.1",
     "forever": "^0.15.3",
     "forever-monitor": "^1.7.1",
@@ -38,8 +39,6 @@
     "hyperdrive-daemon-client": "^0.9.4",
     "hyperdrive-fuse": "^1.1.0",
     "level": "^4.0.0",
-    "megastore-swarm-networking": "^1.0.0",
-    "mini-megastore": "^1.0.0",
     "mkdirp": "^0.5.1",
     "ora": "^3.4.0",
     "pino": "^5.12.6",

test/replication.js

@@ -81,6 +81,40 @@ test('can replicate many mounted drives between daemons', async t => {
   }
 })
 
+test('can replicate nested mounts between daemons', async t => {
+  const { clients, cleanup } = await create(2)
+  const firstClient = clients[0]
+  const secondClient = clients[1]
+
+  try {
+    const { opts: rootOpts1, id: rootId1 } = await firstClient.drive.get()
+    const { opts: mountOpts1, id: mountId1 } = await firstClient.drive.get()
+    const { opts: mountOpts2, id: mountId2 } = await firstClient.drive.get()
+    await firstClient.drive.publish(mountId2)
+
+    await firstClient.drive.mount(rootId1, 'a', { ...mountOpts1, version: null })
+    await firstClient.drive.mount(mountId1, 'b', { ...mountOpts2, version: null })
+
+    await firstClient.drive.writeFile(mountId2, 'hello', 'world')
+
+    const { opts: rootOpts2, id: rootId2 } = await secondClient.drive.get()
+    const { id: remoteMountId } = await secondClient.drive.get({ key: mountOpts2.key })
+
+    await secondClient.drive.mount(rootId2, 'c', { ...mountOpts2, version: null })
+
+    // 100 ms delay for replication.
+    await delay(100)
+
+    const replicatedContent = await secondClient.drive.readFile(rootId2, 'c/hello')
+    t.same(replicatedContent, Buffer.from('world'))
+  } catch (err) {
+    t.fail(err)
+  }
+
+  await cleanup()
+  t.end()
+})
+
 function delay (ms) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }