@rpcbase/server 0.326.0 → 0.328.0

package/database.js

@@ -47,8 +47,7 @@ const get_mongo_url = () => {
 }
 
 
-// TODO: handle multiple databases, remove RB_APP_NAME env ??
-module.exports = async(...database_names) => {
+module.exports = async() => {
   // set listeners before attempting to connect
   mongoose.connection.on("connected", () => {
     console.log("mongoose connected")

package/express/index.js

@@ -12,6 +12,7 @@ const sessions = require("../src/sessions")
 
 const dev_save_coverage = require("./dev_save_coverage")
 const custom_cors = require("./custom_cors")
+const setup_handlers = require("./setup_handlers")
 
 
 const log = debug("rb:server")
@@ -33,6 +34,9 @@ module.exports = () => {
 
   const app = express()
 
+  setup_handlers(app)
+
+
   if (has_sentry && is_production) {
     Sentry.init({
       dsn: SENTRY_DSN,

package/express/setup_handlers.js

@@ -0,0 +1,46 @@
+/* @flow */
+
+const setup_handlers = (app) => {
+  const original_get = app.get.bind(app)
+  const original_post = app.post.bind(app)
+
+  // function to sequentially execute handlers
+  function apply_handlers(handlers, req, res, next) {
+    const handler = handlers.shift()
+    if (handler) {
+      Promise.resolve(handler(req, res, function(err) {
+        if (err) {
+          return next(err)
+        }
+        apply_handlers(handlers, req, res, next)
+      })).catch(next)
+    } else {
+      next()
+    }
+  }
+
+  // app.get
+  app.get = function (path, ...handlers) {
+    original_get(path, (req, res, next) => apply_handlers([...handlers], req, res, next))
+  }
+
+  // app.post
+  app.post = function (path, ...handlers) {
+    original_post(path, (req, res, next) => apply_handlers([...handlers], req, res, next))
+  }
+
+  // app.handler
+  app.handler = (path, fn) => {
+    app.post(path, async (req, res, next) => {
+      try {
+        const result = await fn(req.body, {req, res})
+        res.json(result)
+      } catch (err) {
+        next(err)
+      }
+    })
+  }
+
+}
+
+module.exports = setup_handlers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.326.0",
+  "version": "0.328.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {

package/src/api/stored-values/index.js

@@ -1,10 +1,8 @@
 /* @flow */
-const handler_wrapper = require("../../helpers/handler_wrapper")
-
 const get_stored_values = require("./get_stored_values")
 const set_stored_values = require("./set_stored_values")
 
 module.exports = (app) => {
-  app.post("/api/v1/stored-values/get", handler_wrapper(get_stored_values))
-  app.post("/api/v1/stored-values/set", handler_wrapper(set_stored_values))
+  app.handler("/api/v1/stored-values/get", get_stored_values)
+  app.handler("/api/v1/stored-values/set", set_stored_values)
 }

package/src/auth/index.js

@@ -1,7 +1,4 @@
 /* @flow */
-const async_wrapper = require("../helpers/async_wrapper")
-const handler_wrapper = require("../helpers/handler_wrapper")
-
 const sign_up = require("./sign_up")
 const sign_in = require("./sign_in")
 const sign_out = require("./sign_out")
@@ -14,14 +11,14 @@ const get_account = require("./get_account")
 
 
 module.exports = (app) => {
-  app.post("/api/v1/auth/sign_in", handler_wrapper(sign_in))
-  app.post("/api/v1/auth/sign_out", handler_wrapper(sign_out))
+  app.handler("/api/v1/auth/sign_in", sign_in)
+  app.handler("/api/v1/auth/sign_out", sign_out)
 
-  app.post("/api/v1/auth/reset_password", handler_wrapper(reset_password))
-  app.post("/api/v1/auth/set_new_password", handler_wrapper(set_new_password))
+  app.handler("/api/v1/auth/reset_password", reset_password)
+  app.handler("/api/v1/auth/set_new_password", set_new_password)
 
-  app.post("/api/v1/auth/check_session", handler_wrapper(check_session))
+  app.handler("/api/v1/auth/check_session", check_session)
 
-  app.post("/api/v1/auth/get_account", handler_wrapper(get_account))
-  app.post("/api/v1/auth/get_accounts", handler_wrapper(get_accounts))
+  app.handler("/api/v1/auth/get_account", get_account)
+  app.handler("/api/v1/auth/get_accounts", get_accounts)
 }

package/src/client/client_router.js

@@ -5,8 +5,6 @@ const path = require("path")
 const glob = require("glob")
 const Sentry = require("@sentry/node")
 
-const async_wrapper = require("../helpers/async_wrapper")
-
 
 const MIME_TYPES = {
   ".css": "text/css",
@@ -64,7 +62,7 @@ const client_router = (app) => {
   if (fs.existsSync(index_file_path)) {
     const index_file_buffer = fs.readFileSync(index_file_path)
 
-    app.get("*", async_wrapper(async(req, res, next) => {
+    app.get("*", async(req, res, next) => {
       const full_path = req.baseUrl + req.path
 
       // TODO: this shouldn't be here,
@@ -83,7 +81,7 @@ const client_router = (app) => {
         })
         res.end(index_file_buffer)
       }
-    }))
+    })
   }
   // register final error handlers
 

package/src/rpc/rpc_router.js

@@ -4,8 +4,6 @@ const path = require("path")
 const glob = require("glob")
 const debug = require("debug")
 
-const async_wrapper = require("../helpers/async_wrapper")
-
 
 const log = debug("rb:rpc")
 
@@ -32,14 +30,14 @@ const setup_prod_rpc_routes = (app) => {
     }
 
     const rpc_fn = require(module_path)
-    app.post(`/rpc/${route_path}`, async_wrapper(async(req, res) => {
+    app.post(`/rpc/${route_path}`, async(req, res) => {
 
       log(`POST /rpc/${route_path}`)
 
       // TODO: add jaegerclient / opentelemetry
       const result = await rpc_fn(req.body, {req, res})
       res.json(result)
-    }))
+    })
   })
 }
 
@@ -47,7 +45,7 @@ const setup_prod_rpc_routes = (app) => {
 const setup_dev_rpc_routes = (app) => {
   const rpc_routes = glob.sync(path.join(client_dir, "./build/rpc/*"))
 
-  app.post("/rpc/*", async_wrapper(async(req, res) => {
+  app.post("/rpc/*", async(req, res) => {
     const route_path = req.params[0]
 
     const module_path = path.join(server_src_dir, `${route_path}.js`)
@@ -58,7 +56,7 @@ const setup_dev_rpc_routes = (app) => {
     // TODO: add jaegerclient / opentelemetry
     const result = await rpc_fn(req.body, {req, res})
     res.json(result)
-  }))
+  })
 }
 
 

package/src/helpers/async_wrapper.js

@@ -1,8 +0,0 @@
-/* @flow */
-
-const async_wrapper = fn => (req, res, next) => {
-  Promise.resolve(fn(req, res, next))
-    .catch(next)
-}
-
-module.exports = async_wrapper

package/src/helpers/handler_wrapper.js

@@ -1,11 +0,0 @@
-/* @flow */
-const async_wrapper = require("./async_wrapper")
-
-
-const handler_wrapper = (fn) =>
-  async_wrapper(async(req, res) => {
-    const result = await fn(req.body, {req, res})
-    res.json(result)
-  })
-
-module.exports = handler_wrapper