@rpcbase/server 0.337.0 → 0.339.0

package/boot/server.js

@@ -2,7 +2,7 @@
 // MUST COME FIRST!
 require("./shared")
 //
-const rb_server_plugin = require("rb-plugin-server")
+const rb_server_plugin = require("/rb-plugin-server")
 
 const http = require("http")
 

package/boot/worker.js

@@ -1,7 +1,7 @@
 /* @flow */
 require("./shared")
 
-require("rb-plugin-worker")
+require("/rb-plugin-worker")
 
 const register_queue_listener = require("../queue/register_queue_listener")
 

package/package.json

@@ -1,11 +1,8 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.337.0",
+  "version": "0.339.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
-  "bin": {
-    "rb-server": "./bin.js"
-  },
   "scripts": {
     "test": "../../node_modules/.bin/wireit"
   },
@@ -81,14 +78,12 @@
     "lodash": "4.17.21",
     "mkdirp": "2.1.3",
     "mongoose": "8.1.0",
-    "nodemon": "3.0.3",
     "picocolors": "1.0.0",
     "postmark": "4.0.2",
     "redis": "4.6.12",
     "request-ip": "3.3.0",
     "sift": "17.0.1",
     "socket.io": "4.7.4",
-    "validator": "13.11.0",
-    "yargs": "17.7.2"
+    "validator": "13.11.0"
   }
 }

package/bin.js

@@ -1,80 +0,0 @@
-#!/usr/bin/env node
-/* @flow */
-process.title = "rb-cli-server"
-const path = require("path")
-require("dotenv").config({path: path.join(__dirname, "./.env")})
-
-const yargs = require("yargs/yargs")
-const {hideBin} = require("yargs/helpers")
-
-const pack = require("./package.json")
-const start_server_infrastructure = require("./cli/start_server_infrastructure")
-const run_dev_server = require("./cli/run_dev_server")
-const run_dev_worker = require("./cli/run_dev_worker")
-const build_server = require("./cli/build_server")
-const check_args = require("./cli/check_args")
-const run_agent = require("./cli/run_agent")
-
-let is_command = false
-
-
-const args = yargs(hideBin(process.argv))
-  .option("verbose", {
-    type: "boolean",
-    default: false,
-    description: "Run with verbose logging"
-  })
-  .option("sessions", {
-    type: "boolean",
-    default: false,
-    description: "Run with the sessions store enabled"
-  })
-  .option("session", {
-    hidden: true,
-  })
-  .command("start", "runs server/infrastructure", (yargs) => {
-    yargs
-      .option("docker", {
-        type: "boolean",
-        default: false,
-        description: "Run in docker"
-      })
-  }, (args) => {
-    is_command = true
-    check_args(args)
-    start_server_infrastructure(args)
-  })
-  .command("dev-server", "runs the web server in dev mode", () => {}, (args) => {
-    is_command = true
-    run_dev_server(args)
-  })
-  .command("dev-worker", "runs the worker in dev mode", () => {}, (args) => {
-    is_command = true
-    run_dev_worker(args)
-  })
-  .command("agent", "run the agent", () => {}, (args) => {
-    is_command = true
-    run_agent()
-  })
-  .command("build", "Build the server package", () => {}, (args) => {
-    is_command = true
-    build_server()
-  })
-  .parse()
-
-
-if (!is_command) {
-  console.log("server default command exiting.")
-  process.exit(0)
-}
-
-
-// TODO: why was this needed
-// -> was this for when running in docker ? I think yes
-
-// // add helpers to ensure proper process termination
-// const exit_clean = () => {
-//   process.exit()
-// }
-// process.on("SIGINT", exit_clean) // ctrl-c
-// process.on("SIGTERM", exit_clean) // kill

package/cli/build_server.js

@@ -1,27 +0,0 @@
-/* @flow */
-const path = require("path")
-const fs = require("fs")
-
-const run_docker = require("./run_docker")
-const run_native = require("./run_native")
-
-
-const build_server = async() => {
-  // const build_schemas =
-  // 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)
-  //
-  //
-  // if (runtime === "native") {
-  //   run_native(infrastructure_dir, proj_prefix)
-  // } else {
-  //   run_docker(infrastructure_dir, proj_prefix)
-  // }
-  console.log("WOW run build server")
-
-}
-
-module.exports = build_server

package/cli/check_args.js

