@rpcbase/server 0.153.0 → 0.155.0

package/cli/run_docker.js

@@ -25,10 +25,10 @@ const run_docker = async(infrastructure_dir, proj_prefix) => {
     compose_files.push("-f", "dev.yml")
   }
 
-  const opts = ["--build", "--remove-orphans"]
+  const opts = ["--build", "--quiet-pull", "--remove-orphans", "--force-recreate"]
   if (!is_production) opts.push("--abort-on-container-exit")
 
-  const cmd = "docker-compose"
+  const cmd = "docker compose"
   const cmd_args = ["--env-file", env_path, "-p", proj_prefix, ...compose_files, "up", ...opts]
 
   console.log(cmd_args.join(" "))

package/express/index.js

@@ -57,6 +57,7 @@ module.exports = () => {
       `http://admin.localhost:${CLIENT_PORT}`,
       // TODO: WARNING: TMP hardcoded port
       "http://localhost:8090", // TMP: used by inspected app from admin
+      "http://localhost:8091", // TMP: used by inspected app from admin
       "http://localhost:9292", // TMP
     ]
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.153.0",
+  "version": "0.155.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.25.0",
+    "@rpcbase/agent": "0.26.0",
     "@rpcbase/std": "0.5.0",
     "body-parser": "1.20.1",
     "bull": "4.10.2",

package/queue/register_queue_listener.js

@@ -7,8 +7,6 @@ const queue = require("./index")
 const dispatch_queue = require("./dispatch_queue")
 
 
-console.log("AFTER REQUIRE register_model_emitter")
-
 const log = debug("rb:queue:listener")
 
 // Listens for mongodb change events,
@@ -31,8 +29,18 @@ const mongoose_delete_plugin = (schema) => {
 }
 
 
-const get_dispatch_change_handler = (model_name) => (change) => {
-  // console.log("change data", model_name, change)
+const get_dispatch_change_handler = (model_name, filter_fn) => (change) => {
+  if (typeof filter_fn === "function") {
+    let ret
+    try {
+      ret = filter_fn(model_name, change)
+    } catch (err) {
+      console.log("get_dispatch_change_handler::filter_fn::error:", err)
+    }
+    if (!ret) {
+      return
+    }
+  }
   const op = change.operationType
   if (["insert", "update"].includes(op)) {
     dispatch_queue(queue, model_name, op, change.fullDocument)
@@ -40,15 +48,15 @@ const get_dispatch_change_handler = (model_name) => (change) => {
 }
 
 
-const register_model_emitter = (model_name) => {
-  console.log("REG", model_name)
+const register_model_emitter = (model_name, filter_fn) => {
+  log("registering emitter for", model_name)
   const model = mongoose.model(model_name)
   // TODO: implement delete operation fullDocument retrieve,
   // when this is released https://jira.mongodb.org/browse/SERVER-36941
   // this is done via a plugin right now
   const emitter = model.watch({fullDocument: "updateLookup"})
 
-  emitter.on("change", get_dispatch_change_handler(model_name))
+  emitter.on("change", get_dispatch_change_handler(model_name, filter_fn))
 
   emitter.on("error", (err) => {
     log("server::queue::register_queue_listener:: change listener emitter got error", err)
@@ -56,24 +64,23 @@ const register_model_emitter = (model_name) => {
 
   emitter.on("close", (arg, arg2) => {
     // TODO: add exponential backoff retry
-    console.log("queue_listener: emitter closed, model:", model_name, "retrying on next tick")
+    console.log("queue_listener: emitter closed, model:", model_name, "retrying on next tick6663")
     process.nextTick(() => {
-      register_model_emitter(model_name)
+      register_model_emitter(model_name, filter_fn)
     })
   })
 }
 
 
-const register_queue_listener = () => {
+const register_queue_listener = (filter_fn) => {
   // register the mongoose delete plugin
   log("registering mongoose_delete_plugin")
   mongoose.plugin(mongoose_delete_plugin)
 
-  mongoose.connection.on("open", () => {
-    console.log("CONNEC OPEN:register_queue_listener")
+  mongoose.connection.once("open", () => {
+    log("queue_listener mongoose connection opened")
     const models = mongoose.modelNames()
-    console.log("WILL register_model_emitter")
-    models.forEach(register_model_emitter)
+    models.forEach((model_name) => register_model_emitter(model_name, filter_fn))
   })
 }