@rpcbase/server 0.84.0 → 0.88.0

package/database.js

@@ -1,7 +1,14 @@
 /* @flow */
-const mongoose = require("mongoose")
 const isPort = require("validator/lib/isPort")
 
+const mongoose = require("./mongoose")
+
+// load internal models
+require("./src/models/User")
+require("./src/models/Invite")
+require("./src/models/ResetPasswordToken")
+
+
 const {DATABASE_NAME, DATABASE_PORT, CONTAINER_MODE} = process.env
 
 

package/mailer/index.js

@@ -3,7 +3,7 @@ const postmark = require("postmark")
 
 const {POSTMARK_API_KEY, IS_PRODUCTION} = process.env
 
-const is_production = true //IS_PRODUCTION === "yes"
+const is_production = IS_PRODUCTION === "yes"
 console.warn("email sender forcing is production")
 
 let client

package/mongoose/index.js

@@ -1,5 +1,8 @@
 /* @flow */
 const mongoose = require("mongoose")
 
+// override register model method to keep track of all registered models
+// console.log("MONGOOSE", mongoose)
+
 
 module.exports = mongoose

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.84.0",
+  "version": "0.88.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {
@@ -22,7 +22,7 @@
     "express-session": "1.17.3",
     "glob": "8.0.3",
     "lodash": "4.17.21",
-    "mongoose": "6.5.1",
+    "mongoose": "6.5.3",
     "picocolors": "1.0.0",
     "postmark": "3.0.12",
     "redis": "4.2.0",

package/queue/dispatch_queue.js

@@ -0,0 +1,24 @@
+/* @flow */
+const op_names = {
+  insert: "create",
+  delete: "delete",
+  update: "update",
+}
+
+const dispatch_queue = (queue, model_name, op, doc) => {
+  const instance = queue.instance()
+
+  const tasks = queue.get_tasks()
+
+  const handler_name = `on_${op_names[op]}_${model_name.toLowerCase()}`
+
+  // skip if there's no matching handler
+  if (!Object.keys(tasks).includes(handler_name)) return
+
+  // console.log("handler_name", handler_name)
+
+  queue.add(handler_name, {doc})
+}
+
+
+module.exports = dispatch_queue

package/{queue.js → queue/index.js}

@@ -5,16 +5,13 @@ const {WORKER_QUEUE_PORT, CONTAINER_MODE} = process.env
 const hostname = CONTAINER_MODE === "native" ? "localhost" : "worker-queue"
 const worker_queue_url = `redis://${hostname}:${WORKER_QUEUE_PORT}`
 
-console.log("using worker-queue url", worker_queue_url)
-
-
 const tasks_list = Object.create(null)
 
 let worker_queue
 
 const worker_add = async(task_name, payload, options) => {
   const res = await worker_queue.add({task_name, payload}, options)
-  // paymentsQueue.add(paymentsData, { repeat: { cron: '15 3 * * *' } });
+  // myQueue.add(data, { repeat: { cron: '15 3 * * *' } });
   console.log("created task:", task_name, res.id)
   return res
 }
@@ -25,7 +22,11 @@ const register_task = (name, fn) => {
   tasks_list[name] = fn
 }
 
+const get_tasks = () => tasks_list
+
 const start_worker = async() => {
+  console.log("start worker queue", worker_queue_url)
+
   worker_queue = new Queue("worker-queue", worker_queue_url)
 
   // error handler
@@ -55,11 +56,21 @@ const start_worker = async() => {
       console.log("ERRRR", err)
     }
   })
+
+  return worker_queue
+}
+
+
+const get_instance = () => {
+  if (!worker_queue) worker_queue = new Queue("worker-queue", worker_queue_url)
+  return worker_queue
 }
 
 
 module.exports = {
   start: start_worker,
   register_task,
+  get_tasks,
   add: worker_add,
+  instance: get_instance,
 }

package/queue/register_queue_listener.js

