@rpcbase/server 0.239.0 → 0.241.0

package/package.json

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

package/src/rpc/rpc_router.js

@@ -6,19 +6,24 @@ const debug = require("debug")
 
 const async_wrapper = require("../helpers/async_wrapper")
 
-const src_path = path.join(process.cwd(), "./src/")
+
+const log = debug("rb:rpc")
+
+const server_src_dir = path.join(process.cwd(), "./src/")
 const build_dir = path.join(process.cwd(), "build/")
+const client_dir = path.join(process.cwd(), "../../client/")
 
+const is_production = process.env.NODE_ENV === "production"
 
-const rpc_router = (app) => {
-  const rpc_routes = glob.sync(path.join(build_dir, "./rpc/*"))
 
-  // console.log("rpc_routes", rpc_routes)
+const setup_prod_rpc_routes = (app) => {
+  // the difference with the dev router is that routes are loaded at startup time, whereas in dev mode routes are resolved on each request
+  const rpc_routes = glob.sync(path.join(build_dir, "./client/rpc/*"))
 
   rpc_routes.forEach((file_path) => {
     const basename = path.basename(file_path)
     const route_path = basename.replace(/__slash__/g, "/")
-    const module_path = path.join(src_path, `${route_path}.js`)
+    const module_path = path.join(server_src_dir, `${route_path}.js`)
 
     // if module not found, remove created route file
     if (!fs.existsSync(module_path)) {
@@ -29,13 +34,41 @@ const rpc_router = (app) => {
     const rpc_fn = require(module_path)
     app.post(`/rpc/${route_path}`, async_wrapper(async(req, res) => {
 
-      console.log(`POST /rpc/${route_path}`)
+      log(`POST /rpc/${route_path}`)
 
       // TODO: add jaegerclient / opentelemetry
       const result = await rpc_fn(req.body, {req, res})
       res.json(result)
     }))
   })
+}
+
+
+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) => {
+    const route_path = req.params[0]
+
+    const module_path = path.join(server_src_dir, `${route_path}.js`)
+
+    const rpc_fn = require(module_path)
+    log(`POST /rpc/${route_path}`)
+
+    // TODO: add jaegerclient / opentelemetry
+    const result = await rpc_fn(req.body, {req, res})
+    res.json(result)
+  }))
+}
+
+
+const rpc_router = (app) => {
+
+  if (is_production) {
+    setup_prod_rpc_routes(app)
+  } else {
+    setup_dev_rpc_routes(app)
+  }
 
 }
 

package/admin/README.md

@@ -1 +0,0 @@
-admin middleware that exposes the local models, schemas etc

package/admin/index.js

@@ -1,43 +0,0 @@
-// /* @flow */
-// const fs = require("fs")
-// const path = require("path")
-// const glob = require("glob")
-// const debug = require("debug")
-//
-// const src_path = path.join(process.cwd(), "./src/")
-// const build_dir = path.join(process.cwd(), "build/")
-//
-//
-// const async_wrapper = fn => (req, res, next) => {
-//   Promise.resolve(fn(req, res, next))
-//     .catch(next)
-// }
-//
-//
-// const rpc_router = (app) => {
-//   const rpc_routes = glob.sync(path.join(build_dir, "./rpc/*"))
-//
-//   rpc_routes.forEach((file_path) => {
-//     const basename = path.basename(file_path)
-//     const route_path = basename.replace(/__slash__/g, "/")
-//     const module_path = path.join(src_path, `${route_path}.js`)
-//
-//     // if module not found, remove created route file
-//     if (!fs.existsSync(module_path)) {
-//       fs.unlinkSync(file_path)
-//       console.log("removed inexistant rpc route", basename, "with module path", module_path)
-//     }
-//
-//     const rpc_fn = require(module_path)
-//     app.post(`/rpc/${route_path}`, async_wrapper(async(req, res) => {
-//
-//       console.log(`POST /rpc/${route_path}`)
-//       // TODO: add jaegerclient / opentelemetry
-//       const result = await rpc_fn(req.body, {req})
-//       res.json(result)
-//     }))
-//   })
-//
-// }
-//
-// module.exports = rpc_router