@rpcbase/server 0.37.0 → 0.40.0

package/cli/get_runtime.js

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

package/cli/run_docker.js

@@ -17,7 +17,7 @@ const run_docker = async(infrastructure_dir, proj_prefix) => {
   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(" ")}`
+  const cmd = `docker-compose --quiet --env-file ${env_path} -p ${proj_prefix} ${compose_files.join(" ")} up ${opts.join(" ")}`
 
   console.log(cmd)
   try {

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

@@ -8,7 +8,6 @@ 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
 
 if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PORT)) {
@@ -34,7 +33,7 @@ const redis_client = createClient({
     port: SESSION_STORE_PORT,
     reconnectStrategy
   },
-  // legacyMode: true,
+  legacyMode: true,
 })
 
 // extreme warning: when there is blocking io redis client won't connect

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.37.0",
+  "version": "0.40.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})