@flowerforce/flowerbase 1.1.2-beta.1 → 1.1.2-beta.10

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,kBA0FjC,CAAA"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/features/functions/controller.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAKhD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,kBAoHjC,CAAA"}

package/dist/features/functions/controller.js

@@ -23,6 +23,7 @@ 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);
+    const streams = {};
     app.post('/call', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const { user } = req;
         const { name: method, arguments: args } = req.body;
@@ -73,23 +74,42 @@ const functionsController = (app_1, _a) => __awaiter(void 0, [app_1, _a], void 0
         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, {
+        const headers = {
+            'Content-Type': 'text/event-stream',
+            'Cache-Control': 'no-cache',
+            'Connection': 'keep-alive',
+            "access-control-allow-credentials": "true",
+            "access-control-allow-origin": '*',
+            "access-control-allow-headers": "X-Stitch-Location, X-Baas-Location, Location",
+        };
+        res.raw.writeHead(200, headers);
+        res.raw.flushHeaders();
+        const requestKey = baas_request || stitch_request;
+        if (!requestKey)
+            return;
+        const changeStream = streams[requestKey];
+        if (changeStream) {
+            changeStream.on('change', (change) => {
+                res.raw.write(`data: ${JSON.stringify(change)}\n\n`);
+            });
+            req.raw.on('close', () => {
+                var _a;
+                console.log("change stream closed");
+                (_a = changeStream === null || changeStream === void 0 ? void 0 : changeStream.close) === null || _a === void 0 ? void 0 : _a.call(changeStream);
+                delete streams[requestKey];
+            });
+            return;
+        }
+        streams[requestKey] = yield services['mongodb-atlas'](app, {
             user,
             rules
         })
             .db(database)
             .collection(collection)
             .watch([], { fullDocument: 'whenAvailable' });
-        res.header('Content-Type', 'text/event-stream');
-        res.header('Cache-Control', 'no-cache');
-        res.header('Connection', 'keep-alive');
-        res.raw.flushHeaders();
-        changeStream.on('change', (change) => {
+        streams[requestKey].on('change', (change) => {
             res.raw.write(`data: ${JSON.stringify(change)}\n\n`);
         });
-        req.raw.on('close', () => {
-            changeStream.close();
-        });
     }));
 });
 exports.functionsController = functionsController;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAA;AActB,cAAc,SAAS,CAAA;AAEvB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAAC,EAC/B,SAAS,EACT,IAAI,EACJ,SAAqC,EACrC,IAA0B,EAC1B,UAAuC,EACxC,EAAE,gBAAgB,iBAwElB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAA;AActB,cAAc,SAAS,CAAA;AAEvB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAAC,EAC/B,SAAS,EACT,IAA0B,EAC1B,SAAqC,EACrC,IAA0B,EAC1B,UAAuC,EACxC,EAAE,gBAAgB,iBAwElB"}

package/dist/index.js

