@zintrust/core 2.2.5 → 2.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/core",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "description": "Production-grade TypeScript backend framework for JavaScript",
   "homepage": "https://zintrust.com",
   "repository": {

package/src/index.js

@@ -1,11 +1,11 @@
 /**
- * @zintrust/core v2.2.5
+ * @zintrust/core v2.2.6
  *
  * ZinTrust Framework - Production-Grade TypeScript Backend
  * Built for performance, type safety, and exceptional developer experience
  *
  * Build Information:
- *   Built: 2026-05-28T17:42:54.893Z
+ *   Built: 2026-05-28T20:15:36.566Z
  *   Node: >=20.0.0
  *   License: MIT
  *
@@ -21,7 +21,7 @@
  * Available at runtime for debugging and health checks
  */
 export const ZINTRUST_VERSION = '0.1.41';
-export const ZINTRUST_BUILD_DATE = '2026-05-28T17:42:54.858Z'; // Replaced during build
+export const ZINTRUST_BUILD_DATE = '2026-05-28T20:15:36.526Z'; // Replaced during build
 export { Application } from './boot/Application.js';
 export { AwsSigV4 } from './common/index.js';
 export { SignedRequest } from './security/SignedRequest.js';

package/src/proxy/redis/RedisProxyServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RedisProxyServer.d.ts","sourceRoot":"","sources":["../../../../src/proxy/redis/RedisProxyServer.ts"],"names":[],"mappings":"AAQA,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,yBAAyB,CAAC;AAsBjC,KAAK,cAAc,GAAG,kBAAkB,GACtC,OAAO,CAAC;IACN,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,CAAC;AAwZL,eAAO,MAAM,gBAAgB;sBACJ,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EAgC1D,CAAC;AAEH,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"RedisProxyServer.d.ts","sourceRoot":"","sources":["../../../../src/proxy/redis/RedisProxyServer.ts"],"names":[],"mappings":"AAQA,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,yBAAyB,CAAC;AAsBjC,KAAK,cAAc,GAAG,kBAAkB,GACtC,OAAO,CAAC;IACN,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,CAAC;AAybL,eAAO,MAAM,gBAAgB;sBACJ,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EAgC1D,CAAC;AAEH,eAAe,gBAAgB,CAAC"}

package/src/proxy/redis/RedisProxyServer.js

