@rpcbase/server 0.44.0 → 0.47.0

package/bin.js

@@ -13,8 +13,7 @@ let is_command = false
 const args = yargs(hideBin(process.argv))
   .command("start", "run server/infrastructure", () => {}, (argv) => {
     is_command = true
-    console.log("run start server/infrastructure")
-    start_server(argv)
+    start_server()
   })
   .command("ping", "ping", () => {}, (argv) => {
     is_command = true

package/cli/run_docker.js

@@ -4,12 +4,10 @@ const path = require("path")
 
 const is_production = "yes" === process.env.INFRASTRUCTURE_IS_PRODUCTION
 
-const run_docker = async(infrastructure_dir, proj_prefix, args) => {
+const run_docker = async(infrastructure_dir, proj_prefix) => {
   // 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")
@@ -17,11 +15,11 @@ const run_docker = async(infrastructure_dir, proj_prefix, args) => {
 
   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(" ")}`
 
   console.log(cmd)
+
   try {
     execSync(cmd, {stdio: "inherit", cwd: infrastructure_dir})
   } catch (err) {

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(args) => {
+const start_server = async() => {
 
   const infrastructure_dir = path.join(process.cwd(), "../infrastructure")
 
@@ -20,11 +20,10 @@ const start_server = async(args) => {
 
   const runtime = get_runtime()
 
-  console.log("RUN", runtime)
   if (runtime === "native") {
     run_native(infrastructure_dir, proj_prefix)
   } else {
-    run_docker(infrastructure_dir, proj_prefix, args)
+    run_docker(infrastructure_dir, proj_prefix)
   }
 
 }

package/database.js

@@ -15,22 +15,22 @@ if (typeof DATABASE_NAME !== "string") {
 const replicaset_str = [0, 1, 2].map((i) => `database${i}:${process.env["DATABASE_PORT_" + i]}`)
   .join(",")
 
-console.log("db connection str:", replicaset_str)
+const mongo_url = `mongodb://${replicaset_str}/${DATABASE_NAME}`
+// &readPreference=secondary
 
-const mongo_url = `mongodb://${replicaset_str}/${DATABASE_NAME}?`
-  + `replicaSet=rs0`
-
-  // &readPreference=secondary
 
 module.exports = async() => {
-  console.log("MONGO_URL", mongo_url)
+  console.log("mongo_url", mongo_url)
+
   const ret = await mongoose.connect(mongo_url, {
+    replicaSet: "rs0",
     keepAlive: true,
-    keepAliveInitialDelay: 10000,
+    keepAliveInitialDelay: 5000,
     minPoolSize: 3,
+    serverSelectionTimeoutMS: 5000,
+    family: 4, // force ipv4
   })
 
-  // mongoose.connection.on("")
   mongoose.connection.on("disconnected", (arg) => {
     console.log("Mongoose disconnected", arg)
   })
@@ -39,7 +39,6 @@ module.exports = async() => {
     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/index.js

@@ -38,11 +38,11 @@ module.exports = () => {
     // local dev origins
     [
       `http://localhost:${CLIENT_PORT}`,
+      // WARNING: hardcoded port
       "http://localhost:8090", // TMP: used by client of admin
       "localhost",
     ]
 
-  // console.log("SETUP CORS", cors_origins)
 
   app.use(cors({
     origin: cors_origins,

package/mailer/index.js

@@ -1,8 +1,21 @@
 /* @flow */
 const postmark = require("postmark")
 
-const {POSTMARK_API_KEY} = process.env
+const {POSTMARK_API_KEY, IS_PRODUCTION} = process.env
 
-const client = new postmark.ServerClient(POSTMARK_API_KEY)
+const is_production = IS_PRODUCTION === "yes"
+
+let client
+
+if (is_production) {
+  client = new postmark.ServerClient(POSTMARK_API_KEY)
+} else {
+  client = {
+    sendEmail: async(payload) => {
+      console.log("sendEmail disabled outside of production")
+      console.log("From:", payload.From, "To:", payload.To, "Subject:", payload.Subject)
+    }
+  }
+}
 
 module.exports = client

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.44.0",
+  "version": "0.47.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {

package/rpc/rpc_router.js

@@ -17,9 +17,6 @@ const async_wrapper = fn => (req, res, next) => {
 const rpc_router = (app) => {
   const rpc_routes = glob.sync(path.join(build_dir, "./rpc/*"))
 
-
-  console.log("rpc router setup")
-
   rpc_routes.forEach((file_path) => {
     const basename = path.basename(file_path)
     const route_path = basename.replace(/__slash__/g, "/")