@@ -73,7 +73,7 @@ __exportStar(require("./model"), exports);
  * @param mongodbUrl -> the database connection string
  */
 function initialize(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ projectId, host, jwtSecret = constants_1.DEFAULT_CONFIG.JWT_SECRET, port = constants_1.DEFAULT_CONFIG.PORT, mongodbUrl = constants_1.DEFAULT_CONFIG.MONGODB_URL }) {
+    return __awaiter(this, arguments, void 0, function* ({ projectId, host = constants_1.DEFAULT_CONFIG.HOST, jwtSecret = constants_1.DEFAULT_CONFIG.JWT_SECRET, port = constants_1.DEFAULT_CONFIG.PORT, mongodbUrl = constants_1.DEFAULT_CONFIG.MONGODB_URL }) {
         var _b;
         const fastify = (0, fastify_1.default)({
             logger: !!constants_1.DEFAULT_CONFIG.ENABLE_LOGGER

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;AAmpBrF,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,14 +292,15 @@ 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);
+            const firstStep = formattedQuery.length ? {
+                $match: {
+                    $and: formattedQuery
+                }
+            } : undefined;
             const formattedPipeline = [
-                {
-                    $match: {
-                        $and: formattedQuery
-                    }
-                },
+                firstStep,
                 ...pipeline
-            ];
+            ].filter(Boolean);
             const result = collection.watch(formattedPipeline, options);
             const originalOn = result.on.bind(result);
             /**
@@ -348,7 +349,7 @@ const getOperators = (collection, { rules = {}, collName, user, run_as_system })
         if (isClient) {
             throw new Error("Aggregate operator from cliente is not implemented! Move it to a function");
         }
-        if (run_as_system) {
+        if (run_as_system || !isClient) {
             return collection.aggregate(pipeline, options);
         }
         (0, utils_2.checkDenyOperation)(rules, collection.collectionName, model_1.CRUD_OPERATIONS.READ);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase",
-  "version": "1.1.2-beta.1",
+  "version": "1.1.2-beta.10",
   "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 { ChangeStream, Document } from 'mongodb';
 import { services } from '../../services'
 import { StateManager } from '../../state'
 import { GenerateContext } from '../../utils/context'
@@ -7,6 +7,8 @@ import { Base64Function, FunctionCallBase64Dto, FunctionCallDto } from './dtos'
 import { FunctionController } from './interface'
 import { executeQuery } from './utils'
 
+
+
 /**
  * > Creates a pre handler for every query
  * @param app -> the fastify instance
@@ -19,6 +21,8 @@ export const functionsController: FunctionController = async (
 ) => {
   app.addHook('preHandler', app.jwtAuthentication)
 
+  const streams = {} as Record<string, ChangeStream<Document, Document>>
+
   app.post<{ Body: FunctionCallDto }>('/call', async (req, res) => {
     const { user } = req
     const { name: method, arguments: args } = req.body
@@ -78,29 +82,53 @@ export const functionsController: FunctionController = async (
     const config: Base64Function = JSON.parse(
       Buffer.from(baas_request || stitch_request || '', 'base64').toString('utf8')
     )
+
     const [{ database, collection }] = config.arguments
     const app = StateManager.select('app')
     const services = StateManager.select('services')
 
-    const changeStream = await services['mongodb-atlas'](app, {
+    const headers = {
+      'Content-Type': 'text/event-stream',
+      'Cache-Control': 'no-cache',
+      'Connection': 'keep-alive',
+      "access-control-allow-credentials": "true",
+      "access-control-allow-origin": '*',
+      "access-control-allow-headers": "X-Stitch-Location, X-Baas-Location, Location",
+    };
+
+    res.raw.writeHead(200, headers)
+    res.raw.flushHeaders();
+
+    const requestKey = baas_request || stitch_request
+
+    if (!requestKey) return
+
+    const changeStream = streams[requestKey]
+
+    if (changeStream) {
+      changeStream.on('change', (change) => {
+        res.raw.write(`data: ${JSON.stringify(change)}\n\n`);
+      });
+
+      req.raw.on('close', () => {
+        console.log("change stream closed");
+        changeStream?.close?.();
+        delete streams[requestKey]
+      });
+      return
+    }
+
+    streams[requestKey] = await services['mongodb-atlas'](app, {
       user,
       rules
     })
       .db(database)
       .collection(collection)
-      .watch([], { fullDocument: 'whenAvailable' })
-
-    res.header('Content-Type', 'text/event-stream')
-    res.header('Cache-Control', 'no-cache')
-    res.header('Connection', 'keep-alive')
-    res.raw.flushHeaders()
+      .watch([], { fullDocument: 'whenAvailable' });
 
-    changeStream.on('change', (change) => {
-      res.raw.write(`data: ${JSON.stringify(change)}\n\n`)
-    })
 
-    req.raw.on('close', () => {
-      changeStream.close()
-    })
+    streams[requestKey].on('change', (change) => {
+      res.raw.write(`data: ${JSON.stringify(change)}\n\n`);
+    });
   })
 }

package/src/index.ts

@@ -32,7 +32,7 @@ export type InitializeConfig = {
  */
 export async function initialize({
   projectId,
-  host,
+  host = DEFAULT_CONFIG.HOST,
   jwtSecret = DEFAULT_CONFIG.JWT_SECRET,
   port = DEFAULT_CONFIG.PORT,
   mongodbUrl = DEFAULT_CONFIG.MONGODB_URL

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

@@ -342,14 +342,17 @@ const getOperators: GetOperatorsFunction = (
 
       // Apply access filters to initial change stream pipeline
       const formattedQuery = getFormattedQuery(filters, {}, user)
+
+      const firstStep = formattedQuery.length ? {
+        $match: {
+          $and: formattedQuery
+        }
+      } : undefined
+
       const formattedPipeline = [
-        {
-          $match: {
-            $and: formattedQuery
-          }
-        },
+        firstStep,
         ...pipeline
-      ]
+      ].filter(Boolean) as Document[]
 
       const result = collection.watch(formattedPipeline, options)
       const originalOn = result.on.bind(result)
@@ -414,7 +417,6 @@ const getOperators: GetOperatorsFunction = (
           listener(filteredChange)
         })
       }
-
       return result
     }
 
@@ -426,7 +428,7 @@ const getOperators: GetOperatorsFunction = (
     if (isClient) {
       throw new Error("Aggregate operator from cliente is not implemented! Move it to a function")
     }
-    if (run_as_system) {
+    if (run_as_system || !isClient) {
       return collection.aggregate(pipeline, options)
     }
     checkDenyOperation(rules, collection.collectionName, CRUD_OPERATIONS.READ)