@@ -149,7 +149,8 @@ const handleScriptCommand = async (args, config) => {
     return { status: 200, body: { result: sha } };
 };
 const handleStandardRedisCommand = async (client, action, args) => {
-    const lower = action.trim().toLowerCase();
+    const command = action.trim();
+    const lower = command.toLowerCase();
     if (lower === 'evalsha' && args.length > 0) {
         const sha = String(args[0]);
         Logger.info('[RedisProxyServer] EVALSHA command received', {
@@ -167,25 +168,45 @@ const handleStandardRedisCommand = async (client, action, args) => {
             });
         }
     }
-    const candidate = client[lower];
-    if (typeof candidate === 'function') {
+    const directCandidate = client[command];
+    if (typeof directCandidate === 'function') {
         return {
             status: 200,
             body: {
-                result: await candidate.apply(client, args),
+                result: await directCandidate.apply(client, args),
+            },
+        };
+    }
+    const lowerCandidate = client[lower];
+    if (typeof lowerCandidate === 'function') {
+        return {
+            status: 200,
+            body: {
+                result: await lowerCandidate.apply(client, args),
             },
         };
     }
     if (typeof client.call === 'function') {
-        return { status: 200, body: { result: await client.call(action.trim(), ...args) } };
+        return { status: 200, body: { result: await client.call(command, ...args) } };
     }
     throw ErrorFactory.createValidationError(`Unsupported Redis command: ${action}`);
 };
-const handleServiceRpc = async (validated, queueMonitor) => {
+const handleServiceRpc = async (client, validated, queueMonitor) => {
     const startedAt = Date.now();
-    const result = await dispatchServiceCommand(validated.service, validated.action ?? '', validated.payload, queueMonitor);
-    SystemTraceBridge.emitRedis(`${validated.service}:${validated.action ?? 'unknown'}`, Date.now() - startedAt);
-    return { status: 200, body: { result } };
+    try {
+        const result = await dispatchServiceCommand(validated.service, validated.action ?? '', validated.payload, queueMonitor);
+        SystemTraceBridge.emitRedis(`${validated.service}:${validated.action ?? 'unknown'}`, Date.now() - startedAt);
+        return { status: 200, body: { result } };
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        if (message.includes('Unsupported worker action:') ||
+            message.includes('Unsupported queue-monitor action:')) {
+            const parsedArgs = parseRedisCommandArgs(validated.payload);
+            return handleStandardRedisCommand(client, validated.action ?? '', parsedArgs);
+        }
+        throw error;
+    }
 };
 const handleRedisRequest = async (request, config, queueMonitor) => {
     Logger.info('[RedisProxyServer] Handling request', {
@@ -217,10 +238,10 @@ const handleRedisRequest = async (request, config, queueMonitor) => {
             },
         };
     }
+    const client = await createClient(config);
     if (validated.service === 'worker' || validated.service === 'queue-monitor') {
-        return handleServiceRpc(validated, queueMonitor);
+        return handleServiceRpc(client, validated, queueMonitor);
     }
-    const client = await createClient(config);
     try {
         const parsedArgs = parseRedisCommandArgs(validated.payload);
         if (validated.action?.toLowerCase() === 'script') {

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

@@ -1 +1 @@
-{"version":3,"file":"PluginAutoImports.d.ts","sourceRoot":"","sources":["../../../src/runtime/PluginAutoImports.ts"],"names":[],"mappings":"AAKA,OAAO,EAAmB,KAAK,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAEzF,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;AAgRN,eAAO,MAAM,iBAAiB;uCACY,uBAAuB,GAAY,OAAO,CAAC,YAAY,CAAC;IAkBhG;;;;;;OAMG;mCACkC,OAAO,CAAC,YAAY,CAAC;qCAgFnB,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;EAavE,CAAC"}
+{"version":3,"file":"PluginAutoImports.d.ts","sourceRoot":"","sources":["../../../src/runtime/PluginAutoImports.ts"],"names":[],"mappings":"AAKA,OAAO,EAAmB,KAAK,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAEzF,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;AA2RN,eAAO,MAAM,iBAAiB;uCACY,uBAAuB,GAAY,OAAO,CAAC,YAAY,CAAC;IAkBhG;;;;;;OAMG;mCACkC,OAAO,CAAC,YAAY,CAAC;qCAgFnB,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;EAavE,CAAC"}

package/src/runtime/PluginAutoImports.js

@@ -147,11 +147,17 @@ const importFromLocalFallback = async (specifier, fallback) => {
 };
 const importFromFileContents = async (filePath, specifier) => {
     try {
-        const summary = await importSpecifiers([{ filePath, specifier }]);
+        const raw = await readFile(filePath, 'utf-8');
+        const fileSpecifiers = extractImportSpecifiers(raw);
+        if (fileSpecifiers.length === 0) {
+            return 'missing';
+        }
+        const summary = await importSpecifiers(fileSpecifiers.map((importSpecifier) => ({ filePath, specifier: importSpecifier })));
         if (summary.loaded > 0) {
-            Logger.debug('[plugins] Loaded auto-import specifier from file contents', {
+            Logger.debug('[plugins] Loaded auto-import specifiers from file contents', {
                 specifier,
                 filePath,
+                loadedCount: summary.loaded,
             });
             return 'loaded';
         }

package/src/tools/redis/RedisTransport.d.ts

@@ -49,8 +49,16 @@ type RedisProxyConnection = {
         off: (event: string, handler: (...args: unknown[]) => void) => unknown;
     };
 };
+type ScriptDefinition = Readonly<{
+    numberOfKeys: number;
+    lua: string;
+}>;
+type ProxyScriptRegistry = {
+    definitions: Map<string, ScriptDefinition>;
+    shaByCommand: Map<string, string>;
+};
 export declare const resolveRedisTransportMode: () => RedisTransportMode;
-export declare const createRedisProxyConnection: (config: RedisConfig, options?: RedisTransportOptions) => RedisProxyConnection;
+export declare const createRedisProxyConnection: (config: RedisConfig, options?: RedisTransportOptions, registry?: ProxyScriptRegistry) => RedisProxyConnection;
 export declare const ensureRedisTransportMode: (config: RedisConfig, options?: RedisTransportOptions) => RedisTransportMode;
 export {};
 //# sourceMappingURL=RedisTransport.d.ts.map

package/src/tools/redis/RedisTransport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RedisTransport.d.ts","sourceRoot":"","sources":["../../../../src/tools/redis/RedisTransport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RedisTransport.d.ts","sourceRoot":"","sources":["../../../../src/tools/redis/RedisTransport.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAUhD,MAAM,MAAM,kBAAkB,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEpD,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC,CAAC;AAWH,KAAK,oBAAoB,GAAG;IAC1B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,IAAI,CAAC;IACvB,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,oBAAoB,CAAC;IACtC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACzF,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAChE,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK,oBAAoB,CAAC;IACnF,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK,oBAAoB,CAAC;IACrF,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK,oBAAoB,CAAC;IACpF,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK,oBAAoB,CAAC;IAC/F,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,oBAAoB,CAAC;IACzD,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAChE,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;KACzD,CAAC;IACF,QAAQ,EAAE,MAAM;QACd,IAAI,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QACpD,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;QACxD,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,KAAK,EAAE,MAAM;QACX,IAAI,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QACpD,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;QACxD,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,UAAU,EAAE,CAAC,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK;QAC5D,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK,OAAO,CAAC;QACtE,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK,OAAO,CAAC;QACxE,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK,OAAO,CAAC;KACxE,CAAC;CACH,CAAC;AAEF,KAAK,gBAAgB,GAAG,QAAQ,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC,CAAC;AAEH,KAAK,mBAAmB,GAAG;IACzB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC3C,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC,CAAC;AA+UF,eAAO,MAAM,yBAAyB,QAAO,kBAI5C,CAAC;AAoIF,eAAO,MAAM,0BAA0B,GACrC,QAAQ,WAAW,EACnB,UAAU,qBAAqB,EAC/B,WAAW,mBAAmB,KAC7B,oBAqBF,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,QAAQ,WAAW,EACnB,UAAU,qBAAqB,KAC9B,kBAuBF,CAAC"}

package/src/tools/redis/RedisTransport.js

@@ -62,12 +62,12 @@ const createRequestId = () => {
         return crypto.randomUUID();
     return `req_${Date.now()}_${Math.random().toString(16).slice(2)}`;
 };
-const resolveProxySettings = (options) => ({
+const resolveProxySettings = (_options) => ({
     baseUrl: resolveProxyBaseUrl(),
-    keyId: Env.REDIS_PROXY_KEY_ID.trim() === '' ? undefined : Env.REDIS_PROXY_KEY_ID,
-    secret: Env.REDIS_PROXY_SECRET.trim() === '' ? undefined : Env.REDIS_PROXY_SECRET,
+    keyId: Env.get('REDIS_PROXY_KEY_ID').trim() === '' ? undefined : Env.get('REDIS_PROXY_KEY_ID'),
+    secret: Env.REDIS_PROXY_SECRET.trim() === '' ? undefined : Env.get('REDIS_PROXY_SECRET'),
     timeoutMs: Env.REDIS_PROXY_TIMEOUT_MS,
-    service: resolveProxyRpcService(options?.subsystem),
+    service: resolveProxyRpcService('redis'),
     customHeaders: parseCustomHeadersFromEnv('REDIS'),
 });
 const buildHeaders = async (settings, requestUrl, body) => {
@@ -114,11 +114,34 @@ const requestProxyCommand = async (settings, action, payload) => {
     });
     if (!response.ok) {
         const text = await response.text();
-        throw ErrorFactory.createTryCatchError(`Redis proxy request failed (${response.status})`, text);
+        // Don't log HTML responses (e.g., 502 Bad Gateway pages)
+        const isHtml = text.trim().toLowerCase().startsWith('<!doctype html') ||
+            text.trim().toLowerCase().startsWith('<html');
+        const errorMessage = isHtml ? 'Non-JSON response from proxy (proxy may be unavailable)' : text;
+        throw ErrorFactory.createTryCatchError(`Redis proxy request failed (${response.status})`, errorMessage);
     }
     const parsed = (await response.json());
     return parsed.result;
 };
+const loadScriptDefinition = async (settings, definition) => {
+    const loaded = await requestProxyCommand(settings, 'SCRIPT', {
+        args: ['LOAD', definition.lua],
+    });
+    return loaded;
+};
+const getDefinedScriptSha = async (settings, registry, command) => {
+    const cached = registry.shaByCommand.get(command);
+    if (cached !== undefined) {
+        return cached;
+    }
+    const definition = registry.definitions.get(command);
+    if (definition === undefined) {
+        return undefined;
+    }
+    const sha = await loadScriptDefinition(settings, definition);
+    registry.shaByCommand.set(command, sha);
+    return sha;
+};
 const logTransportSelection = (mode, config, options) => {
     const rawSubsystem = options?.subsystem?.trim();
     const subsystem = rawSubsystem === undefined || rawSubsystem === '' ? 'redis' : rawSubsystem;
@@ -253,6 +276,19 @@ export const resolveRedisTransportMode = () => {
 const createCommandFunction = (settings, command) => {
     return async (...args) => requestProxyCommand(settings, command, { args });
 };
+const createDefinedScriptFunction = (settings, command, registry) => {
+    return async (...args) => {
+        const sha = await getDefinedScriptSha(settings, registry, command);
+        if (sha === undefined) {
+            return requestProxyCommand(settings, command, { args });
+        }
+        const definition = registry.definitions.get(command);
+        const numberOfKeys = definition?.numberOfKeys ?? 0;
+        return requestProxyCommand(settings, 'EVALSHA', {
+            args: [sha, numberOfKeys, ...args],
+        });
+    };
+};
 const createScriptsHandler = (settings) => {
     return new Proxy({}, {
         get(_target, prop) {
@@ -262,7 +298,7 @@ const createScriptsHandler = (settings) => {
         },
     });
 };
-const handlePropertyAccess = (obj, prop, client, settings) => {
+const handlePropertyAccess = (obj, prop, client, settings, registry) => {
     if (typeof prop !== 'string')
         return Reflect.get(obj, prop);
     if (prop === 'then')
@@ -277,12 +313,15 @@ const handlePropertyAccess = (obj, prop, client, settings) => {
             return Infinity;
         };
     }
+    if (registry.definitions.has(prop)) {
+        return createDefinedScriptFunction(settings, prop, registry);
+    }
     if (prop in obj) {
         return Reflect.get(obj, prop);
     }
     return createCommandFunction(settings, prop);
 };
-const createProxyTarget = (config, options, settings, client) => {
+const createProxyTarget = (config, options, settings, client, registry) => {
     const target = {
         __bullmq_iredis: true,
         isCluster: false,
@@ -292,11 +331,14 @@ const createProxyTarget = (config, options, settings, client) => {
         // eslint-disable-next-line @typescript-eslint/require-await
         quit: async () => 'OK',
         disconnect: () => undefined,
-        duplicate: () => createRedisProxyConnection(config, options),
+        duplicate: () => createRedisProxyConnection(config, options, registry),
         defineCommand: (name, definition) => {
-            Logger.debug('[redis][proxy][bullmq] defineCommand ignored on frontend proxy', {
+            registry.definitions.set(name, definition);
+            registry.shaByCommand.delete(name);
+            Logger.debug('[redis][proxy][bullmq] registered defined command', {
                 commandName: name,
                 numberOfKeys: definition.numberOfKeys,
+                luaLength: definition.lua.length,
             });
         },
         runCommand: async (name, args) => requestProxyCommand(settings, name, { args }),
@@ -314,24 +356,33 @@ const createProxyTarget = (config, options, settings, client) => {
     };
     return target;
 };
-export const createRedisProxyConnection = (config, options) => {
+export const createRedisProxyConnection = (config, options, registry) => {
     const settings = resolveProxySettings(options);
+    const scriptRegistry = registry ?? {
+        definitions: new Map(),
+        shaByCommand: new Map(),
+    };
     logTransportSelection('proxy', config, options);
     Logger.info('[redis][proxy] Creating opaque proxy connection', {
         transport: 'BullMQ',
     });
-    const proxyTarget = createProxyTarget(config, options, settings, null);
+    const proxyTarget = createProxyTarget(config, options, settings, null, scriptRegistry);
     const client = new Proxy(proxyTarget, {
         get(obj, prop) {
-            return handlePropertyAccess(obj, prop, client, settings);
+            return handlePropertyAccess(obj, prop, client, settings, scriptRegistry);
         },
     });
     return client;
 };
 export const ensureRedisTransportMode = (config, options) => {
     const mode = resolveRedisTransportMode();
+    const subsystem = options?.subsystem ?? 'redis';
+    const requireDirectForScripts = options?.requireDirectForScripts ?? Env.REDIS_REQUIRE_DIRECT_FOR_SCRIPTS;
     if (mode === 'proxy' && options?.requireDirect === true) {
-        throw ErrorFactory.createConfigError(`Redis subsystem '${options.subsystem ?? 'redis'}' requires a direct Redis connection, but proxy mode is enabled.`);
+        throw ErrorFactory.createConfigError(`Redis subsystem '${subsystem}' requires a direct Redis connection, but proxy mode is enabled.`);
+    }
+    if (mode === 'proxy' && requireDirectForScripts) {
+        throw ErrorFactory.createConfigError(`Redis subsystem '${subsystem}' requires a direct Redis connection for scripts, but proxy mode is enabled.`);
     }
     if (mode === 'direct') {
         logTransportSelection(mode, config, options);