@rpcbase/server 0.346.0 → 0.348.0

package/express/index.js

@@ -30,13 +30,12 @@ const BODY_MAX_SIZE_MB = 80
 
 log("server is production:", JSON.stringify(is_production))
 
-module.exports = async() => {
+module.exports = () => {
 
   const app = express()
 
   setup_handlers(app)
 
-
   if (has_sentry && is_production) {
     Sentry.init({
       dsn: SENTRY_DSN,
@@ -77,12 +76,12 @@ module.exports = async() => {
 
   custom_cors(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))
   app.post("/__ping", (req, res) => res.json(pong_res))
 
+  sessions(app)
+
   auth(app)
   api(app)
 

package/package.json

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

package/rts/index.js

@@ -9,7 +9,6 @@ const debug = require("debug")
 const colors = require("picocolors")
 
 const mongoose = require("../mongoose")
-const get_session_store_middleware = require("../src/sessions/get_session_store_middleware")
 
 
 const log = debug("rb:rts:server")
@@ -296,9 +295,6 @@ const run_query = async(mongoose, socket_id, {model_name, query, query_key, opti
 
   const data = await query_promise
 
-  // console.log("TMP Artificial delay")
-  // await Promise.delay(500)
-
   const data_buf = JSON.stringify(data)
 
   s.emit("query_payload", {model_name, query_key, data_buf})
@@ -321,7 +317,6 @@ const disconnect_handler = (socket_id, reason) => {
     console.log("client disconnected, reason:", reason, "socket:", socket_id)
   }
 
-
   const local_queries = _socket_queries[socket_id] || {}
 
   // remove all queries matching that socket id
@@ -383,7 +378,7 @@ const rts_server = async(server) => {
   const has_session_store = process.env.RB_SESSION_STORE === "yes"
 
   if (has_session_store) {
-    const session_store_middleware = await get_session_store_middleware()
+    const session_store_middleware = require("../src/sessions/session_store_middleware")
     // socket io session middleware
     io.use((socket, next) => {
       session_store_middleware(socket.request, {}, next)

package/src/sessions/index.js

@@ -1,18 +1,16 @@
 /* @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 = async(app) => {
+module.exports = (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 = await get_session_store_middleware()
+    const session_store_middleware = require("./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")

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

@@ -9,13 +9,12 @@ const RedisStore = require("connect-redis").default
 const is_docker = require("@rpcbase/std/is_docker")
 
 
-const {NODE_ENV, SESSION_STORE_PORT, APP_DOMAIN} = process.env
+const {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
+
 
 // WARNING:
 // https://stackoverflow.com/questions/70867229/error-connection-timeout-when-connecting-to-redis-docker-instance
@@ -29,12 +28,11 @@ const hostname = is_docker() ? "session-store" : "127.0.0.1"
 
 console.log("session-store hostname", hostname, "port", SESSION_STORE_PORT)
 
+let session_middleware = null
 
-const get_session_store_middleware = async() => {
-  if (is_production) {
-    throw new Error("SESSION STORE MIDDLEWARE CANNOT BE USED IN PRODUCTION")
-  }
-
+// EXTREME WARNING: docker issue
+// when there is synchronous io redis client fails to connect
+setTimeout(async() => {
   const reconnectStrategy = (retries) => {
     log("redis_client::reconnectStrategy::retrying with arg", retries)
     if (retries < 5) {
@@ -67,7 +65,7 @@ const get_session_store_middleware = 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
@@ -81,16 +79,27 @@ const get_session_store_middleware = 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("\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)
 
-  return (req, res, next) => {
+
+module.exports = (req, res, next) => {
+  if (typeof session_middleware === "function") {
     session_middleware(req, res, next)
+  } else {
+    // recheck until it's a function and call it
+    const interval = setInterval(() => {
+      if (typeof session_middleware === "function") {
+        clearInterval(interval)
+        session_middleware(req, res, next)
+      }
+    }, 100)
   }
 }
-
-module.exports = get_session_store_middleware