Merge branch 'master' into i#1203MainNetSwitch

2 files changed, 77 insertions, 0 deletions

diff --git a/mascara/server/index.js b/mascara/server/index.js
new file mode 100644
index 000000000..14e3fa18e
--- /dev/null
+++ b/mascara/server/index.js
@@ -0,0 +1,32 @@
+const express = require('express')
+const createBundle = require('./util').createBundle
+const serveBundle = require('./util').serveBundle
+
+module.exports = createMetamascaraServer
+
+
+function createMetamascaraServer(){
+
+  // start bundlers
+  const metamascaraBundle = createBundle(__dirname + '/../src/mascara.js')
+  const proxyBundle = createBundle(__dirname + '/../src/proxy.js')
+  const uiBundle = createBundle(__dirname + '/../src/ui.js')
+  const backgroundBuild = createBundle(__dirname + '/../src/background.js')
+
+  // serve bundles
+  const server = express()
+  // ui window
+  serveBundle(server, '/ui.js', uiBundle)
+  server.use(express.static(__dirname+'/../ui/'))
+  server.use(express.static(__dirname+'/../../dist/chrome'))
+  // metamascara
+  serveBundle(server, '/metamascara.js', metamascaraBundle)
+  // proxy
+  serveBundle(server, '/proxy/proxy.js', proxyBundle)
+  server.use('/proxy/', express.static(__dirname+'/../proxy'))
+  // background
+  serveBundle(server, '/background.js', backgroundBuild)
+
+  return server
+
+}
diff --git a/mascara/server/util.js b/mascara/server/util.js
new file mode 100644
index 000000000..6e25b35d8
--- /dev/null
+++ b/mascara/server/util.js
@@ -0,0 +1,45 @@
+const browserify = require('browserify')
+const watchify = require('watchify')
+
+module.exports = {
+  serveBundle,
+  createBundle,
+}
+
+
+function serveBundle(server, path, bundle){
+  server.get(path, function(req, res){
+    res.setHeader('Content-Type', 'application/javascript; charset=UTF-8')
+    res.send(bundle.latest)
+  })
+}
+
+function createBundle(entryPoint){
+
+  var bundleContainer = {}
+
+  var bundler = browserify({
+    entries: [entryPoint],
+    cache: {},
+    packageCache: {},
+    plugin: [watchify],
+  })
+
+  bundler.on('update', bundle)
+  bundle()
+
+  return bundleContainer
+
+  function bundle() {
+    bundler.bundle(function(err, result){
+      if (err) {
+        console.log(`Bundle failed! (${entryPoint})`)
+        console.error(err)
+        return
+      }
+      console.log(`Bundle updated! (${entryPoint})`)
+      bundleContainer.latest = result.toString()
+    })
+  }
+
+}