feat(data-point-express): migrate to use async/await (#443)

re #434
ViacomInc · Oct 22, 2019 · ed41ea9 · ed41ea9
1 parent ca7d270
commit ed41ea9
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 26 deletions.
diff --git a/packages/data-point-express/lib/factory.js b/packages/data-point-express/lib/factory.js
@@ -27,13 +27,14 @@ function createMiddleware(service) {
   });
 }
 
-function create(options) {
+async function create(options) {
   const dpInjection = {
     DataPoint
   };
   const dpOptions = Object.assign({}, options, dpInjection);
 
-  return Service.create(dpOptions).then(createMiddleware);
+  const service = await Service.create(dpOptions);
+  return createMiddleware(service);
 }
 
 module.exports = {

diff --git a/packages/data-point-express/lib/factory.test.js b/packages/data-point-express/lib/factory.test.js
@@ -14,7 +14,7 @@ jest.mock("../../data-point-cache/lib/io-redis", () => {
 describe("create - all middleware", () => {
   let service;
   const consoleWarn = console.warn;
-  beforeAll(() => {
+  beforeAll(async () => {
     console.warn = () => {};
     const options = {
       entities: {
@@ -23,9 +23,7 @@ describe("create - all middleware", () => {
         })
       }
     };
-    return Factory.create(options).then(dpService => {
-      service = dpService;
-    });
+    service = await Factory.create(options);
   });
 
   afterAll(() => {

diff --git a/packages/data-point-express/lib/inspector-middleware.js b/packages/data-point-express/lib/inspector-middleware.js
@@ -33,10 +33,9 @@ function create(dataPoint) {
   const router = Express.Router();
 
   router.use(bodyParser.json());
-  router.get("/", (req, res) => {
-    InspectorUi.getInspector().then(html => {
-      res.send(html);
-    });
+  router.get("/", async (req, res) => {
+    const html = await InspectorUi.getInspector();
+    res.send(html);
   });
 
   router.post("/", (req, res, next) => {

diff --git a/packages/data-point-express/lib/inspector-ui/inspector-ui.js b/packages/data-point-express/lib/inspector-ui/inspector-ui.js
@@ -1,8 +1,8 @@
 const fs = require("fs");
 const path = require("path");
-const Promise = require("bluebird");
+const util = require("util");
 
-const readFile = Promise.promisify(fs.readFile);
+const readFile = util.promisify(fs.readFile);
 
 function getInspector() {
   return readFile(path.resolve(__dirname, "inspect.html"), "utf8");

diff --git a/packages/data-point-express/lib/middleware.js b/packages/data-point-express/lib/middleware.js
@@ -42,20 +42,23 @@ function createErrorMessage(err) {
   };
 }
 
-function resolveReducer(dataPoint, reducer, options, res, initialValue = {}) {
-  dataPoint
-    .transform(reducer, initialValue, options)
-    .then(acc => {
-      if (typeof acc.value === "string") {
-        res.send(acc.value);
-        return;
-      }
-      res.json(acc.value);
-    })
-    .catch(err => {
-      res.status(400).send(createErrorMessage(err));
-    })
-    .done();
+async function resolveReducer(
+  dataPoint,
+  reducer,
+  options,
+  res,
+  initialValue = {}
+) {
+  try {
+    const acc = await dataPoint.transform(reducer, initialValue, options);
+    if (typeof acc.value === "string") {
+      res.send(acc.value);
+      return;
+    }
+    res.json(acc.value);
+  } catch (error) {
+    res.status(400).send(createErrorMessage(error));
+  }
 }
 
 module.exports = {