@rpcbase/server 0.49.0 → 0.52.0

package/bin.js

@@ -7,6 +7,7 @@ const yargs = require("yargs/yargs")
 const {hideBin} = require("yargs/helpers")
 
 const start_server = require("./cli/start_server")
+const build_server = require("./cli/build_server")
 
 let is_command = false
 
@@ -15,6 +16,10 @@ const args = yargs(hideBin(process.argv))
     is_command = true
     start_server()
   })
+  .command("build", "build server", () => {}, (argv) => {
+    is_command = true
+    build_server()
+  })
   .command("ping", "ping", () => {}, (argv) => {
     is_command = true
     console.log("PING")

package/cli/build_server.js

@@ -0,0 +1,29 @@
+/* @flow */
+const path = require("path")
+const fs = require("fs")
+
+const get_runtime = require("./get_runtime")
+const run_docker = require("./run_docker")
+const run_native = require("./run_native")
+
+
+const build_server = async() => {
+  // const build_schemas =
+  // const infrastructure_dir = path.join(process.cwd(), "../infrastructure")
+  //
+  // // prefix
+  // const proj_parent_dir = path.join(infrastructure_dir, "../../")
+  // const proj_prefix = path.basename(proj_parent_dir)
+  //
+  // const runtime = get_runtime()
+  //
+  // if (runtime === "native") {
+  //   run_native(infrastructure_dir, proj_prefix)
+  // } else {
+  //   run_docker(infrastructure_dir, proj_prefix)
+  // }
+  console.log("WOW run build server")
+
+}
+
+module.exports = build_server

package/cli/run_docker.js

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

package/cli/run_native.js

@@ -26,7 +26,6 @@ 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
 }
 

package/cli/start_server.js

@@ -11,7 +11,6 @@ const run_native = require("./run_native")
 // docker network create local-network
 
 const start_server = async() => {
-
   const infrastructure_dir = path.join(process.cwd(), "../infrastructure")
 
   // prefix

package/database.js

@@ -2,9 +2,9 @@
 const mongoose = require("mongoose")
 const validator = require("validator")
 
-const {DATABASE_NAME} = process.env
+const {DATABASE_NAME, DATABASE_PORT} = process.env
 
-if (typeof DATABASE_PORT === "string" && !validator.isPort(DATABASE_PORT)) {
+if (typeof DATABASE_PORT !== "string" || !validator.isPort(DATABASE_PORT)) {
   throw new Error("expected DATABASE_PORT to be a valid port number")
 }
 
@@ -12,12 +12,7 @@ if (typeof DATABASE_NAME !== "string") {
   throw new Error("expected DATABASE_NAME to be a string")
 }
 
-const replicaset_str = [0, 1, 2].map((i) => `database${i}:${process.env["DATABASE_PORT_" + i]}`)
-  .join(",")
-
-const mongo_url = `mongodb://${replicaset_str}/${DATABASE_NAME}`
-// &readPreference=secondary
-
+const mongo_url = `mongodb://127.0.0.1:${DATABASE_PORT}/${DATABASE_NAME}`
 
 module.exports = async() => {
 
@@ -32,29 +27,17 @@ module.exports = async() => {
 
   // TODO: should we be retrying in dev only
   mongoose.connection.on("error", (err) => {
-    console.log("Mongoose connection error", /*err*/)
     // replicaSet has no primary, retry connecting in a moment
-    if (err.reason.type === "ReplicaSetNoPrimary") {
-      console.log("no primary, will retry")
-      setTimeout(async() => {
-        console.log("retrying now")
-        await mongoose.connect(mongo_url, connect_opts)
-      }, 3000)
-    } else {
-      console.log("WOW ici mongoose connection error", err)
-    }
+    console.log("mongoose connection error", err)
   })
 
 
-  console.log("mongo_url", mongo_url)
+  console.log("connect mongo_url", mongo_url)
 
   const connect_opts = {
-    replicaSet: "rs0",
     keepAlive: true,
     keepAliveInitialDelay: 5000,
-    minPoolSize: 3,
-    serverSelectionTimeoutMS: 5000,
-    heartbeatFrequencyMS: 1000,
+    minPoolSize: 5,
     family: 4, // force ipv4
   }
 
@@ -65,18 +48,10 @@ module.exports = async() => {
     await mongoose.connect(mongo_url, connect_opts)
   } catch (err) {
     // TODO: handle error ?
-    if (err.reason.type === "ReplicaSetNoPrimary") {
-      // console.log("no primary, will retry")
-      // setTimeout(async() => {
-      //   console.log("retrying now")
-      //   await mongoose.connect(mongo_url, connect_opts)
-      // }, 3000)
-    } else {
-      console.log("ICI SERVER GOT ERROR")
-      console.log(err)
-      console.log("JSON:", JSON.stringify(err, null, 2))
-      console.log("resaon", err.reason)
-    }
+    console.log("mongoose connect SERVER GOT ERROR")
+    console.log(err)
+    console.log("JSON:", JSON.stringify(err, null, 2))
+    console.log("resaon", err.reason)
   }
 
 }

package/express/session_middleware.js

@@ -14,44 +14,60 @@ if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PO
   throw new Error("expected SESSION_STORE_PORT to be a valid port number")
 }
 
-const reconnectStrategy = (retries) => {
-  console.log("reconnectStrategy::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 session_middleware = null
+
+// extreme warning: when there is blocking io redis client won't connect
+process.nextTick(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
-  },
-  legacyMode: true,
-})
+  const redis_client = createClient({
+    socket: {
+      host: "127.0.0.1",
+      port: SESSION_STORE_PORT,
+      reconnectStrategy,
+      connectTimeout: 10000,
+      keepAlive: 0,
+    },
+    legacyMode: true,
+  })
 
-// 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)
-    })
-})
+  console.log("redis session willconnect")
+  await redis_client.connect()
+  console.log("redis session connected")
+
+  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,
+  })
 
-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,
 })
 
-module.exports = session_middleware
+
+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.49.0",
+  "version": "0.52.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -15,12 +15,12 @@
     "cors": "2.8.5",
     "debug": "4.3.4",
     "dotenv": "16.0.0",
-    "express": "4.17.3",
+    "express": "4.18.1",
     "express-session": "1.17.2",
     "glob": "8.0.1",
-    "mongoose": "6.3.1",
+    "mongoose": "6.3.2",
     "postmark": "3.0.1",
-    "redis": "4.0.6",
+    "redis": "4.1.0",
     "validator": "13.7.0",
     "yargs": "17.4.1"
   }