Initialize db with correct adapter

Author: relekang

src/db.js

@@ -1,37 +1,33 @@
 const promise = require('promise')
-const Observable = require("zen-observable")
 
-let adapter
-const adapterName = `micro-analytics-adapter-${process.env.DB_ADAPTER || 'flat-file-db'}`
+function initDbAdapter(adapterName) {
+  let adapter
+  const repeatCharacter = (char, n) => `${Array(n + 1).join(char)}`
 
-const repeatCharacter = (char, n) => `${Array(n + 1).join(char)}`
-
-try {
-  adapter = require(adapterName)
-} catch (err) {
-  if (err.code === 'MODULE_NOT_FOUND') {
-    // Console.error a warning message, but normally exit the process to avoid printing ugly npm ERR lines and stack trace.
-    console.error(`\n${repeatCharacter(' ', 22)}⚠️ ERROR ⚠️\n${repeatCharacter('-', 55)}\nYou specified "${process.env.DB_ADAPTER}" as the DB_ADAPTER, but no package\ncalled "${adapterName}" was found.\n\nPlease make sure you spelled the name correctly and\nhave "npm install"ed the necessary adapter package!\n${repeatCharacter('-', 55)}\n`)
-    process.exit(0)
-  } else {
-    throw err
+  try {
+    adapter = require(`micro-analytics-adapter-${adapterName}`)
+  } catch (err) {
+    if (err.code === 'MODULE_NOT_FOUND') {
+      // Console.error a warning message, but normally exit the process to avoid printing ugly npm ERR lines and stack trace.
+      console.error(`\n${repeatCharacter(' ', 22)}⚠️ ERROR ⚠️\n${repeatCharacter('-', 55)}\nYou specified "${adapterName}" as the DB_ADAPTER, but no package\ncalled "micro-analytics-adapter-${adapterName}" was found.\n\nPlease make sure you spelled the name correctly and\nhave "npm install"ed the necessary adapter package!\n${repeatCharacter('-', 55)}\n`)
+      process.exit(0)
+    } else {
+      throw err
+    }
   }
-}
 
-const observable = new Observable((observer) => {
-  let timer = setInterval(_ => {
-    observer.next("hello")
-  }, 1000)
 
-  return _ => clearTimeout(timer)
-});
+  module.exports.get = adapter.get;
+  module.exports.getAll = adapter.getAll;
+  module.exports.put = adapter.put;
+  module.exports.has = adapter.has;
+  module.exports.keys = adapter.keys;
+  module.exports.subscribe = adapter.subscribe;
+  module.exports.hasFeature = (feature) => typeof adapter[feature] === "function";
 
+}
 
 module.exports = {
-  get: adapter.get,
-  getAll: adapter.getAll,
-  put: adapter.put,
-  has: adapter.has,
-  keys: adapter.keys,
-  subscribe: adapter.subscribe,
+  initDbAdapter: initDbAdapter,
+  hasFeature: (feature) => false,
 }

src/index.js

@@ -2,15 +2,16 @@ const micro = require('micro')
 const SSE = require('sse')
 const args = require('args');
 
-const handler = require('./handler')
-const sseHandler = require('./sse')
-
 const flags = args
   .option(['p', 'port'], 'Port to listen on', process.env.PORT || 3000, Number)
   .option(['H', 'host'], 'Host to listen on', '0.0.0.0')
   .option(['a', 'adapter'], 'Database adapter used', process.env.DB_ADAPTER || 'flat-file-db')
   .parse(process.argv, { name: 'micro-analytics' })
 
+const db = require('./db');
+db.initDbAdapter(flags.adapter)
+
+const handler = require('./handler')
 const server = micro(handler)
 const sse = new SSE(server)
 sse.on('connection', sseHandler)

src/sse.js

@@ -1,17 +1,11 @@
 const db = require('./db')
 
 module.exports = function handleSseConnection(connection) {
-  console.log('new connection')
   const subscription = db.subscribe((event) => {
-  console.log('new event', event)
-    connection.send({
-      event: 'new-event',
-      data: JSON.stringify(event),
-    })
+    connection.send({ event: 'new-event', data: JSON.stringify(event) })
   })
 
   connection.on('close', function () {
-    console.log('closing connection')
     subscription.unsubscribe()
   })
 }