@rpcbase/server 0.35.0 → 0.36.0

package/database.js

@@ -23,6 +23,6 @@ const mongo_url = `mongodb://${replicaset_str}/${DATABASE_NAME}?`
 module.exports = async() => {
   console.log("mongo_url", mongo_url)
   const ret = await mongoose.connect(mongo_url)
-  console.log("waiting after return", ret)
+  // console.log("waiting after return", ret)
   // TODO: handle connection retry and pools
 }

package/express/session_middleware.js

@@ -1,9 +1,11 @@
 /* @flow */
 const session = require("express-session")
-const redis = require("redis")
+// const redis = require("redis")
 const validator = require("validator")
 const redis_store = require("connect-redis")(session)
 
+const { createClient } = require("redis")
+
 
 const {SESSION_STORE_PORT} = process.env
 
@@ -13,12 +15,42 @@ if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PO
 
 const session_store_url = `redis://session-store:${SESSION_STORE_PORT}`
 
-const redis_client = redis.createClient({
-  url: session_store_url
+console.log("will connect to session-store", session_store_url)
+
+
+const reconnectStrategy = (retries) => {
+  console.log("retrying with arg", retries)
+  if (retries < 5) {
+    console.log("retry count:", retries, "retrying in 1s")
+    return 1000
+  } else {
+    return new Error("max retries expiered")
+  }
+}
+
+
+
+let redisClient = createClient({
+  socket: {reconnectStrategy},
+  url: session_store_url,
+  legacyMode: true,
 })
 
+redisClient.connect()
+  .catch((err) => {
+    console.log("session store error ohh", err)
+  })
+  .then(() => {
+    console.log("REDIS CONNECTED OW")
+  })
+
+// const redis_client = redis.createClient({
+//   url: session_store_url
+// })
+
 const session_middleware = session({
-  store: new redis_store({client: redis_client}),
+  // store: new redis_store({client: redis_client}),
+  store: new redis_store({client: redisClient}),
   proxy: true,
   saveUninitialized: false,
   // TODO: fix session secret

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -18,7 +18,7 @@
     "express-session": "1.17.2",
     "glob": "7.2.0",
     "mongoose": "6.2.4",
-    "redis": "3.1.2",
+    "redis": "4.0.4",
     "validator": "13.7.0",
     "yargs": "17.3.1"
   }