@common-stack/frontend-stack-react 4.0.1-alpha.29 → 4.0.1-alpha.32

package/lib/backend/middlewares/container.js

@@ -12,61 +12,65 @@ const containerMiddleware = async (req, res, next) => {
         console.time(`Request ${requestId} Duration`); // Start timing the request
     }
     logger.debug(`Express req started - ID: ${requestId} , URL: ${req.url}`); // Log when request starts with unique ID
-    const container = features.createContainers({}, requestId);
-    const clientState = features.getStateParams({
-        // resolverContex: () => services,
-        scopeId: requestId,
-        requestResponsePair: {
-            req,
-            res,
-        },
-    });
-    const { apolloClient } = createApolloClient({
-        httpGraphqlURL: config.GRAPHQL_URL,
-        httpLocalGraphqlURL: config.LOCAL_GRAPHQL_URL,
-        isDev: process.env.NODE_ENV === 'development',
-        isDebug: __DEBUGGING__,
-        isSSR: __SSR__,
-        scope: typeof window !== 'undefined' ? 'browser' : 'server',
-        clientState,
-        getDataIdFromObject: (result) => features.getDataIdFromObject(result),
-        initialState: typeof window !== 'undefined' ? window?.__APOLLO_STATE__ : undefined,
-        logger,
-    });
-    container.bind(TYPES.HttpRequest).toConstantValue(req);
-    let count = 1;
-    container
-        .bind(ClientTypes.ApolloClientFactory)
-        .toDynamicValue((context) => () => {
-        count = count + 1;
-        console.log('---COUNT__________', count);
-        return apolloClient;
-    })
-        .inRequestScope();
-    const services = merge({}, ...features.createServiceFunc.map((serviceFunc) => serviceFunc(container)));
-    const resolvers = features.getApolloResolvers(() => services);
-    apolloClient.setResolvers(resolvers);
-    const { store } = createReduxStore(apolloClient, services, container);
-    req.container = container;
-    req.apolloClient = container.get(ClientTypes.ApolloClientFactory)();
-    req.logger = logger;
-    req.store = store;
-    req.services = services;
-    res.on('finish', () => {
-        logger.debug(`Express req Finished! - ID: ${requestId}`); // Log when request finishes with unique ID
-        if (config.LOG_LEVEL === 'debug' || config.LOG_LEVEL === 'trace') {
-            console.timeEnd(`Request ${requestId} Duration`); // End timing and log the duration
-        }
-        try {
-            // req.services.organizationContextService.dispose();
-            // req.services.configurationService.dispose();
-            ScopedContainer.remove(requestId);
-            req.apollClient = null;
-            req.services = null;
-        }
-        catch (error) {
-            console.error(`Error during container cleanup - ID: ${requestId}`, error);
-        }
-    });
-    next();
+    try {
+        const container = features.createContainers({}, requestId);
+        const clientState = features.getStateParams({
+            scopeId: requestId,
+            requestResponsePair: {
+                req,
+                res,
+            },
+        });
+        const { apolloClient } = createApolloClient({
+            httpGraphqlURL: config.GRAPHQL_URL,
+            httpLocalGraphqlURL: config.LOCAL_GRAPHQL_URL,
+            isDev: process.env.NODE_ENV === 'development',
+            isDebug: __DEBUGGING__,
+            isSSR: __SSR__,
+            scope: typeof window !== 'undefined' ? 'browser' : 'server',
+            clientState,
+            getDataIdFromObject: (result) => features.getDataIdFromObject(result),
+            initialState: typeof window !== 'undefined' ? window?.__APOLLO_STATE__ : undefined,
+            logger,
+        });
+        container.bind(TYPES.HttpRequest).toConstantValue(req);
+        let count = 1;
+        container
+            .bind(ClientTypes.ApolloClientFactory)
+            .toDynamicValue((context) => () => {
+            count = count + 1;
+            logger.debug(`Apollo Client Factory called - Count: ${count}`);
+            return apolloClient;
+        })
+            .inRequestScope();
+        const services = merge({}, ...features.createServiceFunc.map((serviceFunc) => serviceFunc(container)));
+        const resolvers = features.getApolloResolvers(() => services);
+        apolloClient.setResolvers(resolvers);
+        const { store } = createReduxStore(apolloClient, services, container);
+        req.container = container;
+        req.apolloClient = container.get(ClientTypes.ApolloClientFactory)();
+        req.logger = logger;
+        req.store = store;
+        req.services = services;
+        res.on('finish', () => {
+            logger.debug(`Express req Finished! - ID: ${requestId}`); // Log when request finishes with unique ID
+            if (config.LOG_LEVEL === 'debug' || config.LOG_LEVEL === 'trace') {
+                console.timeEnd(`Request ${requestId} Duration`); // End timing and log the duration
+            }
+            try {
+                ScopedContainer.remove(requestId);
+                req.apollClient = null;
+                req.services = null;
+                logger.debug(`Successfully cleaned up - ID: ${requestId}`);
+            }
+            catch (error) {
+                logger.error(`Error during container cleanup - ID: ${requestId}`, error);
+            }
+        });
+        next();
+    }
+    catch (error) {
+        logger.error(`Error processing request - ID: ${requestId}`, error);
+        next(error);
+    }
 };export{TYPES,containerMiddleware};

