Extract simulator into separate bin module

Author: andrewosh

bin.js renamed to bin/index.js

@@ -7,9 +7,8 @@ const { spawn } = require('child_process')
 const minimist = require('minimist')
 const ram = require('random-access-memory')
 
-const { Server, Client } = require('./')
+const { Server, Client } = require('../')
 const { migrate: migrateFromDaemon, isMigrated } = require('@hyperspace/migration-tool')
-const getNetworkOptions = require('@hyperspace/rpc/socket')
 
 // TODO: Default paths are duplicated here because we need to do the async migration check.
 const HYPERSPACE_STORAGE_DIR = p.join(os.homedir(), '.hyperspace', 'storage')
@@ -26,21 +25,15 @@ const argv = minimist(process.argv.slice(2), {
     host: 'h',
     storage: 's',
     bootstrap: 'b'
-  },
-  '--': true
+  }
 })
-console.log('argv:', argv)
 
-const version = `hyperspace/${require('./package.json').version} ${process.platform}-${process.arch} node-${process.version}`
+const version = `hyperspace/${require('../package.json').version} ${process.platform}-${process.arch} node-${process.version}`
 
 const help = `Hypercore, batteries included.
 ${version}
 
-Usage: hyperspace [command] [options]
-  Commands:
-    simulator <script.js>  Run script.js using an in-memory Hyperspace instance
-  
-  Flags:
+Usage: hyperspace [options]
     --host,      -h  Set unix socket name
     --port       -p  Set the port (will use TCP)
     --storage,   -s  Overwrite storage folder
@@ -59,10 +52,6 @@ if (argv.help) {
 main().catch(onerror)
 
 async function main () {
-  if (argv._[0] === 'simulator') {
-    return simulator()
-  }
-
   console.log('Running ' + version)
 
   // Note: This will be removed in future releases of Hyperspace.
@@ -149,33 +138,6 @@ function createServer (storage, opts) {
   })
 }
 
-async function simulator () {
-  if (argv._.length === 1) throw new Error('Must provide a script for the simulator to run.')
-  const scriptPath = p.resolve(argv._[1])
-  const simulatorId = `hyperspace-simulator-${process.pid}`
-  process.env.HYPERSPACE_SOCKET = simulatorId
-
-  const server = createServer(ram, {
-    ...argv,
-    host: simulatorId
-  })
-  await server.open()
-
-  process.once('SIGINT', close)
-  process.once('SIGTERM', close)
-
-  const childArgs = argv['--'] || []
-  const child = spawn(process.execPath, [scriptPath, ...childArgs], {
-    stdio: 'inherit'
-  })
-  child.on('close', close)
-
-  async function close () {
-    console.log('Shutting down simulator...')
-    server.close().catch(onerror)
-  }
-}
-
 async function getStoragePath () {
   try {
     // If this dir exists, use it.

bin/simulator.js

@@ -0,0 +1,58 @@
+#!/usr/bin/env node
+const p = require('path')
+const { spawn } = require('child_process')
+const minimist = require('minimist')
+const ram = require('random-access-memory')
+
+const { Server, Client } = require('../')
+
+const argv = minimist(process.argv.slice(2), {
+  '--': true
+})
+const version = `hyperspace/${require('../package.json').version} ${process.platform}-${process.arch} node-${process.version}`
+const help = `Hypercore, batteries included.
+${version}
+
+Usage: hyperspace-simulator <script.js> -- [script-args]
+  Run the test script using an in-memory Hyperspace instance.
+`
+
+if (argv.help) {
+  console.error(help)
+  process.exit(0)
+}
+main().catch(onerror)
+
+
+async function main () {
+  if (!argv._.length) throw new Error('Must provide a script for the simulator to run.')
+  const scriptPath = p.resolve(argv._[0])
+  const simulatorId = `hyperspace-simulator-${process.pid}`
+  process.env.HYPERSPACE_SOCKET = simulatorId
+
+  const server = new Server({
+    host: simulatorId,
+    storage: ram,
+    noMigrate: true
+  })
+  await server.open()
+
+  process.once('SIGINT', close)
+  process.once('SIGTERM', close)
+
+  const childArgs = argv['--'] || []
+  const child = spawn(process.execPath, [scriptPath, ...childArgs], {
+    stdio: 'inherit'
+  })
+  child.on('close', close)
+
+  async function close () {
+    console.log('Shutting down simulator...')
+    server.close().catch(onerror)
+  }
+}
+
+function onerror (err) {
+  console.error(err.stack)
+  process.exit(1)
+}

package.json

@@ -4,7 +4,8 @@
   "description": "Hypercores, batteries included.",
   "main": "index.js",
   "bin": {
-    "hyperspace": "bin.js"
+    "hyperspace": "bin/index.js",
+    "hyperspace-simulator": "bin/simulator.js"
   },
   "directories": {
     "test": "test"