just-another-http-api 1.2.8 → 1.2.10

package/api.js

@@ -36,6 +36,9 @@ async function createServer ( config ) {
         if ( config.websocket?.enabled ){
             app.register ( require ( '@fastify/websocket' ), config.websocket?.options );
         }
+        if (config.cookies?.enabled) {
+            app.register ( require ( '@fastify/cookie' ), config.cookies );
+        }
         await uploads.initialiseUploads ( app, config );
         await caching.initialiseCaching ( app, config );
         await auth.initialiseAuth ( app, config );
@@ -118,11 +121,11 @@ function fastifyHandlerWrapper ( handler, config, globalConfig, method ) {
             try {
                 let response;
                 if ( globalConfig?.cache?.enabled ){
-                    const request = { method: req.method, query: JSON.parse ( JSON.stringify ( req.query ) ), routeOptions: req.routeOptions };
+                    const request = { method: req.method, query: JSON.parse ( JSON.stringify ( req.query ) ), routeOptions: req.routeOptions, params: JSON.parse ( JSON.stringify ( req.params ) ) };
                     response = await caching.checkRequestCache ( app, request, reply, config, globalConfig );
-                       
+
                     if ( !response ){
-                        response = await handler ( req );
+                        response = await handler ( req, { invalidateRequest: ( _req ) => caching.invalidateRequestCache( app, _req, globalConfig ) } );
                         await caching.setRequestCache ( app, request, response, config, globalConfig );
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "just-another-http-api",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "description": "A framework built on top of fastify aimed at removing the need for any network or server configuration. ",
   "homepage": "https://github.com/OllieEdge/just-another-http-api#readme",
   "repository": {
@@ -27,6 +27,7 @@
   "dependencies": {
     "@aws-sdk/lib-storage": "^3.569.0",
     "@fastify/caching": "^8.3.0",
+    "@fastify/cookie": "^9.4.0",
     "@fastify/cors": "^9.0.1",
     "@fastify/jwt": "^7.2.3",
     "@fastify/redis": "^6.2.0",
@@ -44,4 +45,4 @@
     "eslint": "^9.2.0",
     "mocha": "^10.4.0"
   }
-}
+}

package/src/cache.js

@@ -1,4 +1,12 @@
-const getCacheKey = ( config, req ) => `${config?.cache?.redisPrefix || ''}:${req.method.toLowerCase ()}:${req.routeOptions.url}:${JSON.stringify ( req.query )}`;
+const getCacheKey = (config, req) => {
+    let url = req.routeOptions.url;
+
+    for (const [ param, value ] of Object.entries( req.params || {} )) {
+        url = url.replace(`:${param}`, value);
+    }
+
+    return `${config?.cache?.redisPrefix || ''}:${req.method.toLowerCase()}:${url}:${JSON.stringify( req.query )}`;
+};
 
 exports.initialiseCaching = async ( app, config ) => {
 
@@ -66,4 +74,12 @@ exports.setRequestCache = async ( app, req, response, handleConfig, globalConfig
         }
 
     }
-};
+};
+
+exports.invalidateRequestCache = async ( app, req, globalConfig ) => {
+    if ( globalConfig?.cache?.enabled ) {
+        const cacheKey = getCacheKey ( globalConfig, req );
+
+        await app.redis.del ( cacheKey );
+    }
+};