@flowerforce/flowerbase 1.8.3 → 1.8.4-beta.1

package/dist/features/triggers/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/features/triggers/utils.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,aAAa,EAAW,QAAQ,EAAE,MAAM,aAAa,CAAA;AA0E9D;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,GAAU,gBAAuB,KAAG,OAAO,CAAC,QAAQ,CAkB5E,CAAA;AA2qBD,eAAO,MAAM,gBAAgB;kHAppB1B,aAAa;iHA4jBb,aAAa;uHA1cb,aAAa;CAsiBf,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/features/triggers/utils.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAW,QAAQ,EAAE,MAAM,aAAa,CAAA;AA6E9D;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,GAAU,gBAAuB,KAAG,OAAO,CAAC,QAAQ,CAkB5E,CAAA;AAmrBD,eAAO,MAAM,gBAAgB;kHA5pB1B,aAAa;iHAmkBb,aAAa;uHAhdb,aAAa;CA6iBf,CAAA"}

package/dist/features/triggers/utils.js

@@ -27,11 +27,13 @@ exports.TRIGGER_HANDLERS = exports.loadTriggers = void 0;
 const fs_1 = __importDefault(require("fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_cron_1 = __importDefault(require("node-cron"));
+const bson_1 = require("bson");
 const constants_1 = require("../../constants");
 const utils_1 = require("../../monitoring/utils");
 const state_1 = require("../../state");
 const utils_2 = require("../../utils");
 const context_1 = require("../../utils/context");
+const normalizeTriggerPayload = (value) => bson_1.EJSON.deserialize(bson_1.EJSON.serialize(value, { relaxed: false }));
 const registerOnClose = (app, handler, label) => {
     if (app.server) {
         app.server.once('close', () => {
@@ -148,7 +150,8 @@ const handleCronTrigger = (_a) => __awaiter(void 0, [_a], void 0, function* ({ c
                 currentFunction: triggerHandler,
                 functionName,
                 functionsList,
-                services
+                services,
+                deserializeArgs: false
             });
         }
         catch (error) {
@@ -332,7 +335,7 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGOUT' })
                     });
                     yield (0, context_1.GenerateContext)({
-                        args: [Object.assign({ user: userData }, op)],
+                        args: [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                         app,
                         rules: state_1.StateManager.select("rules"),
                         user: {}, // TODO from currentUser ??
@@ -340,7 +343,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         functionName,
                         functionsList,
                         services,
-                        runAsSystem: true
+                        runAsSystem: true,
+                        deserializeArgs: false
                     });
                 }
                 catch (error) {
@@ -352,7 +356,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGOUT' }),
                         error
                     });
-                    console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
                 }
                 return;
             }
@@ -389,7 +392,7 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGIN' })
                     });
                     yield (0, context_1.GenerateContext)({
-                        args: [Object.assign({ user: userData }, op)],
+                        args: [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                         app,
                         rules: state_1.StateManager.select("rules"),
                         user: {}, // TODO from currentUser ??
@@ -397,7 +400,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         functionName,
                         functionsList,
                         services,
-                        runAsSystem: true
+                        runAsSystem: true,
+                        deserializeArgs: false
                     });
                 }
                 catch (error) {
@@ -409,7 +413,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGIN' }),
                         error
                     });
-                    console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
                 }
                 return;
             }
@@ -441,7 +444,9 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'DELETE' })
                     });
                     yield (0, context_1.GenerateContext)({
-                        args: isAutoTrigger ? [userData] : [Object.assign({ user: userData }, op)],
+                        args: isAutoTrigger
+                            ? [normalizeTriggerPayload(userData)]
+                            : [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                         app,
                         rules: state_1.StateManager.select("rules"),
                         user: {}, // TODO from currentUser ??
@@ -449,7 +454,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         functionName,
                         functionsList,
                         services,
-                        runAsSystem: true
+                        runAsSystem: true,
+                        deserializeArgs: false
                     });
                 }
                 catch (error) {
@@ -461,7 +467,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'DELETE' }),
                         error
                     });
