@flowerforce/flowerbase 1.7.6-beta.0 → 1.7.6-beta.1

package/src/features/triggers/utils.ts

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'node:path'
 import cron from 'node-cron'
-import { AUTH_CONFIG, AUTH_DB_NAME, DB_NAME } from '../../constants'
+import { AUTH_CONFIG, AUTH_DB_NAME, DB_NAME, CHANGESTREAM } from '../../constants'
 import { createEventId, sanitize } from '../../monitoring/utils'
 import { StateManager } from '../../state'
 import { readJsonContent } from '../../utils'
@@ -246,7 +246,7 @@ const handleAuthenticationTrigger = async ({
   const { database, isAutoTrigger, operation_types = [], operation_type } = config
   const providerFilter = normalizeProviders(config.providers ?? [])
   const authCollection = AUTH_CONFIG.authCollection ?? 'auth_users'
-  const collection = app.mongo.client.db(database || AUTH_DB_NAME).collection(authCollection)
+  const collection = app.mongo[CHANGESTREAM].client.db(database || AUTH_DB_NAME).collection(authCollection)
   const operationCandidates = operation_type ? mapOpInverse[operation_type] : operation_types
   const normalizedOps = normalizeOperationTypes(operationCandidates)
   const baseMeta = {
@@ -277,17 +277,6 @@ const handleAuthenticationTrigger = async ({
   changeStream.on('error', (error) => {
     if (shouldIgnoreStreamError(error)) return
     console.error('Authentication trigger change stream error', error)
-    emitTriggerEvent({
-      status: 'error',
-      triggerName,
-      triggerType,
-      functionName,
-      meta: {
-        ...baseMeta,
-        event: 'CHANGE_STREAM'
-      },
-      error
-    })
   })
   changeStream.on('change', async function (change) {
     const operationType = change['operationType' as keyof typeof change] as
@@ -376,6 +365,13 @@ const handleAuthenticationTrigger = async ({
         updateDescription
       }
       try {
+        emitTriggerEvent({
+          status: 'fired',
+          triggerName,
+          triggerType,
+          functionName,
+          meta: { ...baseMeta, event: 'LOGOUT' }
+        })
         await GenerateContext({
           args: [{ user: userData, ...op }],
           app,
@@ -387,13 +383,6 @@ const handleAuthenticationTrigger = async ({
           services,
           runAsSystem: true
         })
-        emitTriggerEvent({
-          status: 'fired',
-          triggerName,
-          triggerType,
-          functionName,
-          meta: { ...baseMeta, event: 'LOGOUT' }
-        })
       } catch (error) {
         emitTriggerEvent({
           status: 'error',
@@ -428,6 +417,13 @@ const handleAuthenticationTrigger = async ({
         updateDescription
       }
       try {
+        emitTriggerEvent({
+          status: 'fired',
+          triggerName,
+          triggerType,
+          functionName,
+          meta: { ...baseMeta, event: 'DELETE' }
+        })
         await GenerateContext({
           args: isAutoTrigger ? [userData] : [{ user: userData, ...op }],
           app,
@@ -439,13 +435,6 @@ const handleAuthenticationTrigger = async ({
           services,
           runAsSystem: true
         })
-        emitTriggerEvent({
-          status: 'fired',
-          triggerName,
-          triggerType,
-          functionName,
-          meta: { ...baseMeta, event: 'DELETE' }
-        })
       } catch (error) {
         emitTriggerEvent({
           status: 'error',
@@ -482,6 +471,13 @@ const handleAuthenticationTrigger = async ({
         updateDescription
       }
       try {
+        emitTriggerEvent({
+          status: 'fired',
+          triggerName,
+          triggerType,
+          functionName,
+          meta: { ...baseMeta, event: 'UPDATE' }
+        })
         await GenerateContext({
           args: isAutoTrigger ? [userData] : [{ user: userData, ...op }],
           app,
@@ -493,13 +489,6 @@ const handleAuthenticationTrigger = async ({
           services,
           runAsSystem: true
         })
-        emitTriggerEvent({
-          status: 'fired',
-          triggerName,
-          triggerType,
-          functionName,
-          meta: { ...baseMeta, event: 'UPDATE' }
-        })
       } catch (error) {
         emitTriggerEvent({
           status: 'error',
@@ -586,6 +575,13 @@ const handleAuthenticationTrigger = async ({
     }
 
     try {
+      emitTriggerEvent({
+        status: 'fired',
+        triggerName,
+        triggerType,
+        functionName,
+        meta: { ...baseMeta, event: 'CREATE' }
+      })
       await GenerateContext({
         args: isAutoTrigger ? [userData] : [{ user: userData, ...op }],
         app,
@@ -597,13 +593,6 @@ const handleAuthenticationTrigger = async ({
         services,
         runAsSystem: true
       })
-      emitTriggerEvent({
-        status: 'fired',
-        triggerName,
-        triggerType,
-        functionName,
-        meta: { ...baseMeta, event: 'CREATE' }
-      })
     } catch (error) {
       emitTriggerEvent({
         status: 'error',
@@ -663,7 +652,7 @@ const handleDataBaseTrigger = async ({
 
   const normalizedOperations = normalizeOperationTypes(operation_types)
 
-  const collection = app.mongo.client.db(database).collection(collectionName)
+  const collection = app.mongo[CHANGESTREAM].client.db(database).collection(collectionName)
   const pipeline = [
     {
       $match: {

package/src/index.ts

@@ -6,12 +6,14 @@ import { loadEndpoints } from './features/endpoints/utils'
 import { registerFunctions } from './features/functions'
 import { loadFunctions } from './features/functions/utils'
 import { loadRules } from './features/rules/utils'
+import { loadEncryptionSchemas } from './features/encryption/utils'
 import { activateTriggers } from './features/triggers'
 import { loadTriggers } from './features/triggers/utils'
 import { services } from './services'
 import { StateManager } from './state'
 import { exposeRoutes } from './utils/initializer/exposeRoutes'
 import { registerPlugins } from './utils/initializer/registerPlugins'
+import { type MongoDbEncryptionConfig } from './utils/initializer/mongodbCSFLE'
 export * from './model'
 
 
@@ -30,6 +32,7 @@ export type InitializeConfig = {
   host?: string
   corsConfig?: CorsConfig
   basePath?: string
+  mongodbEncryptionConfig?: MongoDbEncryptionConfig
 }
 
 /**
@@ -47,7 +50,8 @@ export async function initialize({
   port = DEFAULT_CONFIG.PORT,
   mongodbUrl = DEFAULT_CONFIG.MONGODB_URL,
   corsConfig = DEFAULT_CONFIG.CORS_OPTIONS,
-  basePath
+  basePath,
+  mongodbEncryptionConfig
 }: InitializeConfig) {
   if (!jwtSecret || jwtSecret.trim().length === 0) {
     throw new Error('JWT secret missing: set JWT_SECRET or pass jwtSecret to initialize()')
@@ -77,6 +81,8 @@ export async function initialize({
   logInfo("Endpoints LOADED")
   const rulesList = await loadRules(resolvedBasePath)
   logInfo("Rules LOADED")
+  const encryptionSchemas = await loadEncryptionSchemas(resolvedBasePath)
+  logInfo("Encryption schemas LOADED")
 
   const stateConfig = {
     functions: functionsList,
@@ -152,7 +158,9 @@ export async function initialize({
     mongodbUrl,
     jwtSecret,
     functionsList,
-    corsConfig
+    corsConfig,
+    encryptionSchemas,
+    mongodbEncryptionConfig
   })
 
   logInfo('Plugins registration COMPLETED')

package/src/monitoring/plugin.ts

@@ -2,6 +2,7 @@ import fastifyWebsocket from '@fastify/websocket'
 import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify'
 import fp from 'fastify-plugin'
 import '@fastify/websocket'
+import fs from 'fs'
 import { DEFAULT_CONFIG } from '../constants'
 import { StateManager } from '../state'
 import { registerCollectionRoutes } from './routes/collections'
@@ -316,6 +317,38 @@ const createMonitoringPlugin = fp(async (
     })
   })
 
+  const resolveCodeMirrorAsset = (internalPath: string) => {
+    try {
+      return require.resolve(`codemirror/${internalPath}`)
+    } catch {
+      return ''
+    }
+  }
+
+  const codemirrorAssets: Record<string, string> = {
+    'codemirror.js': resolveCodeMirrorAsset('lib/codemirror.js'),
+    'codemirror.css': resolveCodeMirrorAsset('lib/codemirror.css'),
+    'javascript.js': resolveCodeMirrorAsset('mode/javascript/javascript.js'),
+    'foldcode.js': resolveCodeMirrorAsset('addon/fold/foldcode.js'),
+    'foldgutter.js': resolveCodeMirrorAsset('addon/fold/foldgutter.js'),
+    'brace-fold.js': resolveCodeMirrorAsset('addon/fold/brace-fold.js'),
+    'comment-fold.js': resolveCodeMirrorAsset('addon/fold/comment-fold.js'),
+    'foldgutter.css': resolveCodeMirrorAsset('addon/fold/foldgutter.css')
+  }
+
+  Object.entries(codemirrorAssets).forEach(([assetName, relativePath]) => {
+    app.get(`${prefix}/vendor/codemirror/${assetName}`, async (_req, reply) => {
+      const assetPath = relativePath || ''
+      if (!assetPath || !fs.existsSync(assetPath)) {
+        reply.code(404).send(`${assetName} not found`)
+        return
+      }
+      const asset = fs.readFileSync(assetPath, 'utf8')
+      reply.header('Cache-Control', 'no-store')
+      reply.type(assetName.endsWith('.css') ? 'text/css' : 'application/javascript').send(asset)
+    })
+  })
+
   app.get(`${prefix}/ws`, { websocket: true }, (connection) => {
     const socket =
       (connection as {

package/src/monitoring/ui.collections.js

@@ -91,7 +91,7 @@
     collectionTabButtons,
     collectionTabPanels
   } = dom;
-  const { api, parseJsonObject, highlightJson, safeStringify } = utils;
+  const { api, parseJsonObject, highlightJson, renderJsonViewer, clearJsonViewer, safeStringify } = utils;
 
   const TABLE_TRUNCATE_LIMIT = 200;
 
@@ -337,22 +337,21 @@
     const highlight = state.collectionResultHighlight;
     if (payload === null || payload === undefined) {
       collectionResult.classList.remove('table-view', 'json-highlight');
-      collectionResult.textContent = '';
+      clearJsonViewer(collectionResult, '');
       return;
     }
     if (state.collectionResultView === 'table') {
+      clearJsonViewer(collectionResult, '');
       renderCollectionTable(payload);
       return;
     }
     collectionResult.classList.remove('table-view');
     if (highlight) {
       const text = typeof payload === 'string' ? payload : JSON.stringify(payload, null, 2);
-      collectionResult.classList.add('json-highlight');
-      collectionResult.innerHTML = highlightJson(text || '');
+      renderJsonViewer(collectionResult, text || '', { collapsible: true });
       return;
     }
-    collectionResult.classList.remove('json-highlight');
-    collectionResult.textContent = typeof payload === 'string' ? payload : String(payload ?? '');
+    clearJsonViewer(collectionResult, typeof payload === 'string' ? payload : String(payload ?? ''));
   };
 
   const setCollectionResult = (value, highlight) => {
@@ -365,12 +364,10 @@
     if (!collectionRules) return;
     if (highlight) {
       const text = typeof value === 'string' ? value : JSON.stringify(value, null, 2);
-      collectionRules.classList.add('json-highlight');
-      collectionRules.innerHTML = highlightJson(text || '');
+      renderJsonViewer(collectionRules, text || '', { collapsible: true });
       return;
     }
-    collectionRules.classList.remove('json-highlight');
-    collectionRules.textContent = typeof value === 'string' ? value : String(value ?? '');
+    clearJsonViewer(collectionRules, typeof value === 'string' ? value : String(value ?? ''));
   };
 
   const updateCollectionModeView = () => {