@rpcbase/server 0.306.0 → 0.308.0

package/cli/run_native.js

@@ -1,4 +1,5 @@
 /* @flow */
+const assert = require("assert")
 const {spawn} = require("child_process")
 const path = require("path")
 const fs = require("fs")
@@ -13,6 +14,7 @@ const mkdirp = require("mkdirp")
 
 const is_production = process.env.NODE_ENV === "production"
 
+
 const NO_PRINT_LIST = [
   // "database",
 ]
@@ -28,6 +30,8 @@ const get_env = () => {
 const get_processes = (args) => {
   const env = get_env()
 
+  assert(env.RB_APP_NAME, "missing RB_APP_NAME in env")
+
   const infrastructure_conf_dir = path.join(__dirname, "../infrastructure")
 
   // db storage
@@ -42,7 +46,12 @@ const get_processes = (args) => {
   const worker_queue_dir = path.join(process.cwd(), "../infrastructure/data/worker-queue/data")
   const worker_queue_logs_path = path.join(process.cwd(), "../infrastructure/data/worker-queue/log/logs.txt")
 
-  // TODO: add a redis cache
+  const has_uds = true
+  const uds_root_path = `/tmp/${env.RB_APP_NAME}/`
+  if (has_uds && !fs.existsSync(uds_root_path)) {
+    mkdirp.sync(uds_root_path)
+  }
+
   const processes = [
     // web server
     {
@@ -66,8 +75,9 @@ const get_processes = (args) => {
       cmd: ["mongod", [
         "--quiet",
         "--dbpath", db_path,
+        "--bind_ip", "127.0.0.1", // TODO: bind to 0.0.0.0 here when going multinodes
         "--port", env.DATABASE_PORT,
-        // "--bind_ip_all",
+        ...(has_uds ? ["--unixSocketPrefix", uds_root_path, "--filePermissions", "0700"] : []),
         // if in verbose mode, print to stdout, else write to file
         ...(args.verbose ? [] : ["--logpath", db_logs_path]),
         "--replSet", "rs0"

package/database.js

@@ -13,7 +13,7 @@ require("./src/models/Invite")
 require("./src/models/ResetPasswordToken")
 
 
-const {DATABASE_NAME, DATABASE_PORT} = process.env
+const {RB_APP_NAME, DATABASE_PORT} = process.env
 
 
 // database can be set by env variable or passed as paramaters to
@@ -22,16 +22,32 @@ if (typeof DATABASE_PORT !== "string" || !isPort(DATABASE_PORT)) {
   throw new Error("expected DATABASE_PORT to be a valid port number")
 }
 
-if (typeof DATABASE_NAME !== "string") {
-  throw new Error("expected DATABASE_NAME to be a string")
+if (typeof RB_APP_NAME !== "string") {
+  throw new Error("expected RB_APP_NAME in env to be a string")
 }
 
-const hostname = is_docker() ? "database" : "127.0.0.1"
 
-const mongo_url = `mongodb://${hostname}:${DATABASE_PORT}/${DATABASE_NAME}?directConnection=true&replicaSet=rs0`
+const get_mongo_url = () => {
+  const conn_suffix = `?directConnection=true&replicaSet=rs0`
 
+  let url
 
-// TODO: handle multiple databases, remove DATABASE_NAME env ??
+  // connect via tcp in docker
+  if (is_docker()) {
+    const hostname = "database" // "127.0.0.1"
+    url = `mongodb://${hostname}:${DATABASE_PORT}/${conn_suffix}`
+  }
+  // when running natively, prefer the unix socket
+  else {
+    const uds_root_path = `/tmp/sockets-${RB_APP_NAME}/`
+    url = `mongodb://${encodeURIComponent(uds_root_path)}mongodb-${DATABASE_PORT}.sock`
+  }
+
+  return url
+}
+
+
+// TODO: handle multiple databases, remove RB_APP_NAME env ??
 module.exports = async(...database_names) => {
   // set listeners before attempting to connect
   mongoose.connection.on("connected", () => {
@@ -49,13 +65,15 @@ module.exports = async(...database_names) => {
     console.log("mongoose connection error", err)
   })
 
+  const mongo_url = get_mongo_url()
   console.log("connect mongo_url", mongo_url)
 
   const connect_opts = {
-    minPoolSize: 4,
+    dbName: RB_APP_NAME,
+    minPoolSize: 8,
     // maxPoolSize: 1024 * 1024,
     // TODO: setting this to a low value adds ~3s delay to requests... WHY
-    maxPoolSize: 64,
+    maxPoolSize: 512,
     family: 4, // force ipv4
     driverInfo: {
       name: `${pack.name}/database`,

package/package.json

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