@flowerforce/flowerbase 1.1.2-beta.6 → 1.1.2-beta.8

package/dist/features/functions/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/features/functions/controller.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAGhD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,kBAoJjC,CAAA"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/features/functions/controller.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAGhD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,kBAmGjC,CAAA"}

package/dist/features/functions/controller.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionsController = void 0;
 const bson_1 = require("bson");
+const constants_1 = require("../../constants");
 const services_1 = require("../../services");
 const state_1 = require("../../state");
 const context_1 = require("../../utils/context");
@@ -24,38 +25,8 @@ const utils_1 = require("./utils");
 const functionsController = (app_1, _a) => __awaiter(void 0, [app_1, _a], void 0, function* (app, { functionsList, rules }) {
     app.addHook('preHandler', app.jwtAuthentication);
     app.post('/call', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
-        const { user, query } = req;
+        const { user } = req;
         const { name: method, arguments: args } = req.body;
-        if (query) {
-            const { baas_request, stitch_request } = query;
-            const config = JSON.parse(Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8'));
-            console.log("🚀 ~ functionsController ~ baas_request:", baas_request, query, Buffer.from(baas_request || stitch_request || '', 'base64'), Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8'), config);
-            const [{ database, collection }] = config.arguments;
-            const app = state_1.StateManager.select('app');
-            const services = state_1.StateManager.select('services');
-            const changeStream = yield services['mongodb-atlas'](app, {
-                user,
-                rules
-            })
-                .db(database)
-                .collection(collection)
-                .watch([], { fullDocument: 'whenAvailable' });
-            console.log("🚀 ~ functionsController ~ changeStream:", changeStream);
-            res.header('Content-Type', 'text/event-stream');
-            res.header('Cache-Control', 'no-cache');
-            res.header("content-encoding", "gzip");
-            res.header('Connection', 'keep-alive');
-            res.header("access-control-allow-credentials", true);
-            res.header("access-control-allow-origin", "*");
-            res.header("access-control-allow-headers", "X-Stitch-Location, X-Baas-Location, Location");
-            res.raw.flushHeaders();
-            changeStream.on('change', (change) => {
-                res.raw.write(`data: ${JSON.stringify(change)}\n\n`);
-            });
-            req.raw.on('close', () => {
-                changeStream.close();
-            });
-        }
         if ('service' in req.body) {
             const serviceFn = services_1.services[req.body.service];
             if (req.body.service)
@@ -100,10 +71,19 @@ const functionsController = (app_1, _a) => __awaiter(void 0, [app_1, _a], void 0
         const { query, user } = req;
         const { baas_request, stitch_request } = query;
         const config = JSON.parse(Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8'));
-        console.log("🚀 ~ functionsController ~ baas_request:", baas_request, query, Buffer.from(baas_request || stitch_request || '', 'base64'), Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8'), config);
         const [{ database, collection }] = config.arguments;
         const app = state_1.StateManager.select('app');
         const services = state_1.StateManager.select('services');
+        const headers = {
+            'Content-Type': 'text/event-stream',
+            'Cache-Control': 'no-cache',
+            'Connection': 'keep-alive',
+            "access-control-allow-credentials": "true",
+            "access-control-allow-origin": `${constants_1.DEFAULT_CONFIG.HTTPS_SCHEMA}://${req.headers.host}`,
+            "access-control-allow-headers": "X-Stitch-Location, X-Baas-Location, Location",
+        };
+        res.raw.writeHead(200, headers);
+        res.raw.flushHeaders();
         const changeStream = yield services['mongodb-atlas'](app, {
             user,
             rules
@@ -111,19 +91,11 @@ const functionsController = (app_1, _a) => __awaiter(void 0, [app_1, _a], void 0
             .db(database)
             .collection(collection)
             .watch([], { fullDocument: 'whenAvailable' });
-        console.log("🚀 ~ functionsController ~ changeStream:", changeStream);
-        res.header('Content-Type', 'text/event-stream');
-        res.header('Cache-Control', 'no-cache');
-        res.header("content-encoding", "gzip");
-        res.header('Connection', 'keep-alive');
-        res.header("access-control-allow-credentials", true);
-        res.header("access-control-allow-origin", "*");
-        res.header("access-control-allow-headers", "X-Stitch-Location, X-Baas-Location, Location");
-        res.raw.flushHeaders();
         changeStream.on('change', (change) => {
             res.raw.write(`data: ${JSON.stringify(change)}\n\n`);
         });
         req.raw.on('close', () => {
+            console.log("change stream closed");
             changeStream.close();
         });
     }));

package/dist/services/mongodb-atlas/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/mongodb-atlas/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAyC,oBAAoB,EAAE,MAAM,SAAS,CAAA;AA+pBrF,QAAA,MAAM,YAAY,EAAE,oBAmBlB,CAAA;AAEF,eAAe,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/mongodb-atlas/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAyC,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAqpBrF,QAAA,MAAM,YAAY,EAAE,oBAmBlB,CAAA;AAEF,eAAe,YAAY,CAAA"}

package/dist/services/mongodb-atlas/index.js

@@ -292,7 +292,6 @@ const getOperators = (collection, { rules = {}, collName, user, run_as_system })
             const { filters, roles } = rules[collName] || {};
             // Apply access filters to initial change stream pipeline
             const formattedQuery = (0, utils_2.getFormattedQuery)(filters, {}, user);
-            console.log("🚀 ~ getOperators ~ formattedQuery:", formattedQuery);
             const firstStep = formattedQuery.length ? {
                 $match: {
                     $and: formattedQuery
@@ -302,11 +301,8 @@ const getOperators = (collection, { rules = {}, collName, user, run_as_system })
                 firstStep,
                 ...pipeline
             ].filter(Boolean);
-            console.log("🚀 ~ getOperators ~ formattedPipeline:", formattedPipeline);
             const result = collection.watch(formattedPipeline, options);
-            console.log("🚀 ~ getOperators ~ result:", result);
             const originalOn = result.on.bind(result);
-            console.log("🚀 ~ getOperators ~ originalOn:", originalOn);
             /**
              * Validates a change event against the user's roles.
              *
@@ -335,18 +331,14 @@ const getOperators = (collection, { rules = {}, collName, user, run_as_system })
             });
             // Override the .on() method to apply validation before emitting events
             result.on = (eventType, listener) => {
-                console.log("🚀 ~ getOperators ~ eventType:", eventType);
                 return originalOn(eventType, (change) => __awaiter(void 0, void 0, void 0, function* () {
-                    console.log("🚀 ~ getOperators ~ change:", change);
                     const { status, document, updatedFieldsStatus, updatedFields } = yield isValidChange(change);
                     if (!status)
                         return;
                     const filteredChange = Object.assign(Object.assign({}, change), { fullDocument: document, updateDescription: Object.assign(Object.assign({}, change.updateDescription), { updatedFields: updatedFieldsStatus ? updatedFields : {} }) });
-                    console.log("🚀 ~ getOperators ~ filteredChange:", filteredChange);
                     listener(filteredChange);
                 }));
             };
-            console.log("result", result, options);
             return result;
         }
         // System mode: no filtering applied

package/package.json

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

package/src/features/functions/controller.ts

@@ -1,5 +1,5 @@
 import { ObjectId } from 'bson'
-
+import { DEFAULT_CONFIG } from '../../constants'
 import { services } from '../../services'
 import { StateManager } from '../../state'
 import { GenerateContext } from '../../utils/context'
@@ -19,54 +19,9 @@ export const functionsController: FunctionController = async (
 ) => {
   app.addHook('preHandler', app.jwtAuthentication)
 
-  app.post<{ Body: FunctionCallDto, Querystring?: FunctionCallBase64Dto }>('/call', async (req, res) => {
-    const { user, query } = req
+  app.post<{ Body: FunctionCallDto }>('/call', async (req, res) => {
+    const { user } = req
     const { name: method, arguments: args } = req.body
-    if (query) {
-      const { baas_request, stitch_request } = query
-
-      const config: Base64Function = JSON.parse(
-        Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8')
-      )
-
-      console.log("🚀 ~ functionsController ~ baas_request:",
-        baas_request,
-        query,
-        Buffer.from(baas_request || stitch_request || '', 'base64'),
-        Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8'),
-        config
-      )
-      const [{ database, collection }] = config.arguments
-      const app = StateManager.select('app')
-      const services = StateManager.select('services')
-
-      const changeStream = await services['mongodb-atlas'](app, {
-        user,
-        rules
-      })
-        .db(database)
-        .collection(collection)
-        .watch([], { fullDocument: 'whenAvailable' })
-      console.log("🚀 ~ functionsController ~ changeStream:", changeStream)
-
-      res.header('Content-Type', 'text/event-stream')
-      res.header('Cache-Control', 'no-cache')
-      res.header("content-encoding", "gzip")
-      res.header('Connection', 'keep-alive')
-      res.header("access-control-allow-credentials", true)
-      res.header("access-control-allow-origin", "*")
-      res.header("access-control-allow-headers", "X-Stitch-Location, X-Baas-Location, Location")
-      res.raw.flushHeaders()
-
-      changeStream.on('change', (change) => {
-        res.raw.write(`data: ${JSON.stringify(change)}\n\n`)
-      })
-
-      req.raw.on('close', () => {
-        changeStream.close()
-      })
-    }
-
 
     if ('service' in req.body) {
       const serviceFn = services[req.body.service]
@@ -124,17 +79,22 @@ export const functionsController: FunctionController = async (
       Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8')
     )
 
-    console.log("🚀 ~ functionsController ~ baas_request:",
-      baas_request,
-      query,
-      Buffer.from(baas_request || stitch_request || '', 'base64'),
-      Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8'),
-      config
-    )
     const [{ database, collection }] = config.arguments
     const app = StateManager.select('app')
     const services = StateManager.select('services')
 
+    const headers = {
+      'Content-Type': 'text/event-stream',
+      'Cache-Control': 'no-cache',
+      'Connection': 'keep-alive',
+      "access-control-allow-credentials": "true",
+      "access-control-allow-origin": `${DEFAULT_CONFIG.HTTPS_SCHEMA}://${req.headers.host}`,
+      "access-control-allow-headers": "X-Stitch-Location, X-Baas-Location, Location",
+    }
+
+    res.raw.writeHead(200, headers)
+    res.raw.flushHeaders();
+
     const changeStream = await services['mongodb-atlas'](app, {
       user,
       rules
@@ -142,23 +102,14 @@ export const functionsController: FunctionController = async (
       .db(database)
       .collection(collection)
       .watch([], { fullDocument: 'whenAvailable' })
-    console.log("🚀 ~ functionsController ~ changeStream:", changeStream)
-
-    res.header('Content-Type', 'text/event-stream')
-    res.header('Cache-Control', 'no-cache')
-    res.header("content-encoding", "gzip")
-    res.header('Connection', 'keep-alive')
-    res.header("access-control-allow-credentials", true)
-    res.header("access-control-allow-origin", "*")
-    res.header("access-control-allow-headers", "X-Stitch-Location, X-Baas-Location, Location")
-    res.raw.flushHeaders()
 
     changeStream.on('change', (change) => {
-      res.raw.write(`data: ${JSON.stringify(change)}\n\n`)
-    })
+      res.raw.write(`data: ${JSON.stringify(change)}\n\n`);
+    });
 
     req.raw.on('close', () => {
-      changeStream.close()
-    })
+      console.log("change stream closed")
+      changeStream.close();
+    });
   })
 }

package/src/services/mongodb-atlas/index.ts

@@ -342,7 +342,6 @@ const getOperators: GetOperatorsFunction = (
 
       // Apply access filters to initial change stream pipeline
       const formattedQuery = getFormattedQuery(filters, {}, user)
-      console.log("🚀 ~ getOperators ~ formattedQuery:", formattedQuery)
 
       const firstStep = formattedQuery.length ? {
         $match: {
@@ -354,12 +353,9 @@ const getOperators: GetOperatorsFunction = (
         firstStep,
         ...pipeline
       ].filter(Boolean) as Document[]
-      console.log("🚀 ~ getOperators ~ formattedPipeline:", formattedPipeline)
 
       const result = collection.watch(formattedPipeline, options)
-      console.log("🚀 ~ getOperators ~ result:", result)
       const originalOn = result.on.bind(result)
-      console.log("🚀 ~ getOperators ~ originalOn:", originalOn)
 
       /**
        * Validates a change event against the user's roles.
@@ -404,9 +400,7 @@ const getOperators: GetOperatorsFunction = (
         eventType: EventKey,
         listener: EventsDescription[EventKey]
       ) => {
-        console.log("🚀 ~ getOperators ~ eventType:", eventType)
         return originalOn(eventType, async (change: Document) => {
-          console.log("🚀 ~ getOperators ~ change:", change)
           const { status, document, updatedFieldsStatus, updatedFields } =
             await isValidChange(change)
           if (!status) return
@@ -419,14 +413,10 @@ const getOperators: GetOperatorsFunction = (
               updatedFields: updatedFieldsStatus ? updatedFields : {}
             }
           }
-          console.log("🚀 ~ getOperators ~ filteredChange:", filteredChange)
 
           listener(filteredChange)
         })
       }
-
-      console.log("result", result, options)
-
       return result
     }