fix: dont spawn node for local ops (#110)

fsdiogo · achingbrain · commit 36f4e8f06955 · 2019-06-04T18:11:34.000+01:00
* chore: remove unneeded asyncs

* fix: dont spawn node for local ops
diff --git a/src/core/commands/proxy.js b/src/core/commands/proxy.js
@@ -1,15 +1,10 @@
 'use strict'
 
 const config = require('../config')
-const startIpfs = require('./start-ipfs')
 const startServer = require('./start-server')
 const rewriteLockfile = require('./rewrite-lock-file')
-const request = require('ipfs-registry-mirror-common/utils/retry-request')
-const {
-  spawn
-} = require('child_process')
+const { spawn } = require('child_process')
 const which = require('which-promise')
-const timeout = require('ipfs-registry-mirror-common/utils/timeout-promise')
 
 const cleanUpOps = []
 
@@ -28,44 +23,9 @@ process.on('SIGINT', cleanUp)
 module.exports = async (options) => {
   options = config(options)
 
-  const ipfs = await startIpfs(options)
-
-  cleanUpOps.push(() => {
-    return new Promise((resolve) => {
-      if (options.ipfs.node !== 'proc') {
-        return resolve()
-      }
-
-      ipfs.stop(() => {
-        console.info('👿 IPFS node stopped') // eslint-disable-line no-console
-        resolve()
-      })
-    })
-  })
-
-  console.info('🗂️  Loading registry index from', options.registry) // eslint-disable-line no-console
-
-  try {
-    const mirror = await request(Object.assign({}, options.request, {
-      uri: options.registry,
-      json: true
-    }))
-
-    console.info('☎️  Dialling registry mirror', mirror.ipfs.addresses.join(',')) // eslint-disable-line no-console
-
-    await timeout(
-      ipfs.api.swarm.connect(mirror.ipfs.addresses[0]),
-      options.registryConnectTimeout
-    )
-
-    console.info('📱️ Connected to registry') // eslint-disable-line no-console
-  } catch (error) {
-    console.info('📴 Not connected to registry') // eslint-disable-line no-console
-  }
-
   console.info('👩‍🚀 Starting local proxy') // eslint-disable-line no-console
 
-  const server = await startServer(options, ipfs.api)
+  const server = await startServer(options)
 
   cleanUpOps.push(() => {
     return new Promise((resolve) => {
diff --git a/src/core/commands/start-ipfs.js b/src/core/commands/start-ipfs.js
@@ -21,7 +21,7 @@ const spawn = (createArgs, spawnArgs = { init: true }) => {
 
 const startIpfs = async (config) => {
   if (config.ipfs.node === 'proc') {
-    console.info(`👿 Spawning an in-process IPFS node using repo at ${config.ipfs.repo}`) // eslint-disable-line no-console
+    console.info(`😈 Spawning an in-process IPFS node using repo at ${config.ipfs.repo}`) // eslint-disable-line no-console
 
     const node = await spawn({
       type: 'proc',
@@ -31,46 +31,40 @@ const startIpfs = async (config) => {
       repoPath: config.ipfs.repo
     })
 
-    return new Promise(async (resolve, reject) => {
-      try {
-        const initalise = promisify(node.init.bind(node))
-        const start = promisify(node.start.bind(node))
+    const initalise = promisify(node.init.bind(node))
+    const start = promisify(node.start.bind(node))
 
-        if (!node.initialized) {
-          await initalise()
-        }
+    if (!node.initialized) {
+      await initalise()
+    }
 
-        await start()
+    await start()
 
-        resolve(node)
-      } catch (error) {
-        reject(error)
-      }
-    })
+    return node
   } else if (config.ipfs.node === 'disposable') {
-    console.info('👿 Spawning an in-process disposable IPFS node') // eslint-disable-line no-console
+    console.info('😈 Spawning an in-process disposable IPFS node') // eslint-disable-line no-console
 
     return spawn({
       type: 'proc',
       exec: require('ipfs')
     })
   } else if (config.ipfs.node === 'js') {
-    console.info('👿 Spawning a js-IPFS node') // eslint-disable-line no-console
+    console.info('😈 Spawning a js-IPFS node') // eslint-disable-line no-console
 
     return spawn({
       type: 'js',
       exec: await which('jsipfs')
     })
   } else if (config.ipfs.node === 'go') {
-    console.info('👿 Spawning a go-IPFS node') // eslint-disable-line no-console
+    console.info('😈 Spawning a go-IPFS node') // eslint-disable-line no-console
 
     return spawn({
       type: 'go',
       exec: await which('ipfs')
     })
   }
 
-  console.info(`👿 Connecting to a remote IPFS node at ${config.ipfs.node}`) // eslint-disable-line no-console
+  console.info(`😈 Connecting to a remote IPFS node at ${config.ipfs.node}`) // eslint-disable-line no-console
 
   return {
     api: new IpfsApi(config.ipfs.node),
diff --git a/src/core/commands/start-server.js b/src/core/commands/start-server.js
@@ -9,20 +9,21 @@ const favicon = require('ipfs-registry-mirror-common/handlers/favicon')
 const root = require('../handlers/root')
 const tarball = require('../handlers/tarball')
 const manifest = require('../handlers/manifest')
+const getIpfs = require('../middlewares/getIpfs')
 
-const startServer = (config, ipfs) => {
+const startServer = (config) => {
   const app = express()
 
   app.use(requestLog)
 
-  app.get('/favicon.ico', favicon(config, ipfs, app))
-  app.get('/favicon.png', favicon(config, ipfs, app))
+  app.get('/favicon.ico', favicon(config, app))
+  app.get('/favicon.png', favicon(config, app))
 
-  app.get('/', root(config, ipfs, app))
+  app.get('/', getIpfs(config), root(config, app))
 
   // intercept requests for tarballs and manifests
-  app.get('/*.tgz', tarball(config, ipfs, app))
-  app.get('/*', manifest(config, ipfs, app))
+  app.get('/*.tgz', getIpfs(config), tarball(config, app))
+  app.get('/*', getIpfs(config), manifest(config, app))
 
   // everything else should just proxy for the registry
   const registry = proxy(config.registry, {
@@ -35,9 +36,7 @@ const startServer = (config, ipfs) => {
 
   app.use(errorLog)
 
-  app.locals.ipfs = ipfs
-
-  return new Promise(async (resolve, reject) => {
+  return new Promise((resolve, reject) => {
     const callback = once((error) => {
       if (error) {
         reject(error)
diff --git a/src/core/handlers/manifest.js b/src/core/handlers/manifest.js
@@ -22,16 +22,18 @@ const replaceTarballUrls = (pkg, config) => {
   return pkg
 }
 
-module.exports = (config, ipfs, app) => {
+module.exports = (config, app) => {
   return async (request, response, next) => {
     log(`Requested ${request.path}`)
 
     let moduleName = sanitiseName(request.path)
 
     log(`Loading manifest for ${moduleName}`)
 
+    const ipfs = response.locals.ipfs
+
     try {
-      const manifest = await loadManifest(config, ipfs, moduleName)
+      const manifest = await loadManifest(config, ipfs.api, moduleName)
 
       // because we start the server on a random high port, the previously stored
       // manifests may have port numbers from the last time we ran, so overwrite
diff --git a/src/core/handlers/tarball.js b/src/core/handlers/tarball.js
@@ -5,16 +5,18 @@ const path = require('path')
 const loadTarball = require('ipfs-registry-mirror-common/utils/load-tarball')
 const lol = require('ipfs-registry-mirror-common/utils/error-message')
 
-module.exports = (config, ipfs, app) => {
+module.exports = (config, app) => {
   return async (request, response, next) => {
     log(`Requested ${request.path}`)
 
     let file = request.path
 
     log(`Loading ${file}`)
 
+    const ipfs = response.locals.ipfs
+
     try {
-      const readStream = await loadTarball(config, ipfs, file)
+      const readStream = await loadTarball(config, ipfs.api, file)
 
       readStream.on('error', (error) => {
         log(`Error loading ${file} - ${error}`)
diff --git a/src/core/middlewares/getIpfs.js b/src/core/middlewares/getIpfs.js
@@ -0,0 +1,77 @@
+'use strict'
+
+const startIpfs = require('../commands/start-ipfs')
+const request = require('ipfs-registry-mirror-common/utils/retry-request')
+const timeout = require('ipfs-registry-mirror-common/utils/timeout-promise')
+
+const cleanUpOps = []
+
+const cleanUp = async () => {
+  Promise.all(
+    cleanUpOps.map(op => op())
+  )
+    .then(() => {
+      process.exit(0)
+    })
+}
+
+process.on('SIGTERM', cleanUp)
+process.on('SIGINT', cleanUp)
+
+const ipfsInstance = (function() {
+  let ipfs = null
+
+  return {
+    get: () => ipfs,
+    set: (instance) => { ipfs = instance }
+  }
+}())
+
+module.exports = (options) => {
+  return async (req, res, next) => {
+    if (ipfsInstance.get() !== null) {
+      res.locals.ipfs = ipfsInstance.get()
+      return next()
+    }
+
+    const ipfs = await startIpfs(options)
+
+    cleanUpOps.push(() => {
+      return new Promise((resolve) => {
+        if (options.ipfs.node !== 'proc') {
+          return resolve()
+        }
+
+        ipfs.stop(() => {
+          console.info('😈 IPFS node stopped') // eslint-disable-line no-console
+          ipfsInstance.set(null)
+          resolve()
+        })
+      })
+    })
+
+    console.info('🗂️  Loading registry index from', options.registry) // eslint-disable-line no-console
+
+    try {
+      const mirror = await request(Object.assign({}, options.request, {
+        uri: options.registry,
+        json: true
+      }))
+
+      console.info('☎️  Dialling registry mirror', mirror.ipfs.addresses.join(',')) // eslint-disable-line no-console
+
+      await timeout(
+        ipfs.api.swarm.connect(mirror.ipfs.addresses[0]),
+        options.registryConnectTimeout
+      )
+
+      console.info('📱️ Connected to registry') // eslint-disable-line no-console
+    } catch (error) {
+      console.info('📴 Not connected to registry') // eslint-disable-line no-console
+    }
+
+    ipfsInstance.set(ipfs)
+    res.locals.ipfs = ipfs
+    next()
+  }
+}