-                    console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
                 }
                 return;
             }
@@ -495,7 +500,9 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'UPDATE' })
                     });
                     yield (0, context_1.GenerateContext)({
-                        args: isAutoTrigger ? [userData] : [Object.assign({ user: userData }, op)],
+                        args: isAutoTrigger
+                            ? [normalizeTriggerPayload(userData)]
+                            : [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                         app,
                         rules: state_1.StateManager.select("rules"),
                         user: {}, // TODO from currentUser ??
@@ -503,7 +510,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         functionName,
                         functionsList,
                         services,
-                        runAsSystem: true
+                        runAsSystem: true,
+                        deserializeArgs: false
                     });
                 }
                 catch (error) {
@@ -515,7 +523,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'UPDATE' }),
                         error
                     });
-                    console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
                 }
                 return;
             }
@@ -586,7 +593,9 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     meta: Object.assign(Object.assign({}, baseMeta), { event: 'CREATE' })
                 });
                 yield (0, context_1.GenerateContext)({
-                    args: isAutoTrigger ? [userData] : [Object.assign({ user: userData }, op)],
+                    args: isAutoTrigger
+                        ? [normalizeTriggerPayload(userData)]
+                        : [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                     app,
                     rules: state_1.StateManager.select("rules"),
                     user: {}, // TODO from currentUser ??
@@ -594,7 +603,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     functionName,
                     functionsList,
                     services,
-                    runAsSystem: true
+                    runAsSystem: true,
+                    deserializeArgs: false
                 });
             }
             catch (error) {
@@ -606,7 +616,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     meta: Object.assign(Object.assign({}, baseMeta), { event: 'CREATE' }),
                     error
                 });
-                console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
             }
         });
     });
@@ -677,14 +686,15 @@ const handleDataBaseTrigger = (_a) => __awaiter(void 0, [_a], void 0, function*
             });
             try {
                 yield (0, context_1.GenerateContext)({
-                    args: [change],
+                    args: [normalizeTriggerPayload(change)],
                     app,
                     rules: state_1.StateManager.select("rules"),
                     user: {}, // TODO add from?
                     currentFunction: triggerHandler,
                     functionName,
                     functionsList,
-                    services
+                    services,
+                    deserializeArgs: false
                 });
             }
             catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase",
-  "version": "1.8.3",
+  "version": "1.8.4-beta.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/features/triggers/__tests__/utils.test.ts

