@rpcbase/server 0.72.0 → 0.73.0

package/cli/run_native.js

@@ -11,6 +11,10 @@ const mkdirp = require("mkdirp")
 // TODO: verify mongod and redis-sever and elasticsearch executables are present
 // and have the right version
 
+const NO_PRINT_LIST = [
+  // "database",
+]
+
 // load env
 const get_env = () => {
   const env_path = path.join(process.cwd(), "./.env")
@@ -19,17 +23,22 @@ const get_env = () => {
   return env
 }
 
-const init_processes = () => {
+const init_processes = (args) => {
   const env = get_env()
 
   const infrastructure_conf_dir = path.join(__dirname, "../infrastructure")
 
-  // create data dirs
+  // db storage
   const db_path = path.join(process.cwd(), "../infrastructure/data/database/db/")
-  const db_logs_path = path.join(process.cwd(), "../infrastructure/data/database/log/")
 
+  // db log file
+  const db_logs_path = path.join(process.cwd(), "../infrastructure/data/database/log/logs.txt")
+
+  // session-store + worker-queue
   const session_store_dir = path.join(process.cwd(), "../infrastructure/data/session-store/data")
+  const session_store_logs_path = path.join(process.cwd(), "../infrastructure/data/session-store/log/logs.txt")
   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 processes = [
@@ -46,14 +55,16 @@ const init_processes = () => {
     {
       name: "database",
       dirs: [
-        db_path, db_logs_path
+        db_path,
+        path.dirname(db_logs_path),
       ],
       cmd: ["mongod", [
         "--quiet",
         "--dbpath", db_path,
         "--port", env.DATABASE_PORT,
         // "--bind_ip_all",
-        // "--logpath", "/var/log/logs.txt",
+        // if in verbose mode, print to stdout, else write to file
+        ...(args.verbose ? [] : ["--logpath", db_logs_path]),
         "--replSet", "rs0"
       ]]
     },
@@ -62,11 +73,13 @@ const init_processes = () => {
       name: "session-store",
       dirs: [
         session_store_dir,
+        path.dirname(session_store_logs_path),
       ],
       cmd: ["redis-server", [
         path.join(infrastructure_conf_dir, "./redis/redis.conf"),
         "--dir", session_store_dir,
         "--port", env.SESSION_STORE_PORT,
+        ...(args.verbose ? [] : ["--logfile", session_store_logs_path]),
       ]]
     },
     // worker-queue
@@ -74,11 +87,13 @@ const init_processes = () => {
       name: "worker-queue",
       dirs: [
         worker_queue_dir,
+        path.dirname(worker_queue_logs_path),
       ],
       cmd: ["redis-server", [
         path.join(infrastructure_conf_dir, "./redis/redis.conf"),
         "--dir", worker_queue_dir,
         "--port", env.WORKER_QUEUE_PORT,
+        ...(args.verbose ? [] : ["--logfile", worker_queue_logs_path]),
       ]]
     },
   ]
@@ -118,22 +133,32 @@ const init_processes = () => {
 
 // TODO: run each native process from list
 // TODO: handle process close
-const run_native = (infrastructure_dir, proj_prefix) => {
-  console.log("running in NATIVE mode")
+const run_native = (infrastructure_dir, proj_prefix, args) => {
+  console.log(`running in ${colors.bold(colors.magenta("NATIVE"))} mode`)
 
-  const processes = init_processes()
+  const processes = init_processes(args)
 
   const run_process = (item) => {
-    // console.log("start process", item)
+    // console.log("run_native:run_process:item", item)
     const ps = spawn(item.cmd[0], item.cmd[1], {env: {...process.env, CONTAINER_MODE: "native"}})
 
-    ps.stdout.on("data", (data) => {
-      process.stdout.write(`${colors.green(item.name)}: ${data.toString()}`)
-    })
+    // TODO: add flag to force print
+    if (!NO_PRINT_LIST.includes(item.name)) {
 
-    ps.stderr.on("data", (data) => {
-      process.stderr.write(`${item.name}: ${data.toString()}`)
-    })
+      let prefix = ""
+      // avoid printing [server] server:
+      if (!args.verbose && item.name !== "server") {
+        prefix = `${colors.green(item.name)}: `
+      }
+
+      ps.stdout.on("data", (data) => {
+        process.stdout.write(`${prefix}${data.toString()}`)
+      })
+
+      ps.stderr.on("data", (data) => {
+        process.stderr.write(`${prefix}${data.toString()}`)
+      })
+    }
   }
 
   const spawned = processes.map(run_process)

package/cli/start_server_infrastructure.js

@@ -19,9 +19,9 @@ const start_server = async(args) => {
   const proj_prefix = path.basename(proj_parent_dir)
 
   if (runtime === "docker") {
-    run_docker(infrastructure_dir, proj_prefix)
+    run_docker(infrastructure_dir, proj_prefix, args)
   } else if (runtime === "native") {
-    run_native(infrastructure_dir, proj_prefix)
+    run_native(infrastructure_dir, proj_prefix, args)
   } else {
     throw new Error("unknown runtime")
   }

package/database.js

@@ -24,6 +24,7 @@ module.exports = async() => {
   })
 
   mongoose.connection.on("disconnected", (arg) => {
+    // TODO: add tracing
     console.log("Mongoose disconnected", arg)
   })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.72.0",
+  "version": "0.73.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -10,7 +10,7 @@
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "dependencies": {
-    "@rpcbase/agent": "0.8.0",
+    "@rpcbase/agent": "0.9.0",
     "body-parser": "1.20.0",
     "connect-redis": "6.1.3",
     "cors": "2.8.5",
@@ -19,7 +19,7 @@
     "express": "4.18.1",
     "express-session": "1.17.3",
     "glob": "8.0.3",
-    "mongoose": "6.3.6",
+    "mongoose": "6.4.0",
     "picocolors": "1.0.0",
     "postmark": "3.0.11",
     "redis": "4.1.0",