Move flat-file-db implementation to an adapter

Author: relekang

src/db.js

@@ -1,18 +1,11 @@
 const flatfile = require('flat-file-db')
 const promise = require('promise')
 
-const db = flatfile.sync(process.env.DB_NAME || 'views.db')
+const adapter = require('./flat-file-adapter');
 
-const promisifiedDb = {
-  // Promisify async operations
-  put: promise.denodeify(db.put.bind(db)),
-  del: promise.denodeify(db.del.bind(db)),
-  clear: promise.denodeify(db.clear.bind(db)),
-
-  get: db.get.bind(db),
-  has: db.has.bind(db),
-  keys: db.keys.bind(db),
-  close: db.close.bind(db),
+module.exports = {
+  get: adapter.get,
+  getAll: adapter.getAll,
+  put: adapter.put,
+  has: adapter.has,
 }
-
-module.exports = promisifiedDb

src/flat-file-adapter.js

@@ -0,0 +1,19 @@
+const flatfile = require('flat-file-db')
+const promise = require('promise')
+
+const db = flatfile.sync(process.env.DB_NAME || 'views.db')
+
+function getAll(options) {
+  const data = {};
+  const keys = db.keys()
+    .filter(key => String(options.filter) === 'false' ? true : key.startsWith(pathname));
+
+  return Promise.resolve(keys.map(key => db.get(key)));
+}
+
+module.exports = {
+  get: promise.denodeify(db.get.bind(db)),
+  put: promise.denodeify(db.put.bind(db)),
+  has: promise.denodeify(db.has.bind(db)),
+  getAll: getAll,
+}

src/index.js

@@ -9,12 +9,9 @@ module.exports = async function (req, res) {
   // Send all views down if "?all" is true
   if (String(query.all) === 'true') {
     const data = {
-      data: {},
+      data: await db.getAll(),
       time: Date.now()
     }
-    for (let key of db.keys().filter(key => String(query.filter) === 'false' ? true : key.startsWith(pathname))) {
-      data.data[key] = db.get(key)
-    }
     send(res, 200, data)
     return
   }
@@ -27,7 +24,7 @@ module.exports = async function (req, res) {
   }
   const shouldIncrement = String(query.inc) !== 'false'
   try {
-    const currentViews = db.has(pathname) ? db.get(pathname).views.length : 0
+    const currentViews = await db.has(pathname) ? (await db.get(pathname)).views.length : 0
     // Add a view and send the total views back to the client
     if (shouldIncrement) {
       await pushView(pathname, { time: Date.now() })

src/utils.js

@@ -10,8 +10,8 @@ const pushView = async (key, view) => {
     if (locks[key]) return setImmediate(async () => { await push() })
     locks[key] = true
 
-    const views = db.has(key)
-      ? db.get(key).views
+    const views = await db.has(key)
+      ? (await db.get(key)).views
       : []
 
     try {

tests/atomicity.test.js

@@ -1,7 +1,7 @@
 const request = require('request-promise')
 const { listen, mockDb } = require('./utils')
 
-jest.mock('../src/db', () => mockDb)
+jest.mock('../src/flat-file-adapter', () => mockDb)
 const service = require('../src')
 let url
 

tests/items.test.js

@@ -1,7 +1,7 @@
 const request = require('request-promise')
 const { listen, mockDb } = require('./utils')
 
-jest.mock('../src/db', () => mockDb)
+jest.mock('../src/flat-file-adapter', () => mockDb)
 const service = require('../src')
 let url
 

tests/utils.js

@@ -6,15 +6,24 @@ const DB = () => {
   let DELAY = 1
 
   return {
-    get: (key) => data[key],
+    get: (key) => new Promise((res, rej) => {
+      setTimeout(() => {
+        res(data[key])
+      }, DELAY)
+    }),
     put: (key, val) => new Promise((res, rej) => {
       setTimeout(() => {
         data[key] = val
         res()
       }, DELAY)
     }),
-    has: (key) => !!data[key],
-    keys: () => Object.keys(data),
+    has: (key) => new Promise((res, rej) => {
+      setTimeout(() => {
+        res(!!data[key])
+      }, DELAY)
+    }),
+    getAll: (options) => Object.assign({}, data),
+
     // Custom methods used in tests
     _reset: () => { data = {} },
     _setDelay: (ms) => { DELAY = ms || 1 }