Rename "roles" to "units". Put units in their own folders.

lib/units/app/middleware/appstore-icons.js

@@ -0,0 +1,12 @@
+var serveStatic = require('serve-static')
+
+var pathutil = require('../../../util/pathutil')
+
+module.exports = function() {
+  return serveStatic(
+    pathutil.root('node_modules/stf-appstore-db/dist')
+    , {
+      maxAge: '30d'
+    }
+  )
+}

lib/units/app/middleware/auth.js

@@ -0,0 +1,50 @@
+var jwtutil = require('../../../util/jwtutil')
+var urlutil = require('../../../util/urlutil')
+
+var dbapi = require('../../../db/api')
+
+module.exports = function(options) {
+  return function(req, res, next) {
+    if (req.query.jwt) {
+      // Coming from auth client
+      var data = jwtutil.decode(req.query.jwt, options.secret)
+        , redir = urlutil.removeParam(req.url, 'jwt')
+      if (data) {
+        // Redirect once to get rid of the token
+        dbapi.saveUserAfterLogin({
+            name: data.name
+          , email: data.email
+          , ip: req.ip
+          })
+          .then(function() {
+            req.session.jwt = data
+            res.redirect(redir)
+          })
+          .catch(next)
+      }
+      else {
+        // Invalid token, forward to auth client
+        res.redirect(options.authUrl)
+      }
+    }
+    else if (req.session && req.session.jwt) {
+      dbapi.loadUser(req.session.jwt.email)
+        .then(function(user) {
+          if (user) {
+            // Continue existing session
+            req.user = user
+            next()
+          }
+          else {
+            // We no longer have the user in the database
+            res.redirect(options.authUrl)
+          }
+        })
+        .catch(next)
+    }
+    else {
+      // No session, forward to auth client
+      res.redirect(options.authUrl)
+    }
+  }
+}

lib/units/app/middleware/browser-icons.js

@@ -0,0 +1,12 @@
+var serveStatic = require('serve-static')
+
+var pathutil = require('../../../util/pathutil')
+
+module.exports = function() {
+  return serveStatic(
+    pathutil.root('node_modules/stf-browser-db/dist')
+  , {
+      maxAge: '30d'
+    }
+  )
+}

lib/units/app/middleware/device-icons.js

@@ -0,0 +1,12 @@
+var serveStatic = require('serve-static')
+
+var pathutil = require('../../../util/pathutil')
+
+module.exports = function() {
+  return serveStatic(
+    pathutil.root('node_modules/stf-device-db/dist')
+  , {
+      maxAge: '30d'
+    }
+  )
+}

lib/units/app/middleware/webpack.js

@@ -0,0 +1,109 @@
+var path = require('path')
+var url = require('url')
+
+var webpack = require('webpack')
+var mime = require('mime')
+var Promise = require('bluebird')
+var _ = require('lodash')
+var MemoryFileSystem = require('webpack/node_modules/memory-fs')
+
+var logger = require('../../../util/logger')
+var lifecycle = require('../../../util/lifecycle')
+var globalOptions = require('../../../../webpack.config').webpack
+
+// Similar to webpack-dev-middleware, but integrates with our custom
+// lifecycle, behaves more like normal express middleware, and removes
+// all unnecessary features.
+module.exports = function(options) {
+  var log = logger.createLogger('middleware:webpack')
+  options = _.defaults(options || {}, globalOptions)
+
+  var compiler = webpack(options)
+  var fs = compiler.outputFileSystem = new MemoryFileSystem()
+
+  var valid = false
+  var queue = []
+
+  log.info('Creating bundle')
+  var watching = compiler.watch(options.watchDelay, function(err) {
+    if (err) {
+      log.fatal('Webpack had an error', err.stack)
+      lifecycle.fatal()
+    }
+  })
+
+  lifecycle.observe(function() {
+    if (watching.watcher) {
+      watching.watcher.close()
+    }
+  })
+
+  function doneListener(stats) {
+    process.nextTick(function() {
+      if (valid) {
+        log.info(stats.toString(options.stats))
+
+        if (stats.hasErrors()) {
+          log.error('Bundle has errors')
+        }
+        else if (stats.hasWarnings()) {
+          log.warn('Bundle has warnings')
+        }
+        else {
+          log.info('Bundle is now valid')
+        }
+
+        queue.forEach(function(resolver) {
+          resolver.resolve()
+        })
+      }
+    })
+
+    valid = true
+  }
+
+  function invalidate() {
+    if (valid) {
+      log.info('Bundle is now invalid')
+      valid = false
+    }
+  }
+
+  compiler.plugin('done', doneListener)
+  compiler.plugin('invalid', invalidate)
+  compiler.plugin('compile', invalidate)
+
+  function bundle() {
+    if (valid) {
+      return Promise.resolve()
+    }
+    else {
+      log.info('Waiting for bundle to finish')
+      var resolver = Promise.defer()
+      queue.push(resolver)
+      return resolver.promise
+    }
+  }
+
+  return function(req, res, next) {
+    var parsedUrl = url.parse(req.url)
+
+    var target = path.join(
+      compiler.outputPath
+    , parsedUrl.pathname
+    )
+
+    bundle()
+      .then(function() {
+        try {
+          var body = fs.readFileSync(target)
+          res.set('Content-Type', mime.lookup(target))
+          res.end(body)
+        }
+        catch (err) {
+          return next()
+        }
+      })
+      .catch(next)
+  }
+}