@rpcbase/server 0.331.0 → 0.333.0

package/get_object_id.js

@@ -5,28 +5,28 @@ const crypto = require("crypto")
 const isHexadecimal = require("validator/lib/isHexadecimal")
 
 
-const {TENANT_PREFIX} = process.env
+const {RB_TENANT_ID} = process.env
 
 
 // TODO: WARNING: DANGER: this code is duplicated in the client
 // TODO: move it to iso
 
 // Validation: is defined
-assert(TENANT_PREFIX, "expected TENANT_PREFIX to be defined")
+assert(RB_TENANT_ID, "expected RB_TENANT_ID to be defined")
 // is hexadecimal
-assert(isHexadecimal(TENANT_PREFIX), "expected TENANT_PREFIX to be a hexadecimal")
+assert(isHexadecimal(RB_TENANT_ID), "expected RB_TENANT_ID to be a hexadecimal")
 // is 4 bytes
-assert(TENANT_PREFIX.length === 8, "TENANT_PREFIX must be exactly 4 bytes (8 hex chars)")
+assert(RB_TENANT_ID.length === 8, "RB_TENANT_ID must be exactly 4 bytes (8 hex chars)")
 
 
 // generates a 12 bytes mongodb object id using the org id prefix or custom customer id
 const get_object_id = () => {
   const ts_bytes = Math.floor(Date.now() / 1000).toString(16)
-  assert(ts_bytes.length === 8, "expected ts_bytes.length to be 4")
+  expect(ts_bytes.length).toBe(8)
 
   const random_bytes = crypto.randomBytes(4).toString("hex")
 
-  const obj_id = `${ts_bytes}${TENANT_PREFIX}${random_bytes}`
+  const obj_id = `${ts_bytes}${RB_TENANT_ID}${random_bytes}`
   return obj_id
 }
 

package/package.json

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

package/queue/register_queue_listener.js

@@ -11,7 +11,7 @@ const dispatch_queue = require("./dispatch_queue")
 
 const log = debug("rb:queue:listener")
 
-const {RB_APP_NAME} = process.env
+const {RB_APP_NAME, RB_TENANT_ID} = process.env
 
 const RETRY_MAXIMUM_DELAY = 2000
 const RETRY_MINIMUM_DELAY = 10
@@ -52,12 +52,31 @@ const mongoose_delete_plugin = (schema) => {
 }
 
 
+const assert_doc_id = (change) => {
+  if (process.env.NODE_ENV !== "development") return
+
+  const doc_id = change.documentKey?._id?.toString()
+
+  if (!doc_id) return
+
+  const sub = doc_id.substring(8, 16)
+  try {
+    expect(sub).toBe(RB_TENANT_ID)
+  } catch (err) {
+    console.log("in document:", change.ns, change.documentKey)
+    console.log("_id must be constructed with get_object_id()")
+    console.log(err.message)
+  }
+}
+
 const dispatch_change_handler = (change) => {
   // skip if change is on another db
   if (change?.ns?.db !== RB_APP_NAME) {
     return
   }
 
+  assert_doc_id(change)
+
   const op = change.operationType
   if (["insert", "update"].includes(op)) {
     const coll_name = change.ns.coll