@rpcbase/server 0.52.0 → 0.55.0

package/bin.js

@@ -8,6 +8,7 @@ const {hideBin} = require("yargs/helpers")
 
 const start_server = require("./cli/start_server")
 const build_server = require("./cli/build_server")
+const run_agent = require("./cli/run_agent")
 
 let is_command = false
 
@@ -16,6 +17,10 @@ const args = yargs(hideBin(process.argv))
     is_command = true
     start_server()
   })
+  .command("agent", "run the agent", () => {}, (argv) => {
+    is_command = true
+    run_agent()
+  })
   .command("build", "build server", () => {}, (argv) => {
     is_command = true
     build_server()
@@ -33,5 +38,5 @@ const args = yargs(hideBin(process.argv))
   .parse()
 
 if (!is_command) {
-  console.log("default command")
+  console.log("default com22mand")
 }

package/cli/run_agent.js

@@ -0,0 +1,33 @@
+/* @flow */
+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() => {
+  const cwd = process.cwd()
+  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

@@ -15,6 +15,8 @@ const run_docker = async(infrastructure_dir, proj_prefix) => {
   }
   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")
 

package/cli/run_native.js

@@ -1,6 +1,6 @@
 /* @flow */
 const {spawn} = require("child_process")
-const dotenv = require("dotenv")
+// const dotenv = require("dotenv")
 const path = require("path")
 const fs = require("fs")
 
@@ -20,20 +20,18 @@ const run_processes = [
   ]],
 ]
 
-
-
-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 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 env = get_env()
 
   const ps = spawn("ls", ["-la"])
   ps.stdout.on("data", (data) => {

package/database.js

@@ -12,10 +12,10 @@ if (typeof DATABASE_NAME !== "string") {
   throw new Error("expected DATABASE_NAME to be a string")
 }
 
-const mongo_url = `mongodb://127.0.0.1:${DATABASE_PORT}/${DATABASE_NAME}`
+const mongo_url = `mongodb://database:${DATABASE_PORT}/${DATABASE_NAME}?directConnection=true&replicaSet=rs0`
 
-module.exports = async() => {
 
+module.exports = async() => {
   // set listeners before attempting to connect
   mongoose.connection.on("connected", () => {
     console.log("mongoose connected")
@@ -31,13 +31,13 @@ module.exports = async() => {
     console.log("mongoose connection error", err)
   })
 
-
   console.log("connect mongo_url", mongo_url)
 
   const connect_opts = {
     keepAlive: true,
     keepAliveInitialDelay: 5000,
     minPoolSize: 5,
+    maxPoolSize: 1024 * 1024,
     family: 4, // force ipv4
   }
 

package/express/session_middleware.js

@@ -16,9 +16,10 @@ if (typeof SESSION_STORE_PORT === "string" && !validator.isPort(SESSION_STORE_PO
 
 let session_middleware = null
 
-// extreme warning: when there is blocking io redis client won't connect
-process.nextTick(async() => {
-
+// extreme warning: docker issue
+// when there is synchronous io redis client fails to connect
+// process.nextTick(async() => {
+setTimeout(async() => {
   if (!SESSION_STORE_PORT) {
     return
   }
@@ -35,7 +36,7 @@ process.nextTick(async() => {
 
   const redis_client = createClient({
     socket: {
-      host: "127.0.0.1",
+      host: "session-store",
       port: SESSION_STORE_PORT,
       reconnectStrategy,
       connectTimeout: 10000,
@@ -44,9 +45,12 @@ process.nextTick(async() => {
     legacyMode: true,
   })
 
-  console.log("redis session willconnect")
-  await redis_client.connect()
-  console.log("redis session connected")
+
+  redis_client.on("ready", () => {
+    console.log("session-storage::redis_client connected")
+  })
+
+  const res = await redis_client.connect()
 
   session_middleware = session({
     store: new redis_store({client: redis_client}),
@@ -57,7 +61,7 @@ process.nextTick(async() => {
     resave: false,
   })
 
-})
+}, 300)
 
 
 module.exports = (req, res, next) => {

package/infrastructure/compose-redis.yml

@@ -0,0 +1,19 @@
+# docker-compose
+version: "3"
+
+services:
+  # connect-redis session store
+  session-store:
+    image: redis:6.2.7-alpine
+    volumes:
+      - ./redis/redis.conf:/usr/local/etc/redis/redis.conf
+      - ./data/session-store/log/:/var/log/
+    networks:
+      - local-network
+    ports:
+      - "127.0.0.1:$SESSION_STORE_PORT:$SESSION_STORE_PORT"
+    command: [
+      "redis-server",
+      "/usr/local/etc/redis/redis.conf",
+      "--port", $SESSION_STORE_PORT
+    ]