@@ -1,29 +0,0 @@
-/* @flow */
-
-const check_args = (args) => {
-  if (typeof args.session !== "undefined") {
-    throw new Error("Did you mean --sessions?")
-  }
-
-  try {
-    const {npm_config_argv} = process.env
-
-    // if not started from npm (ie: docker) this var is not set, we assume args are correct
-    if (!npm_config_argv) {
-      console.warn("no npm_config_argv skipping arg check")
-      return
-    }
-
-    const raw_args = JSON.parse(npm_config_argv).original
-    if (raw_args.indexOf("--no-session") > -1) {
-      throw new Error("Did you mean --no-sessions?")
-    }
-  } catch (err) {
-    console.log("ERROR CHECKING ARGS", raw_args)
-  }
-
-  return true
-}
-
-
-module.exports = check_args

package/cli/get_dev_watcher.js

@@ -1,51 +0,0 @@
-/* @flow */
-const picocolors = require("picocolors")
-const nodemon = require("nodemon")
-
-
-const MAX_RECENT_CRASHES = 16
-const CRASH_COOLDOWN_INTERVAL = 10000
-const CRASH_RESTART_DELAY = 1000
-
-
-const get_dev_watcher = ({script, nodeArgs = [], ...opts}) => {
-
-  let crash_count = 0
-
-  const instance = nodemon({
-    script,
-    nodeArgs: [...nodeArgs, "--stack-trace-limit=64"],
-    ...opts,
-  })
-
-  instance.on("start", () => {
-    console.log(picocolors.green(`${script} has started`))
-  }).on("quit", () => {
-    console.log(picocolors.green(`${script} has quit`))
-    process.exit()
-  }).on("restart", (files) => {
-    console.log(picocolors.green(`${script} restarted due to: ${files?.length} changes`))
-  }).on("crash", () => {
-    crash_count++
-
-    if (crash_count > MAX_RECENT_CRASHES) {
-      return
-    }
-
-    console.log(picocolors.red(`${script} crashed, will restart`))
-
-    setTimeout(() => {
-      instance.emit("restart")
-    }, CRASH_RESTART_DELAY)
-  })
-
-  setInterval(() => {
-    if (crash_count > 0) {
-      crash_count--
-    }
-  }, CRASH_COOLDOWN_INTERVAL)
-
-  return instance
-}
-
-module.exports = get_dev_watcher

package/cli/run_agent.js

@@ -1,17 +0,0 @@
-/* @flow */
-const path = require("path")
-const fs = require("fs")
-
-const {run} = require("@rpcbase/agent")
-
-const run_agent = async() => {
-  process.title = "rb-agent"
-
-  const cwd = process.cwd()
-  const proj_parent_dir = path.join(cwd, "../../")
-  const proj_prefix = path.basename(proj_parent_dir)
-
-  run(proj_prefix)
-}
-
-module.exports = run_agent

package/cli/run_dev_server.js

@@ -1,17 +0,0 @@
-/* @flow */
-const get_dev_watcher = require("./get_dev_watcher")
-
-const run_dev_server = (args) => {
-
-  const watcher = get_dev_watcher({
-    script: "./build/server.js",
-    ignore: [],
-    watch: [
-      "./build/server.js",
-    ],
-    delay: "500ms"
-  })
-
-}
-
-module.exports = run_dev_server

package/cli/run_dev_worker.js

@@ -1,17 +0,0 @@
-/* @flow */
-const get_dev_watcher = require("./get_dev_watcher")
-
-const run_dev_worker = (args) => {
-
-  const watcher = get_dev_watcher({
-    script: "./build/worker.js",
-    ignore: [],
-    watch: [
-      "./build/worker.js",
-    ],
-    delay: "500ms"
-  })
-
-}
-
-module.exports = run_dev_worker

package/cli/run_docker.js

@@ -1,73 +0,0 @@
-/* @flow */
-const {execSync} = require("child_process")
-const path = require("path")
-const fs = require("fs")
-const debug = require("debug")
-
-
-const log = debug("docker")
-
-const is_production = process.env.NODE_ENV === "production"
-const is_ci = process.env.CI === "true"
-
-const run_docker = async(infrastructure_dir, proj_prefix, args) => {
-  // env
-  const env_path = path.relative(infrastructure_dir, path.join(process.cwd(), "./.env"))
-
-  const exists = (f) => {
-    const target_path = path.join(infrastructure_dir, f)
-    return fs.existsSync(target_path)
-  }
-
-  // compose files
-  const compose_files = ["-f", "common.yml"]
-  // TODO: which files are loaded and when should be documented
-  // when running with native mode, do not load native infrastructure
-  if (is_production && exists("prod.yml")) {
-    compose_files.push("-f", "prod.yml")
-  }
-  if (!is_production && exists("dev.yml")) {
-    compose_files.push("-f", "dev.yml")
-  }
-
-  if (is_ci) {
-    console.log("CI==true, will skip docker build")
-  }
-
-  const opts = [
-    is_ci ? "--no-build" : "--build",
-    is_ci ? "--no-recreate" : "--force-recreate",
-    /*"--quiet-pull",*/
-    "--remove-orphans",
-    !is_production && "--abort-on-container-exit",
-  ].filter(Boolean)
-
-
-  const cmd = "docker compose"
-  const cmd_args = ["--env-file", env_path, "-p", proj_prefix, ...compose_files, "up", ...opts]
-
-  console.log("CMD", cmd_args.join(" "))
-
-  const ps_env = {
-    ...process.env,
-  }
-
-  if (args.sessions) {
-    ps_env.RB_SESSION_STORE = "yes"
-  }
-
-  const exec_cmd = `${cmd} ${cmd_args.join(" ")}`
-
-  log("CMD", exec_cmd)
-
-  // WARNING: blocks the process
-  // this is the only way to have docker-compose shut down gracefully
-  execSync(exec_cmd, {
-    cwd: infrastructure_dir,
-    stdio: "inherit",
-    env: ps_env
-  })
-
-}
-
-module.exports = run_docker

