@rpcbase/server 0.61.0 → 0.64.0

package/cli/get_runtime.js

@@ -3,9 +3,7 @@ const os = require("os")
 
 const get_runtime = () => {
   if (os.platform() === "darwin") {
-    console.warn("warning: native mode is tmp disabled")
-    // return "native"
-    return "docker"
+    return "native"
   } else {
     return "docker"
   }

package/cli/run_docker.js

@@ -1,35 +1,61 @@
 /* @flow */
-const {execSync} = require("child_process")
+const {spawn} = require("child_process")
 const path = require("path")
 
+const chalk = require("chalk")
+
 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, is_native) => {
   // env
   const env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env"))
 
   // compose files
-  const compose_files = ["-f common.yml"]
+  const compose_files = ["-f", "common.yml"]
+  if (!is_native) {
+    compose_files.push("-f", "native.yml")
+  }
   if (is_production) {
-    compose_files.push("-f prod.yml")
+    compose_files.push("-f", "prod.yml")
   }
-  else compose_files.push("-f dev.yml")
-
-  // console.log("got compose files", compose_files)
+  else compose_files.push("-f", "dev.yml")
 
   const opts = ["--build", "--remove-orphans"]
   if (!is_production) opts.push("--abort-on-container-exit")
 
-  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) {
-    console.log("start_server::error\n", err)
-    process.exit(1)
-  }
+  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(" "))
+
+  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")}: ${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(line)}\n`)
+    })
+  })
+
+  // try {
+  //
+  // } catch (err) {
+  //   console.log("start_server::error\n", err)
+  //   process.exit(1)
+  // }
 }
 
 module.exports = run_docker

package/cli/run_native.js

@@ -6,18 +6,19 @@ const fs = require("fs")
 
 
 const run_processes = [
-  ["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",
-  ]],
+  ["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 = () => {
@@ -28,16 +29,18 @@ const run_processes = [
 // }
 
 
-
+// TODO: run each native process from list
+// TODO: handle process close
 const run_native = (infrastructure_dir, proj_prefix) => {
-  console.log("native mode")
+  console.log("running in NATIVE mode")
   // const env = get_env()
 
-  const ps = spawn("ls", ["-la"])
+  const ps = spawn("yarn", ["dev"], {env: {...process.env, CONTAINER_MODE: "native"}})
   ps.stdout.on("data", (data) => {
-    console.log("stdout", data.toString())
+    process.stdout.write(data.toString())
   })
 
+
 }
 
 module.exports = run_native

package/cli/start_server.js

@@ -20,6 +20,7 @@ const start_server = async() => {
   const runtime = get_runtime()
 
   if (runtime === "native") {
+    run_docker(infrastructure_dir, proj_prefix, true)
     run_native(infrastructure_dir, proj_prefix)
   } else {
     run_docker(infrastructure_dir, proj_prefix)

package/database.js

@@ -2,7 +2,7 @@
 const mongoose = require("mongoose")
 const validator = require("validator")
 
-const {DATABASE_NAME, DATABASE_PORT} = process.env
+const {DATABASE_NAME, DATABASE_PORT, CONTAINER_MODE} = process.env
 
 if (typeof DATABASE_PORT !== "string" || !validator.isPort(DATABASE_PORT)) {
   throw new Error("expected DATABASE_PORT to be a valid port number")
@@ -12,7 +12,9 @@ if (typeof DATABASE_NAME !== "string") {
   throw new Error("expected DATABASE_NAME to be a string")
 }
 
-const mongo_url = `mongodb://database:${DATABASE_PORT}/${DATABASE_NAME}?directConnection=true&replicaSet=rs0`
+const hostname = CONTAINER_MODE === "native" ? "localhost" : "database"
+
+const mongo_url = `mongodb://${hostname}:${DATABASE_PORT}/${DATABASE_NAME}?directConnection=true&replicaSet=rs0`
 
 
 module.exports = async() => {

package/express/dev_save_coverage.js

@@ -6,7 +6,7 @@ const is_production = process.env.NODE_ENV === "production"
 module.exports = (app) => {
 
   app.post("/api/__dev_save_coverage", (req, res) => {
-    console.log(global.__coverage__)
-    console.log("WOW save coverage")
+    console.log("sending coverage for", req.body.path_key)
+    res.json(global.__coverage__)
   })
 }

package/express/index.js

@@ -56,7 +56,7 @@ module.exports = () => {
 
   app.get("/api/ping", (req, res) => res.json({message: "pong"}))
   app.post("/api/ping", (req, res) => res.json({message: "pong"}))
-  console.log("WITH COVERAGE WOW")
+
   dev_save_coverage(app)
 
   return app

package/express/session_middleware.js

@@ -8,12 +8,14 @@ const redis_store = require("connect-redis")(session)
 // https://stackoverflow.com/questions/70867229/error-connection-timeout-when-connecting-to-redis-docker-instance
 // https://github.com/redis/node-redis/issues/1656/
 
-const {SESSION_STORE_PORT} = process.env
+const {SESSION_STORE_PORT, CONTAINER_MODE} = process.env
 
 if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PORT)) {
   throw new Error("expected SESSION_STORE_PORT to be a valid port number")
 }
 
+const hostname = CONTAINER_MODE === "native" ? "localhost" : "session-store"
+
 let session_middleware = null
 
 // extreme warning: docker issue
@@ -36,7 +38,7 @@ setTimeout(async() => {
 
   const redis_client = createClient({
     socket: {
-      host: "session-store",
+      host: hostname,
       port: SESSION_STORE_PORT,
       reconnectStrategy,
       connectTimeout: 10000,

package/index.js

@@ -5,6 +5,7 @@ const express = require("./express")
 const rpc_router = require("./rpc/rpc_router")
 
 
+
 module.exports = {
   client_router,
   database,

package/package.json

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

package/rpc/rpc_router.js

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