package/lib/config/redis-config.server.d.ts

@@ -1,2 +1,2 @@
-import Redis from 'ioredis';
-export declare function getRedisClient(): Redis;
+import { Redis, Cluster } from 'ioredis';
+export declare function getRedisClient(logger?: any): Redis | Cluster;

package/lib/config/redis-config.server.js

@@ -1,8 +1,19 @@
-import Redis from'ioredis';import {config}from'./env-config.server.js';let redisClient;
-function getRedisClient() {
+import {Cluster,Redis}from'ioredis';import {config}from'./env-config.server.js';let redisClient;
+function getRedisClient(logger) {
     if (!redisClient) {
         // Initialize Redis client if it doesn't exist
-        redisClient = new Redis(config.REDIS_URL);
+        if (config.REDIS_CLUSTER_ENABLED) {
+            if (!config.REDIS_CLUSTER_URL) {
+                throw new Error(`No nodes defined for cluster, ${config.REDIS_CLUSTER_URL}`);
+            }
+            logger?.info('Setting Redis.Cluster connection');
+            redisClient = new Cluster(config.REDIS_CLUSTER_URL, this.opts);
+        }
+        else {
+            logger?.info('Setting Redis connection');
+            redisClient = new Redis(config.REDIS_URL || this.opts);
+        }
+        return redisClient;
     }
     return redisClient;
 }export{getRedisClient};

package/lib/load-context.server.js

@@ -1,6 +1,6 @@
-import'reflect-metadata';import features from'./modules.js';import {getRedisClient}from'./config/redis-config.server.js';/* eslint-disable @typescript-eslint/ban-ts-comment */
+import'reflect-metadata';import {logger}from'@cdm-logger/server';import features from'./modules.js';import {getRedisClient}from'./config/redis-config.server.js';/* eslint-disable @typescript-eslint/ban-ts-comment */
 const routeConfig = features.getConfiguredRoutes();
-const redisClient = getRedisClient();
+const redisClient = getRedisClient(logger);
 const loadContext = async (req, res) => {
     const { container, store, apolloClient, services, logger } = req;
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/frontend-stack-react",
-    "version": "4.0.1-alpha.29",
+    "version": "4.0.1-alpha.32",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -29,8 +29,8 @@
         "watch": "npm run build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/client-react": "4.0.1-alpha.29",
-        "@common-stack/core": "4.0.1-alpha.29"
+        "@common-stack/client-react": "4.0.1-alpha.31",
+        "@common-stack/core": "4.0.1-alpha.31"
     },
     "devDependencies": {
         "jest-fetch-mock": "^3.0.3",
@@ -50,5 +50,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "557a66b0df8bc11a3c53de845533b0f867e45978"
+    "gitHead": "5c696283f6ec69e7197c4593ea425a06b30bb7d4"
 }