@rpcbase/server 0.41.0 → 0.44.0

package/bin.js

@@ -14,11 +14,11 @@ const args = yargs(hideBin(process.argv))
   .command("start", "run server/infrastructure", () => {}, (argv) => {
     is_command = true
     console.log("run start server/infrastructure")
-    start_server()
+    start_server(argv)
   })
   .command("ping", "ping", () => {}, (argv) => {
     is_command = true
-    console.log("OING")
+    console.log("PING")
   })
   .option("verbose", {
     alias: "v",

package/cli/run_docker.js

@@ -4,11 +4,12 @@ const path = require("path")
 
 const is_production = "yes" === process.env.INFRASTRUCTURE_IS_PRODUCTION
 
-
-const run_docker = async(infrastructure_dir, proj_prefix) => {
+const run_docker = async(infrastructure_dir, proj_prefix, args) => {
   // env
   const env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env"))
 
+  console.log("ICI ARGS", args)
+
   // compose files
   const compose_files = ["-f common.yml"]
   if (is_production) compose_files.push("-f prod.yml")
@@ -16,6 +17,7 @@ const run_docker = async(infrastructure_dir, proj_prefix) => {
 
   const opts = ["--build", "--remove-orphans"]
   if (!is_production) opts.push("--abort-on-container-exit")
+  if (args.detach) opts.push("--detach")
 
   const cmd = `docker-compose --env-file ${env_path} -p ${proj_prefix} ${compose_files.join(" ")} up ${opts.join(" ")}`
 

package/cli/start_server.js

@@ -10,7 +10,7 @@ const run_native = require("./run_native")
 // TODO: auto create network if necessary
 // docker network create local-network
 
-const start_server = async() => {
+const start_server = async(args) => {
 
   const infrastructure_dir = path.join(process.cwd(), "../infrastructure")
 
@@ -24,7 +24,7 @@ const start_server = async() => {
   if (runtime === "native") {
     run_native(infrastructure_dir, proj_prefix)
   } else {
-    run_docker(infrastructure_dir, proj_prefix)
+    run_docker(infrastructure_dir, proj_prefix, args)
   }
 
 }

package/database.js

@@ -24,7 +24,22 @@ const mongo_url = `mongodb://${replicaset_str}/${DATABASE_NAME}?`
 
 module.exports = async() => {
   console.log("MONGO_URL", mongo_url)
-  const ret = await mongoose.connect(mongo_url)
+  const ret = await mongoose.connect(mongo_url, {
+    keepAlive: true,
+    keepAliveInitialDelay: 10000,
+    minPoolSize: 3,
+  })
+
+  // mongoose.connection.on("")
+  mongoose.connection.on("disconnected", (arg) => {
+    console.log("Mongoose disconnected", arg)
+  })
+
+  mongoose.connection.on("error", (arg) => {
+    console.log("Mongoose connection error", arg)
+  })
+
+  // console.log("Mongoose connect got ret", ret)
   // console.log("waiting after return", ret)
   // TODO: handle connection retry and pools
 }

package/express/session_middleware.js

@@ -14,8 +14,6 @@ if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PO
   throw new Error("expected SESSION_STORE_PORT to be a valid port number")
 }
 
-// console.log("ICIII", execSync("redis-cli -p 7979 -h session-store ping", {stdio: "inherit"}))
-
 const reconnectStrategy = (retries) => {
   console.log("reconnectStrategy::retrying with arg", retries)
   if (retries < 5) {

package/mailer/index.js

@@ -0,0 +1,8 @@
+/* @flow */
+const postmark = require("postmark")
+
+const {POSTMARK_API_KEY} = process.env
+
+const client = new postmark.ServerClient(POSTMARK_API_KEY)
+
+module.exports = client

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.41.0",
+  "version": "0.44.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -11,16 +11,17 @@
   },
   "dependencies": {
     "body-parser": "1.19.2",
-    "connect-redis": "6.1.2",
+    "connect-redis": "6.1.3",
     "cors": "2.8.5",
-    "debug": "4.3.3",
+    "debug": "4.3.4",
     "dotenv": "16.0.0",
     "express": "4.17.3",
     "express-session": "1.17.2",
     "glob": "7.2.0",
-    "mongoose": "6.2.6",
+    "mongoose": "6.2.7",
+    "postmark": "3.0.1",
     "redis": "4.0.4",
     "validator": "13.7.0",
-    "yargs": "17.3.1"
+    "yargs": "17.4.0"
   }
 }