@rpcbase/server 0.240.0 → 0.242.0

package/cli/run_docker.js

@@ -42,6 +42,8 @@ const run_docker = async(infrastructure_dir, proj_prefix, args) => {
     ps_env.RB_SESSION_STORE = "yes"
   }
 
+  console.log("SERVER START WITH SESSIONS DOCKER")
+
   // WARNING: blocks the process
   // this is the only way to have docker-compose shut down gracefully
   execSync(`${cmd} ${cmd_args.join(" ")}`, {

package/package.json

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

package/src/rpc/rpc_router.js

@@ -7,19 +7,23 @@ 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 log = debug("rb:rpc")
+const is_production = process.env.NODE_ENV === "production"
 
 
-const rpc_router = (app) => {
+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)) {
@@ -37,6 +41,34 @@ const rpc_router = (app) => {
       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/src/sessions/index.js

@@ -7,6 +7,8 @@ const is_development = process.env.NODE_ENV === "development"
 module.exports = (app) => {
   const has_session_store = process.env.RB_SESSION_STORE === "yes"
 
+  console.log("WOWOWOW", process.env)
+
   if (has_session_store) {
     console.log("using", pc.bold(pc.green("SESSION STORE")))
 

package/src/sessions/warning_proxy_middleware.js

@@ -8,7 +8,7 @@ const warning_proxy_middleware = (req, res, next) => {
   const {host} = req.headers
 
   if (!suppress_warning && host.startsWith("localhost:")) {
-    console.warn("are you running with the proxy address ? you shouldn't be using localhost when you are running the app with the reverse proxyy")
+    console.warn("are you running with the proxy address ? you shouldn't be using localhost when you are running the app with the reverse proxyy22")
   }
 
   next()

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