@candlerip/shared 0.0.130 → 0.0.132

package/cache/redis/workers/index.js

@@ -1,6 +1,6 @@
 import { CustomErrorWorker } from '../../../common/index.js';
 import { createClient } from 'redis';
-import { composeGetRedisData } from './compose-redis-get-data/index.js';
+import { composeGetRedisData } from './compose-get-redis-data/index.js';
 export const CacheWorker = (environmentMode, url, password, options) => {
     const _isEnabled = Boolean(options?.isEnabled);
     const customErrorWorker = CustomErrorWorker();
@@ -38,9 +38,10 @@ export const CacheWorker = (environmentMode, url, password, options) => {
             data: _client,
         };
     };
-    const getCache = async (props) => {
+    const get = async (props) => {
+        const { cacheKey } = props;
         const { composeCustomError } = CustomErrorWorker({ info: props });
-        const { cacheKey, objKeys, pathKeys } = composeGetRedisData(props);
+        const { objKeys, pathKeys } = composeGetRedisData(props);
         const { data: client, customError } = _getClient();
         if (customError) {
             return { customError };
@@ -79,7 +80,7 @@ export const CacheWorker = (environmentMode, url, password, options) => {
             data: normalizedData,
         };
     };
-    const mGetCache = async (props) => {
+    const gets = async (props) => {
         const { composeCustomError } = CustomErrorWorker({ info: { props } });
         const getRedisData = props.map((it) => composeGetRedisData(it));
         const { data: client, customError } = _getClient();
@@ -91,7 +92,6 @@ export const CacheWorker = (environmentMode, url, password, options) => {
         try {
             const promises = getRedisData.map((it) => client.json.get(it.cacheKey, { path: it.pathKeys }));
             data = await Promise.all(promises);
-            console.error('***', data);
             if (!data || data.some((it) => it.length === 0)) {
                 return {
                     customError: composeCustomError('No data in Redis'),
@@ -103,27 +103,23 @@ export const CacheWorker = (environmentMode, url, password, options) => {
                 customError: composeCustomError('Error get data by object keys from Redis', { err }),
             };
         }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const normalizedData = {};
-        getRedisData.forEach((it, index) => {
+        const normalizedData = getRedisData.map((it, index) => {
             const { objKeys } = it;
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            let normalizedCacheKeyData = {};
-            if (objKeys) {
-                objKeys.forEach((objKey) => {
-                    normalizedCacheKeyData[objKey] = objKeys?.length === 1 ? data[index][0] : data[index][`$.${objKey}`][0];
-                });
-            }
-            else {
-                normalizedCacheKeyData = data[index];
+            if (!objKeys) {
+                return data[index];
             }
-            normalizedData[it.cacheKey] = normalizedCacheKeyData;
+            const normalizedCacheKeyData = {};
+            objKeys.forEach((objKey) => {
+                normalizedCacheKeyData[objKey] = objKeys?.length === 1 ? data[index][0] : data[index][`$.${objKey}`][0];
+            });
+            return normalizedCacheKeyData;
         });
         return {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             data: normalizedData,
         };
     };
-    const setCache = async (key, data) => {
+    const set = async (key, data) => {
         const { composeCustomError } = CustomErrorWorker({ info: { key } });
         const { data: client, customError } = _getClient();
         if (customError) {
@@ -142,8 +138,17 @@ export const CacheWorker = (environmentMode, url, password, options) => {
         };
     };
     return {
-        getCache,
-        mGetCache,
-        setCache,
+        get,
+        gets,
+        set,
     };
 };
+const { gets } = CacheWorker('', '', '', { isEnabled: true });
+let language = 'hu';
+const cacheKey = [`common-page-header-langmenu-items-dictionary-${language}`];
+const resp = await gets([
+    {
+        cacheKey: cacheKey[0],
+    },
+]);
+resp.data;

package/cache/redis/workers/type.d.ts

@@ -1,26 +1,22 @@
 import { EnvironmentMode, TCustomError } from '../../../common/index.js';
-import { CacheKey, CandleLightingProfilesCacheKey, Cache, CacheData } from '../../common/index.js';
+import { CacheKey, Cache, CacheData } from '../../common/index.js';
 import { createClient } from 'redis';
 export type TCacheWorker = (environmentMode: EnvironmentMode, url: string, password: string, options?: {
     isEnabled?: boolean;
 }) => {
-    getCache: GetCache;
-    mGetCache: MGetCache;
-    setCache: SetCache;
+    get: Get;
+    gets: Gets;
+    set: Set;
 };
 export type GetClient = () => TCustomError<ReturnType<typeof createClient>>;
-export type SetCache = <T extends keyof Cache>(key: T, data: Cache[T]) => Promise<TCustomError<null>>;
-export type GetCache = <T extends CacheData = never, C extends CacheKey = CacheKey>(props: GetCacheProps<C>) => Promise<TCustomError<T>>;
-export type GetCacheProps<C extends CacheKey> = C extends CandleLightingProfilesCacheKey ? {
+export type Set = <T extends keyof Cache>(key: T, data: Cache[T]) => Promise<TCustomError<null>>;
+export type Get = <T extends CacheData = never, C extends CacheKey = CacheKey>(props: GetProps<C>) => Promise<TCustomError<T>>;
+export type GetProps<C extends CacheKey> = {
     cacheKey: C;
     objKey?: ObjKey;
-} : {
-    cacheKey: C;
     objKeys?: string[];
 };
-export type MGetCache = <T extends {
-    [key in CacheKey]?: CacheData;
-} = never, C extends CacheKey = CacheKey>(props: GetCacheProps<C>[]) => Promise<TCustomError<T>>;
+export type Gets = <T extends CacheData[] = CacheData[], C extends CacheKey = CacheKey>(props: GetProps<C>[]) => Promise<TCustomError<T>>;
 export type ObjKeys = string[];
 export type ObjKey = {
     code: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@candlerip/shared",
-  "version": "0.0.130",
+  "version": "0.0.132",
   "type": "module",
   "engines": {
     "node": "=22.19.0"