@rpcbase/server 0.67.0 → 0.70.0

package/bin.js

@@ -12,23 +12,20 @@ const run_agent = require("./cli/run_agent")
 
 let is_command = false
 
+
 const args = yargs(hideBin(process.argv))
-  .command("start", "run server/infrastructure", () => {}, (argv) => {
+  .command("start", "run server/infrastructure", () => {}, (args) => {
     is_command = true
-    start_server()
+    start_server(args)
   })
-  .command("agent", "run the agent", () => {}, (argv) => {
+  .command("agent", "run the agent", () => {}, (args) => {
     is_command = true
     run_agent()
   })
-  .command("build", "build server", () => {}, (argv) => {
+  .command("build", "build server", () => {}, (args) => {
     is_command = true
     build_server()
   })
-  .command("ping", "ping", () => {}, (argv) => {
-    is_command = true
-    console.log("PING")
-  })
   .option("verbose", {
     alias: "v",
     type: "boolean",
@@ -38,5 +35,12 @@ const args = yargs(hideBin(process.argv))
   .parse()
 
 if (!is_command) {
-  console.log("default com22mand")
+  console.log("server default com22mand")
 }
+
+// // add helpers to ensure proper process termination
+// const exit_clean = () => {
+//   process.exit()
+// }
+// process.on("SIGINT", exit_clean) // ctrl-c
+// process.on("SIGTERM", exit_clean) // kill

package/cli/build_server.js

@@ -2,7 +2,6 @@
 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")
 
@@ -11,11 +10,10 @@ const build_server = async() => {
   // const build_schemas =
   // const infrastructure_dir = path.join(process.cwd(), "../infrastructure")
   //
-  // // prefix
+  // 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)

package/cli/run_docker.js

@@ -1,5 +1,5 @@
 /* @flow */
-const {spawn} = require("child_process")
+const {execSync} = require("child_process")
 const path = require("path")
 const fs = require("fs")
 
@@ -7,7 +7,7 @@ const chalk = require("chalk")
 
 const is_production = "yes" === process.env.INFRASTRUCTURE_IS_PRODUCTION
 
-const run_docker = async(infrastructure_dir, proj_prefix, is_native) => {
+const run_docker = async(infrastructure_dir, proj_prefix) => {
   // env
   const env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env"))
 
@@ -19,12 +19,7 @@ const run_docker = async(infrastructure_dir, proj_prefix, is_native) => {
   // compose files
   const compose_files = ["-f", "common.yml"]
   // TODO: which files are loaded and when should be documented
-  if (!is_native && exists("native.yml")) {
-    compose_files.push("-f", "native.yml")
-  }
-  if (!is_native && !is_production && exists("native.dev.yml")) {
-    compose_files.push("-f", "native.dev.yml")
-  }
+  // when running with native mode, do not load native infrastructure
   if (is_production && exists("prod.yml")) {
     compose_files.push("-f", "prod.yml")
   }
@@ -36,41 +31,14 @@ const run_docker = async(infrastructure_dir, proj_prefix, is_native) => {
   if (!is_production) opts.push("--abort-on-container-exit")
 
   const cmd = "docker-compose"
-  // const cmd_args = `--env-file ${env_path} -p ${proj_prefix} ${compose_files.join(" ")} up ${opts.join(" ")}`
   const cmd_args = ["--env-file", env_path, "-p", proj_prefix, ...compose_files, "up", ...opts]
 
   console.log(cmd_args.join(" "))
 
-  // trim extra docker spaces
-  const fmt_line = (line) => line.replace("       |", "")
-
-  const ps = spawn(cmd, cmd_args, {cwd: infrastructure_dir})
-  ps.stdout.on("data", (data) => {
-    const lines = data.toString().split("\n")
-    lines.forEach((line) => {
-      if (line.trim() === "") {
-        return
-      }
-      process.stdout.write(`${chalk.cyan("docker")}: ${fmt_line(line)}\n`)
-    })
-  })
-
-  ps.stderr.on("data", (data) => {
-    const lines = data.toString().split("\n")
-    lines.forEach((line) => {
-      if (line.trim() === "") {
-        return
-      }
-      process.stdout.write(`${chalk.cyan("docker")}: ${chalk.yellow(fmt_line(line))}\n`)
-    })
-  })
+  // WARNING: blocks the process
+  // this is the only way to have docker-compose shut down gracefully
+  execSync(`${cmd} ${cmd_args.join(" ")}`, {cwd: infrastructure_dir, stdio: "inherit"})
 
-  // try {
-  //
-  // } catch (err) {
-  //   console.log("start_server::error\n", err)
-  //   process.exit(1)
-  // }
 }
 
 module.exports = run_docker

package/cli/run_native.js

@@ -1,46 +1,110 @@
 /* @flow */
 const {spawn} = require("child_process")
-// const dotenv = require("dotenv")
 const path = require("path")
 const fs = require("fs")
 
+const dotenv = require("dotenv")
+const mkdirp = require("mkdirp")
 
-const run_processes = [
-  ["yarn", ["dev"]]
-  // ["mongod", [
-  //   "--quiet",
-  //   "--port", "$DATABASE_PORT_0",
-  //   "--replSet", "rs0",
-  //   "--logpath", "/var/log/logs.txt",
-  // ]],
-  // ["mongod", [
-  //   "--quiet",
-  //   "--port", "$DATABASE_PORT_2",
-  //   "--replSet", "rs0",
-  //   "--logpath", "/var/log/logs.txt",
-  // ]],
-]
-
-// 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
-// }
+// TODO: verify mongod and redis-sever executables are present
+// and have the right version
 
+// "redis-server", "/usr/local/etc/redis/redis.conf", "--port", $WORKER_QUEUE_PORT
+
+// load env
+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
+}
+
+const init_processes = () => {
+  const env = get_env()
+
+  const infrastructure_conf_dir = path.join(__dirname, "../infrastructure")
+
+  // create data dirs
+  const db_path = path.join(process.cwd(), "../infrastructure/data/database/db/")
+  const db_logs_path = path.join(process.cwd(), "../infrastructure/data/database/log/")
+
+  const session_store_dir = path.join(process.cwd(), "../infrastructure/data/session-store/data")
+
+  // TODO: add a redis cache
+  const processes = [
+    // web server
+    // TODO: do not use yarn dev server command
+    {
+      name: "server",
+      dirs: [],
+      cmd: ["yarn", ["dev"]]
+    },
+    // mongodb database
+    {
+      name: "database",
+      dirs: [
+        db_path, db_logs_path
+      ],
+      cmd: ["mongod", [
+        "--quiet",
+        "--dbpath", db_path,
+        "--port", env.DATABASE_PORT,
+        // "--bind_ip_all",
+        // "--logpath", "/var/log/logs.txt",
+        "--replSet", "rs0"
+      ]]
+    },
+    {
+      name: "session-store",
+      dirs: [
+        session_store_dir,
+      ],
+      cmd: ["redis-server", [
+        path.join(infrastructure_conf_dir, "./redis/redis.conf"),
+        "--dir", session_store_dir,
+        "--port", env.SESSION_STORE_PORT,
+      ]]
+    },
+  ]
+
+  // create missing directories
+  processes.forEach((item) => {
+    item.dirs.forEach((dir) => {
+      if (!fs.existsSync(dir)) {
+        mkdirp.sync(dir)
+      }
+    })
+  })
+
+  return 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 env = get_env()
 
-  const ps = spawn("yarn", ["dev"], {env: {...process.env, CONTAINER_MODE: "native"}})
-  ps.stdout.on("data", (data) => {
-    process.stdout.write(data.toString())
-  })
+  const processes = init_processes()
 
+  const run_process = (item) => {
+    // console.log("start process", item)
+    const ps = spawn(item.cmd[0], item.cmd[1], {env: {...process.env, CONTAINER_MODE: "native"}})
 
+    ps.stdout.on("data", (data) => {
+      process.stdout.write(`${item.name}: ${data.toString()}`)
+    })
+
+    ps.stderr.on("data", (data) => {
+      process.stderr.write(`${item.name}: ${data.toString()}`)
+    })
+  }
+
+  const spawned = processes.map(run_process)
+
+  process.on("exit", () => {
+    console.log("EXIT from native1")
+    // ps.kill()
+  })
 }
 
 module.exports = run_native

package/cli/start_server.js

@@ -2,30 +2,29 @@
 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 get_runtime = require("./get_runtime")
 
 // 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")
 
+  const runtime = get_runtime()
+
   // 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_docker(infrastructure_dir, proj_prefix, true)
+  if (runtime === "docker") {
+    run_docker(infrastructure_dir, proj_prefix)
+  } else if (runtime === "native") {
     run_native(infrastructure_dir, proj_prefix)
   } else {
-    run_docker(infrastructure_dir, proj_prefix)
+    throw new Error("unknown runtime")
   }
-
 }
 
 module.exports = start_server

package/infrastructure/mongodb/mongod.conf

@@ -0,0 +1,9 @@
+systemLog:
+  destination: file
+  path: /opt/homebrew/var/log/mongodb/mongo.log
+  logAppend: true
+storage:
+  dbPath: /opt/homebrew/var/mongodb
+net:
+  bindIp: 127.0.0.1, ::1
+  ipv6: true