@rpcbase/server 0.343.0 → 0.345.0

package/express/index.js

@@ -30,7 +30,7 @@ const BODY_MAX_SIZE_MB = 80
 
 log("server is production:", JSON.stringify(is_production))
 
-module.exports = () => {
+module.exports = async() => {
 
   const app = express()
 
@@ -77,7 +77,7 @@ module.exports = () => {
 
   custom_cors(app)
 
-  sessions(app)
+  await sessions(app)
 
   const pong_res = {app: `app_name:${JSON.stringify(process.env.RB_APP_NAME)}`, message: "pong"}
   app.get("/__ping", (req, res) => res.json(pong_res))

package/express/setup_handlers.js

@@ -31,9 +31,12 @@ const setup_handlers = (app) => {
 
   // app.handler
   app.handler = (path, fn) => {
+
+    const resolved_fn = typeof fn === "function" ? fn : fn.default
+
     app.post(path, async (req, res, next) => {
       try {
-        const result = await fn(req.body, {req, res})
+        const result = await resolved_fn(req.body, {req, res})
         res.json(result)
       } catch (err) {
         next(err)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.343.0",
+  "version": "0.345.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "scripts": {

package/src/sessions/{session_store_middleware.js → get_session_store_middleware.js}

@@ -9,9 +9,10 @@ const RedisStore = require("connect-redis").default
 const is_docker = require("@rpcbase/std/is_docker")
 
 
-const {SESSION_STORE_PORT, APP_DOMAIN} = process.env
+const {NODE_ENV, SESSION_STORE_PORT, APP_DOMAIN} = process.env
 assert(SESSION_STORE_PORT, "SESSION_STORE_PORT is undefined")
 
+const is_production = NODE_ENV === "production"
 
 const log = debug("rb:session")
 // log.useColors = true
@@ -28,11 +29,12 @@ const hostname = is_docker() ? "session-store" : "127.0.0.1"
 
 console.log("session-store hostname", hostname, "port", SESSION_STORE_PORT)
 
-let session_middleware = null
 
-// EXTREME WARNING: docker issue
-// when there is synchronous io redis client fails to connect
-setTimeout(async() => {
+const get_session_store_middleware = async() => {
+  if (is_production) {
+    throw new Error("SESSION STORE MIDDLEWARE CANNOT BE USED IN PRODUCTION")
+  }
+
   const reconnectStrategy = (retries) => {
     log("redis_client::reconnectStrategy::retrying with arg", retries)
     if (retries < 5) {
@@ -65,7 +67,7 @@ setTimeout(async() => {
     proxy: true,
     saveUninitialized: true,
     // WARNING DO NOT USE IN PROD
-    secret: "NOT_A_SECRET_BECAUSE_THIS_MIDDLEWARE_IS_NOT_MEANT_TO_BE_USED_IN_PROD",
+    secret: "__NOT_A_SECRET_BECAUSE_THIS_MIDDLEWARE_IS_NOT_MEANT_TO_BE_USED_IN_PROD__",
     resave: true,
     cookie: {
       // TODO: set to secure in production
@@ -79,21 +81,16 @@ setTimeout(async() => {
   // https://stackoverflow.com/questions/1134290/cookies-on-localhost-with-explicit-domain
   // TODO: WTF IS THIS
   // if (is_docker() && typeof APP_DOMAIN === "string" && APP_DOMAIN.trim() !== "") {
-  //   log("\n\n")
-  //   log("SETTING COOKIE DOMAIN TO", APP_DOMAIN)
-  //   log("SETTING secure", APP_DOMAIN)
-  //   log("TRUST PROXY TRUE")
-  //   log("\n\n")
   //   session_config.cookie.domain = APP_DOMAIN
   //   // session_config.cookie.secure = true
   //   session_config.cookie.sameSite = false
   // }
 
+  const session_middleware = session(session_config)
 
-  session_middleware = session(session_config)
-}, 200)
-
-
-module.exports = (req, res, next) => {
-  session_middleware(req, res, next)
+  return (req, res, next) => {
+    session_middleware(req, res, next)
+  }
 }
+
+module.exports = get_session_store_middleware

package/src/sessions/index.js

@@ -1,16 +1,18 @@
 /* @flow */
 const pc = require("picocolors")
 
+const get_session_store_middleware = require("./get_session_store_middleware")
+
 
 const is_development = process.env.NODE_ENV === "development"
 
-module.exports = (app) => {
+module.exports = async(app) => {
   const has_session_store = process.env.RB_SESSION_STORE === "yes"
 
   if (has_session_store) {
     console.log("using", pc.bold(pc.green("SESSION STORE")))
 
-    const session_store_middleware = require("./session_store_middleware")
+    const session_store_middleware = await get_session_store_middleware()
     app.use(session_store_middleware)
   } else {
     console.log("using", pc.bold(pc.red("REVERSE-PROXY SESSIONS!")), "if you want to use the session store, start with the --sessions argument")