@zintrust/core 0.1.38 → 0.1.40

package/src/orm/Model.js

@@ -69,14 +69,25 @@ const runObservers = async (config, hook, model) => {
     const observers = config.observers;
     if (observers === undefined || observers.length === 0)
         return;
-    for (const observer of observers) {
-        const fn = observer[hook];
-        if (typeof fn === 'function') {
-            // Observers intentionally run sequentially.
-            // eslint-disable-next-line no-await-in-loop
-            await fn(model);
+    // Run "before" hooks sequentially to ensure safety and consistent state changes.
+    // This allows observers to modify the model or throw errors to cancel the operation.
+    const isBeforeHook = ['saving', 'creating', 'updating', 'deleting'].includes(hook);
+    if (isBeforeHook) {
+        for (const observer of observers) {
+            const fn = observer[hook];
+            if (typeof fn === 'function') {
+                // eslint-disable-next-line no-await-in-loop
+                await fn(model);
+            }
         }
+        return;
     }
+    // Run "after" hooks in parallel for better performance.
+    // These are typically side effects (logging, notifications) that don't depend on each other.
+    await Promise.all(observers.map(async (observer) => {
+        const fn = observer[hook];
+        return typeof fn === 'function' ? Promise.resolve(fn(model)) : Promise.resolve();
+    }));
 };
 const createModelJSON = (config, attrs) => {
     const json = {};

package/src/routes/errorPages.js

@@ -31,7 +31,7 @@ const servePublicRootFile = (relativePath, response, contentType) => {
     const candidates = candidateRoots.map((root) => path.join(root, relativePath));
     const filePath = findFirstExistingFile(candidates);
     try {
-        if (!filePath) {
+        if (filePath === undefined || filePath === null) {
             response.setStatus(404);
             response.setHeader(HTTP_HEADERS.CONTENT_TYPE, MIME_TYPES.TEXT);
             response.send('Not Found');

package/src/runtime/PluginAutoImports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PluginAutoImports.d.ts","sourceRoot":"","sources":["../../../src/runtime/PluginAutoImports.ts"],"names":[],"mappings":"AAMA,KAAK,YAAY,GACb;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAChC;IACE,EAAE,EAAE,KAAK,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,WAAW,GAAG,eAAe,CAAC;IACtC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAwBN,eAAO,MAAM,iBAAiB;IAC5B;;;;;;OAMG;mCACkC,OAAO,CAAC,YAAY,CAAC;EAqB1D,CAAC"}
+{"version":3,"file":"PluginAutoImports.d.ts","sourceRoot":"","sources":["../../../src/runtime/PluginAutoImports.ts"],"names":[],"mappings":"AAMA,KAAK,YAAY,GACb;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAChC;IACE,EAAE,EAAE,KAAK,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,WAAW,GAAG,eAAe,CAAC;IACtC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAwBN,eAAO,MAAM,iBAAiB;IAC5B;;;;;;OAMG;mCACkC,OAAO,CAAC,YAAY,CAAC;EA2D1D,CAAC"}

package/src/runtime/PluginAutoImports.js

@@ -33,21 +33,47 @@ export const PluginAutoImports = Object.freeze({
     async tryImportProjectAutoImports() {
         const projectRoot = resolveProjectRoot();
         const candidates = getCandidates(projectRoot);
-        for (const candidate of candidates) {
-            if (!existsSync(candidate))
-                continue;
+        // Filter out non-existent candidates first
+        const existingCandidates = candidates.filter((candidate) => existsSync(candidate));
+        if (existingCandidates.length === 0) {
+            Logger.debug('[plugins] No plugin auto-imports file found', { projectRoot, candidates });
+            return { ok: false, reason: 'not-found' };
+        }
+        // Try all existing candidates in parallel
+        const importPromises = existingCandidates.map(async (candidate) => {
             try {
                 const url = pathToFileURL(candidate).href;
-                // eslint-disable-next-line no-await-in-loop
                 await import(url);
                 return { ok: true, loadedPath: candidate };
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : String(error);
-                return { ok: false, loadedPath: candidate, reason: 'import-failed', errorMessage };
+                return {
+                    ok: false,
+                    loadedPath: candidate,
+                    reason: 'import-failed',
+                    errorMessage,
+                };
+            }
+        });
+        // Return the first successful import, or the first failure if none succeed
+        try {
+            const results = await Promise.allSettled(importPromises);
+            const successfulResult = results.find((result) => result.status === 'fulfilled' && result.value.ok);
+            if (successfulResult) {
+                return successfulResult.value;
             }
+            // Return the first failed result if no success
+            const firstFailedResult = results.find((result) => result.status === 'fulfilled' && !result.value.ok);
+            return (firstFailedResult?.value ?? {
+                ok: false,
+                reason: 'import-failed',
+                errorMessage: 'All candidates failed',
+            });
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            return { ok: false, reason: 'import-failed', errorMessage };
         }
-        Logger.debug('[plugins] No plugin auto-imports file found', { projectRoot, candidates });
-        return { ok: false, reason: 'not-found' };
     },
 });

package/src/security/CsrfTokenManager.d.ts

@@ -2,6 +2,7 @@
  * CSRF Token Manager
  * Generate, validate, and bind CSRF tokens to sessions
  */
+import type { Redis } from 'ioredis';
 export interface CsrfTokenData {
     token: string;
     sessionId: string;
@@ -9,18 +10,26 @@ export interface CsrfTokenData {
     expiresAt: Date;
 }
 export interface ICsrfTokenManager {
-    generateToken(sessionId: string): string;
-    validateToken(sessionId: string, token: string): boolean;
-    invalidateToken(sessionId: string): void;
-    getTokenData(sessionId: string): CsrfTokenData | null;
-    refreshToken(sessionId: string): string | null;
-    cleanup(): number;
-    clear(): void;
-    getTokenCount(): number;
+    generateToken(sessionId: string): Promise<string>;
+    validateToken(sessionId: string, token: string): Promise<boolean>;
+    invalidateToken(sessionId: string): Promise<void>;
+    getTokenData(sessionId: string): Promise<CsrfTokenData | null>;
+    refreshToken(sessionId: string): Promise<string | null>;
+    cleanup(): Promise<number>;
+    clear(): Promise<void>;
+    getTokenCount(): Promise<number>;
 }
 export interface CsrfTokenManagerType {
-    create(): ICsrfTokenManager;
+    create(options?: CsrfTokenManagerOptions): ICsrfTokenManager;
 }
+export type CsrfStoreName = 'memory' | 'redis';
+export type CsrfTokenManagerOptions = {
+    store?: CsrfStoreName;
+    redis?: Redis;
+    keyPrefix?: string;
+    tokenLength?: number;
+    tokenTtlMs?: number;
+};
 /**
  * CsrfTokenManager namespace - sealed for immutability
  */

package/src/security/CsrfTokenManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CsrfTokenManager.d.ts","sourceRoot":"","sources":["../../../src/security/CsrfTokenManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IACzC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IACzD,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAAC;IACtD,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC/C,OAAO,IAAI,MAAM,CAAC;IAClB,KAAK,IAAI,IAAI,CAAC;IACd,aAAa,IAAI,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,IAAI,iBAAiB,CAAC;CAC7B;AAoED;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,oBAE7B,CAAC"}
+{"version":3,"file":"CsrfTokenManager.d.ts","sourceRoot":"","sources":["../../../src/security/CsrfTokenManager.ts"],"names":[],"mappings":"AACA;;;GAGG;AAQH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClE,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IAC/D,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,CAAC,OAAO,CAAC,EAAE,uBAAuB,GAAG,iBAAiB,CAAC;CAC9D;AAED,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE/C,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAwRF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,oBAE7B,CAAC"}

package/src/security/CsrfTokenManager.js

@@ -1,18 +1,40 @@
+/* eslint-disable @typescript-eslint/require-await */
 /**
  * CSRF Token Manager
  * Generate, validate, and bind CSRF tokens to sessions
  */
 import { Env } from '../config/env.js';
+import { Logger } from '../config/logger.js';
+import { createRedisConnection } from '../config/workers.js';
+import { ZintrustLang } from '../lang/lang.js';
 import { randomBytes } from '../node-singletons/crypto.js';
+import { RedisKeys } from '../tools/redis/RedisKeyManager.js';
 /**
  * Create a new CSRF token manager instance
  */
-const create = () => {
+const normalizeStoreName = (name) => {
+    const raw = String(name ?? '')
+        .trim()
+        .toLowerCase();
+    if (raw === 'redis')
+        return 'redis';
+    return 'memory';
+};
+const resolveStoreName = (options) => {
+    return normalizeStoreName(options?.store ?? Env.CSRF_STORE ?? Env.CSRF_DRIVER ?? Env.get('CSRF_STORE', 'memory'));
+};
+const toTokenData = (stored) => {
+    return {
+        token: stored.token,
+        sessionId: stored.sessionId,
+        createdAt: new Date(stored.createdAt),
+        expiresAt: new Date(stored.expiresAt),
+    };
+};
+const createMemoryManager = (tokenLength, tokenTtl) => {
     const tokens = new Map();
-    const tokenLength = Env.TOKEN_LENGTH; // 256 bits
-    const tokenTtl = Env.TOKEN_TTL; // 1 hour in milliseconds
     return {
-        generateToken(sessionId) {
+        async generateToken(sessionId) {
             tokens.delete(sessionId);
             const token = randomBytes(tokenLength).toString('hex');
             const now = new Date();
@@ -21,7 +43,7 @@ const create = () => {
             tokens.set(sessionId, tokenData);
             return token;
         },
-        validateToken(sessionId, token) {
+        async validateToken(sessionId, token) {
             const tokenData = tokens.get(sessionId);
             if (!tokenData)
                 return false;
@@ -33,13 +55,13 @@ const create = () => {
             }
             return isValid;
         },
-        invalidateToken(sessionId) {
+        async invalidateToken(sessionId) {
             tokens.delete(sessionId);
         },
-        getTokenData(sessionId) {
+        async getTokenData(sessionId) {
             return tokens.get(sessionId) ?? null;
         },
-        refreshToken(sessionId) {
+        async refreshToken(sessionId) {
             const tokenData = tokens.get(sessionId);
             if (!tokenData)
                 return null;
@@ -51,7 +73,7 @@ const create = () => {
             tokenData.expiresAt = new Date(Date.now() + tokenTtl);
             return tokenData.token;
         },
-        cleanup() {
+        async cleanup() {
             let removed = 0;
             const now = new Date();
             for (const [sessionId, tokenData] of tokens.entries()) {
@@ -62,14 +84,173 @@ const create = () => {
             }
             return removed;
         },
-        clear() {
+        async clear() {
             tokens.clear();
         },
-        getTokenCount() {
+        async getTokenCount() {
             return tokens.size;
         },
     };
 };
+// Helper functions for Redis CSRF manager
+const createRedisClientFactory = (options) => {
+    let redisClient = options?.redis ?? null;
+    return () => {
+        if (redisClient)
+            return redisClient;
+        const dbFromEnv = Env.CSRF_REDIS_DB;
+        const database = dbFromEnv >= 0 ? dbFromEnv : Env.getInt('REDIS_QUEUE_DB', ZintrustLang.REDIS_DEFAULT_DB);
+        redisClient = createRedisConnection({
+            host: Env.get('REDIS_HOST', 'localhost'),
+            port: Env.getInt('REDIS_PORT', ZintrustLang.REDIS_DEFAULT_PORT),
+            password: Env.get('REDIS_PASSWORD'),
+            db: database,
+        });
+        return redisClient;
+    };
+};
+const createRedisTokenOperations = (keyPrefix, tokenTtl, getRedisClient) => {
+    const buildKey = (sessionId) => `${keyPrefix}${sessionId}`;
+    const fetchTokenData = async (sessionId) => {
+        try {
+            const client = getRedisClient();
+            const payload = await client.get(buildKey(sessionId));
+            if (payload === null || payload === '')
+                return null;
+            const parsed = JSON.parse(payload);
+            return toTokenData(parsed);
+        }
+        catch (error) {
+            Logger.error('CSRF Redis fetch failed', error);
+            return null;
+        }
+    };
+    const saveTokenData = async (data) => {
+        try {
+            const client = getRedisClient();
+            const stored = {
+                token: data.token,
+                sessionId: data.sessionId,
+                createdAt: data.createdAt.getTime(),
+                expiresAt: data.expiresAt.getTime(),
+            };
+            await client.set(buildKey(data.sessionId), JSON.stringify(stored), 'PX', tokenTtl);
+        }
+        catch (error) {
+            Logger.error('CSRF Redis save failed', error);
+        }
+    };
+    const deleteToken = async (sessionId) => {
+        try {
+            const client = getRedisClient();
+            await client.del(buildKey(sessionId));
+        }
+        catch (error) {
+            Logger.error('CSRF Redis delete failed', error);
+        }
+    };
+    const scanKeys = async () => {
+        const client = getRedisClient();
+        const keys = [];
+        const stream = client.scanStream({ match: `${keyPrefix}*`, count: 200 });
+        return new Promise((resolve, reject) => {
+            stream.on('data', (resultKeys) => {
+                if (Array.isArray(resultKeys) && resultKeys.length) {
+                    keys.push(...resultKeys);
+                }
+            });
+            stream.on('end', () => resolve(keys));
+            stream.on('error', (err) => reject(err));
+        });
+    };
+    return {
+        fetchTokenData,
+        saveTokenData,
+        deleteToken,
+        scanKeys,
+    };
+};
+const createRedisManager = (tokenLength, tokenTtl, options) => {
+    const keyPrefix = options?.keyPrefix ?? RedisKeys.getCsrfPrefix();
+    const getRedisClient = createRedisClientFactory(options);
+    const { fetchTokenData, saveTokenData, deleteToken, scanKeys } = createRedisTokenOperations(keyPrefix, tokenTtl, getRedisClient);
+    return {
+        async generateToken(sessionId) {
+            const token = randomBytes(tokenLength).toString('hex');
+            const now = new Date();
+            const expiresAt = new Date(now.getTime() + tokenTtl);
+            const tokenData = { token, sessionId, createdAt: now, expiresAt };
+            await saveTokenData(tokenData);
+            return token;
+        },
+        async validateToken(sessionId, token) {
+            const tokenData = await fetchTokenData(sessionId);
+            if (!tokenData)
+                return false;
+            const isValid = tokenData.token === token;
+            const isExpired = new Date() > tokenData.expiresAt;
+            if (isExpired) {
+                await deleteToken(sessionId);
+                return false;
+            }
+            return isValid;
+        },
+        async invalidateToken(sessionId) {
+            await deleteToken(sessionId);
+        },
+        async getTokenData(sessionId) {
+            return fetchTokenData(sessionId);
+        },
+        async refreshToken(sessionId) {
+            const tokenData = await fetchTokenData(sessionId);
+            if (!tokenData)
+                return null;
+            const isExpired = new Date() > tokenData.expiresAt;
+            if (isExpired) {
+                await deleteToken(sessionId);
+                return null;
+            }
+            tokenData.expiresAt = new Date(Date.now() + tokenTtl);
+            await saveTokenData(tokenData);
+            return tokenData.token;
+        },
+        async cleanup() {
+            // Redis handles expiry via TTL, so nothing to do here.
+            return Promise.resolve(0); // NOSONAR
+        },
+        async clear() {
+            try {
+                const keys = await scanKeys();
+                if (keys.length === 0)
+                    return;
+                const client = getRedisClient();
+                await client.del(...keys);
+            }
+            catch (error) {
+                Logger.error('CSRF Redis clear failed', error);
+            }
+        },
+        async getTokenCount() {
+            try {
+                const keys = await scanKeys();
+                return keys.length;
+            }
+            catch (error) {
+                Logger.error('CSRF Redis count failed', error);
+                return 0;
+            }
+        },
+    };
+};
+const create = (options) => {
+    const tokenLength = options?.tokenLength ?? Env.TOKEN_LENGTH; // 256 bits
+    const tokenTtl = options?.tokenTtlMs ?? Env.TOKEN_TTL; // 1 hour in milliseconds
+    const store = resolveStoreName(options);
+    if (store === 'redis') {
+        return createRedisManager(tokenLength, tokenTtl, options);
+    }
+    return createMemoryManager(tokenLength, tokenTtl);
+};
 /**
  * CsrfTokenManager namespace - sealed for immutability
  */

package/src/templates/project/basic/app/Middleware/index.ts.tpl

@@ -220,7 +220,7 @@ export const csrfMiddleware = (csrfManager: CsrfManagerInput) => {
       return;
     }
 
-    const isValid = resolveCsrfManager(csrfManager).validateToken(
+    const isValid = await resolveCsrfManager(csrfManager).validateToken(
       String(sessionId),
       String(csrfToken)
     );

package/src/templates/project/basic/config/queue.ts.tpl

@@ -1,4 +1,4 @@
-import { Env, type QueueConfigOverrides, type QueueDriverName } from '@zintrust/core';
+import { Env, type QueueConfigOverrides, type QueueDriverName, ZintrustLang } from '@zintrust/core';
 
 /**
  * Queue Configuration (default override)
@@ -41,7 +41,7 @@ export default {
       host: Env.get('REDIS_HOST', 'localhost'),
       port: Env.getInt('REDIS_PORT', 6379),
       password: Env.get('REDIS_PASSWORD'),
-      database: Env.getInt('REDIS_QUEUE_DB', 1),
+      database: Env.getInt('REDIS_QUEUE_DB', ZintrustLang.REDIS_DEFAULT_DB),
       // Note: Redis driver uses BullMQ for enterprise features
       // See BullMQ environment variables in file header for customization
     },

package/src/toolkit/Secrets/providers/AwsSecretsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AwsSecretsManager.d.ts","sourceRoot":"","sources":["../../../../../src/toolkit/Secrets/providers/AwsSecretsManager.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AA0GF,eAAO,MAAM,iBAAiB;qBACX;QACf,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;QACzE,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KAC9D;iBAsDY,MAAM,EAAE;EAcrB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"AwsSecretsManager.d.ts","sourceRoot":"","sources":["../../../../../src/toolkit/Secrets/providers/AwsSecretsManager.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AA0GF,eAAO,MAAM,iBAAiB;qBACX;QACf,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;QACzE,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KAC9D;iBAsDY,MAAM,EAAE;EAkBrB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}

package/src/toolkit/Secrets/providers/AwsSecretsManager.js

@@ -117,9 +117,11 @@ export const AwsSecretsManager = Object.freeze({
     },
     doctorEnv() {
         const missing = [];
-        const region = (readEnvString('AWS_REGION') || readEnvString('AWS_DEFAULT_REGION')).trim();
-        if (region === '')
+        const awsRegion = readEnvString('AWS_REGION').trim();
+        const awsDefaultRegion = readEnvString('AWS_DEFAULT_REGION').trim();
+        if (awsRegion === '' && awsDefaultRegion === '') {
             missing.push('AWS_REGION');
+        }
         const accessKeyId = readEnvString('AWS_ACCESS_KEY_ID').trim();
         if (accessKeyId === '')
             missing.push('AWS_ACCESS_KEY_ID');

package/src/tools/queue/AdvancedQueue.d.ts

@@ -4,8 +4,9 @@
  */
 import type { AdvancedJobOptions, JobResult, QueueConfig } from '../../types/Queue';
 import { type DeduplicationBuilder } from './DeduplicationBuilder';
+import type { BullMQPayload } from './Queue';
 export interface AdvancedQueue {
-    enqueue(name: string, payload: unknown, options: AdvancedJobOptions): Promise<string>;
+    enqueue(name: string, payload: BullMQPayload, options: AdvancedJobOptions): Promise<string>;
     deduplicate(id: string, builder: DeduplicationBuilder): Promise<JobResult>;
     releaseLock(key: string): Promise<void>;
     extendLock(key: string, ttl: number): Promise<boolean>;

package/src/tools/queue/AdvancedQueue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdvancedQueue.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/AdvancedQueue.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,kBAAkB,EAElB,SAAS,EAGT,WAAW,EACZ,MAAM,eAAe,CAAC;AAKvB,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAIxE,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACtF,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAC3E,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACxD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,GAAG,aAAa,CAiBtE"}
+{"version":3,"file":"AdvancedQueue.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/AdvancedQueue.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,kBAAkB,EAElB,SAAS,EAGT,WAAW,EACZ,MAAM,eAAe,CAAC;AAOvB,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5F,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAC3E,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACxD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,GAAG,aAAa,CAiBtE"}

package/src/tools/queue/AdvancedQueue.js

@@ -4,6 +4,7 @@
  */
 import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
+import { queueConfig } from '../../config/queue.js';
 import { createValidationError } from '../../exceptions/ZintrustError.js';
 import { ZintrustLang } from '../../lang/lang.js';
 import { createLockProvider, getLockProvider, registerLockProvider } from './LockProvider.js';
@@ -47,7 +48,7 @@ function initializeLockProvider(lockProviderName, config) {
     return provider;
 }
 function resolveLockProviderName(config) {
-    const envProvider = Env.get('QUEUE_LOCK_PROVIDER', '').trim();
+    const envProvider = queueConfig.default;
     if (config.lockProvider !== undefined &&
         config.lockProvider !== null &&
         config.lockProvider.length > 0)

package/src/tools/queue/LockProvider.d.ts

@@ -3,6 +3,10 @@
  * Provides distributed lock management for job deduplication
  */
 import type { LockProvider, LockProviderConfig } from '../../types/Queue';
+/**
+ * Close Redis connection and cleanup resources
+ */
+export declare function closeLockProvider(): Promise<void>;
 /**
  * Redis-based Lock Provider Implementation
  */

package/src/tools/queue/LockProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LockProvider.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/LockProvider.ts"],"names":[],"mappings":"AACA;;;GAGG;AAGH,OAAO,KAAK,EAGV,YAAY,EACZ,kBAAkB,EAEnB,MAAM,eAAe,CAAC;AAwKvB;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,CAWhF;AAYD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,CA4FjF;AAOD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI,CAG/E;AACD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAEtE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,CAS3E"}
+{"version":3,"file":"LockProvider.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/LockProvider.ts"],"names":[],"mappings":"AACA;;;GAGG;AAGH,OAAO,KAAK,EAGV,YAAY,EACZ,kBAAkB,EAEnB,MAAM,eAAe,CAAC;AAwBvB;;GAEG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAUvD;AAkJD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,CAWhF;AAYD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,CA4FjF;AAOD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI,CAG/E;AACD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAEtE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,CAS3E"}

package/src/tools/queue/LockProvider.js

@@ -23,6 +23,22 @@ function getRedisClient() {
     }
     return redisClient;
 }
+/**
+ * Close Redis connection and cleanup resources
+ */
+export async function closeLockProvider() {
+    if (redisClient) {
+        try {
+            await redisClient.quit();
+        }
+        catch (error) {
+            Logger.warn('Error closing Redis lock provider connection', error);
+        }
+        finally {
+            redisClient = null;
+        }
+    }
+}
 const METRICS_SUFFIX = {
     attempts: 'metrics:attempts',
     acquired: 'metrics:acquired',

package/src/tools/queue/Queue.d.ts

@@ -3,13 +3,49 @@ export type QueueMessage<T = unknown> = {
     payload: T;
     attempts: number;
 };
-interface IQueueDriver {
+export interface IQueueDriver {
     enqueue<T = unknown>(queue: string, payload: T): Promise<string>;
     dequeue<T = unknown>(queue: string): Promise<QueueMessage<T> | undefined>;
     ack(queue: string, id: string): Promise<void>;
     length(queue: string): Promise<number>;
     drain(queue: string): Promise<void>;
 }
+/**
+ * BullMQ payload interface with all supported JobOptions
+ */
+export interface BullMQPayload {
+    to?: string;
+    subject?: string;
+    template?: string;
+    templateData?: Record<string, unknown>;
+    timestamp?: number;
+    attempts?: number;
+    uniqueId?: string;
+    delay?: number;
+    priority?: number;
+    removeOnComplete?: number | boolean;
+    removeOnFail?: number | boolean;
+    backoff?: {
+        type: 'fixed' | 'exponential';
+        delay: number;
+    };
+    repeat?: {
+        every?: number;
+        cron?: string;
+        limit?: number;
+    };
+    lifo?: boolean;
+    deduplication?: {
+        id: string;
+        ttl?: number;
+        releaseAfter?: string | number | {
+            condition: string;
+            delay: number;
+        };
+    };
+    uniqueVia?: string;
+    [key: string]: unknown;
+}
 /**
  * Resolves the lock prefix for queue operations
  * Uses singleton RedisKeys for consistent key management
@@ -19,7 +55,7 @@ export declare const Queue: Readonly<{
     register(name: string, driver: IQueueDriver): void;
     reset(): void;
     get(name?: string): IQueueDriver;
-    enqueue<T = unknown>(queue: string, payload: T, driverName?: string): Promise<string>;
+    enqueue(queue: string, payload: BullMQPayload, driverName?: string): Promise<string>;
     dequeue<T = unknown>(queue: string, driverName?: string): Promise<QueueMessage<T> | undefined>;
     ack(queue: string, id: string, driverName?: string): Promise<void>;
     length(queue: string, driverName?: string): Promise<number>;

package/src/tools/queue/Queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/Queue.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,OAAO,IAAI;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAErF,UAAU,YAAY;IACpB,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjE,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC1E,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAID;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAAO,MAOpC,CAAC;AAIF,eAAO,MAAM,KAAK;mBACD,MAAM,UAAU,YAAY;aAIlC,IAAI;eAIF,MAAM,GAAG,YAAY;YAUlB,CAAC,mBAAmB,MAAM,WAAW,CAAC,eAAe,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAM7E,CAAC,mBACN,MAAM,eACA,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;eAKtB,MAAM,MAAM,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;kBAKpD,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;iBAK9C,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;EAI9D,CAAC;AAEH,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/Queue.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,OAAO,IAAI;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAErF,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjE,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC1E,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAE5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAGlB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE;QACR,IAAI,EAAE,OAAO,GAAG,aAAa,CAAC;QAC9B,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,MAAM,CAAC,EAAE;QACP,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,IAAI,CAAC,EAAE,OAAO,CAAC;IAGf,aAAa,CAAC,EAAE;QACd,EAAE,EAAE,MAAM,CAAC;QACX,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;KACvE,CAAC;IAGF,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAID;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAAO,MAOpC,CAAC;AAIF,eAAO,MAAM,KAAK;mBACD,MAAM,UAAU,YAAY;aAIlC,IAAI;eAIF,MAAM,GAAG,YAAY;mBAYX,MAAM,WAAW,aAAa,eAAe,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAM5E,CAAC,mBACN,MAAM,eACA,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;eAKtB,MAAM,MAAM,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;kBAKpD,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;iBAK9C,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;EAI9D,CAAC;AAEH,eAAe,KAAK,CAAC"}

package/src/tools/queue/Queue.js

@@ -1,3 +1,4 @@
+import { ZintrustLang } from '../../lang/lang.js';
 import { Env } from '../../config/env.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
 import { RedisKeys } from '../redis/RedisKeyManager.js';
@@ -22,8 +23,8 @@ export const Queue = Object.freeze({
         drivers.clear();
     },
     get(name) {
-        const resolved = (name ?? Env.QUEUE_CONNECTION) || Env.QUEUE_DRIVER || 'inmemory';
-        const driverName = (resolved !== null && resolved !== undefined ? String(resolved) : 'inmemory')
+        const resolved = (name ?? Env.QUEUE_CONNECTION) || Env.QUEUE_DRIVER || ZintrustLang.INMEMORY;
+        const driverName = (resolved !== null && resolved !== undefined ? String(resolved) : ZintrustLang.INMEMORY)
             .trim()
             .toLowerCase();
         const driver = drivers.get(driverName);

package/src/tools/queue/QueueExtensions.d.ts

@@ -4,6 +4,7 @@
  */
 import type { AdvancedJobOptions, QueueConfig } from '../../types/Queue';
 import { createDeduplicationBuilder } from './DeduplicationBuilder';
+import type { BullMQPayload } from './Queue';
 /**
  * Extend existing Queue with advanced capabilities
  * This provides a migration path for existing code
@@ -13,7 +14,7 @@ export declare function extendQueue(config: QueueConfig): void;
  * Enhanced enqueue method that supports advanced options
  * This can be used as a drop-in replacement for Queue.enqueue
  */
-export declare function enqueueAdvanced(name: string, payload: unknown, options?: AdvancedJobOptions): Promise<string>;
+export declare function enqueueAdvanced(name: string, payload: BullMQPayload, options?: AdvancedJobOptions): Promise<string>;
 /**
  * Initialize default lock providers
  */

package/src/tools/queue/QueueExtensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueueExtensions.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/QueueExtensions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAsB,WAAW,EAAE,MAAM,eAAe,CAAC;AAKzF,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAMzE;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAWrD;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED;;GAEG;AACH,wBAAgB,8BAA8B,IAAI,IAAI,CAuBrD;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAEvF;AAED;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE;IACvB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAkC3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB;IAC3B;;OAEG;uCAEgB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,aAC7B,MAAM,GAChB,kBAAkB;IAOrB;;OAEG;uCAEgB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,mBACvB,MAAM,QACjB,MAAM,GACX,kBAAkB;CAStB,CAAC"}
+{"version":3,"file":"QueueExtensions.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/QueueExtensions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAsB,WAAW,EAAE,MAAM,eAAe,CAAC;AAKzF,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAEzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAKlD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAWrD;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,EACtB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED;;GAEG;AACH,wBAAgB,8BAA8B,IAAI,IAAI,CAuBrD;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAEvF;AAED;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE;IACvB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAkC3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB;IAC3B;;OAEG;uCAEgB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,aAC7B,MAAM,GAChB,kBAAkB;IAOrB;;OAEG;uCAEgB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,mBACvB,MAAM,QACjB,MAAM,GACX,kBAAkB;CAStB,CAAC"}