@@ -0,0 +1,112 @@
+import { ObjectId } from 'bson'
+import { GenerateContext } from '../../../utils/context'
+import { StateManager } from '../../../state'
+import { TRIGGER_HANDLERS } from '../utils'
+
+jest.mock('../../../utils/context', () => ({
+    GenerateContext: jest.fn()
+}))
+
+jest.mock('../../../state', () => ({
+    StateManager: {
+        select: jest.fn()
+    }
+}))
+
+const mockedGenerateContext = jest.mocked(GenerateContext)
+const mockedStateSelect = StateManager.select as jest.Mock
+
+describe('TRIGGER_HANDLERS.DATABASE', () => {
+    beforeEach(() => {
+        mockedGenerateContext.mockReset()
+        mockedGenerateContext.mockResolvedValue(undefined)
+        mockedStateSelect.mockReset()
+        mockedStateSelect.mockReturnValue(undefined)
+    })
+
+    it('preserves BSON ObjectId values in fullDocument before invoking the trigger function', async () => {
+        const changeListeners: Record<string, (...args: any[]) => unknown> = {}
+        const close = jest.fn(async () => undefined)
+        const watch = jest.fn(() => ({
+            on: jest.fn((event: string, listener: (...args: any[]) => unknown) => {
+                changeListeners[event] = listener
+            }),
+            close
+        }))
+
+        const collection = { watch }
+        const db = jest.fn(() => ({ collection: jest.fn(() => collection) }))
+        const client = { db }
+
+        const app = {
+            mongo: {
+                changestream: { client }
+            },
+            server: {
+                once: jest.fn()
+            }
+        } as any
+
+        await TRIGGER_HANDLERS.DATABASE({
+            config: {
+                database: 'flowerbase-test',
+                collection: 'activityLogs',
+                operation_types: ['INSERT'],
+                full_document: true,
+                full_document_before_change: false,
+                match: {},
+                project: {}
+            } as any,
+            triggerHandler: { code: 'module.exports = async function () {}' } as any,
+            functionsList: {
+                logTriggerEvent: { code: 'module.exports = async function () {}' }
+            } as any,
+            services: {} as any,
+            app,
+            triggerName: 'log-trigger-event',
+            triggerType: 'DATABASE',
+            functionName: 'logTriggerEvent'
+        })
+
+        const documentId = new ObjectId('507f1f77bcf86cd799439011')
+        const ownerId = new ObjectId('507f191e810c19729de860ea')
+
+        await changeListeners.change({
+            clusterTime: new Date(),
+            operationType: 'insert',
+            ns: { db: 'flowerbase-test', coll: 'activityLogs' },
+            documentKey: { _id: documentId },
+            fullDocument: {
+                _id: documentId,
+                ownerId
+            }
+        })
+
+        expect(mockedGenerateContext).toHaveBeenCalledTimes(1)
+        expect(mockedGenerateContext).toHaveBeenCalledWith(
+            expect.objectContaining({
+                deserializeArgs: false,
+                args: [
+                    expect.objectContaining({
+                        documentKey: expect.objectContaining({
+                            _id: expect.any(ObjectId)
+                        }),
+                        fullDocument: expect.objectContaining({
+                            _id: expect.any(ObjectId),
+                            ownerId: expect.any(ObjectId)
+                        })
+                    })
+                ]
+            })
+        )
+
+        const payload = mockedGenerateContext.mock.calls[0][0].args[0] as {
+            documentKey: { _id: ObjectId }
+            fullDocument: { _id: ObjectId; ownerId: ObjectId }
+        }
+
+        expect(payload.documentKey._id.toHexString()).toBe(documentId.toHexString())
+        expect(payload.fullDocument._id.toHexString()).toBe(documentId.toHexString())
+        expect(payload.fullDocument.ownerId.toHexString()).toBe(ownerId.toHexString())
+    })
+})

package/src/features/triggers/utils.ts

@@ -1,6 +1,7 @@
 import fs from 'fs'
 import path from 'node:path'
 import cron from 'node-cron'
+import { EJSON } from 'bson'
 import { AUTH_CONFIG, AUTH_DB_NAME, DB_NAME, CHANGESTREAM } from '../../constants'
 import { createEventId, sanitize } from '../../monitoring/utils'
 import { StateManager } from '../../state'
@@ -8,6 +9,9 @@ import { readJsonContent } from '../../utils'
 import { GenerateContext } from '../../utils/context'
 import { HandlerParams, Trigger, Triggers } from './interface'
 
+const normalizeTriggerPayload = <T>(value: T): T =>
+  EJSON.deserialize(EJSON.serialize(value, { relaxed: false })) as T
+
 const registerOnClose = (
   app: HandlerParams['app'],
   handler: () => Promise<void> | void,
@@ -150,7 +154,8 @@ const handleCronTrigger = async ({
         currentFunction: triggerHandler,
         functionName,
         functionsList,
-        services
+        services,
+        deserializeArgs: false
       })
     } catch (error) {
       emitTriggerEvent({
@@ -376,7 +381,7 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'LOGOUT' }
         })
         await GenerateContext({
-          args: [{ user: userData, ...op }],
+          args: [normalizeTriggerPayload({ user: userData, ...op })],
           app,
           rules: StateManager.select("rules"),
           user: {},  // TODO from currentUser ??
@@ -384,7 +389,8 @@ const handleAuthenticationTrigger = async ({
           functionName,
           functionsList,
           services,
-          runAsSystem: true
+          runAsSystem: true,
+          deserializeArgs: false
         })
       } catch (error) {
         emitTriggerEvent({
@@ -395,7 +401,6 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'LOGOUT' },
           error
         })
-        console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error)
       }
       return
     }
