@rpcbase/server 0.356.0 → 0.357.0

package/boot/server.js

@@ -23,5 +23,11 @@ server.listen(SERVER_PORT, "0.0.0.0", () => {
   console.log(`listening on 0.0.0.0:${SERVER_PORT}`)
 })
 
+// graceful exit handler
+process.on("SIGTERM", () => {
+  server.close(() => {
+    process.exit(0)
+  })
+})
 
 module.exports = app

package/boot/shared.js

@@ -3,8 +3,6 @@ if (typeof __RB_IS_WEBPACK__ === "undefined") {
   throw new Error("cannot run without webpack bundling")
 }
 
-require("source-map-support").install()
-
 require("./setup_env")
 
 require("../extend-expect")

package/boot/worker.js

@@ -9,4 +9,27 @@ const queue = require("../queue")
 
 queue.start()
 
+let _queue_listener
+
 register_queue_listener()
+  .then((arg) => {
+    _queue_listener = arg
+  })
+
+
+const handle_graceful_exit = async () => {
+  const close_fns = [
+    queue.instance().close,
+  ]
+
+  if (_queue_listener) {
+    close_fns.push(_queue_listener.close)
+  }
+
+  await Promise.allSettled(close_fns.map(fn => fn()))
+
+  process.exit(0)
+}
+
+process.on("SIGTERM", handle_graceful_exit)
+// process.on("SIGINT", handle_graceful_exit)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.356.0",
+  "version": "0.357.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "scripts": {
@@ -84,7 +84,6 @@
     "request-ip": "3.3.0",
     "sift": "17.1.3",
     "socket.io": "4.7.5",
-    "source-map-support": "0.5.21",
     "validator": "13.12.0"
   }
 }

package/queue/register_queue_listener.js

@@ -8,22 +8,20 @@ const queue = require("./index")
 
 const dispatch_queue = require("./dispatch_queue")
 
-
 const log = debug("rb:queue:listener")
 
 const {RB_APP_NAME, RB_TENANT_ID} = process.env
 
-const RETRY_MAXIMUM_DELAY = 2000
-const RETRY_MINIMUM_DELAY = 10
-const MAX_RETRIES = 64
+const RETRY_MAXIMUM_DELAY = 3000
+const RETRY_MINIMUM_DELAY = 50
+const MAX_RETRIES = 20
 
 // TODO: reset retry counters when connection becomes healthy again?
 let retry_counter = 0
+let emitter = null
 
 
-// Listens for mongodb change events,
-// when a document is created, updated or deleted, dispatch job message
-
+// TODO: use proper mongodb delete event here now
 // mongoose middleware used for delete events
 const mongoose_delete_plugin = (schema) => {
   schema.pre("deleteOne", function(next) {
@@ -70,38 +68,44 @@ const assert_doc_id = (change) => {
 }
 
 const dispatch_change_handler = (change) => {
-  // skip if change is on another db
-  if (change?.ns?.db !== RB_APP_NAME) {
-    return
-  }
-
+  // verify we have correct object ids
   assert_doc_id(change)
 
-  const op = change.operationType
-  if (["insert", "update"].includes(op)) {
-    const coll_name = change.ns.coll
-
-    const model_name = Object.keys(mongoose.models).find((k) => {
-      return mongoose.models[k].collection.collectionName === coll_name
-    })
+  const coll_name = change.ns.coll
 
-    if (!model_name) {
-      return
-    }
+  const model_name = Object.keys(mongoose.models).find((k) => {
+    return mongoose.models[k].collection.collectionName === coll_name
+  })
 
-    dispatch_queue(queue, model_name, op, change.fullDocument, change.updateDescription)
+  if (!model_name) {
+    return
   }
-}
 
+  dispatch_queue(queue, model_name, op, change.fullDocument, change.updateDescription)
+}
 
 const register_db_emitter = () => {
+  // TODO: unclear why it's necessary to have this step here too even though we already removeListeners in the on close event
+  if (emitter) {
+    emitter.removeAllListeners()
+    emitter.close()
+  }
+
   log("registering db emitter")
 
   // 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
   // https://mongodb.github.io/node-mongodb-native/4.9/interfaces/ChangeStreamOptions.html
-  const emitter = mongoose.connection.watch({fullDocument: "updateLookup"})
+
+  // Set up the change stream with a filter to only listen to the specific database
+  const pipeline = [
+    { $match: { 'ns.db': RB_APP_NAME } },
+    { $match: { operationType: { $in: ["insert", "update", /*"delete"*/] } } }
+  ]
+
+  // https://www.mongodb.com/docs/manual/reference/method/Mongo.watch/
+  emitter = mongoose.connection.watch(pipeline, {fullDocument: "updateLookup"})
 
   emitter.on("change", dispatch_change_handler)
 
@@ -110,7 +114,9 @@ const register_db_emitter = () => {
   })
 
   emitter.on("close", (arg, arg2) => {
-    // TODO: investigate why we disconnect here and can't reconnect easily
+    emitter.removeAllListeners()
+    emitter.close()
+
     retry_counter++
 
     if (retry_counter > MAX_RETRIES) {
@@ -130,18 +136,30 @@ const register_db_emitter = () => {
   emitter.on("end", (arg) => {
     console.log("EMITTER ENDED", arg)
   })
+
+  return emitter
 }
 
 
-const register_queue_listener = () => {
+const register_queue_listener = () => new Promise((resolve, reject) => {
   // register the mongoose delete plugin
   log("registering mongoose_delete_plugin")
   mongoose.plugin(mongoose_delete_plugin)
 
   mongoose.connection.once("open", () => {
-    register_db_emitter()
+    const emitter = register_db_emitter()
+    resolve(emitter)
   })
-}
+
+  mongoose.connection.on("error", (err) => {
+    console.log("register_queue_listener:", "mongoose connection error", err)
+    // reject(err)
+  })
+
+  mongoose.connection.on("disconnected", (err) => {
+    console.log("mongodb:", "mongodb disconnected", err)
+  })
+})
 
 
 module.exports = register_queue_listener