@@ -0,0 +1,66 @@
+/* @flow */
+const mongoose = require("../mongoose")
+const queue = require("./index")
+
+const dispatch_queue = require("./dispatch_queue")
+
+
+// Listens for mongodb change events,
+// when a document is created, updated or deleted, dispatch job message
+
+
+// mongoose middleware used for delete events
+const mongoose_delete_plugin = (schema) => {
+  schema.pre("deleteOne", function(next) {
+    throw new Error("rts::deleteOne is deprecated, use findOneAndDelete")
+  })
+
+  // 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)
+    const model_name = this.model.modelName
+    dispatch_queue(queue, model_name, "delete", doc)
+  })
+}
+
+
+const get_dispatch_change_handler = (model_name) => (change) => {
+  const op = change.operationType
+  if (["insert", "update"].includes(op)) {
+    dispatch_queue(queue, model_name, op, change.fullDocument)
+  }
+  // else
+}
+
+
+const register_queue_listener = async() => {
+  // register the mongoose delete plugin
+  mongoose.plugin(mongoose_delete_plugin)
+
+  const models = mongoose.modelNames()
+
+  models.forEach((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("error", (err) => {
+      console.log("server::queue::register_queue_listener:: change listener emitter got error", err)
+    })
+
+    emitter.on("close", () => {
+      console.log("queue_listener: emitter closed, model:", model_name)
+    })
+  })
+
+}
+
+
+module.exports = register_queue_listener

package/src/auth/index.js

@@ -8,6 +8,7 @@ const reset_password = require("./reset_password")
 const set_new_password = require("./set_new_password")
 const check_session = require("./check_session")
 
+
 const sign_up_handler = async(req, res) => {
   const result = await sign_up(req.body, {req})
   res.json(result)

package/src/auth/sign_in.js

@@ -27,6 +27,7 @@ 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")
     req.session.user_id = user._id.toString()
     await req.session.save()
     return {

package/src/auth/sign_up.js

@@ -3,6 +3,8 @@ const {hash_password} = require("@rpcbase/std/crypto/hash")
 
 const mongoose = require("../../mongoose")
 
+const HAS_INVITES = process.env.AUTH_DISABLE_INVITES !== "true"
+
 const sign_up = async({email, password}, ctx) => {
   const User = mongoose.model("User")
   const Invite = mongoose.model("Invite")
@@ -20,18 +22,22 @@ const sign_up = async({email, password}, ctx) => {
   }
 
   // check if we have an invite for this user
-  const invite = await Invite.findOne({email}, null, {ctx})
-  if (invite && !invite.is_ready) {
-    console.log("found an invite, but not ready", email)
-    return {
-      status: "error",
-      message: "Your invite is still pending approval. Expect an email in the next weeks to activate your account."
-    }
-  } else if (!invite) {
-    console.log("no invite for signup email:", email)
-    return {
-      status: "error",
-      message: "No valid invite was found for this email"
+  if (HAS_INVITES) {
+    const invite = await Invite.findOne({email}, null, {ctx})
+
+    // TODO: mark invite as accepted here
+    if (invite && !invite.is_ready) {
+      console.log("found an invite, but not ready", email)
+      return {
+        status: "error",
+        message: "Your invite is still pending approval. Expect an email in the next weeks to activate your account."
+      }
+    } else if (!invite) {
+      console.log("no invite for signup email:", email)
+      return {
+        status: "error",
+        message: "No valid invite was found for this email"
+      }
     }
   }
 

package/src/models/Invite.js

@@ -0,0 +1,23 @@
+/* @flow */
+const mongoose = require("../../mongoose")
+
+const Invite = mongoose.model("Invite", {
+  email: String,
+  email_hash: String, // TODO: unused field?
+  token: String,
+  expires: Date,
+  is_ready: {
+    type: Boolean,
+    default: false,
+  },
+  is_sent: {
+    type: Boolean,
+    default: false,
+  },
+  is_accepted: {
+    type: Boolean,
+    default: false,
+  },
+})
+
+module.exports = Invite

package/src/models/User.js

@@ -0,0 +1,17 @@
+/* @flow */
+const mongoose = require("../../mongoose")
+
+const User = mongoose.model("User", {
+  name: {
+    type: String,
+    default: "",
+  },
+  email: String,
+  is_email_verified: {
+    type: Boolean,
+    default: false,
+  },
+  password_hash: String,
+})
+
+module.exports = User