@rpcbase/server 0.36.0 → 0.39.0

package/cli/get_runtime.js

@@ -0,0 +1,14 @@
+/* @flow */
+const os = require("os")
+
+const get_runtime = () => {
+  if (os.platform() === "darwin") {
+    console.warn("warning: native mode is tmp disabled")
+    // return "native"
+    return "docker"
+  } else {
+    return "docker"
+  }
+}
+
+module.exports = get_runtime

package/cli/native/get_commands.js

@@ -0,0 +1,3 @@
+// hardcoded infrastructure members ?
+// server + worker + 2 redis + 3 mongodb??
+// run the remaining services in docker ?

package/cli/run_docker.js

@@ -0,0 +1,31 @@
+/* @flow */
+const {execSync} = require("child_process")
+const path = require("path")
+
+const is_production = "yes" === process.env.INFRASTRUCTURE_IS_PRODUCTION
+
+
+const run_docker = async(infrastructure_dir, proj_prefix) => {
+  // env
+  const env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env"))
+
+  // compose files
+  const compose_files = ["-f common.yml"]
+  if (is_production) compose_files.push("-f prod.yml")
+  else compose_files.push("-f dev.yml")
+
+  const opts = ["--build", "--remove-orphans"]
+  if (!is_production) opts.push("--abort-on-container-exit")
+  throw "shit"
+  const cmd = `docker-compose --quiet --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)
+  }
+}
+
+module.exports = run_docker

package/cli/run_native.js

@@ -0,0 +1,46 @@
+/* @flow */
+const {spawn} = require("child_process")
+const dotenv = require("dotenv")
+const path = require("path")
+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",
+  ]],
+]
+
+
+
+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 run_native = (infrastructure_dir, proj_prefix) => {
+  console.log("native mode")
+  const env = get_env()
+
+  const ps = spawn("ls", ["-la"])
+  ps.stdout.on("data", (data) => {
+    console.log("stdout", data.toString())
+  })
+
+}
+
+module.exports = run_native

package/cli/start_server.js

@@ -1,40 +1,30 @@
 /* @flow */
-const {execSync} = require("child_process")
 const path = require("path")
 const fs = require("fs")
 
-const is_production = "yes" === process.env.INFRASTRUCTURE_IS_PRODUCTION
+const get_runtime = require("./get_runtime")
+const run_docker = require("./run_docker")
+const run_native = require("./run_native")
+
 
 // TODO: auto create network if necessary
 // docker network create local-network
 
 const start_server = async() => {
-  if (is_production) {
-    console.log("server will run in production")
-  }
 
   const infrastructure_dir = path.join(process.cwd(), "../infrastructure")
 
-  // env
-  const env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env"))
-
   // prefix
   const proj_parent_dir = path.join(infrastructure_dir, "../../")
   const proj_prefix = path.basename(proj_parent_dir)
 
-  // compose files
-  const compose_files = ["-f common.yml"]
-  if (is_production) compose_files.push("-f prod.yml")
-  else compose_files.push("-f dev.yml")
-
-  const cmd = `docker-compose --env-file ${env_path} -p ${proj_prefix} ${compose_files.join(" ")} up --build --remove-orphans`
+  const runtime = get_runtime()
 
-  console.log(cmd)
-  try {
-    execSync(cmd, {stdio: "inherit", cwd: infrastructure_dir})
-  } catch (err) {
-    console.log("start_server::error\n", err)
-    process.exit(1)
+  console.log("RUN", runtime)
+  if (runtime === "native") {
+    run_native(infrastructure_dir, proj_prefix)
+  } else {
+    run_docker(infrastructure_dir, proj_prefix)
   }
 
 }

package/database.js

@@ -18,10 +18,12 @@ const replicaset_str = [0, 1, 2].map((i) => `database${i}:${process.env["DATABAS
 console.log("db connection str:", replicaset_str)
 
 const mongo_url = `mongodb://${replicaset_str}/${DATABASE_NAME}?`
-  + `replicaSet=rs0&readPreference=secondary`
+  + `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)
   // console.log("waiting after return", ret)
   // TODO: handle connection retry and pools

package/express/index.js

@@ -11,7 +11,7 @@ const {APP_DOMAIN, CLIENT_PORT} = process.env
 
 module.exports = () => {
   const app = express()
-  app.use(body_parser.json())
+  app.use(body_parser.json({limit: "2mb"}))
 
   app.set("trust proxy", 1)
 
@@ -38,9 +38,10 @@ module.exports = () => {
     // local dev origins
     [
       `http://localhost:${CLIENT_PORT}`,
-      "http://localhost:8090",
+      "http://localhost:8090", // TMP: used by client of admin
       "localhost",
     ]
+
   // console.log("SETUP CORS", cors_origins)
 
   app.use(cors({
@@ -52,7 +53,8 @@ module.exports = () => {
   console.log("use session middleware")
   app.use(session_middleware)
 
-  app.get("/api/ping", (req, res) => res.json({status: "ok"}))
+  app.get("/api/ping", (req, res) => res.json({message: "pong"}))
+  app.post("/api/ping", (req, res) => res.json({message: "pong"}))
 
   return app
 }

package/express/session_middleware.js

@@ -1,11 +1,12 @@
 /* @flow */
 const session = require("express-session")
-// const redis = require("redis")
 const validator = require("validator")
+const {createClient} = require("redis")
 const redis_store = require("connect-redis")(session)
 
-const { createClient } = require("redis")
-
+// WARNING:
+// 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
 
@@ -13,13 +14,10 @@ if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PO
   throw new Error("expected SESSION_STORE_PORT to be a valid port number")
 }
 
-const session_store_url = `redis://session-store:${SESSION_STORE_PORT}`
-
-console.log("will connect to session-store", session_store_url)
-
+// console.log("ICIII", execSync("redis-cli -p 7979 -h session-store ping", {stdio: "inherit"}))
 
 const reconnectStrategy = (retries) => {
-  console.log("retrying with arg", retries)
+  console.log("reconnectStrategy::retrying with arg", retries)
   if (retries < 5) {
     console.log("retry count:", retries, "retrying in 1s")
     return 1000
@@ -29,31 +27,31 @@ const reconnectStrategy = (retries) => {
 }
 
 
-
-let redisClient = createClient({
-  socket: {reconnectStrategy},
-  url: session_store_url,
+const redis_client = createClient({
+  socket: {
+    host: "session-store",
+    port: SESSION_STORE_PORT,
+    reconnectStrategy
+  },
   legacyMode: true,
 })
 
-redisClient.connect()
-  .catch((err) => {
-    console.log("session store error ohh", err)
-  })
-  .then(() => {
-    console.log("REDIS CONNECTED OW")
-  })
-
-// const redis_client = redis.createClient({
-//   url: session_store_url
-// })
+// extreme warning: when there is blocking io redis client won't connect
+process.nextTick(() => {
+  redis_client.connect()
+    .catch((err) => {
+      console.log("session store error ohh", err)
+    })
+    .then(() => {
+      console.log("redis session-store connected port:", SESSION_STORE_PORT)
+    })
+})
 
 const session_middleware = session({
-  // store: new redis_store({client: redis_client}),
-  store: new redis_store({client: redisClient}),
+  store: new redis_store({client: redis_client}),
   proxy: true,
   saveUninitialized: false,
-  // TODO: fix session secret
+  // TODO: use session secret from env
   secret: "session secret wowow",
   resave: false,
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.36.0",
+  "version": "0.39.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -11,13 +11,14 @@
   },
   "dependencies": {
     "body-parser": "1.19.2",
-    "connect-redis": "6.1.1",
+    "connect-redis": "6.1.2",
     "cors": "2.8.5",
+    "debug": "4.3.3",
     "dotenv": "16.0.0",
     "express": "4.17.3",
     "express-session": "1.17.2",
     "glob": "7.2.0",
-    "mongoose": "6.2.4",
+    "mongoose": "6.2.6",
     "redis": "4.0.4",
     "validator": "13.7.0",
     "yargs": "17.3.1"

package/rpc/rpc_router.js

@@ -2,6 +2,7 @@
 const fs = require("fs")
 const path = require("path")
 const glob = require("glob")
+const debug = require("debug")
 
 const src_path = path.join(process.cwd(), "./src/")
 const build_dir = path.join(process.cwd(), "build/")
@@ -16,6 +17,9 @@ 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, "/")
@@ -30,6 +34,7 @@ const rpc_router = (app) => {
     const rpc_fn = require(module_path)
     app.post(`/rpc/${route_path}`, async_wrapper(async(req, res) => {
       // console.log("GOT REQ", req.body)
+      console.log(`POST /rpc/${route_path}`)
       // TODO: add jaegerclient / opentelemetry
       const result = await rpc_fn(req.body, {req})