@rpcbase/server 0.92.0 → 0.95.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) {
+      log("refusing to save coverage in production")
+      return res.status(500).end()
+    }
+    // log("sending coverage for", req.body.path_key)
     res.json(global.__coverage__)
   })
 }

package/express/session_middleware.js

@@ -1,9 +1,12 @@
 /* @flow */
+const debug = require("debug")
 const session = require("express-session")
 const validator = require("validator")
 const {createClient} = require("redis")
 const redis_store = require("connect-redis")(session)
 
+const log = debug("rb:session")
+
 // WARNING:
 // https://stackoverflow.com/questions/70867229/error-connection-timeout-when-connecting-to-redis-docker-instance
 // https://github.com/redis/node-redis/issues/1656/
@@ -27,9 +30,9 @@ setTimeout(async() => {
   }
 
   const reconnectStrategy = (retries) => {
-    console.log("redis_client::reconnectStrategy::retrying with arg", retries)
+    log("redis_client::reconnectStrategy::retrying with arg", retries)
     if (retries < 5) {
-      console.log("retry count:", retries, "retrying in 1s")
+      log("retry count:", retries, "retrying in 1s")
       return 4000
     } else {
       return new Error("max retries expiered")
@@ -47,9 +50,8 @@ setTimeout(async() => {
     legacyMode: true,
   })
 
-
   redis_client.on("ready", () => {
-    console.log("session-storage::redis_client connected")
+    log("session-storage::redis_client connected")
   })
 
   const res = await redis_client.connect()
@@ -69,7 +71,7 @@ setTimeout(async() => {
   })
 
 // TODO: is this still necessary
-}, 300)
+}, 200)
 
 
 module.exports = (req, res, next) => {
@@ -80,6 +82,6 @@ module.exports = (req, res, next) => {
   if (session_middleware) {
     session_middleware(req, res, next)
   } else {
-    console.warn("session middleware not set yet")
+    warn("session middleware not set yet")
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.92.0",
+  "version": "0.95.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {

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)
 
 }
 

package/src/auth/check_session.js

@@ -1,10 +1,19 @@
 /* @flow */
+const debug = require("debug")
+
+
+const log = debug("rb:auth:check_session")
+
 
 const check_session = async(payload, ctx) => {
   const {req} = ctx
-  // console.log("session check", req.session)
+
+  log("session:", req.session)
 
   const is_signed_in = !!req.session.user_id
+
+  log("is_signed_in:", is_signed_in)
+
   return {
     status: "ok",
     is_signed_in,

package/src/auth/sign_in.js

@@ -1,8 +1,12 @@
 /* @flow */
 const {compare_hash} = require("@rpcbase/std/crypto/hash")
+const debug = require("debug")
 
 const mongoose = require("../../mongoose")
 
+
+const log = debug("rb:auth:signin")
+
 const fail = () => ({
   errors: {form: "Invalid email or password"}
 })
@@ -13,8 +17,6 @@ const sign_in = async({email, password}, ctx) => {
   const {req} = ctx
 
   // find the matching user
-  // TODO: document ctx param
-  // const user = await User.findOne({email}, null, {ctx})
   const user = await User.findOne({email}, null)
 
   if (!user) {
@@ -26,13 +28,20 @@ const sign_in = async({email, password}, ctx) => {
   const is_match = await compare_hash(password, hashed_pass)
 
   if (is_match) {
-    console.log("is match, user signed in wow")
+    log("compare_hash is match")
+
+    req.session.user_id = user._id.toString()
     await req.session.save()
-    console.log("rb:auth:user_signed_in")
+
+    log("session saved, user is signed in")
+
     return {
       status: "ok"
     }
+
   } else {
+    log("no match, returning error")
+
     return fail()
   }
 }