lesgo 2.1.7 → 2.1.9

package/dist/config/rds.d.ts

@@ -6,6 +6,10 @@ declare const _default: {
             proxy: {
                 dbCredentialsSecretId: string | undefined;
                 host: string | undefined;
+                port: string | undefined;
+                connectionLimit: number;
+                waitForConnections: boolean;
+                queueLimit: number;
             };
         };
     };

package/dist/config/rds.js

@@ -8,6 +8,16 @@ export default {
         dbCredentialsSecretId:
           process.env.LESGO_AWS_RDS_AURORA_MYSQL_PROXY_DB_CREDENTIALS_SECRET_ID,
         host: process.env.LESGO_AWS_RDS_AURORA_MYSQL_PROXY_HOST,
+        port: process.env.LESGO_AWS_RDS_AURORA_MYSQL_PROXY_PORT,
+        connectionLimit: Number(
+          process.env.LESGO_AWS_RDS_AURORA_MYSQL_PROXY_CONNECTION_LIMIT || '10'
+        ),
+        waitForConnections:
+          process.env.LESGO_AWS_RDS_AURORA_MYSQL_PROXY_WAIT_FOR_CONNECTIONS ===
+          'true',
+        queueLimit: Number(
+          process.env.LESGO_AWS_RDS_AURORA_MYSQL_PROXY_QUEUE_LIMIT || '0'
+        ),
       },
     },
   },

package/dist/services/ElastiCacheRedisService/deleteRedisCache.d.ts

@@ -1,3 +1,3 @@
 import { ClientOptions } from '../../types/aws';
-declare const deleteRedisCache: (keys: string | string[], clientOpts?: ClientOptions) => Promise<number>;
+declare const deleteRedisCache: (keys: string | string[], clientOpts?: ClientOptions) => Promise<void>;
 export default deleteRedisCache;

package/dist/services/ElastiCacheRedisService/deleteRedisCache.js

@@ -38,14 +38,19 @@ const FILE = 'lesgo.services.ElastiCacheRedis.deleteRedisCache';
 const deleteRedisCache = (keys, clientOpts) =>
   __awaiter(void 0, void 0, void 0, function* () {
     const client = yield getElastiCacheRedisClient(clientOpts);
-    let resp;
     if (!Array.isArray(keys)) {
       keys = [keys];
     }
     try {
-      resp = yield client.del(...keys);
-      logger.debug(`${FILE}::RECEIVED_RESPONSE`, { resp, keys });
-      return resp;
+      if (keys.length > 0) {
+        for (const key of keys) {
+          // Keys to be deleted individually due to using Redis Cluster and key may exist across different nodes
+          // ioredis handles the routing of the key to the correct node automatically
+          const resp = yield client.del(key);
+          logger.debug(`${FILE}::CACHE_KEY_DELETED`, { resp, key });
+        }
+      }
+      logger.debug(`${FILE}::ALL_KEYS_DELETED`, { keys });
     } catch (err) {
       throw new LesgoException(
         'Failed to delete redis cache',

package/dist/services/ElastiCacheRedisService/scanRedisCache.js

@@ -50,22 +50,26 @@ const scanRedisCache = (pattern, clientOpts) =>
       { key: 'pattern', type: 'string', required: true },
     ]);
     const client = yield getElastiCacheRedisClient(clientOpts);
-    const keys = [];
+    const allKeys = [];
     try {
-      let cursor = '0'; // Start cursor
-      do {
-        // Perform SCAN operation
-        const [newCursor, matchedKeys] = yield client.scan(
-          cursor,
-          'MATCH',
-          pattern
-        );
-        cursor = newCursor;
-        if (matchedKeys.length > 0) {
-          keys.push(...matchedKeys);
-        }
-      } while (cursor !== '0'); // Continue until cursor is 0 (scan complete)
-      logger.debug(`${FILE}::RECEIVED_RESPONSE`, { keys, input });
+      const masterNodes = client.nodes('master');
+      for (const node of masterNodes) {
+        let cursor = '0';
+        do {
+          const [newCursor, keys] = yield node.scan(
+            cursor,
+            'MATCH',
+            pattern,
+            'COUNT',
+            100
+          );
+          cursor = newCursor;
+          if (keys.length > 0) {
+            allKeys.push(...keys);
+          }
+        } while (cursor !== '0');
+      }
+      logger.debug(`${FILE}::RECEIVED_RESPONSE`, { allKeys, input });
     } catch (err) {
       throw new LesgoException(
         'Failed to scan redis cache',
@@ -78,6 +82,6 @@ const scanRedisCache = (pattern, clientOpts) =>
         }
       );
     }
-    return keys;
+    return allKeys;
   });
 export default scanRedisCache;

package/dist/services/RDSAuroraMySQLProxyService/getMySQLProxyClient.js

@@ -64,26 +64,22 @@ const getMySQLProxyClient = (connOptions, clientOpts) =>
         singletonConn,
       }
     );
-    const validatedDbCredentials = validateFields(dbCredentials, [
-      { key: 'host', type: 'string', required: true },
-      { key: 'username', type: 'string', required: true },
-      { key: 'password', type: 'string', required: true },
-    ]);
     const connOpts = Object.assign(
       {
-        host: rdsConfig.aurora.mysql.proxy.host || validatedDbCredentials.host,
+        host: rdsConfig.aurora.mysql.proxy.host || dbCredentials.host,
         database: databaseName,
+        port: rdsConfig.aurora.mysql.proxy.port || dbCredentials.port || 3306,
+        connectionLimit: rdsConfig.aurora.mysql.proxy.connectionLimit || 10,
+        waitForConnections:
+          rdsConfig.aurora.mysql.proxy.waitForConnections || true,
+        queueLimit: rdsConfig.aurora.mysql.proxy.queueLimit || 0,
       },
       connOptions
     );
     logger.debug(`${FILE}::CONN_OPTS`, { connOpts });
     const dbPool = createPool(
       Object.assign(
-        {
-          user: validatedDbCredentials.username,
-          password: validatedDbCredentials.password,
-          connectionLimit: 20,
-        },
+        { user: dbCredentials.username, password: dbCredentials.password },
         connOpts
       )
     );

package/dist/utils/cache/redis/deleteCache.d.ts

@@ -16,5 +16,5 @@ import { ClientOptions } from '../../../types/aws';
  *
  * await deleteCache(keys);
  */
-declare const deleteCache: (keys: string | string[], clientOpts?: ClientOptions) => Promise<number>;
+declare const deleteCache: (keys: string | string[], clientOpts?: ClientOptions) => Promise<void>;
 export default deleteCache;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lesgo",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "description": "Core framework for lesgo node.js serverless framework.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",