@@ -433,7 +438,7 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'LOGIN' }
         })
         await GenerateContext({
-          args: [{ user: userData, ...op }],
+          args: [normalizeTriggerPayload({ user: userData, ...op })],
           app,
           rules: StateManager.select("rules"),
           user: {},  // TODO from currentUser ??
@@ -441,7 +446,8 @@ const handleAuthenticationTrigger = async ({
           functionName,
           functionsList,
           services,
-          runAsSystem: true
+          runAsSystem: true,
+          deserializeArgs: false
         })
       } catch (error) {
         emitTriggerEvent({
@@ -452,7 +458,6 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'LOGIN' },
           error
         })
-        console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error)
       }
       return
     }
@@ -485,7 +490,9 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'DELETE' }
         })
         await GenerateContext({
-          args: isAutoTrigger ? [userData] : [{ user: userData, ...op }],
+          args: isAutoTrigger
+            ? [normalizeTriggerPayload(userData)]
+            : [normalizeTriggerPayload({ user: userData, ...op })],
           app,
           rules: StateManager.select("rules"),
           user: {},  // TODO from currentUser ??
@@ -493,7 +500,8 @@ const handleAuthenticationTrigger = async ({
           functionName,
           functionsList,
           services,
-          runAsSystem: true
+          runAsSystem: true,
+          deserializeArgs: false
         })
       } catch (error) {
         emitTriggerEvent({
@@ -504,7 +512,6 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'DELETE' },
           error
         })
-        console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error)
       }
       return
     }
@@ -539,7 +546,9 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'UPDATE' }
         })
         await GenerateContext({
-          args: isAutoTrigger ? [userData] : [{ user: userData, ...op }],
+          args: isAutoTrigger
+            ? [normalizeTriggerPayload(userData)]
+            : [normalizeTriggerPayload({ user: userData, ...op })],
           app,
           rules: StateManager.select("rules"),
           user: {},  // TODO from currentUser ??
@@ -547,7 +556,8 @@ const handleAuthenticationTrigger = async ({
           functionName,
           functionsList,
           services,
-          runAsSystem: true
+          runAsSystem: true,
+          deserializeArgs: false
         })
       } catch (error) {
         emitTriggerEvent({
@@ -558,7 +568,6 @@ const handleAuthenticationTrigger = async ({
           meta: { ...baseMeta, event: 'UPDATE' },
           error
         })
-        console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error)
       }
       return
     }
@@ -643,7 +652,9 @@ const handleAuthenticationTrigger = async ({
         meta: { ...baseMeta, event: 'CREATE' }
       })
       await GenerateContext({
-        args: isAutoTrigger ? [userData] : [{ user: userData, ...op }],
+        args: isAutoTrigger
+          ? [normalizeTriggerPayload(userData)]
+          : [normalizeTriggerPayload({ user: userData, ...op })],
         app,
         rules: StateManager.select("rules"),
         user: {},  // TODO from currentUser ??
@@ -651,7 +662,8 @@ const handleAuthenticationTrigger = async ({
         functionName,
         functionsList,
         services,
-        runAsSystem: true
+        runAsSystem: true,
+        deserializeArgs: false
       })
     } catch (error) {
       emitTriggerEvent({
@@ -662,7 +674,6 @@ const handleAuthenticationTrigger = async ({
         meta: { ...baseMeta, event: 'CREATE' },
         error
       })
-      console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error)
     }
   })
   registerOnClose(
@@ -755,14 +766,15 @@ const handleDataBaseTrigger = async ({
     })
     try {
       await GenerateContext({
-        args: [change],
+        args: [normalizeTriggerPayload(change)],
         app,
         rules: StateManager.select("rules"),
         user: {}, // TODO add from?
         currentFunction: triggerHandler,
         functionName,
         functionsList,
-        services
+        services,
+        deserializeArgs: false
       })
     } catch (error) {
       emitTriggerEvent({