@rpcbase/server 0.364.0-mongoosetsindex.1 → 0.365.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.364.0-mongoosetsindex.1",
+  "version": "0.365.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "scripts": {

package/queue/register_queue_listener.js

@@ -9,6 +9,7 @@ const queue = require("./index")
 const dispatch_worker_queue = require("./dispatch_worker_queue")
 const dispatch_indexer_queue = require("./dispatch_indexer_queue")
 
+
 const log = debug("rb:queue:listener")
 
 const {RB_APP_NAME, RB_TENANT_ID} = process.env
@@ -30,10 +31,12 @@ const mongoose_delete_plugin = (schema) => {
   })
 
   // TODO: add other delete operations
+  // TODO: this should be deleteOne ?
   // https://mongoosejs.com/docs/queries.html
   schema.post("findOneAndDelete", function(doc) {
     log("queue:findOneAndDelete", "dispatch_doc_change NYI")
     log("del PLUGIN", doc)
+    const change = null // TMP
     const coll_name = change.ns.coll
 
     const model_name = Object.keys(mongoose.models).find((k) => {
@@ -79,8 +82,6 @@ const dispatch_change_handler = (change) => {
     return mongoose.models[k].collection.collectionName === coll_name
   })
 
-  console.log("O3333K", Object.keys(require("../mongoose").models), Object.keys(mongoose.models))
-
   if (!model_name) {
     return
   }
@@ -107,8 +108,8 @@ const register_db_emitter = () => {
 
   // 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"*/] } } }
+    { $match: { "ns.db": RB_APP_NAME } },
+    { $match: { operationType: { $in: ["insert", "update" /* "delete"*/] } } },
   ]
 
   // https://www.mongodb.com/docs/manual/reference/method/Mongo.watch/
@@ -154,8 +155,8 @@ const register_queue_listener = () => new Promise((resolve, reject) => {
   mongoose.plugin(mongoose_delete_plugin)
 
   mongoose.connection.once("open", () => {
-    const emitter = register_db_emitter()
-    resolve(emitter)
+    const db_emitter = register_db_emitter()
+    resolve(db_emitter)
   })
 
   mongoose.connection.on("error", (err) => {

package/rts/index.js

@@ -37,7 +37,7 @@ const get_query_options = (ctx, options) => {
   // https://mongoosejs.com/docs/api/query.html#Query.prototype.setOptions()
   const query_options = {
     ctx,
-    is_client: true
+    is_client: true,
     //
   }
 
@@ -46,8 +46,7 @@ const get_query_options = (ctx, options) => {
   }
 
   const limit = typeof options.limit === "number" ? Math.min(QUERY_MAX_LIMIT, Math.abs(options.limit)) : QUERY_MAX_LIMIT
-  // TODO: warn if limit greater than default ?
-  query_options.limit = options.limit
+  query_options.limit = limit
 
   return query_options
 }
@@ -99,15 +98,15 @@ const dispatch_doc_change = (model, doc) => {
         return
       }
 
-
       const query_options = get_query_options(ctx, options)
+      // TODO: do not redo query here, use document from change event
       const query_promise = model.find(query, options.projection, query_options)
       if (query_options.sort) {
         query_promise.sort(query_options.sort)
       }
-      if (typeof query_options.limit === "number" && query_options.limit >= 0) {
-        query_promise.limit(query_options.limit)
-      }
+
+      query_promise.limit(query_options.limit)
+
       // WARNING: DANGER
       // TODO: we should not be doing a read here, use doc from event
       const data = await query_promise
@@ -179,8 +178,8 @@ const mongoose_txn_plugin = (schema, options) => {
 
 
 // responds to a change stream "change" event
-const get_dispatch_change_handler = (mongoose, model_name) => async(change) => {
-  const queries = _queries[model_name]
+const get_dispatch_change_handler = (model_name) => async(change) => {
+  // const queries = _queries[model_name]
 
   const model = mongoose.model(model_name)
 
@@ -203,7 +202,7 @@ const get_dispatch_change_handler = (mongoose, model_name) => async(change) => {
 }
 
 
-const add_change_stream = (mongoose, socket_id, {model_name, query, query_key, options}) => {
+const add_change_stream = (socket_id, {model_name, query, query_key, options}) => {
   if (!model_name) throw new Error("empty model name")
 
   if (!_change_streams[model_name]) {
@@ -225,7 +224,7 @@ const add_change_stream = (mongoose, socket_id, {model_name, query, query_key, o
       fullDocumentBeforeChange: "whenAvailable",
     })
 
-    emitter.on("change", get_dispatch_change_handler(mongoose, model_name))
+    emitter.on("change", get_dispatch_change_handler(model_name))
 
     emitter.on("error", (err) => {
       console.log("change listener emitter got error", err)
@@ -261,7 +260,7 @@ const add_change_stream = (mongoose, socket_id, {model_name, query, query_key, o
 }
 
 
-const run_query = async(mongoose, socket_id, {model_name, query, query_key, options}) => {
+const run_query = async(socket_id, {model_name, query, query_key, options}) => {
   const model = mongoose.model(model_name)
 
   log("run_query", {model_name, query, query_key, options})
@@ -399,7 +398,7 @@ const rts_server = async(server) => {
     console.log("socket connected", socket.id)
     //
     socket.on("register_query", (payload) => {
-      add_change_stream(mongoose, socket.id, payload)
+      add_change_stream(socket.id, payload)
     })
 
     socket.on("remove_query", (payload) => {
@@ -408,7 +407,7 @@ const rts_server = async(server) => {
 
     socket.on("run_query", (payload) => {
       try {
-        run_query(mongoose, socket.id, payload)
+        run_query(socket.id, payload)
       } catch (err) {
         console.log("run_query caught error", err)
       }