@zintrust/core 0.1.40 → 0.1.41

package/src/config/env.js

@@ -7,6 +7,24 @@
  */
 // Cache process check once at module load time
 const processLike = typeof process === 'undefined' ? undefined : process;
+let externalEnvSource = null;
+const getEnvSource = () => {
+    if (typeof externalEnvSource === 'function')
+        return externalEnvSource();
+    if (externalEnvSource !== null)
+        return externalEnvSource;
+    return processLike?.env ?? {};
+};
+const normalizeEnvValue = (value) => {
+    if (value === null || value === undefined)
+        return '';
+    if (typeof value === 'string')
+        return value;
+    if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'bigint') {
+        return String(value);
+    }
+    return '';
+};
 export const getProcessLike = () => processLike;
 export const dirnameFromExecPath = (execPath, platform) => {
     const separator = platform === 'win32' ? '\\' : '/';
@@ -17,34 +35,50 @@ export const dirnameFromExecPath = (execPath, platform) => {
 };
 // Private helper functions
 export const get = (key, defaultValue) => {
-    const env = processLike?.env ?? {};
-    return env[key] ?? defaultValue ?? '';
+    const env = getEnvSource();
+    const value = normalizeEnvValue(env[key]);
+    return value === '' ? (defaultValue ?? '') : value;
 };
 export const getInt = (key, defaultValue) => {
-    const env = processLike?.env ?? {};
-    const value = env[key];
-    if (value === undefined || value === null)
-        return defaultValue ?? 0;
-    if (typeof value === 'string' && value.trim() === '')
+    const value = get(key, String(defaultValue ?? 0));
+    if (value.trim() === '')
         return defaultValue ?? 0;
     return Number.parseInt(value, 10);
 };
 export const getFloat = (key, defaultValue) => {
-    const env = processLike?.env ?? {};
-    const value = env[key];
-    if (value === undefined || value === null)
-        return defaultValue ?? 0;
-    if (typeof value === 'string' && value.trim() === '')
+    const value = get(key, String(defaultValue ?? 0));
+    if (value.trim() === '')
         return defaultValue ?? 0;
     return Number.parseFloat(value);
 };
 export const getBool = (key, defaultValue) => {
-    const env = processLike?.env ?? {};
-    const value = env[key];
-    if (value === undefined || value === null)
+    const value = get(key, defaultValue === true ? 'true' : 'false');
+    if (value.trim() === '')
         return defaultValue ?? false;
     return value.toLowerCase() === 'true' || value === '1';
 };
+export const set = (key, value) => {
+    if (processLike?.env === undefined)
+        return;
+    processLike.env[key] = value;
+};
+export const unset = (key) => {
+    if (processLike?.env === undefined)
+        return;
+    // Use Reflect.deleteProperty to avoid deleting dynamically computed property keys
+    Reflect.deleteProperty(processLike.env, key);
+};
+export const setSource = (source) => {
+    externalEnvSource = source;
+};
+export const snapshot = () => {
+    const env = getEnvSource();
+    const out = {};
+    for (const [key, value] of Object.entries(env)) {
+        out[key] = normalizeEnvValue(value);
+    }
+    return out;
+};
 export const getDefaultLogLevel = () => {
     const NODE_ENV_VALUE = get('NODE_ENV', 'development');
     if (NODE_ENV_VALUE === 'production')
@@ -53,6 +87,9 @@ export const getDefaultLogLevel = () => {
         return 'error';
     return 'debug';
 };
+export const ZT_PROXY_TIMEOUT_MS = getInt('ZT_PROXY_TIMEOUT_MS', 30000);
+const PROXY_KEY_ID_FALLBACK = get('APP_NAME', 'ZinTrust');
+const PROXY_SECRET_FALLBACK = get('APP_KEY', '');
 // Sealed namespace with all environment configuration
 export const Env = Object.freeze({
     // Helper functions
@@ -60,6 +97,10 @@ export const Env = Object.freeze({
     getInt,
     getBool,
     getFloat,
+    set,
+    unset,
+    setSource,
+    snapshot,
     // Core
     NODE_ENV: get('NODE_ENV', 'development'),
     // Prefer PORT, fallback to APP_PORT for compatibility
@@ -100,6 +141,67 @@ export const Env = Object.freeze({
     D1_REMOTE_KEY_ID: get('D1_REMOTE_KEY_ID', ''),
     D1_REMOTE_SECRET: get('D1_REMOTE_SECRET', ''),
     D1_REMOTE_MODE: get('D1_REMOTE_MODE', 'registry'),
+    MYSQL_PROXY_URL: get('MYSQL_PROXY_URL', ''),
+    MYSQL_PROXY_HOST: get('MYSQL_PROXY_HOST', '127.0.0.1'),
+    MYSQL_PROXY_PORT: getInt('MYSQL_PROXY_PORT', 8789),
+    MYSQL_PROXY_MAX_BODY_BYTES: getInt('MYSQL_PROXY_MAX_BODY_BYTES', 131072),
+    MYSQL_PROXY_POOL_LIMIT: getInt('MYSQL_PROXY_POOL_LIMIT', 10),
+    MYSQL_PROXY_KEY_ID: get('MYSQL_PROXY_KEY_ID', PROXY_KEY_ID_FALLBACK),
+    MYSQL_PROXY_SECRET: get('MYSQL_PROXY_SECRET', PROXY_SECRET_FALLBACK),
+    MYSQL_PROXY_TIMEOUT_MS: getInt('MYSQL_PROXY_TIMEOUT_MS', ZT_PROXY_TIMEOUT_MS),
+    MYSQL_PROXY_REQUIRE_SIGNING: getBool('MYSQL_PROXY_REQUIRE_SIGNING', true),
+    MYSQL_PROXY_SIGNING_WINDOW_MS: getInt('MYSQL_PROXY_SIGNING_WINDOW_MS', getInt('ZT_PROXY_SIGNING_WINDOW_MS', 60000)),
+    POSTGRES_PROXY_URL: get('POSTGRES_PROXY_URL', ''),
+    POSTGRES_PROXY_HOST: get('POSTGRES_PROXY_HOST', '127.0.0.1'),
+    POSTGRES_PROXY_PORT: getInt('POSTGRES_PROXY_PORT', 8790),
+    POSTGRES_PROXY_MAX_BODY_BYTES: getInt('POSTGRES_PROXY_MAX_BODY_BYTES', 131072),
+    POSTGRES_PROXY_POOL_LIMIT: getInt('POSTGRES_PROXY_POOL_LIMIT', 10),
+    POSTGRES_PROXY_KEY_ID: get('POSTGRES_PROXY_KEY_ID', PROXY_KEY_ID_FALLBACK),
+    POSTGRES_PROXY_SECRET: get('POSTGRES_PROXY_SECRET', PROXY_SECRET_FALLBACK),
+    POSTGRES_PROXY_TIMEOUT_MS: getInt('POSTGRES_PROXY_TIMEOUT_MS', ZT_PROXY_TIMEOUT_MS),
+    POSTGRES_PROXY_REQUIRE_SIGNING: getBool('POSTGRES_PROXY_REQUIRE_SIGNING', true),
+    POSTGRES_PROXY_SIGNING_WINDOW_MS: getInt('POSTGRES_PROXY_SIGNING_WINDOW_MS', getInt('ZT_PROXY_SIGNING_WINDOW_MS', 60000)),
+    REDIS_PROXY_URL: get('REDIS_PROXY_URL', ''),
+    REDIS_PROXY_HOST: get('REDIS_PROXY_HOST', '127.0.0.1'),
+    REDIS_PROXY_PORT: getInt('REDIS_PROXY_PORT', 8791),
+    REDIS_PROXY_MAX_BODY_BYTES: getInt('REDIS_PROXY_MAX_BODY_BYTES', 131072),
+    REDIS_PROXY_KEY_ID: get('REDIS_PROXY_KEY_ID', PROXY_KEY_ID_FALLBACK),
+    REDIS_PROXY_SECRET: get('REDIS_PROXY_SECRET', PROXY_SECRET_FALLBACK),
+    REDIS_PROXY_TIMEOUT_MS: getInt('REDIS_PROXY_TIMEOUT_MS', ZT_PROXY_TIMEOUT_MS),
+    REDIS_PROXY_REQUIRE_SIGNING: getBool('REDIS_PROXY_REQUIRE_SIGNING', true),
+    REDIS_PROXY_SIGNING_WINDOW_MS: getInt('REDIS_PROXY_SIGNING_WINDOW_MS', getInt('ZT_PROXY_SIGNING_WINDOW_MS', 60000)),
+    USE_REDIS_PROXY: getBool('USE_REDIS_PROXY', false),
+    SMTP_PROXY_URL: get('SMTP_PROXY_URL', ''),
+    SMTP_PROXY_HOST: get('SMTP_PROXY_HOST', '127.0.0.1'),
+    SMTP_PROXY_PORT: getInt('SMTP_PROXY_PORT', 8794),
+    SMTP_PROXY_MAX_BODY_BYTES: getInt('SMTP_PROXY_MAX_BODY_BYTES', 131072),
+    SMTP_PROXY_KEY_ID: get('SMTP_PROXY_KEY_ID', PROXY_KEY_ID_FALLBACK),
+    SMTP_PROXY_SECRET: get('SMTP_PROXY_SECRET', PROXY_SECRET_FALLBACK),
+    SMTP_PROXY_TIMEOUT_MS: getInt('SMTP_PROXY_TIMEOUT_MS', ZT_PROXY_TIMEOUT_MS),
+    SMTP_PROXY_REQUIRE_SIGNING: getBool('SMTP_PROXY_REQUIRE_SIGNING', true),
+    SMTP_PROXY_SIGNING_WINDOW_MS: getInt('SMTP_PROXY_SIGNING_WINDOW_MS', getInt('ZT_PROXY_SIGNING_WINDOW_MS', 60000)),
+    USE_SMTP_PROXY: getBool('USE_SMTP_PROXY', false),
+    MONGODB_PROXY_URL: get('MONGODB_PROXY_URL', ''),
+    MONGODB_PROXY_HOST: get('MONGODB_PROXY_HOST', '127.0.0.1'),
+    MONGODB_PROXY_PORT: getInt('MONGODB_PROXY_PORT', 8792),
+    MONGODB_PROXY_MAX_BODY_BYTES: getInt('MONGODB_PROXY_MAX_BODY_BYTES', 131072),
+    MONGODB_PROXY_KEY_ID: get('MONGODB_PROXY_KEY_ID', PROXY_KEY_ID_FALLBACK),
+    MONGODB_PROXY_SECRET: get('MONGODB_PROXY_SECRET', PROXY_SECRET_FALLBACK),
+    MONGODB_PROXY_TIMEOUT_MS: getInt('MONGODB_PROXY_TIMEOUT_MS', ZT_PROXY_TIMEOUT_MS),
+    MONGODB_PROXY_REQUIRE_SIGNING: getBool('MONGODB_PROXY_REQUIRE_SIGNING', true),
+    MONGODB_PROXY_SIGNING_WINDOW_MS: getInt('MONGODB_PROXY_SIGNING_WINDOW_MS', getInt('ZT_PROXY_SIGNING_WINDOW_MS', 60000)),
+    USE_MONGODB_PROXY: getBool('USE_MONGODB_PROXY', false),
+    SQLSERVER_PROXY_URL: get('SQLSERVER_PROXY_URL', ''),
+    SQLSERVER_PROXY_HOST: get('SQLSERVER_PROXY_HOST', '127.0.0.1'),
+    SQLSERVER_PROXY_PORT: getInt('SQLSERVER_PROXY_PORT', 8793),
+    SQLSERVER_PROXY_MAX_BODY_BYTES: getInt('SQLSERVER_PROXY_MAX_BODY_BYTES', 131072),
+    SQLSERVER_PROXY_POOL_LIMIT: getInt('SQLSERVER_PROXY_POOL_LIMIT', 10),
+    SQLSERVER_PROXY_KEY_ID: get('SQLSERVER_PROXY_KEY_ID', PROXY_KEY_ID_FALLBACK),
+    SQLSERVER_PROXY_SECRET: get('SQLSERVER_PROXY_SECRET', PROXY_SECRET_FALLBACK),
+    SQLSERVER_PROXY_TIMEOUT_MS: getInt('SQLSERVER_PROXY_TIMEOUT_MS', ZT_PROXY_TIMEOUT_MS),
+    SQLSERVER_PROXY_REQUIRE_SIGNING: getBool('SQLSERVER_PROXY_REQUIRE_SIGNING', true),
+    SQLSERVER_PROXY_SIGNING_WINDOW_MS: getInt('SQLSERVER_PROXY_SIGNING_WINDOW_MS', getInt('ZT_PROXY_SIGNING_WINDOW_MS', 60000)),
+    USE_SQLSERVER_PROXY: getBool('USE_SQLSERVER_PROXY', false),
     KV_REMOTE_URL: get('KV_REMOTE_URL', ''),
     KV_REMOTE_KEY_ID: get('KV_REMOTE_KEY_ID', ''),
     KV_REMOTE_SECRET: get('KV_REMOTE_SECRET', ''),
@@ -112,12 +214,23 @@ export const Env = Object.freeze({
     REDIS_HOST: get('REDIS_HOST', 'localhost'),
     REDIS_PORT: getInt('REDIS_PORT', 6379),
     REDIS_PASSWORD: get('REDIS_PASSWORD', ''),
+    REDIS_DB: getInt('REDIS_DB', 0),
     REDIS_URL: get('REDIS_URL', ''),
     MONGO_URI: get('MONGO_URI'),
     MONGO_DB: get('MONGO_DB', 'zintrust_cache'),
     // Queue
     QUEUE_CONNECTION: get('QUEUE_CONNECTION', ''),
     QUEUE_DRIVER: get('QUEUE_DRIVER', ''),
+    QUEUE_HTTP_PROXY_ENABLED: getBool('QUEUE_HTTP_PROXY_ENABLED', false),
+    QUEUE_HTTP_PROXY_GATEWAY_ENABLED: getBool('QUEUE_HTTP_PROXY_GATEWAY_ENABLED', true),
+    QUEUE_HTTP_PROXY_URL: get('QUEUE_HTTP_PROXY_URL', ''),
+    QUEUE_HTTP_PROXY_PATH: get('QUEUE_HTTP_PROXY_PATH', '/api/_sys/queue/rpc'),
+    QUEUE_HTTP_PROXY_KEY_ID: get('QUEUE_HTTP_PROXY_KEY_ID', PROXY_KEY_ID_FALLBACK),
+    QUEUE_HTTP_PROXY_KEY: get('QUEUE_HTTP_PROXY_KEY', PROXY_SECRET_FALLBACK),
+    QUEUE_HTTP_PROXY_TIMEOUT_MS: getInt('QUEUE_HTTP_PROXY_TIMEOUT_MS', ZT_PROXY_TIMEOUT_MS),
+    QUEUE_HTTP_PROXY_MAX_SKEW_MS: getInt('QUEUE_HTTP_PROXY_MAX_SKEW_MS', getInt('ZT_PROXY_SIGNING_WINDOW_MS', 60000)),
+    QUEUE_HTTP_PROXY_NONCE_TTL_MS: getInt('QUEUE_HTTP_PROXY_NONCE_TTL_MS', 120000),
+    QUEUE_HTTP_PROXY_MIDDLEWARE: get('QUEUE_HTTP_PROXY_MIDDLEWARE', ''),
     // Rate Limiting
     RATE_LIMIT_STORE: get('RATE_LIMIT_STORE', ''),
     RATE_LIMIT_DRIVER: get('RATE_LIMIT_DRIVER', ''),
@@ -163,6 +276,7 @@ export const Env = Object.freeze({
     LOG_LEVEL: get('LOG_LEVEL', getDefaultLogLevel()),
     LOG_FORMAT: get('LOG_FORMAT', 'text'),
     LOG_CHANNEL: get('LOG_CHANNEL', ''),
+    DOCKER_WORKER: getBool('DOCKER_WORKER', false),
     DISABLE_LOGGING: getBool('DISABLE_LOGGING', false),
     LOG_HTTP_REQUEST: getBool('LOG_HTTP_REQUEST', false),
     LOG_TO_FILE: getBool('LOG_TO_FILE', false),
@@ -176,6 +290,7 @@ export const Env = Object.freeze({
     ZINTRUST_ENV_IN_FILE: get('ZINTRUST_ENV_IN_FILE', '.env'),
     ZINTRUST_SECRETS_PROVIDER: get('ZINTRUST_SECRETS_PROVIDER', ''),
     ZINTRUST_ALLOW_AUTO_INSTALL: get('ZINTRUST_ALLOW_AUTO_INSTALL', ''),
+    WORKER_SHUTDOWN_ON_APP_EXIT: getBool('WORKER_SHUTDOWN_ON_APP_EXIT', true),
     // Cloudflare Credentials
     CLOUDFLARE_ACCOUNT_ID: get('CLOUDFLARE_ACCOUNT_ID', ''),
     CLOUDFLARE_API_TOKEN: get('CLOUDFLARE_API_TOKEN', ''),
@@ -191,7 +306,7 @@ export const Env = Object.freeze({
     HOME: get('HOME', ''),
     USERPROFILE: get('USERPROFILE', ''),
     // Template/Misc
-    TEMPLATE_COPYRIGHT: get('TEMPLATE_COPYRIGHT', '© 2025 ZinTrust Framework. All rights reserved.'),
+    TEMPLATE_COPYRIGHT: get('TEMPLATE_COPYRIGHT', `© ${new Date().getFullYear()} ZinTrust Framework. All rights reserved.`),
     SERVICE_NAME: get('SERVICE_NAME', ''),
     APP_MODE: get('APP_MODE', get('NODE_ENV', 'development')),
     APP_PORT: getInt('APP_PORT', 3000),
@@ -216,7 +331,15 @@ export const Env = Object.freeze({
             if (processLike.platform === 'win32') {
                 return [String.raw `C:\Windows\System32`, String.raw `C:\Windows`, binDir].join(';');
             }
-            return ['/usr/bin', '/bin', '/usr/sbin', '/sbin', binDir].join(':');
+            return [
+                '/opt/homebrew/bin',
+                '/usr/local/bin',
+                '/usr/bin',
+                '/bin',
+                '/usr/sbin',
+                '/sbin',
+                binDir,
+            ].join(':');
         }
         catch {
             // Fallback for non-Node environments
@@ -224,3 +347,19 @@ export const Env = Object.freeze({
         }
     })(),
 });
+export const buildRedisUrl = () => {
+    const raw = get('REDIS_URL', '').trim();
+    if (raw !== '')
+        return raw;
+    const host = get('REDIS_HOST', 'localhost');
+    const port = getInt('REDIS_PORT', 6379);
+    const password = get('REDIS_PASSWORD', '');
+    const db = getInt('REDIS_QUEUE_DB', 0);
+    let url = 'redis://';
+    if (password.trim() !== '')
+        url += `:${encodeURIComponent(password)}@`;
+    url += `${host}:${port}`;
+    if (db > 0)
+        url += `/${db}`;
+    return url;
+};

package/src/config/index.d.ts

@@ -28,6 +28,7 @@ export declare const config: Readonly<{
         readonly isProduction: () => boolean;
         readonly isTesting: () => boolean;
         readonly debug: boolean;
+        readonly dockerWorker: boolean;
         readonly timezone: string;
         readonly requestTimeout: number;
         readonly maxBodySize: number;

package/src/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAaH,OAAO,EAAE,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;8BAZc,CAAC;;;;;;;;;;;;;;;;;;;;2EAAC,CAAA;;;;;;;;;;;;;;;;;;;;8BAD2B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAmBrD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;EAKA,CAAC;AAEZ,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAaH,OAAO,EAAE,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;8BAZc,CAAC;;;;;;;;;;;;;;;;;;;;2EAAC,CAAA;;;;;;;;;;;;;;;;;;;;8BAD2B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBA2BomB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;EAHzpB,CAAC;AAEZ,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC"}

package/src/config/mail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mail.d.ts","sourceRoot":"","sources":["../../../src/config/mail.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAItE,MAAM,MAAM,mBAAmB,GAAG,OAAO,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAC3C,CAAC,CAAC;AAmCH,QAAA,MAAM,gBAAgB,QAAO;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC1C,SAAS,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,gBAAgB,CAAC;CAgGvE,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAqB7D,eAAO,MAAM,UAAU,EAAE,UAYvB,CAAC"}
+{"version":3,"file":"mail.d.ts","sourceRoot":"","sources":["../../../src/config/mail.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAItE,MAAM,MAAM,mBAAmB,GAAG,OAAO,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAC3C,CAAC,CAAC;AA6FH,QAAA,MAAM,gBAAgB,QAAO;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC1C,SAAS,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,gBAAgB,CAAC;CA6CvE,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAqB7D,eAAO,MAAM,UAAU,EAAE,UAYvB,CAAC"}

package/src/config/mail.js

@@ -35,16 +35,11 @@ const getMailDriver = (config, name) => {
     }
     throw ErrorFactory.createConfigError(`Mail driver not configured: ${selected}`);
 };
-const createMailConfig = () => {
-    const overrides = StartupConfigFileRegistry.get(StartupConfigFile.Mail) ?? {};
-    const baseDefault = Env.get('MAIL_CONNECTION', Env.get('MAIL_DRIVER', 'disabled'))
-        .trim()
-        .toLowerCase();
-    const baseFrom = {
-        address: Env.get('MAIL_FROM_ADDRESS', ''),
-        name: Env.get('MAIL_FROM_NAME', ''),
-    };
-    const baseDrivers = {
+/**
+ * Create base mail drivers configuration
+ */
+const createMailDrivers = () => {
+    return {
         disabled: {
             driver: 'disabled',
         },
@@ -97,6 +92,17 @@ const createMailConfig = () => {
             region: Env.get('AWS_REGION', 'us-east-1'),
         },
     };
+};
+const createMailConfig = () => {
+    const overrides = StartupConfigFileRegistry.get(StartupConfigFile.Mail) ?? {};
+    const baseDefault = Env.get('MAIL_CONNECTION', Env.get('MAIL_DRIVER', 'disabled'))
+        .trim()
+        .toLowerCase();
+    const baseFrom = {
+        address: Env.get('MAIL_FROM_ADDRESS', ''),
+        name: Env.get('MAIL_FROM_NAME', ''),
+    };
+    const baseDrivers = createMailDrivers();
     const mailConfigObj = {
         /**
          * Default mail driver

package/src/config/middleware.d.ts

@@ -43,6 +43,11 @@ export declare const MiddlewareKeys: Readonly<{
 }>;
 export type MiddlewareKey = keyof typeof MiddlewareKeys;
 export declare function createMiddlewareConfig(): MiddlewareConfigType;
+/**
+ * Clear the middleware configuration cache
+ * This ensures fresh config loading in watch mode
+ */
+export declare const clearMiddlewareConfigCache: () => void;
 export declare const middlewareConfig: MiddlewareConfigType;
 export default middlewareConfig;
 //# sourceMappingURL=middleware.d.ts.map

package/src/config/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/config/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AA+DzD,eAAO,MAAM,cAAc;;;;;CAKjB,CAAC;AAEX,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAClE,aAAa,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAClE,qBAAqB,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3E,CAAC;AAEF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;EAiBuB,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,cAAc,CAAC;AA0MxD,wBAAgB,sBAAsB,IAAI,oBAAoB,CAqB7D;AA0BD,eAAO,MAAM,gBAAgB,EAAE,oBAY7B,CAAC;AAEH,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/config/middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AA+DzD,eAAO,MAAM,cAAc;;;;;CAKjB,CAAC;AAEX,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAClE,aAAa,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAClE,qBAAqB,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3E,CAAC;AAEF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;EAiBuB,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,cAAc,CAAC;AA0MxD,wBAAgB,sBAAsB,IAAI,oBAAoB,CAkC7D;AAID;;;GAGG;AACH,eAAO,MAAM,0BAA0B,QAAO,IAE7C,CAAC;AAwBF,eAAO,MAAM,gBAAgB,EAAE,oBAY7B,CAAC;AAEH,eAAe,gBAAgB,CAAC"}

package/src/config/middleware.js

@@ -1,3 +1,4 @@
+import { Env } from './env.js';
 import { bodyParsingMiddleware } from '../http/middleware/BodyParsingMiddleware.js';
 import { fileUploadMiddleware } from '../http/middleware/FileUploadMiddleware.js';
 import { AuthMiddleware } from '../middleware/AuthMiddleware.js';
@@ -155,7 +156,17 @@ function createSharedMiddlewares(loadMiddlewareConfig) {
 }
 export function createMiddlewareConfig() {
     const loadMiddlewareConfig = StartupConfigFileRegistry.get(StartupConfigFile.Middleware) ?? {};
-    const shared = createSharedMiddlewares(loadMiddlewareConfig);
+    const skipPathsFromEnv = Env.get('CSRF_SKIP_PATHS', '')
+        .split(',')
+        .map((path) => path.trim())
+        .filter((path) => path.length > 0);
+    const effectiveMiddlewareConfig = {
+        ...loadMiddlewareConfig,
+        skipPaths: Array.isArray(loadMiddlewareConfig.skipPaths) && loadMiddlewareConfig.skipPaths.length > 0
+            ? loadMiddlewareConfig.skipPaths
+            : skipPathsFromEnv,
+    };
+    const shared = createSharedMiddlewares(effectiveMiddlewareConfig);
     const middlewareConfigObj = {
         global: [
             shared.log,
@@ -172,6 +183,13 @@ export function createMiddlewareConfig() {
     return Object.freeze(middlewareConfigObj);
 }
 let cached = null;
+/**
+ * Clear the middleware configuration cache
+ * This ensures fresh config loading in watch mode
+ */
+export const clearMiddlewareConfigCache = () => {
+    cached = null;
+};
 // Proxy target must satisfy JS Proxy invariants.
 // When we lazily create a frozen config object (with non-configurable properties),
 // we mirror its property descriptors onto this target so reflective operations

package/src/config/queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../src/config/queue.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,sBAAsB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAGhG,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC;IACzC,OAAO,EAAE,eAAe,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACrC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,UAAU,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACnF,OAAO,EAAE;QACP,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QAClC,WAAW,EAAE,OAAO,CAAC;QACrB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;CACH,CAAC,CAAC;AASH;;GAEG;AACH,eAAO,MAAM,iBAAiB,QAAO,kBAmCnC,CAAC;AAsBH,QAAA,MAAM,iBAAiB,QAAO;IAC5B,OAAO,EAAE,eAAe,CAAC;IACzB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,SAAS,EAAE,CAAC,YAAY,EAAE,sBAAsB,KAAK,kBAAkB,CAAC,eAAe,CAAC,CAAC;IACzF,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,UAAU,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACnF,OAAO,EAAE;QACP,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QAClC,WAAW,EAAE,OAAO,CAAC;QACrB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;CAuEH,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAqB/D,eAAO,MAAM,WAAW,EAAE,WAYxB,CAAC"}
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../src/config/queue.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,KAAK,EAAE,sBAAsB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAGhG,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC;IACzC,OAAO,EAAE,eAAe,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACrC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,UAAU,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACnF,OAAO,EAAE;QACP,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QAClC,WAAW,EAAE,OAAO,CAAC;QACrB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;CACH,CAAC,CAAC;AA+EH;;GAEG;AACH,eAAO,MAAM,iBAAiB,QAAO,kBA4DnC,CAAC;AAsBH,QAAA,MAAM,iBAAiB,QAAO;IAC5B,OAAO,EAAE,eAAe,CAAC;IACzB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,SAAS,EAAE,CAAC,YAAY,EAAE,sBAAsB,KAAK,kBAAkB,CAAC,eAAe,CAAC,CAAC;IACzF,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,UAAU,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACnF,OAAO,EAAE;QACP,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QAClC,WAAW,EAAE,OAAO,CAAC;QACrB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;CAuEH,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAqB/D,eAAO,MAAM,WAAW,EAAE,WAYxB,CAAC"}

package/src/config/queue.js

@@ -3,6 +3,7 @@
  * Background job and message queue settings
  * Sealed namespace for immutability
  */
+import { Cloudflare } from './cloudflare.js';
 import { Env } from './env.js';
 import { ZintrustLang } from '../lang/lang.js';
 import { StartupConfigFile, StartupConfigFileRegistry } from '../runtime/StartupConfigFileRegistry.js';
@@ -10,6 +11,59 @@ const getQueueDriver = (driverConfig) => {
     const driverName = driverConfig.default;
     return driverConfig.drivers[driverName];
 };
+const readWorkersEnvString = (key) => {
+    const workerValue = Cloudflare.getWorkersVar(key);
+    if (workerValue !== null && workerValue.trim() !== '')
+        return workerValue;
+    return '';
+};
+const readWorkersFallbackString = (workersKey, fallbackKey, fallback = '') => {
+    const workerValue = readWorkersEnvString(workersKey);
+    if (workerValue.trim() !== '')
+        return workerValue;
+    return Env.get(fallbackKey, fallback);
+};
+const readWorkersFallbackInt = (workersKey, fallbackKey, fallback) => {
+    const raw = readWorkersFallbackString(workersKey, fallbackKey, String(fallback));
+    if (raw.trim() === '')
+        return fallback;
+    const parsed = Number.parseInt(raw, 10);
+    return Number.isFinite(parsed) ? parsed : fallback;
+};
+const parseRedisUrl = (rawUrl) => {
+    try {
+        const url = new URL(rawUrl);
+        if (url.protocol !== 'redis:' && url.protocol !== 'rediss:')
+            return null;
+        const host = url.hostname;
+        const port = url.port ? Number.parseInt(url.port, 10) : 6379;
+        const password = url.password ? decodeURIComponent(url.password) : undefined;
+        const db = url.pathname ? Number.parseInt(url.pathname.replace('/', ''), 10) : undefined;
+        return { host, port, password, database: Number.isFinite(db ?? Number.NaN) ? db : undefined };
+    }
+    catch {
+        return null;
+    }
+};
+const resolveRedisProxyConfig = () => {
+    const isWorkersRuntime = Cloudflare.getWorkersEnv() !== null;
+    if (!isWorkersRuntime) {
+        return null;
+    }
+    const proxyUrl = Env.get('REDIS_PROXY_URL', '').trim();
+    const parsed = proxyUrl ? parseRedisUrl(proxyUrl) : null;
+    if (parsed)
+        return parsed;
+    if (Env.getBool('USE_REDIS_PROXY', false)) {
+        return {
+            host: Env.get('REDIS_PROXY_HOST', ''),
+            port: Env.getInt('REDIS_PROXY_PORT', 6379),
+            password: Env.get('REDIS_PASSWORD', ''),
+            database: Env.getInt('REDIS_QUEUE_DB', ZintrustLang.REDIS_DEFAULT_DB),
+        };
+    }
+    return null;
+};
 /**
  * Helper: Create base driver configurations from environment
  */
@@ -28,18 +82,25 @@ export const createBaseDrivers = () => ({
     },
     redis: {
         driver: 'redis',
-        host: Env.get('REDIS_HOST', 'localhost'),
-        port: Env.getInt('REDIS_PORT', 6379),
-        password: Env.get('REDIS_PASSWORD'),
-        database: Env.getInt('REDIS_QUEUE_DB', ZintrustLang.REDIS_DEFAULT_DB),
+        host: resolveRedisProxyConfig()?.host ??
+            readWorkersFallbackString('WORKERS_REDIS_HOST', 'REDIS_HOST', 'localhost'),
+        port: resolveRedisProxyConfig()?.port ??
+            readWorkersFallbackInt('WORKERS_REDIS_PORT', 'REDIS_PORT', 6379),
+        password: resolveRedisProxyConfig()?.password ??
+            readWorkersFallbackString('WORKERS_REDIS_PASSWORD', 'REDIS_PASSWORD'),
+        database: resolveRedisProxyConfig()?.database ??
+            readWorkersFallbackInt('WORKERS_REDIS_QUEUE_DB', 'REDIS_QUEUE_DB', ZintrustLang.REDIS_DEFAULT_DB),
     },
     rabbitmq: {
         driver: 'rabbitmq',
-        host: Env.get('RABBITMQ_HOST', 'localhost'),
-        port: Env.getInt('RABBITMQ_PORT', 5672),
-        username: Env.get('RABBITMQ_USER', 'guest'),
-        password: Env.get('RABBITMQ_PASSWORD', 'guest'),
-        vhost: Env.get('RABBITMQ_VHOST', '/'),
+        host: readWorkersFallbackString('WORKERS_RABBITMQ_HOST', 'RABBITMQ_HOST', 'localhost'),
+        port: readWorkersFallbackInt('WORKERS_RABBITMQ_PORT', 'RABBITMQ_PORT', 5672),
+        username: readWorkersFallbackString('WORKERS_RABBITMQ_USER', 'RABBITMQ_USER', 'guest'),
+        password: readWorkersFallbackString('WORKERS_RABBITMQ_PASSWORD', 'RABBITMQ_PASSWORD', 'guest'),
+        vhost: readWorkersFallbackString('WORKERS_RABBITMQ_VHOST', 'RABBITMQ_VHOST', '/'),
+        httpGatewayUrl: readWorkersFallbackString('WORKERS_RABBITMQ_HTTP_GATEWAY_URL', 'RABBITMQ_HTTP_GATEWAY_URL'),
+        httpGatewayToken: readWorkersFallbackString('WORKERS_RABBITMQ_HTTP_GATEWAY_TOKEN', 'RABBITMQ_HTTP_GATEWAY_TOKEN'),
+        httpGatewayTimeoutMs: readWorkersFallbackInt('WORKERS_RABBITMQ_HTTP_GATEWAY_TIMEOUT_MS', 'RABBITMQ_HTTP_GATEWAY_TIMEOUT_MS', 15000),
     },
     sqs: {
         driver: 'sqs',

package/src/config/redis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../../src/config/redis.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAG/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,MAAM,MAAM,WAAW,GAAG;IACxB,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,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC5D,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,SAAS,0BAA0B,KAAG,MAYnE,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,SAAS,0BAA0B,KAAG,MAAM,GAAG,IAW1E,CAAC;AAEF,eAAO,MAAM,YAAY,GAAU,CAAC,GAAG,WAAW,EAAE,OAAO,OAAO,GAAG,SAAS,KAAG,OAAO,CAAC,CAAC,CAqCzF,CAAC"}
+{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../../src/config/redis.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAM/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,MAAM,MAAM,WAAW,GAAG;IACxB,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,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC5D,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,SAAS,0BAA0B,KAAG,MAYnE,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,SAAS,0BAA0B,KAAG,MAAM,GAAG,IAW1E,CAAC;AAqDF,eAAO,MAAM,YAAY,GAAU,CAAC,GAAG,WAAW,EAAE,OAAO,OAAO,GAAG,SAAS,KAAG,OAAO,CAAC,CAAC,CA0BzF,CAAC"}

package/src/config/redis.js

@@ -1,6 +1,9 @@
 import { Env } from './env.js';
 import { ErrorFactory } from '../exceptions/ZintrustError.js';
 import { ZintrustLang } from '../lang/lang.js';
+import { existsSync } from '../node-singletons/fs.js';
+import * as path from '../node-singletons/path.js';
+import { pathToFileURL } from '../node-singletons/url.js';
 import { Queue } from '../tools/queue/Queue.js';
 export const buildRedisUrl = (config) => {
     // Otherwise build URL from individual settings (like cache driver)
@@ -27,29 +30,61 @@ export const getRedisUrl = (config) => {
         return url;
     return buildRedisUrl(config);
 };
+const resolveLocalQueueRedisEntry = () => {
+    const cwd = typeof process !== 'undefined' && typeof process.cwd === 'function' ? process.cwd() : '';
+    if (cwd.trim() === '')
+        return null;
+    const localEntry = path.join(cwd, 'dist', 'packages', 'queue-redis', 'src', 'index.js');
+    return existsSync(localEntry) ? localEntry : null;
+};
+const importQueueRedisModule = async () => {
+    try {
+        return (await import('@zintrust/queue-redis'));
+    }
+    catch {
+        const localEntry = resolveLocalQueueRedisEntry();
+        if (localEntry === null)
+            return undefined;
+        const url = pathToFileURL(localEntry).href;
+        return (await import(url));
+    }
+};
+const loadPluginDriver = async () => {
+    try {
+        const mod = await importQueueRedisModule();
+        if (mod === undefined) {
+            throw ErrorFactory.createConfigError('queue-redis package not found');
+        }
+        if (mod.RedisQueue !== undefined) {
+            Queue.register('redis', mod.RedisQueue);
+        }
+        else if (mod.BullMQRedisQueue !== undefined) {
+            Queue.register('redis', mod.BullMQRedisQueue);
+        }
+        return Queue.get('redis');
+    }
+    catch (error) {
+        throw ErrorFactory.createConfigError('Redis queue driver is not registered. Install queue:redis via zin plugin install.', error);
+    }
+};
 export const ensureDriver = async (type) => {
     if (type === 'publish') {
         // Return Redis publish client with publish() method from package
-        const mod = (await import('@zintrust/queue-redis'));
-        if (mod.createRedisPublishClient) {
+        const mod = await importQueueRedisModule();
+        if (mod?.createRedisPublishClient) {
             return mod.createRedisPublishClient();
         }
         throw ErrorFactory.createConfigError('Redis publish client is not available in queue-redis package');
     }
     // Return queue driver (current behavior)
     try {
-        return Queue.get('redis');
+        const resolved = Queue.get('redis');
+        if (!(resolved.__zintrustCoreRedisQueue ?? false)) {
+            return resolved;
+        }
+        return await loadPluginDriver();
     }
     catch {
-        try {
-            const mod = (await import('@zintrust/queue-redis'));
-            if (mod.RedisQueue !== undefined) {
-                Queue.register('redis', mod.RedisQueue);
-            }
-            return Queue.get('redis');
-        }
-        catch (error) {
-            throw ErrorFactory.createConfigError('Redis queue driver is not registered. Install queue:redis via zin plugin install.', error);
-        }
+        return loadPluginDriver();
     }
 };

package/src/config/storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../src/config/storage.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAI9F,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACvE,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACjE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3C,CAAC,CAAC;AAEH,KAAK,oBAAoB,GAAG,oBAAoB,GAAG;IACjD,SAAS,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,mBAAmB,CAAC;IAC/D,eAAe,EAAE,CAAC,IAAI,EAAE,oBAAoB,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,mBAAmB,CAAC;IACpF,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACjE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3C,CAAC;AAgEF,QAAA,MAAM,mBAAmB,QAAO,oBAgF/B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAqBnE,eAAO,MAAM,aAAa,EAAE,aAY1B,CAAC"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../src/config/storage.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAI9F,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACvE,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACjE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3C,CAAC,CAAC;AAEH,KAAK,oBAAoB,GAAG,oBAAoB,GAAG;IACjD,SAAS,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,mBAAmB,CAAC;IAC/D,eAAe,EAAE,CAAC,IAAI,EAAE,oBAAoB,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,mBAAmB,CAAC;IACpF,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACjE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3C,CAAC;AAiEF,QAAA,MAAM,mBAAmB,QAAO,oBAgF/B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAqBnE,eAAO,MAAM,aAAa,EAAE,aAY1B,CAAC"}

package/src/config/storage.js

@@ -51,6 +51,7 @@ const getDrivers = () => ({
         bucket: Env.get('R2_BUCKET', ''),
         endpoint: Env.get('R2_ENDPOINT', ''),
         url: Env.get('R2_URL', ''),
+        binding: Env.get('R2_BINDING', ''),
     },
     gcs: {
         driver: 'gcs',