@rpcbase/server 0.50.0 → 0.53.0

package/cli/run_docker.js

@@ -10,7 +10,7 @@ const run_docker = async(infrastructure_dir, proj_prefix) => {
 
   // compose files
   const compose_files = ["-f common.yml"]
-  if (is_production)) {
+  if (is_production) {
     compose_files.push("-f prod.yml")
   }
   else compose_files.push("-f dev.yml")

package/cli/run_native.js

@@ -1,6 +1,6 @@
 /* @flow */
 const {spawn} = require("child_process")
-const dotenv = require("dotenv")
+// const dotenv = require("dotenv")
 const path = require("path")
 const fs = require("fs")
 
@@ -20,20 +20,18 @@ const run_processes = [
   ]],
 ]
 
-
-
-const get_env = () => {
-  const env_path = path.join(process.cwd(), ".env")
-  const env_buf = fs.readFileSync(env_path)
-  const env = dotenv.parse(env_buf)
-  return env
-}
+// const get_env = () => {
+//   const env_path = path.join(process.cwd(), ".env")
+//   const env_buf = fs.readFileSync(env_path)
+//   const env = dotenv.parse(env_buf)
+//   return env
+// }
 
 
 
 const run_native = (infrastructure_dir, proj_prefix) => {
   console.log("native mode")
-  const env = get_env()
+  // const env = get_env()
 
   const ps = spawn("ls", ["-la"])
   ps.stdout.on("data", (data) => {

package/express/index.js

@@ -3,13 +3,13 @@ const cors = require("cors")
 const express = require("express")
 const body_parser = require("body-parser")
 
-const get_session_middleware = require("./get_session_middleware")
+const session_middleware = require("./session_middleware")
 
 const is_production = process.env.IS_PRODUCTION === "yes"
 const {APP_DOMAIN, CLIENT_PORT} = process.env
 
 
-module.exports = async() => {
+module.exports = () => {
   const app = express()
   app.use(body_parser.json({limit: "2mb"}))
 
@@ -50,7 +50,6 @@ module.exports = async() => {
     credentials: true // enable set-cookie
   }))
 
-  const session_middleware = await get_session_middleware()
   app.use(session_middleware)
 
   app.get("/api/ping", (req, res) => res.json({message: "pong"}))

package/express/session_middleware.js

@@ -0,0 +1,76 @@
+/* @flow */
+const session = require("express-session")
+const validator = require("validator")
+const {createClient} = require("redis")
+const redis_store = require("connect-redis")(session)
+
+// WARNING:
+// https://stackoverflow.com/questions/70867229/error-connection-timeout-when-connecting-to-redis-docker-instance
+// https://github.com/redis/node-redis/issues/1656/
+
+const {SESSION_STORE_PORT} = process.env
+
+if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PORT)) {
+  throw new Error("expected SESSION_STORE_PORT to be a valid port number")
+}
+
+let session_middleware = null
+
+// extreme warning: when there is blocking io redis client won't connect
+// process.nextTick(async() => {
+setTimeout(async() => {
+  if (!SESSION_STORE_PORT) {
+    return
+  }
+
+  const reconnectStrategy = (retries) => {
+    console.log("redis_client::reconnectStrategy::retrying with arg", retries)
+    if (retries < 5) {
+      console.log("retry count:", retries, "retrying in 1s")
+      return 4000
+    } else {
+      return new Error("max retries expiered")
+    }
+  }
+
+  const redis_client = createClient({
+    socket: {
+      host: "session-store",
+      port: SESSION_STORE_PORT,
+      reconnectStrategy,
+      connectTimeout: 10000,
+      keepAlive: 0,
+    },
+    legacyMode: true,
+  })
+
+
+  redis_client.on("ready", () => {
+    console.log("session-storage::redis_client connected")
+  })
+
+  const res = await redis_client.connect()
+
+  session_middleware = session({
+    store: new redis_store({client: redis_client}),
+    proxy: true,
+    saveUninitialized: false,
+    // TODO: use session secret from env
+    secret: "session secret wowow",
+    resave: false,
+  })
+
+}, 500)
+
+
+module.exports = (req, res, next) => {
+  if (!SESSION_STORE_PORT) {
+    return next()
+  }
+
+  if (session_middleware) {
+    session_middleware(req, res, next)
+  } else {
+    console.warn("session middleware not set yet")
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.50.0",
+  "version": "0.53.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -14,14 +14,13 @@
     "connect-redis": "6.1.3",
     "cors": "2.8.5",
     "debug": "4.3.4",
-    "dotenv": "16.0.0",
     "express": "4.18.1",
-    "express-session": "1.17.2",
-    "glob": "8.0.1",
-    "mongoose": "6.3.2",
+    "express-session": "1.17.3",
+    "glob": "8.0.3",
+    "mongoose": "6.3.3",
     "postmark": "3.0.1",
     "redis": "4.1.0",
     "validator": "13.7.0",
-    "yargs": "17.4.1"
+    "yargs": "17.5.1"
   }
 }

package/express/get_session_middleware.js

@@ -1,75 +0,0 @@
-/* @flow */
-const session = require("express-session")
-const validator = require("validator")
-const {createClient} = require("redis")
-const redis_store = require("connect-redis")(session)
-
-// WARNING:
-// https://stackoverflow.com/questions/70867229/error-connection-timeout-when-connecting-to-redis-docker-instance
-// https://github.com/redis/node-redis/issues/1656/
-
-const {SESSION_STORE_PORT, SESSION_STORE_HOST} = process.env
-
-
-// extreme warning: when there is blocking io redis client won't connect
-// process.nextTick(() => {
-//   redis_client.connect()
-//     .catch((err) => {
-//       console.log("session store error ohh", err)
-//     })
-//     .then(() => {
-//       console.log("redis session-store connected port:", SESSION_STORE_PORT)
-//     })
-// })
-
-
-module.exports = () => new Promise((resolve, reject) => {
-
-  if (!SESSION_STORE_PORT) {
-    return resolve((req, res, next) => next())
-  }
-
-  if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PORT)) {
-    throw new Error("expected SESSION_STORE_PORT to be a valid port number")
-  }
-
-  setTimeout(async() => {
-    const reconnectStrategy = (retries) => {
-      console.log("redis_client::reconnectStrategy::retrying with arg", retries)
-      if (retries < 5) {
-        console.log("retry count:", retries, "retrying in 1s")
-        return 4000
-      } else {
-        return new Error("max retries expiered")
-      }
-    }
-
-    const redis_client = createClient({
-      socket: {
-        host: SESSION_STORE_HOST,
-        port: SESSION_STORE_PORT,
-        reconnectStrategy,
-        connectTimeout: 10000,
-        keepAlive: 0,
-      },
-      legacyMode: true,
-    })
-
-    console.log("redis session willconnect")
-    await redis_client.connect()
-    console.log("redis session connected")
-
-    const session_middleware = session({
-      store: new redis_store({client: redis_client}),
-      proxy: true,
-      saveUninitialized: false,
-      // TODO: use session secret from env
-      secret: "session secret wowow",
-      resave: false,
-    })
-
-    resolve(session_middleware)
-
-  }, 100)
-
-})