@rpcbase/server 0.94.0 → 0.97.0

package/express/dev_save_coverage.js

@@ -1,12 +1,18 @@
 /* @flow */
-// TODO: replace console debug
+const debug = require("debug")
+
+const log = debug("rb:coverage")
 
 
 const is_production = process.env.NODE_ENV === "production"
 
 module.exports = (app) => {
   app.post("/api/__dev_save_coverage", (req, res) => {
-    console.log("sending coverage for", req.body.path_key)
+    if (is_production) {
+      console.warn("refusing to save coverage in production")
+      return res.status(500).end()
+    }
+    // log("sending coverage for", req.body.path_key)
     res.json(global.__coverage__)
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.94.0",
+  "version": "0.97.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -17,7 +17,7 @@
     "connect-redis": "6.1.3",
     "cors": "2.8.5",
     "debug": "4.3.4",
-    "dotenv": "16.0.1",
+    "dotenv": "16.0.2",
     "express": "4.18.1",
     "express-session": "1.17.3",
     "glob": "8.0.3",

package/queue/index.js

@@ -11,8 +11,9 @@ let worker_queue
 
 const worker_add = async(task_name, payload, options) => {
   const res = await worker_queue.add({task_name, payload}, options)
-  // myQueue.add(data, { repeat: { cron: '15 3 * * *' } });
   console.log("created task:", task_name, res.id)
+  console.log(payload)
+  console.log("\n")
   return res
 }
 
@@ -47,9 +48,11 @@ const start_worker = async() => {
   worker_queue.process(async(job) => {
     try {
       const {task_name, payload} = job.data
+
       console.log(`start job ${job.id} ${task_name}`)
-      // await Pomise.delay(2000)
+
       const task_fn = tasks_list[task_name]
+
       const res = await task_fn(payload)
       return res
     } catch (err) {

package/queue/register_queue_listener.js

@@ -1,9 +1,12 @@
 /* @flow */
+const debug = require("debug")
+
 const mongoose = require("../mongoose")
 const queue = require("./index")
 
 const dispatch_queue = require("./dispatch_queue")
 
+const log = debug("rb:queue:listener")
 
 // Listens for mongodb change events,
 // when a document is created, updated or deleted, dispatch job message
@@ -18,8 +21,8 @@ const mongoose_delete_plugin = (schema) => {
   // TODO: add other delete operations
   // https://mongoosejs.com/docs/queries.html
   schema.post("findOneAndDelete", function(doc) {
-    console.log("queue::findOneAndDelete", "dispatch_doc_change NYI")
-    console.log("DEL PLUGIN", doc)
+    log("queue::findOneAndDelete", "dispatch_doc_change NYI")
+    log("DEL PLUGIN", doc)
     const model_name = this.model.modelName
     dispatch_queue(queue, model_name, "delete", doc)
   })
@@ -35,30 +38,35 @@ const get_dispatch_change_handler = (model_name) => (change) => {
 }
 
 
-const register_queue_listener = async() => {
-  // register the mongoose delete plugin
-  mongoose.plugin(mongoose_delete_plugin)
+const register_model_emitter = (model_name) => {
+  const model = mongoose.model(model_name)
 
-  const models = mongoose.modelNames()
+  // 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("error", (err) => {
+    log("server::queue::register_queue_listener:: change listener emitter got error", err)
+  })
 
-  models.forEach((model_name) => {
-    const model = mongoose.model(model_name)
+  emitter.on("close", (arg, arg2) => {
+    log("queue_listener: emitter closed, model:", model_name, "retrying")
+    register_model_emitter(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("error", (err) => {
-      console.log("server::queue::register_queue_listener:: change listener emitter got error", err)
-    })
+const register_queue_listener = async() => {
+  // register the mongoose delete plugin
+  mongoose.plugin(mongoose_delete_plugin)
+
+  const models = mongoose.modelNames()
 
-    emitter.on("close", () => {
-      console.log("queue_listener: emitter closed, model:", model_name)
-    })
-  })
+  models.forEach(register_model_emitter)
 
 }