clone and registryCache

src/cli/commands/daemon.js

@@ -1,18 +1,11 @@
 var Command = require('ronin').Command
-var mirror = require('./../../')
-var path = require('path')
+var regmirror = require('./../../index.js')
+var async = require('async')
 
 module.exports = Command.extend({
   desc: 'Mirror npm registry',
 
   options: {
-    folder: {
-      type: 'string',
-      default: path.join(process.cwd(), 'registry')
-    },
-    'blob-store': {
-      type: 'string'
-    },
     clone: {
       type: 'boolean',
       default: false
@@ -29,16 +22,19 @@ module.exports = Command.extend({
     }
   },
 
-  run: function (folder, blobStore, clone, port, host, logRoot) {
-    blobStore = path.resolve(__dirname, '../../ibs.js')
+  run: function (clone, port, host, logRoot) {
+    if (clone) {
+      regmirror.clone()
+    }
 
-    mirror({
-      outputDir: '/npm-registry/',
-      blobStore: blobStore,
-      clone: clone,
-      port: port,
-      host: host,
-      logRootPath: logRoot
+    async.series([
+      regmirror.registryCache.connect,
+      regmirror.registryCache.cacheRegistry
+    ], (err, results) => {
+      if (err) {
+        return console.log(err)
+      }
+      console.log('latest registry ->', results[1])
     })
   }
 })

src/cli/commands/ls.js

@@ -1,5 +1,5 @@
 var Command = require('ronin').Command
-var fetchIPNS = require('../../fetch-ipns')
+var fetchIPNS = require('../../index.js').registryCache
 var ipfsAPI = require('ipfs-api')
 var debug = require('debug')
 var log = debug('registry-mirror')

src/cli/commands/npm/update.js

@@ -1,5 +1,5 @@
 var Command = require('ronin').Command
-var fetchIPNS = require('../../../fetch-ipns')
+var fetchIPNS = require('../../../index.js').registryCache
 var ipfsAPI = require('ipfs-api')
 var debug = require('debug')
 var log = debug('registry-mirror')

src/clone-npm.js → src/clone.js

@@ -4,14 +4,13 @@ const debug = require('debug')
 const log = debug('registry-mirror')
 log.err = debug('registry-mirror:error')
 
-module.exports = (config) => {
+module.exports = () => {
   const opts = [
-    '-o', config.outputDir,
-    '-d', 'localhost'
+    '-o', '/npm-registry/',
+    '-d', 'localhost',
+    '--blobstore=' + path.resolve(__dirname, 'ibs.js')
   ]
 
-  if (config.blobStore) { opts.push('--blobstore=' + config.blobStore) }
-
   const rspath = path.resolve(require.resolve('registry-static'), '../../bin/registry-static')
   const child = spawn(rspath, opts, { stdio: 'inherit' })
 

src/config.js

@@ -0,0 +1,5 @@
+var ipfsAPI = require('ipfs-api')
+
+module.exports = {
+  apiCtl: ipfsAPI('/ip4/127.0.0.1/tcp/5001')
+}

src/index.js

@@ -1 +1,3 @@
 exports.mirror = require('./mirror')
+exports.clone = require('./clone')
+exports.registryCache = require('./registry-cache')

src/registry-cache.js

@@ -0,0 +1,48 @@
+const debug = require('debug')
+const log = debug('registry-mirror')
+const async = require('async')
+log.error = debug('registry-mirror:error')
+const config = require('./config')
+
+exports = module.exports
+
+exports.connect = (callback) => {
+  // TODO support connection to more than one node
+  // TODO check which nodes are missing from the list first
+  const updaterNodes = {
+    biham: '/ip4/188.40.114.11/tcp/4001/ipfs/QmZY7MtK8ZbG1suwrxc7xEYZ2hQLf1dAWPRHhjxC8rjq8E'
+  }
+
+  config.apiCtl.swarm.connect(updaterNodes.biham, callback)
+}
+
+exports.cacheRegistry = (callback) => {
+  var registry = '/ipns/QmZY7MtK8ZbG1suwrxc7xEYZ2hQLf1dAWPRHhjxC8rjq8E'
+
+  async.waterfall([
+    (cb) => {
+      config.apiCtl.name.resolve(registry, (err, res) => {
+        cb(err, res.Path)
+      })
+    },
+    config.apiCtl.cat,
+    (stream, cb) => {
+      config.apiCtl.block.put(stream, (err, res) => {
+        cb(err, '/ipfs/' + res.Key)
+      })
+    },
+    (ipfsHash, cb) => {
+      config.apiCtl.files.mv(['/npm-registry', '/npm-registry.bak-' + Date.now().toString()], (err) => {
+        cb(err, ipfsHash)
+      })
+    },
+    (ipfsHash, cb) => {
+      config.apiCtl.files.cp([ipfsHash, '/npm-registry'], (err) => {
+        cb(err, ipfsHash)
+      })
+    }
+  ], (err, ipfsHash) => {
+    callback(err, ipfsHash)
+  })
+}
+