package/cli/run_native.js

@@ -1,217 +0,0 @@
-/* @flow */
-const assert = require("assert")
-const {spawn} = require("child_process")
-const path = require("path")
-const fs = require("fs")
-
-const colors = require("picocolors")
-const validator = require("validator")
-const dotenv = require("dotenv")
-const mkdirp = require("mkdirp")
-
-// TODO: verify mongod and redis-sever and elasticsearch executables are present
-// and have the right version
-
-const is_production = process.env.NODE_ENV === "production"
-
-
-const NO_PRINT_LIST = [
-  // "database",
-]
-
-// load 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 get_processes = (args) => {
-  const env = get_env()
-
-  assert(env.RB_APP_NAME, "missing RB_APP_NAME in env")
-
-  const infrastructure_conf_dir = path.join(__dirname, "../infrastructure")
-
-  // db storage
-  const db_path = path.join(process.cwd(), "../infrastructure/data/database/db/")
-
-  // db log file
-  const db_logs_path = path.join(process.cwd(), "../infrastructure/data/database/log/logs.txt")
-
-  // session-store + worker-queue
-  const session_store_dir = path.join(process.cwd(), "../infrastructure/data/session-store/data")
-  const session_store_logs_path = path.join(process.cwd(), "../infrastructure/data/session-store/log/logs.txt")
-  const worker_queue_dir = path.join(process.cwd(), "../infrastructure/data/worker-queue/data")
-  const worker_queue_logs_path = path.join(process.cwd(), "../infrastructure/data/worker-queue/log/logs.txt")
-
-  const has_uds = true
-  const uds_root_path = `/tmp/sockets-${env.RB_APP_NAME}/`
-  if (has_uds && !fs.existsSync(uds_root_path)) {
-    mkdirp.sync(uds_root_path)
-  }
-
-  const processes = [
-    // web server
-    {
-      name: "server",
-      dirs: [],
-      // yarn dev-server
-      cmd: ["yarn", ["dev-server"]]
-    },
-    {
-      name: "worker",
-      dirs: [],
-      cmd: ["yarn", ["dev-worker"]]
-    },
-    // mongodb database
-    {
-      name: "database",
-      dirs: [
-        db_path,
-        path.dirname(db_logs_path),
-      ],
-      cmd: ["mongod", [
-        "--quiet",
-        "--dbpath", db_path,
-        "--bind_ip", "127.0.0.1", // TODO: bind to 0.0.0.0 here when going multinodes
-        "--port", env.DATABASE_PORT,
-        ...(has_uds ? ["--unixSocketPrefix", uds_root_path, "--filePermissions", "0700"] : []),
-        // if in verbose mode, print to stdout, else write to file
-        ...(args.verbose ? [] : ["--logpath", db_logs_path]),
-        "--replSet", "rs0"
-      ]]
-    },
-    // session-store
-    {
-      name: "session-store",
-      dirs: [
-        session_store_dir,
-        path.dirname(session_store_logs_path),
-      ],
-      cmd: ["redis-server", [
-        path.join(infrastructure_conf_dir, "./redis/redis.conf"),
-        "--dir", session_store_dir,
-        "--port", env.SESSION_STORE_PORT,
-        ...(args.verbose ? [] : ["--logfile", session_store_logs_path]),
-      ]]
-    },
-    // server-store
-    {
-      name: "server-store",
-      dirs: [
-        session_store_dir,
-        path.dirname(session_store_logs_path),
-      ],
-      cmd: ["redis-server", [
-        path.join(infrastructure_conf_dir, "./redis/redis.conf"),
-        "--dir", session_store_dir,
-        "--port", env.SERVER_STORE_PORT,
-        ...(args.verbose ? [] : ["--logfile", session_store_logs_path]),
-      ]]
-    },
-    // worker-queue
-    {
-      name: "worker-queue",
-      dirs: [
-        worker_queue_dir,
-        path.dirname(worker_queue_logs_path),
-      ],
-      cmd: ["redis-server", [
-        path.join(infrastructure_conf_dir, "./redis/redis.conf"),
-        "--dir", worker_queue_dir,
-        "--port", env.WORKER_QUEUE_PORT,
-        ...(args.verbose ? [] : ["--logfile", worker_queue_logs_path]),
-      ]]
-    },
-  ]
-
-  // add search-index elasticsearch if port is defined
-  if (env.SEARCH_INDEX_PORT && validator.isPort(env.SEARCH_INDEX_PORT)) {
-    const data_dir = path.join(process.cwd(), "../infrastructure/data/search-index/data")
-    const logs_dir = path.join(process.cwd(), "../infrastructure/data/search-index/logs")
-    processes.push({
-      name: "search-index",
-      dirs: [
-        data_dir,
-        logs_dir,
-      ],
-      cmd: ["elasticsearch", [
-        "-s",
-        "-E", `path.logs=${logs_dir}`,
-        "-E", `http.port=${env.SEARCH_INDEX_PORT}`,
-        ...(is_production ? [] : [
-          "-E", `http.cors.enabled=true`,
-          "-E", `http.cors.allow-origin=http://localhost:8080`,
-        ]),
-        "-E", `path.data=${data_dir}`,
-        "-E", "discovery.type=single-node",
-        "-E", "cluster.initial_master_nodes=''",
-        "-E", "xpack.security.enabled=false",
-        "-E", "xpack.ml.enabled=false",
-        "-E", "ingest.geoip.downloader.enabled=false",
-      ]]
-    })
-  }
-
-  // create missing directories
-  processes.forEach((item) => {
-    item.dirs.forEach((dir) => {
-      if (!fs.existsSync(dir)) {
-        mkdirp.sync(dir)
-      }
-    })
-  })
-
-  return processes
-}
-
-// TODO: run each native process from list
-// TODO: handle process close
-const run_native = (infrastructure_dir, proj_prefix, args) => {
-  console.log(`running in ${colors.bold(colors.magenta("NATIVE"))} mode`)
-
-  const processes = get_processes(args)
-
-
-  const run_process = (item) => {
-    const ps_env = {
-      ...process.env
-    }
-
-    if (args.sessions) {
-      ps_env.RB_SESSION_STORE = "yes"
-    }
-
-
-    const ps = spawn(item.cmd[0], item.cmd[1], {env: ps_env})
-
-    // TODO: add flag to force print
-    if (!NO_PRINT_LIST.includes(item.name)) {
-
-      let prefix = ""
-      // avoid printing [server] server:
-      if (!args.verbose && item.name !== "server") {
-        prefix = `${colors.green(item.name)}:`
-      }
-
-      ps.stdout.on("data", (data) => {
-        process.stdout.write(`${prefix}${data.toString()}`)
-      })
-
-      ps.stderr.on("data", (data) => {
-        process.stderr.write(`${prefix}${data.toString()}`)
-      })
-    }
-  }
-
-  const spawned = processes.map(run_process)
-
-  process.on("exit", () => {
-    console.log("EXIT from native1")
-    // ps.kill()
-  })
-}
-
-module.exports = run_native

package/cli/start_server_infrastructure.js

@@ -1,27 +0,0 @@
-/* @flow */
-const path = require("path")
-const fs = require("fs")
-
-const run_docker = require("./run_docker")
-const run_native = require("./run_native")
-
-// TODO: auto create network if necessary
-// docker network create ${RB_APP_NAME}-network
-
-const start_server = async(args) => {
-  const infrastructure_dir = path.join(process.cwd(), "../infrastructure")
-
-  const runtime = args.docker ? "docker" : "native"
-
-  // prefix
-  const proj_parent_dir = path.join(infrastructure_dir, "../../")
-  const proj_prefix = path.basename(proj_parent_dir)
-
-  if (runtime === "docker") {
-    run_docker(infrastructure_dir, proj_prefix, args)
-  } else if (runtime === "native") {
-    run_native(infrastructure_dir, proj_prefix, args)
-  }
-}
-
-module.exports = start_server

package/infrastructure/elasticsearch/Dockerfile

@@ -1,3 +0,0 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:8.6.1
-
-RUN bin/elasticsearch-plugin remove --purge repository-gcs