@candlerip/shared 0.0.85 → 0.0.87

package/cache/common/index.d.ts

@@ -1,2 +1 @@
 export * from './cache-key/index.js';
-export * from './cache-service/index.js';

package/cache/common/index.js

@@ -1,2 +1 @@
 export * from './cache-key/index.js';
-export * from './cache-service/index.js';

package/cache/redis/workers/index.js

@@ -18,7 +18,6 @@ export const CacheWorker = (environmentMode, url, password, options) => {
         resetCustomError();
     });
     _client.connect();
-    const _composeKey = (key) => `${environmentMode}:${key}`;
     const _getClient = () => {
         const resp = getCustomError();
         if (resp) {
@@ -39,15 +38,14 @@ export const CacheWorker = (environmentMode, url, password, options) => {
         };
     };
     const getCache = async (key) => {
-        const redisKey = _composeKey(key);
-        const { composeCustomError } = CustomErrorWorker({ info: { redisKey } });
+        const { composeCustomError } = CustomErrorWorker({ info: { key } });
         const { data: client, customError } = _getClient();
         if (customError) {
             return { customError };
         }
         let data;
         try {
-            const cache = await client.get(redisKey);
+            const cache = await client.get(key);
             if (cache) {
                 data = JSON.parse(cache);
             }
@@ -67,8 +65,7 @@ export const CacheWorker = (environmentMode, url, password, options) => {
         };
     };
     const mGetCache = async (keys) => {
-        const redisKeys = keys.map((it) => _composeKey(it));
-        const { composeCustomError } = CustomErrorWorker({ info: { redisKeys } });
+        const { composeCustomError } = CustomErrorWorker({ info: { keys } });
         const { data: client, customError } = _getClient();
         if (customError) {
             return { customError };
@@ -76,14 +73,14 @@ export const CacheWorker = (environmentMode, url, password, options) => {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const data = {};
         try {
-            const cache = await client.mGet(redisKeys);
+            const cache = await client.mGet(keys);
             if (!isArray(cache, isString)) {
                 return {
                     customError: composeCustomError('Error get data from redis', { cache }),
                 };
             }
             cache.forEach((it, i) => {
-                data[redisKeys[i]] = JSON.parse(it);
+                data[keys[i]] = JSON.parse(it);
             });
         }
         catch (err) {
@@ -91,7 +88,7 @@ export const CacheWorker = (environmentMode, url, password, options) => {
                 customError: composeCustomError('Error get data from redis', { err }),
             };
         }
-        if (Object.keys(data).length !== redisKeys.length) {
+        if (Object.keys(data).length !== keys.length) {
             return {
                 customError: composeCustomError('Missing data from redis', { data }),
             };
@@ -101,14 +98,13 @@ export const CacheWorker = (environmentMode, url, password, options) => {
         };
     };
     const setCache = async (key, data) => {
-        const redisKey = _composeKey(key);
-        const { composeCustomError } = CustomErrorWorker({ info: { redisKey } });
+        const { composeCustomError } = CustomErrorWorker({ info: { key } });
         const { data: client, customError } = _getClient();
         if (customError) {
             return { customError };
         }
         try {
-            await client.set(redisKey, JSON.stringify(data));
+            await client.set(key, JSON.stringify(data));
         }
         catch (err) {
             return {

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

@@ -9,7 +9,6 @@ export type TCacheWorker = (environmentMode: EnvironmentMode, url: string, passw
     mGetCache: MGetCache;
     setCache: SetCache;
 };
-export type ComposeKey = (key: CacheKey) => string;
 export type GetCache = <T extends CacheKey = never, D extends Cache[T] = Cache[T]>(key: T) => Promise<TCustomError<D>>;
 export type MGetCache = <T extends CacheKey = never, D extends Pick<Cache, T> = Pick<Cache, T>>(keys: T[]) => Promise<TCustomError<D>>;
 export type SetCache = <T extends CacheKey = never>(key: T, data: Cache[T]) => Promise<TCustomError<null>>;

package/message-broker/index.d.ts

@@ -0,0 +1,2 @@
+export * from './message-broker/index.js';
+export * from './message-broker-queue-name/index.js';

package/message-broker/index.js

@@ -0,0 +1,2 @@
+export * from './message-broker/index.js';
+export * from './message-broker-queue-name/index.js';

package/message-broker/message-broker/domains.d.ts

@@ -0,0 +1,9 @@
+import { CacheKey } from '../../cache/common/index.js';
+import { Page } from '../../common/index.js';
+export type MessageBroker = {
+    'cache-service:refresh-cache': {
+        cacheKeys?: CacheKey[];
+        pageDictionaries?: Page[];
+        pageServerData?: Array<'candles-page' | 'home-page' | 'persons-page' | 'persons-map-page'>;
+    } | 'full';
+};

package/message-broker/message-broker/index.d.ts

@@ -0,0 +1,2 @@
+export * from './domains.js';
+export * from './singletons/index.js';

package/message-broker/message-broker/index.js

@@ -0,0 +1,2 @@
+export * from './domains.js';
+export * from './singletons/index.js';

package/message-broker/message-broker/singletons/base/index.d.ts

@@ -0,0 +1,12 @@
+import { GetChannel, Init } from './type.js';
+export declare const BaseMessageBrokerSingleton: {
+    errorWorker: {
+        addCustomErrorInfo: import("../../../../common/custom-error/workers/type.js").AddCustomErrorInfo;
+        addCustomErrorMessage: import("../../../../common/custom-error/workers/type.js").AddCustomErrorMessage;
+        composeCustomError: import("../../../../common/custom-error/workers/type.js").ComposeCustomError;
+        getCustomError: import("../../../../common/custom-error/workers/type.js").GetCustomError;
+        resetCustomError: import("../../../../common/custom-error/workers/type.js").ResetCustomError;
+    };
+    getChannel: GetChannel;
+    init: Init;
+};

package/message-broker/message-broker/singletons/base/index.js

@@ -0,0 +1,54 @@
+import amqp from 'amqplib';
+import { CustomErrorWorker } from '../../../../common/index.js';
+export const BaseMessageBrokerSingleton = (() => {
+    let _channel;
+    let _connection;
+    let _url;
+    const errorWorker = CustomErrorWorker();
+    const _handleError = (err) => {
+        errorWorker.addCustomErrorMessage('Error connect RabbitMQ');
+        errorWorker.addCustomErrorInfo({ err });
+        setTimeout(() => _connect(), 5000);
+    };
+    const _connect = async () => {
+        if (!_url) {
+            return;
+        }
+        try {
+            _connection = await amqp.connect(_url);
+            _connection.on('error', (err) => {
+                _handleError(err);
+            });
+            _channel = await _connection.createChannel();
+            console.info('Successfully connected to RabbitMQ!');
+            errorWorker.resetCustomError();
+        }
+        catch (err) {
+            _handleError(err);
+        }
+    };
+    const getChannel = () => {
+        if (!_channel) {
+            return {
+                customError: errorWorker.composeCustomError('MessageBrokerSingleton not initialized'),
+            };
+        }
+        return {
+            data: _channel,
+        };
+    };
+    const init = (url) => {
+        const error = errorWorker.getCustomError();
+        if (error) {
+            return error;
+        }
+        errorWorker.addCustomErrorMessage('MessageBroker initializing...');
+        _url = url;
+        _connect();
+    };
+    return {
+        errorWorker,
+        getChannel,
+        init,
+    };
+})();

package/message-broker/message-broker/singletons/base/type.d.ts

@@ -0,0 +1,8 @@
+import amqp from 'amqplib';
+import { CustomError, TCustomError } from '../../../../common/index.js';
+export type _Connect = () => Promise<void>;
+export type _HandleError = (err: unknown) => void;
+export type GetChannel = () => TCustomError<amqp.Channel>;
+export type Init = (url: string) => {
+    customError: CustomError;
+} | undefined;

package/message-broker/message-broker/singletons/base/type.js

@@ -0,0 +1 @@
+export {};

package/message-broker/message-broker/singletons/index.d.ts

@@ -0,0 +1,6 @@
+import { ListenQueue, SendMessage } from './type.js';
+export declare const MessageBrokerSingleton: {
+    init: import("./base/type.js").Init;
+    listenQueue: ListenQueue;
+    sendMessage: SendMessage;
+};

package/message-broker/message-broker/singletons/index.js

@@ -0,0 +1,42 @@
+import { composeCustomError, consoleCustomError, stringify } from '../../../common/index.js';
+import { BaseMessageBrokerSingleton } from './base/index.js';
+export const MessageBrokerSingleton = (() => {
+    const { errorWorker, getChannel, init } = BaseMessageBrokerSingleton;
+    const listenQueue = async (queueName, onMessage) => {
+        errorWorker.addCustomErrorInfo({ queueName, onMessage });
+        const { data: channel, customError } = getChannel();
+        if (customError) {
+            setTimeout(() => listenQueue(queueName, onMessage), 5000);
+            return;
+        }
+        await channel.assertQueue(queueName, { durable: true });
+        channel.consume(queueName, (msg) => {
+            if (msg) {
+                let parsedMsg;
+                try {
+                    parsedMsg = JSON.parse(msg.content.toString());
+                    onMessage(parsedMsg);
+                }
+                catch (err) {
+                    const error = composeCustomError('Error parsing message', { err, msg });
+                    consoleCustomError(error);
+                }
+                channel.ack(msg);
+            }
+        });
+    };
+    const sendMessage = async (queueName, message) => {
+        errorWorker.addCustomErrorInfo({ message, queueName });
+        const { data: channel, customError } = getChannel();
+        if (customError) {
+            return;
+        }
+        await channel.assertQueue(queueName, { durable: true });
+        channel.sendToQueue(queueName, Buffer.from(stringify(message)));
+    };
+    return {
+        init,
+        listenQueue,
+        sendMessage,
+    };
+})();

package/message-broker/message-broker/singletons/type.d.ts

@@ -0,0 +1,4 @@
+import { MessageBrokerQueueName } from '../../message-broker-queue-name/index.js';
+import { MessageBroker } from '../domains.js';
+export type ListenQueue = <T extends MessageBrokerQueueName>(queueName: T, onMessage: (message: MessageBroker[T]) => void) => Promise<void>;
+export type SendMessage = <T extends MessageBrokerQueueName>(queueName: T, message: MessageBroker[T]) => Promise<void>;

package/message-broker/message-broker/singletons/type.js

@@ -0,0 +1 @@
+export {};

package/message-broker/message-broker-queue-name/domains.d.ts

@@ -0,0 +1,2 @@
+import { MessageBroker } from '../message-broker/domains.js';
+export type MessageBrokerQueueName = keyof MessageBroker;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@candlerip/shared",
-  "version": "0.0.85",
+  "version": "0.0.87",
   "type": "module",
   "engines": {
     "node": "=22.19.0"
@@ -12,17 +12,21 @@
     "./aws/sdk": "./aws/sdk/index.js",
     "./cache/common": "./cache/common/index.js",
     "./cache/redis": "./cache/redis/index.js",
-    "./database": "./database/index.js"
+    "./database": "./database/index.js",
+    "./message-broker": "./message-broker/index.js"
   },
   "scripts": {
-    "dev": "crs-tsc-watch"
+    "dev": "crs-tsc-watch",
+    "publish-package": "bash ./_devops/publish-package.sh"
   },
   "devDependencies": {
     "@aws-sdk/client-ec2": "^3.938.0",
     "@aws-sdk/client-route-53": "^3.936.0",
     "@aws-sdk/client-sqs": "^3.936.0",
     "@candlerip/shared-devops": "^0.0.50",
+    "@types/amqplib": "^0.10.8",
     "@types/node": "^24.9.1",
+    "amqplib": "^0.10.9",
     "aws-cdk-lib": "^2.227.0",
     "eslint": "^9.39.0",
     "globals": "^16.5.0",

package/cache/common/cache-service/index.d.ts

@@ -1,2 +0,0 @@
-export * from './refresh-cache/index.js';
-export * from './workers/index.js';

package/cache/common/cache-service/index.js

@@ -1,2 +0,0 @@
-export * from './refresh-cache/index.js';
-export * from './workers/index.js';

package/cache/common/cache-service/refresh-cache/domains.d.ts

@@ -1,4 +0,0 @@
-import { CacheKey } from '../../cache-key/index.js';
-export type CacheServiceRefreshCache = {
-    cacheKeys: CacheKey[];
-} | 'full';

package/cache/common/cache-service/workers/index.d.ts

@@ -1,2 +0,0 @@
-import { TCacheServiceSqsWorker } from './type.js';
-export declare const CacheServiceSqsWorker: TCacheServiceSqsWorker;

package/cache/common/cache-service/workers/index.js

@@ -1,39 +0,0 @@
-import { SqsWorker } from '../../../../aws/sdk/index.js';
-import { LANGUAGES } from '../../../../common/index.js';
-export const CacheServiceSqsWorker = ({ awsRegion, environmentMode }) => {
-    const _sqsWorker = SqsWorker({ awsRegion });
-    const refreshCache = async (props) => {
-        let refreshCache;
-        if (!props) {
-            refreshCache = 'full';
-        }
-        else {
-            const { cacheKeys, pageDictionaries, pageServerData } = props;
-            const updatableCacheKeys = [];
-            if (cacheKeys) {
-                updatableCacheKeys.forEach((it) => updatableCacheKeys.push(it));
-            }
-            if (pageDictionaries) {
-                pageDictionaries.forEach((page) => {
-                    LANGUAGES.forEach((lang) => {
-                        updatableCacheKeys.push(`${page}-dictionary-${lang}`);
-                    });
-                });
-            }
-            if (pageServerData) {
-                pageServerData.forEach((page) => {
-                    LANGUAGES.forEach((lang) => {
-                        updatableCacheKeys.push(`${page}-server-data-${lang}`);
-                    });
-                });
-            }
-            refreshCache = {
-                cacheKeys: updatableCacheKeys,
-            };
-        }
-        await _sqsWorker.sendSqsMessage(`cache-service-${environmentMode}`, { refreshCache });
-    };
-    return {
-        refreshCache,
-    };
-};

package/cache/common/cache-service/workers/type.d.ts

@@ -1,14 +0,0 @@
-import { EnvironmentMode, Page } from '../../../../common/index.js';
-import { AwsRegion } from '../../../../aws/common/index.js';
-import { CacheKey } from '../../cache-key/index.js';
-export type TCacheServiceSqsWorker = (props: {
-    awsRegion: AwsRegion;
-    environmentMode: EnvironmentMode;
-}) => {
-    refreshCache: RefreshCache;
-};
-export type RefreshCache = (props?: {
-    cacheKeys?: CacheKey[];
-    pageDictionaries?: Page[];
-    pageServerData?: Array<'candles-page' | 'home-page' | 'persons-page' | 'persons-map-page'>;
-}) => Promise<void>;