@rpcbase/server 0.238.0 → 0.240.0

package/bin.js

@@ -8,6 +8,8 @@ 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")
@@ -35,6 +37,14 @@ const args = yargs(hideBin(process.argv))
     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()

package/cli/get_dev_watcher.js

@@ -0,0 +1,50 @@
+/* @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, ...opts}) => {
+
+  let crash_count = 0
+
+  const instance = nodemon({
+    script,
+    ...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_dev_server.js

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

package/cli/run_dev_worker.js

@@ -0,0 +1,22 @@
+/* @flow */
+const get_dev_watcher = require("./get_dev_watcher")
+
+const run_dev_worker = (args) => {
+
+  const watcher = get_dev_watcher({
+    script: "worker.js",
+    ignore: [
+    ],
+    watch: [
+      "./worker.js",
+      "build/",
+      "src/",
+      "../../../pms/plugin/",
+      "../../../../rpcbase/pkg/access-control/",
+      "../../../../rpcbase/pkg/server/"
+    ],
+    delay: "500ms"
+  })
+}
+
+module.exports = run_dev_worker

package/cli/run_native.js

@@ -47,13 +47,11 @@ const get_processes = (args) => {
   // TODO: add a redis cache
   const processes = [
     // web server
-    // TODO: do not use yarn dev server command
-    // use command: rb-server dev
     {
       name: "server",
       dirs: [],
-      // yarn dev
-      cmd: ["yarn", ["dev"]]
+      // yarn dev-server
+      cmd: ["yarn", ["dev-server"]]
     },
     {
       name: "worker",

package/mailer/index.js

@@ -9,6 +9,9 @@ const {POSTMARK_API_KEY, IS_PRODUCTION, RB_FORCE_SEND_EMAILS} = process.env
 const is_production = IS_PRODUCTION === "yes"
 const force_send = RB_FORCE_SEND_EMAILS === "yes"
 
+
+// TMP use proper mock smtp server in development
+
 log("mailer, is_production:", is_production, "env:", JSON.stringify(IS_PRODUCTION))
 
 let client

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.238.0",
+  "version": "0.240.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -28,6 +28,7 @@
     "lodash": "4.17.21",
     "mkdirp": "2.1.3",
     "mongoose": "7.4.3",
+    "nodemon": "3.0.1",
     "picocolors": "1.0.0",
     "postmark": "3.0.19",
     "redis": "4.6.7",

package/src/rpc/rpc_router.js

@@ -6,14 +6,15 @@ const debug = require("debug")
 
 const async_wrapper = require("../helpers/async_wrapper")
 
+
 const src_path = path.join(process.cwd(), "./src/")
 const build_dir = path.join(process.cwd(), "build/")
 
+const log = debug("rb:rpc")
 
-const rpc_router = (app) => {
-  const rpc_routes = glob.sync(path.join(build_dir, "./rpc/*"))
 
-  // console.log("rpc_routes", rpc_routes)
+const rpc_router = (app) => {
+  const rpc_routes = glob.sync(path.join(build_dir, "./client/rpc/*"))
 
   rpc_routes.forEach((file_path) => {
     const basename = path.basename(file_path)
@@ -29,7 +30,7 @@ const rpc_router = (app) => {
     const rpc_fn = require(module_path)
     app.post(`/rpc/${route_path}`, async_wrapper(async(req, res) => {
 
-      console.log(`POST /rpc/${route_path}`)
+      log(`POST /rpc/${route_path}`)
 
       // TODO: add jaegerclient / opentelemetry
       const result = await rpc_fn(req.body, {req, res})