@rpcbase/server 0.59.0 → 0.62.0

package/cli/get_runtime.js

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

package/cli/run_agent.js

@@ -2,9 +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")
 const {run} = require("@rpcbase/agent")
 
 const run_agent = async() => {
@@ -12,22 +9,7 @@ const run_agent = async() => {
   const proj_parent_dir = path.join(cwd, "../../")
   const proj_prefix = path.basename(proj_parent_dir)
 
-  console.log("RUN AGENT", proj_prefix)
   run(proj_prefix)
-  // const infrastructure_dir = path.join(process.cwd(), "../infrastructure")
-  //
-  // // 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)
-  // } else {
-  //   run_docker(infrastructure_dir, proj_prefix)
-  // }
-
 }
 
 module.exports = run_agent

package/cli/run_docker.js

@@ -1,22 +1,23 @@
 /* @flow */
-const {execSync} = require("child_process")
+const {exec} = require("child_process")
 const path = require("path")
 
 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"]
+  if (!is_native) {
+    compose_files.push("-f native.yml")
+  }
   if (is_production) {
     compose_files.push("-f prod.yml")
   }
   else compose_files.push("-f dev.yml")
 
-  // console.log("got compose files", compose_files)
-
   const opts = ["--build", "--remove-orphans"]
   if (!is_production) opts.push("--abort-on-container-exit")
 
@@ -24,12 +25,18 @@ const run_docker = async(infrastructure_dir, proj_prefix) => {
 
   console.log(cmd)
 
-  try {
-    execSync(cmd, {stdio: "inherit", cwd: infrastructure_dir})
-  } catch (err) {
-    console.log("start_server::error\n", err)
-    process.exit(1)
-  }
+  exec(cmd, {stdio: "inherit", cwd: infrastructure_dir}, (err) => {
+    if (err) {
+      console.log("GOT ERRR", err)
+    }
+    console.log("docker process exited")
+  })
+  // 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

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

package/express/index.js

@@ -3,6 +3,7 @@ const cors = require("cors")
 const express = require("express")
 const body_parser = require("body-parser")
 
+const dev_save_coverage = require("./dev_save_coverage")
 const session_middleware = require("./session_middleware")
 
 const is_production = process.env.IS_PRODUCTION === "yes"
@@ -39,7 +40,8 @@ module.exports = () => {
     [
       `http://localhost:${CLIENT_PORT}`,
       // WARNING: hardcoded port
-      "http://localhost:8090", // TMP: used by client of admin
+      "http://localhost:8090", // TMP: used by inspected app from admin
+      "http://localhost:9292", // TMP
       "localhost",
     ]
 
@@ -54,6 +56,8 @@ 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,
@@ -61,6 +63,7 @@ setTimeout(async() => {
     resave: false,
   })
 
+// TODO: is this still necessary
 }, 300)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.59.0",
+  "version": "0.62.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.5.0",
+    "@rpcbase/agent": "0.6.0",
     "body-parser": "1.20.0",
     "connect-redis": "6.1.3",
     "cors": "2.8.5",

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, "/")