Make server component separate and this module just install npm deps

README.md

@@ -1,6 +1,6 @@
 # npm on IPFS
 
-![Alt text](./img/npm-on-ipfs.svg)
+![npm on IPFS logo](./img/npm-on-ipfs.svg)
 
 [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](https://protocol.ai)
 [![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io/)
@@ -11,6 +11,8 @@
 
 > Install your favourite modules from the Distributed Web using IPFS. Have a cache always ready and share them in all your local networks.
 
+![npm distributed on top of lots of connected IPFS nodes worldwide](/img/ip-npm-small.png)
+
 ## Resources
 
 - [The original demo video](https://vimeo.com/147968322)
@@ -29,12 +31,14 @@
 
 # Usage
 
-Run the `ipfs-npm` command in the directory with your `package.json` and it will pull your dependencies from ipfs!
+`ipfs-npm` wraps your chosen package manager (e.g. npm or yarn) with configuration to use IPFS to retrieve your dependences instead of over HTTP from the central npm registry.
+
+In the directory with your `package.json` file, run:
 
 ```bash
-$ ipfs-npm
+$ ipfs-npm install
 👿 Spawning an in-process IPFS node
-🗑️ Replacing old registry index if it exist
+🗑️ Replacing old registry index if it exists
 ☎️ Dialing replication master /ip4/127.0.0.1/tcp/40020/ipfs/QmeXyYCLSivUn5Ju31jjPBYNKdncbzzEf6zdN2DyrdLAbe
 📠 Copying registry index /ipfs/QmQmVsNFw3stJky7agrETeB9kZqkcvLSLRnFFMrhiR8zG1 to /npm-registry
 👩‍🚀 Starting local proxy

package.json

@@ -38,7 +38,7 @@
     "express": "^4.16.4",
     "express-http-proxy": "^1.4.0",
     "ipfs": "~0.32.3",
-    "ipfs-api": "^24.0.2",
+    "ipfs-api": "^25.0.0",
     "ipfsd-ctl": "~0.39.2",
     "once": "^1.4.0",
     "output-buffer": "^1.2.0",
@@ -54,7 +54,7 @@
     "dirty-chai": "^2.0.1",
     "mock-require": "^3.0.2",
     "npm-run-all": "^4.1.3",
-    "sinon": "^6.1.5"
+    "sinon": "^7.0.0"
   },
   "contributors": [
     "Danny Arnold <despair.blue@gmail.com>",

src/core/index.js

@@ -11,9 +11,12 @@ var OutputBuffer = require('output-buffer')
 const cleanUpOps = []
 
 const cleanUp = async () => {
-  return Promise.all(
+  Promise.all(
     cleanUpOps.map(op => op())
   )
+    .then(() => {
+      process.exit(0)
+    })
 }
 
 process.on('SIGTERM', cleanUp)
@@ -33,6 +36,8 @@ module.exports = async (options) => {
     })
   })
 
+  console.info('👂 Loading replication master id from', options.ipfs.index) // eslint-disable-line no-console
+
   const master = await request(Object.assign({}, options.request, {
     url: options.ipfs.index,
     json: true
@@ -48,7 +53,9 @@ module.exports = async (options) => {
         .then(() => {
           connected = true
         })
-        .catch(() => {})
+        .catch((error) => {
+          console.info(error)
+        })
     })
   )
 
@@ -66,6 +73,8 @@ module.exports = async (options) => {
     console.info('📠 Copying registry index', master.root, 'to', options.ipfs.prefix) // eslint-disable-line no-console
 
     await ipfs.api.files.cp(master.root, options.ipfs.prefix)
+
+    console.info('💌 Copied registry index', master.root, 'to', options.ipfs.prefix) // eslint-disable-line no-console
   } else {
     console.info('⚰️  Could not dial master, running without latest registry index') // eslint-disable-line no-console
   }
@@ -87,7 +96,9 @@ module.exports = async (options) => {
 
   console.info(`🎁 Installing dependencies with ${packageManager}`) // eslint-disable-line no-console
 
-  const proc = spawn(packageManager, ['install', `--registry=http://localhost:${options.http.port}`, '--loglevel=http'])
+  const proc = spawn(packageManager, [
+    `--registry=http://localhost:${options.http.port}`
+  ].concat(process.argv.slice(2)))
 
   const buffer = new OutputBuffer((line) => {
     console.info(`🐨 ${line}`) // eslint-disable-line no-console

src/core/start-ipfs.js

@@ -46,7 +46,10 @@ const startIpfs = async (config) => {
 
   console.info(`👿 Connecting to a remote IPFS node at ${config.ipfs.node}`) // eslint-disable-line no-console
 
-  return new IpfsApi(config.ipfs.node)
+  return {
+    api: new IpfsApi(config.ipfs.node),
+    stop: (cb) => cb()
+  }
 }
 
 module.exports = startIpfs