@zintrust/core 2.2.3 → 2.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/core",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Production-grade TypeScript backend framework for JavaScript",
   "homepage": "https://zintrust.com",
   "repository": {
@@ -215,7 +215,7 @@
     "jsonwebtoken": "^9.0.3",
     "mysql2": "^3.22.4",
     "pg": "^8.21.0",
-    "redis": "^5.12.1",
+    "redis": "^6.0.0",
     "tsx": "^4.22.3"
   },
   "overrides": {

package/src/index.js

@@ -1,11 +1,11 @@
 /**
- * @zintrust/core v2.2.3
+ * @zintrust/core v2.2.4
  *
  * ZinTrust Framework - Production-Grade TypeScript Backend
  * Built for performance, type safety, and exceptional developer experience
  *
  * Build Information:
- *   Built: 2026-05-28T13:50:35.338Z
+ *   Built: 2026-05-28T17:28:12.580Z
  *   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-28T13:50:35.305Z'; // Replaced during build
+export const ZINTRUST_BUILD_DATE = '2026-05-28T17:28:12.543Z'; // Replaced during build
 export { Application } from './boot/Application.js';
 export { AwsSigV4 } from './common/index.js';
 export { SignedRequest } from './security/SignedRequest.js';

package/src/proxy/CloudflareProxyShared.d.ts

@@ -4,6 +4,14 @@ type ReadAndVerifyJsonOptions = WorkerSigningOptions & Readonly<{
     defaultMaxBodyBytes: number;
 }>;
 type ProxyRequestEnv = object;
+export type ProxyRpcService = 'redis' | 'worker' | 'queue-monitor';
+export type ProxyRpcEnvelope = Readonly<{
+    service: ProxyRpcService;
+    action: string;
+    requestId: string;
+    payload: Record<string, unknown>;
+}>;
+export declare const resolveProxyRpcService: (subsystem?: string) => ProxyRpcService;
 export declare const json: (status: number, body: unknown) => Response;
 export declare const toErrorResponse: (status: number, code: string, message: string) => Response;
 export declare const getEnvInt: (env: ProxyRequestEnv, name: string, fallback: number) => number;

package/src/proxy/CloudflareProxyShared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CloudflareProxyShared.d.ts","sourceRoot":"","sources":["../../../src/proxy/CloudflareProxyShared.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAGjE,YAAY,EACV,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAE9B,KAAK,wBAAwB,GAAG,oBAAoB,GAClD,QAAQ,CAAC;IACP,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC,CAAC;AAEL,KAAK,eAAe,GAAG,MAAM,CAAC;AAE9B,eAAO,MAAM,IAAI,GAAI,QAAQ,MAAM,EAAE,MAAM,OAAO,KAAG,QAQpD,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,EAAE,MAAM,MAAM,EAAE,SAAS,MAAM,KAAG,QAG/E,CAAC;AAMF,eAAO,MAAM,SAAS,GAAI,KAAK,eAAe,EAAE,MAAM,MAAM,EAAE,UAAU,MAAM,KAAG,MAKhF,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,OAAO,OAAO,KAAG,MAAM,GAAG,IAI9D,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,SAAS,OAAO,EAChB,UAAU,MAAM,KACf,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAY3F,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,KACX;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAezF,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,SAAS,OAAO,EAChB,KAAK,eAAe,EACpB,WAAW,UAAU,EACrB,SAAS,oBAAoB,KAC5B,OAAO,CAAC,QAAQ,GAAG;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CAQjC,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,OAAO,EAChB,KAAK,eAAe,EACpB,SAAS,wBAAwB,KAChC,OAAO,CACN;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAAC,SAAS,EAAE,UAAU,CAAA;CAAE,GAC5E;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAapC,CAAC"}
+{"version":3,"file":"CloudflareProxyShared.d.ts","sourceRoot":"","sources":["../../../src/proxy/CloudflareProxyShared.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAGjE,YAAY,EACV,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAE9B,KAAK,wBAAwB,GAAG,oBAAoB,GAClD,QAAQ,CAAC;IACP,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC,CAAC;AAEL,KAAK,eAAe,GAAG,MAAM,CAAC;AAE9B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,QAAQ,GAAG,eAAe,CAAC;AAEnE,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACtC,OAAO,EAAE,eAAe,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,CAAC,CAAC;AAEH,eAAO,MAAM,sBAAsB,GAAI,YAAY,MAAM,KAAG,eAK3D,CAAC;AAEF,eAAO,MAAM,IAAI,GAAI,QAAQ,MAAM,EAAE,MAAM,OAAO,KAAG,QAQpD,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,EAAE,MAAM,MAAM,EAAE,SAAS,MAAM,KAAG,QAG/E,CAAC;AAMF,eAAO,MAAM,SAAS,GAAI,KAAK,eAAe,EAAE,MAAM,MAAM,EAAE,UAAU,MAAM,KAAG,MAKhF,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,OAAO,OAAO,KAAG,MAAM,GAAG,IAI9D,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,SAAS,OAAO,EAChB,UAAU,MAAM,KACf,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAY3F,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,KACX;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAezF,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,SAAS,OAAO,EAChB,KAAK,eAAe,EACpB,WAAW,UAAU,EACrB,SAAS,oBAAoB,KAC5B,OAAO,CAAC,QAAQ,GAAG;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CAQjC,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,OAAO,EAChB,KAAK,eAAe,EACpB,SAAS,wBAAwB,KAChC,OAAO,CACN;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAAC,SAAS,EAAE,UAAU,CAAA;CAAE,GAC5E;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAapC,CAAC"}

package/src/proxy/CloudflareProxyShared.js

@@ -2,6 +2,14 @@ import { isString } from '../helper/index.js';
 import { ErrorHandler } from './ErrorHandler.js';
 import { RequestValidator } from './RequestValidator.js';
 import { WorkerSigning } from './WorkerSigning.js';
+export const resolveProxyRpcService = (subsystem) => {
+    const normalized = typeof subsystem === 'string' ? subsystem.trim().toLowerCase() : '';
+    if (normalized.startsWith('queue-monitor'))
+        return 'queue-monitor';
+    if (normalized.startsWith('worker'))
+        return 'worker';
+    return 'redis';
+};
 export const json = (status, body) => {
     return new Response(JSON.stringify(body), {
         status,

package/src/proxy/redis/RedisProxyActions.d.ts

@@ -0,0 +1,15 @@
+import { type QueueDriver } from '@zintrust/queue-monitor/driver';
+import { type Metrics } from '@zintrust/queue-monitor/metrics';
+export type QueueMonitorContext = Readonly<{
+    driver: QueueDriver;
+    metrics: Metrics;
+}>;
+export type RedisProxyRedisConfig = Readonly<{
+    host: string;
+    port: number;
+    password: string;
+    db: number;
+}>;
+export declare const createQueueMonitorContext: (redis: RedisProxyRedisConfig) => QueueMonitorContext;
+export declare const dispatchServiceCommand: (service: string, action: string, payload: Record<string, unknown>, queueMonitor: QueueMonitorContext) => Promise<unknown>;
+//# sourceMappingURL=RedisProxyActions.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RedisProxyActions.d.ts","sourceRoot":"","sources":["../../../../src/proxy/redis/RedisProxyActions.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,gCAAgC,CAAC;AACtF,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAa9E,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC;IACzC,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC,CAAC;AAEH,eAAO,MAAM,yBAAyB,GAAI,OAAO,qBAAqB,KAAG,mBAKxE,CAAC;AAyHF,eAAO,MAAM,sBAAsB,GACjC,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,cAAc,mBAAmB,KAChC,OAAO,CAAC,OAAO,CAUjB,CAAC"}

package/src/proxy/redis/RedisProxyActions.js

@@ -0,0 +1,100 @@
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { createBullMQDriver } from '@zintrust/queue-monitor/driver';
+import { createMetrics } from '@zintrust/queue-monitor/metrics';
+import { getRecentJobsForQueue, getRecentJobsForSelection, } from '../../../packages/queue-monitor/src/QueueMonitoringService.js';
+import { getWorkerDetails, getWorkers, toggleAutoStart, } from '../../../packages/workers/src/dashboard/workers-api.js';
+import { WorkerFactory } from '../../../packages/workers/src/WorkerFactory.js';
+export const createQueueMonitorContext = (redis) => {
+    return {
+        driver: createBullMQDriver(redis),
+        metrics: createMetrics(redis),
+    };
+};
+const readString = (value) => {
+    return typeof value === 'string' && value.trim() !== '' ? value.trim() : undefined;
+};
+const readBoolean = (value) => value === true;
+const readNumber = (value) => {
+    return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
+};
+const readQueueNames = (value) => {
+    if (!Array.isArray(value))
+        return undefined;
+    const names = value
+        .filter((entry) => typeof entry === 'string')
+        .map((entry) => entry.trim())
+        .filter((entry) => entry.length > 0);
+    return names.length > 0 ? names : undefined;
+};
+const resolveWorkerPersistenceOverride = (payload) => {
+    const driver = readString(payload['driver']);
+    if (driver === 'redis')
+        return { driver: 'redis' };
+    if (driver === 'database')
+        return { driver: 'database' };
+    if (driver === 'memory')
+        return { driver: 'memory' };
+    return undefined;
+};
+const workerActionHandlers = {
+    getWorkers: async (payload) => {
+        return getWorkers(payload);
+    },
+    getWorkerDetails: async (payload) => {
+        return getWorkerDetails(readString(payload['name'] ?? payload['workerName']) ?? '', readString(payload['driver']));
+    },
+    toggleAutoStart: async (payload) => {
+        return toggleAutoStart(readString(payload['name'] ?? payload['workerName']) ?? '', readBoolean(payload['enabled']));
+    },
+    listPersistedRecords: async (payload) => {
+        return WorkerFactory.listPersistedRecords(resolveWorkerPersistenceOverride(payload), {
+            offset: readNumber(payload['offset']),
+            limit: readNumber(payload['limit']),
+            search: readString(payload['search']),
+            includeInactive: readBoolean(payload['includeInactive']),
+        });
+    },
+    listFileBackedRecords: async () => {
+        return WorkerFactory.listFileBackedRecords();
+    },
+    getPersisted: async (payload) => {
+        return WorkerFactory.getPersisted(readString(payload['name'] ?? payload['workerName']) ?? '', resolveWorkerPersistenceOverride(payload));
+    },
+    getHealth: async (payload) => {
+        return WorkerFactory.getHealth(readString(payload['name'] ?? payload['workerName']) ?? '');
+    },
+    getMetrics: async (payload) => {
+        return WorkerFactory.getMetrics(readString(payload['name'] ?? payload['workerName']) ?? '');
+    },
+};
+const queueMonitorActionHandlers = {
+    getRecentJobsForQueue: async (payload, queueMonitor) => {
+        return getRecentJobsForQueue(readString(payload['queue'] ?? payload['queueName']) ?? '', queueMonitor.metrics, queueMonitor.driver);
+    },
+    getRecentJobsForSelection: async (payload, queueMonitor) => {
+        return getRecentJobsForSelection(readString(payload['queue'] ?? payload['queueName']) ?? '', queueMonitor.metrics, queueMonitor.driver, readQueueNames(payload['queueNames']));
+    },
+};
+const dispatchWorkerAction = async (action, payload) => {
+    const handler = workerActionHandlers[action];
+    if (handler === undefined) {
+        throw ErrorFactory.createValidationError(`Unsupported worker action: ${action}`);
+    }
+    return handler(payload);
+};
+const dispatchQueueMonitorAction = async (action, payload, queueMonitor) => {
+    const handler = queueMonitorActionHandlers[action];
+    if (handler === undefined) {
+        throw ErrorFactory.createValidationError(`Unsupported queue-monitor action: ${action}`);
+    }
+    return handler(payload, queueMonitor);
+};
+export const dispatchServiceCommand = async (service, action, payload, queueMonitor) => {
+    if (service === 'worker') {
+        return dispatchWorkerAction(action, payload);
+    }
+    if (service === 'queue-monitor') {
+        return dispatchQueueMonitorAction(action, payload, queueMonitor);
+    }
+    throw ErrorFactory.createValidationError(`Unsupported RPC service: ${service}`);
+};

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;AAiBjC,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;AAwSL,eAAO,MAAM,gBAAgB;sBACJ,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EAqB1D,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;AAwZL,eAAO,MAAM,gBAAgB;sBACJ,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EAgC1D,CAAC;AAEH,eAAe,gBAAgB,CAAC"}

package/src/proxy/redis/RedisProxyServer.js

@@ -2,52 +2,13 @@ import { SystemTraceBridge } from '../../trace/SystemTraceBridge.js';
 import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
-import { ErrorHandler } from '../ErrorHandler.js';
+import { resolveProxyRpcService } from '../CloudflareProxyShared.js';
 import { createProxyServer } from '../ProxyServer.js';
 import { resolveBaseConfig, resolveBaseSigningConfig, verifyRequestSignature, } from '../ProxyServerUtils.js';
 import { RequestValidator } from '../RequestValidator.js';
-// Module-level script cache for persistent storage across requests
-const scriptCache = new Map(); // script SHA -> script content
+import { createQueueMonitorContext, dispatchServiceCommand, } from '../redis/RedisProxyActions.js';
+const scriptCache = new Map();
 let scriptCacheClient = null;
-const getScriptCacheClient = async (config) => {
-    if (scriptCacheClient !== null && scriptCacheClient.status === 'ready') {
-        return scriptCacheClient;
-    }
-    const module = (await getRedisModule());
-    const moduleDefault = module['default'];
-    const candidates = [
-        module['Redis'],
-        module['default'],
-        moduleDefault?.['Redis'],
-        moduleDefault?.['default'],
-        module,
-    ];
-    const RedisCtor = candidates.find((candidate) => typeof candidate === 'function');
-    if (typeof RedisCtor !== 'function') {
-        throw ErrorFactory.createConfigError("Redis proxy could not resolve a Redis constructor from 'ioredis'.");
-    }
-    scriptCacheClient = new RedisCtor({
-        host: config.redis.host,
-        port: config.redis.port,
-        password: config.redis.password,
-        db: config.redis.db,
-        maxRetriesPerRequest: 3,
-        enableOfflineQueue: true,
-        lazyConnect: false,
-        retryStrategy: (times) => {
-            if (times > 3)
-                return null;
-            return Math.min(times * 100, 1000);
-        },
-    });
-    if (typeof scriptCacheClient.connect === 'function') {
-        await scriptCacheClient.connect();
-    }
-    scriptCacheClient.on('error', (error) => {
-        Logger.warn('[RedisProxyServer] script cache client error', error);
-    });
-    return scriptCacheClient;
-};
 const resolveRedisConfig = (overrides = {}) => {
     const host = overrides.redisHost ?? Env.get('REDIS_PROXY_TARGET_HOST', Env.get('REDIS_HOST', '127.0.0.1'));
     const port = overrides.redisPort ?? Env.getInt('REDIS_PROXY_TARGET_PORT', Env.getInt('REDIS_PORT', 6379));
@@ -73,17 +34,8 @@ const resolveConfig = (overrides = {}) => {
         },
     };
 };
-const validateCommandPayload = (payload) => {
-    const command = payload['command'];
-    const args = Array.isArray(payload['args']) ? payload['args'] : [];
-    if (typeof command !== 'string' || command.trim() === '') {
-        return { valid: false, error: { code: 'VALIDATION_ERROR', message: 'command is required' } };
-    }
-    return { valid: true, command, args };
-};
 const getRedisModule = async () => {
-    const mod = await import('ioredis');
-    return mod;
+    return import('ioredis');
 };
 const createClient = async (config) => {
     const module = (await getRedisModule());
@@ -132,112 +84,237 @@ const createClient = async (config) => {
     }
     return client;
 };
-const executeCommand = async (client, command, args, config) => {
-    const trimmed = command.trim();
-    const lower = trimmed.toLowerCase();
-    // Handle SCRIPT LOAD - use persistent cache client
-    if (lower === 'script' && args.length > 0) {
-        const subCommand = String(args[0]).toLowerCase();
-        if (subCommand === 'load' && args.length > 1) {
-            const script = String(args[1]);
-            const cacheClient = await getScriptCacheClient(config);
-            const sha = await cacheClient.call('SCRIPT', 'LOAD', script);
-            if (typeof sha === 'string') {
-                scriptCache.set(sha, script);
-                Logger.debug('[RedisProxyServer] Script loaded into cache', { sha });
-            }
-            return sha;
-        }
+const normalizeRpcPayload = (payload) => {
+    return payload ?? {};
+};
+const parseRedisCommandArgs = (payload) => {
+    return Array.isArray(payload['args']) ? payload['args'] : [];
+};
+const validateCommandPayload = (payload) => {
+    const requestId = typeof payload['requestId'] === 'string' && payload['requestId'].trim() !== ''
+        ? payload['requestId'].trim()
+        : 'unknown';
+    const service = resolveProxyRpcService(typeof payload['service'] === 'string' ? payload['service'] : undefined);
+    let actionValue;
+    if (typeof payload['action'] === 'string') {
+        actionValue = payload['action'];
+    }
+    else if (typeof payload['command'] === 'string') {
+        actionValue = payload['command'];
+    }
+    const normalizedPayload = normalizeRpcPayload(payload['payload'] ?? undefined);
+    if (typeof actionValue !== 'string' || actionValue.trim() === '') {
+        return {
+            valid: false,
+            requestId,
+            service,
+            payload: normalizedPayload,
+            error: { code: 'VALIDATION_ERROR', message: 'action is required' },
+        };
+    }
+    return {
+        valid: true,
+        requestId,
+        service,
+        action: actionValue.trim(),
+        payload: normalizedPayload,
+    };
+};
+const handleScriptCommand = async (args, config) => {
+    const subCommand = String(args[0]).toLowerCase();
+    Logger.info('[RedisProxyServer] SCRIPT command received', {
+        subCommand,
+        argsCount: args.length,
+    });
+    if (subCommand !== 'load' || args.length <= 1) {
+        return { status: 200, body: { result: null } };
     }
-    // Handle EVALSHA - check cache first
+    const script = String(args[1]);
+    Logger.info('[RedisProxyServer] Loading script into Redis', { scriptLength: script.length });
+    const cacheClient = await getScriptCacheClient(config);
+    const sha = await cacheClient.call('SCRIPT', 'LOAD', script);
+    if (typeof sha === 'string') {
+        scriptCache.set(sha, script);
+        Logger.info('[RedisProxyServer] Script loaded into cache', {
+            sha,
+            cacheSize: scriptCache.size,
+        });
+    }
+    else {
+        Logger.warn('[RedisProxyServer] Script LOAD returned non-string SHA', {
+            sha,
+            type: typeof sha,
+        });
+    }
+    return { status: 200, body: { result: sha } };
+};
+const handleStandardRedisCommand = async (client, action, args) => {
+    const lower = action.trim().toLowerCase();
     if (lower === 'evalsha' && args.length > 0) {
         const sha = String(args[0]);
+        Logger.info('[RedisProxyServer] EVALSHA command received', {
+            sha,
+            cacheSize: scriptCache.size,
+            hasScript: scriptCache.has(sha),
+        });
         if (scriptCache.has(sha)) {
-            Logger.debug('[RedisProxyServer] Using cached script for EVALSHA', { sha });
+            Logger.info('[RedisProxyServer] Using cached script for EVALSHA', { sha });
+        }
+        else {
+            Logger.warn('[RedisProxyServer] Script not in cache, will attempt direct EVALSHA', {
+                sha,
+                availableScripts: Array.from(scriptCache.keys()).slice(0, 5),
+            });
         }
     }
     const candidate = client[lower];
     if (typeof candidate === 'function') {
-        return candidate.apply(client, args);
+        return {
+            status: 200,
+            body: {
+                result: await candidate.apply(client, args),
+            },
+        };
     }
     if (typeof client.call === 'function') {
-        return client.call(trimmed, ...args);
+        return { status: 200, body: { result: await client.call(action.trim(), ...args) } };
     }
-    throw ErrorFactory.createValidationError(`Unsupported Redis command: ${trimmed}`);
+    throw ErrorFactory.createValidationError(`Unsupported Redis command: ${action}`);
 };
-const createBackend = (config) => ({
-    name: 'redis',
-    handle: async (request) => {
-        const methodError = RequestValidator.requirePost(request.method);
-        if (methodError) {
-            return {
-                status: 405,
-                body: { code: methodError.code, message: methodError.message },
-            };
-        }
-        if (request.path !== '/zin/redis/command') {
-            return { status: 404, body: { code: 'NOT_FOUND', message: 'Unknown endpoint' } };
-        }
-        const parsed = RequestValidator.parseJson(request.body);
-        if (!parsed.ok) {
-            return { status: 400, body: { code: parsed.error.code, message: parsed.error.message } };
-        }
-        const validated = validateCommandPayload(parsed.value);
-        if (!validated.valid) {
-            return {
-                status: 400,
-                body: {
-                    code: validated.error?.code ?? 'VALIDATION_ERROR',
-                    message: validated.error?.message ?? 'Invalid request',
-                },
-            };
-        }
-        const command = validated.command ?? '';
-        if (command.trim() === '') {
-            return {
-                status: 400,
-                body: { code: 'VALIDATION_ERROR', message: 'command is required' },
-            };
-        }
-        try {
-            const client = await createClient(config);
-            try {
-                const startedAt = Date.now();
-                const result = await executeCommand(client, command, validated.args ?? [], config);
-                SystemTraceBridge.emitRedis(command, Date.now() - startedAt);
-                return { status: 200, body: { result } };
-            }
-            finally {
-                await client.quit();
-            }
-        }
-        catch (error) {
-            return ErrorHandler.toProxyError(500, 'REDIS_PROXY_ERROR', String(error));
+const handleServiceRpc = async (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 } };
+};
+const handleRedisRequest = async (request, config, queueMonitor) => {
+    Logger.info('[RedisProxyServer] Handling request', {
+        method: request.method,
+        path: request.path,
+        scriptCacheSize: scriptCache.size,
+    });
+    const methodError = RequestValidator.requirePost(request.method);
+    if (methodError) {
+        return {
+            status: 405,
+            body: { code: methodError.code, message: methodError.message },
+        };
+    }
+    if (request.path !== '/zin/redis/command') {
+        return { status: 404, body: { code: 'NOT_FOUND', message: 'Unknown endpoint' } };
+    }
+    const parsed = RequestValidator.parseJson(request.body);
+    if (!parsed.ok) {
+        return { status: 400, body: { code: parsed.error.code, message: parsed.error.message } };
+    }
+    const validated = validateCommandPayload(parsed.value);
+    if (!validated.valid) {
+        return {
+            status: 400,
+            body: {
+                code: validated.error?.code ?? 'VALIDATION_ERROR',
+                message: validated.error?.message ?? 'Invalid request',
+            },
+        };
+    }
+    if (validated.service === 'worker' || validated.service === 'queue-monitor') {
+        return handleServiceRpc(validated, queueMonitor);
+    }
+    const client = await createClient(config);
+    try {
+        const parsedArgs = parseRedisCommandArgs(validated.payload);
+        if (validated.action?.toLowerCase() === 'script') {
+            return await handleScriptCommand(parsedArgs, config);
         }
-    },
-    health: async () => {
+        return await handleStandardRedisCommand(client, validated.action ?? '', parsedArgs);
+    }
+    finally {
+        await client.quit();
+    }
+};
+const handleRedisHealth = async (config) => {
+    try {
+        const client = await createClient(config);
         try {
-            const client = await createClient(config);
             const pingFn = client.ping;
             if (typeof pingFn === 'function') {
                 await pingFn.apply(client);
             }
             else {
-                await executeCommand(client, 'PING', [], config);
+                await handleStandardRedisCommand(client, 'PING', []);
             }
-            await client.quit();
             return { status: 200, body: { status: 'healthy' } };
         }
-        catch (error) {
-            Logger.warn('[RedisProxyServer] health check failed', error);
-            return { status: 503, body: { status: 'unhealthy', error: String(error) } };
+        finally {
+            await client.quit();
         }
-    },
-});
+    }
+    catch (error) {
+        Logger.warn('[RedisProxyServer] health check failed', error);
+        return { status: 503, body: { status: 'unhealthy', error: String(error) } };
+    }
+};
+const createBackend = (config) => {
+    const queueMonitor = createQueueMonitorContext(config.redis);
+    return {
+        name: 'redis',
+        handle: async (request) => handleRedisRequest(request, config, queueMonitor),
+        health: async () => handleRedisHealth(config),
+        shutdown: async () => {
+            await Promise.all([queueMonitor.driver.close(), queueMonitor.metrics.close()]);
+        },
+    };
+};
+const getScriptCacheClient = async (config) => {
+    if (scriptCacheClient !== null && scriptCacheClient.status === 'ready') {
+        return scriptCacheClient;
+    }
+    const module = (await getRedisModule());
+    const moduleDefault = module['default'];
+    const candidates = [
+        module['Redis'],
+        module['default'],
+        moduleDefault?.['Redis'],
+        moduleDefault?.['default'],
+        module,
+    ];
+    const RedisCtor = candidates.find((candidate) => typeof candidate === 'function');
+    if (typeof RedisCtor !== 'function') {
+        throw ErrorFactory.createConfigError("Redis proxy could not resolve a Redis constructor from 'ioredis'.");
+    }
+    scriptCacheClient = new RedisCtor({
+        host: config.redis.host,
+        port: config.redis.port,
+        password: config.redis.password,
+        db: config.redis.db,
+        maxRetriesPerRequest: 3,
+        enableOfflineQueue: true,
+        lazyConnect: false,
+        retryStrategy: (times) => {
+            if (times > 3)
+                return null;
+            return Math.min(times * 100, 1000);
+        },
+    });
+    if (typeof scriptCacheClient.connect === 'function') {
+        await scriptCacheClient.connect();
+    }
+    scriptCacheClient.on('error', (error) => {
+        Logger.warn('[RedisProxyServer] script cache client error', error);
+    });
+    return scriptCacheClient;
+};
 export const RedisProxyServer = Object.freeze({
     async start(overrides = {}) {
         const config = resolveConfig(overrides);
         const backend = createBackend(config);
+        Logger.info('[RedisProxyServer] Starting Redis proxy', {
+            host: config.host,
+            port: config.port,
+            redisHost: config.redis.host,
+            redisPort: config.redis.port,
+            redisDb: config.redis.db,
+        });
         const server = createProxyServer({
             host: config.host,
             port: config.port,
@@ -252,7 +329,10 @@ export const RedisProxyServer = Object.freeze({
             },
         });
         await server.start();
-        Logger.info(`[redis-proxy] Listening on http://${config.host}:${config.port}`);
+        Logger.info(`[redis-proxy] Listening on http://${config.host}:${config.port}`, {
+            scriptCacheSize: scriptCache.size,
+            luaScriptSupport: 'enabled',
+        });
     },
 });
 export default RedisProxyServer;

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":"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"}

package/src/tools/redis/RedisTransport.js

@@ -2,10 +2,9 @@ import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
 import { parseCustomHeadersFromEnv } from '../../orm/adapters/SqlProxyAdapterUtils.js';
+import { resolveProxyRpcService, } from '../../proxy/CloudflareProxyShared.js';
 import { SignedRequest } from '../../security/SignedRequest.js';
 const loggedSelections = new Set();
-// Module-level script storage for persistence across connections
-const globalScripts = new Map();
 const readEnvString = (key, fallback = '') => {
     if (typeof Env.get === 'function') {
         return Env.get(key, fallback);
@@ -57,11 +56,18 @@ const resolveProxyBaseUrl = () => {
         return explicit;
     return `http://${Env.REDIS_PROXY_HOST}:${Env.REDIS_PROXY_PORT}`;
 };
-const resolveProxySettings = () => ({
+const createRequestId = () => {
+    const crypto = globalThis.crypto;
+    if (typeof crypto?.randomUUID === 'function')
+        return crypto.randomUUID();
+    return `req_${Date.now()}_${Math.random().toString(16).slice(2)}`;
+};
+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,
     timeoutMs: Env.REDIS_PROXY_TIMEOUT_MS,
+    service: resolveProxyRpcService(options?.subsystem),
     customHeaders: parseCustomHeadersFromEnv('REDIS'),
 });
 const buildHeaders = async (settings, requestUrl, body) => {
@@ -84,11 +90,17 @@ const buildHeaders = async (settings, requestUrl, body) => {
     }
     return headers;
 };
-const requestProxyCommand = async (settings, command, args) => {
+const requestProxyCommand = async (settings, action, payload) => {
     if (settings.baseUrl.trim() === '') {
         throw ErrorFactory.createConfigError('Redis proxy URL is missing (REDIS_PROXY_URL)');
     }
-    const body = JSON.stringify({ command, args });
+    const envelope = {
+        service: settings.service,
+        action,
+        requestId: createRequestId(),
+        payload,
+    };
+    const body = JSON.stringify(envelope);
     const requestUrl = buildRequestUrl(settings.baseUrl, '/zin/redis/command');
     const headers = await buildHeaders(settings, requestUrl, body);
     const signal = typeof AbortSignal !== 'undefined' && 'timeout' in AbortSignal
@@ -166,13 +178,9 @@ const createScanStream = (settings, options) => {
                 let cursor = '0';
                 do {
                     // eslint-disable-next-line no-await-in-loop
-                    const result = await requestProxyCommand(settings, 'SCAN', [
-                        cursor,
-                        'MATCH',
-                        options?.match ?? '*',
-                        'COUNT',
-                        String(options?.count ?? 200),
-                    ]);
+                    const result = await requestProxyCommand(settings, 'SCAN', {
+                        args: [cursor, 'MATCH', options?.match ?? '*', 'COUNT', String(options?.count ?? 200)],
+                    });
                     const [nextCursor, batch] = normalizeScanResponse(result);
                     cursor = nextCursor;
                     if (batch.length > 0) {
@@ -188,7 +196,7 @@ const createScanStream = (settings, options) => {
     });
     return stream;
 };
-const createPipeline = (settings, _runCommand) => {
+const createPipeline = (settings) => {
     const commands = [];
     const target = {
         async exec() {
@@ -200,7 +208,7 @@ const createPipeline = (settings, _runCommand) => {
             for (const entry of commands) {
                 try {
                     // eslint-disable-next-line no-await-in-loop
-                    const result = await requestProxyCommand(settings, entry.command, entry.args);
+                    const result = await requestProxyCommand(settings, entry.command, { args: entry.args });
                     results.push([null, result]);
                 }
                 catch (error) {
@@ -218,7 +226,6 @@ const createPipeline = (settings, _runCommand) => {
             Logger.debug('[redis][proxy][pipeline] runCommand called in pipeline', {
                 commandName: name,
                 argsCount: args.length,
-                hasRunCommandFunction: _runCommand !== undefined,
             });
             commands.push({ command: name, args });
             return pipeline;
@@ -230,12 +237,8 @@ const createPipeline = (settings, _runCommand) => {
                 return Reflect.get(obj, prop);
             if (prop in obj)
                 return Reflect.get(obj, prop);
-            Logger.debug('[redis][proxy][pipeline] Property access in pipeline', {
-                property: prop,
-                currentCommandCount: commands.length,
-            });
             return (...args) => {
-                commands.push({ command: prop.toUpperCase(), args });
+                commands.push({ command: prop, args });
                 return pipeline;
             };
         },
@@ -247,55 +250,19 @@ export const resolveRedisTransportMode = () => {
         ? 'proxy'
         : 'direct';
 };
-const logDefineCommandCall = (name, definition) => {
-    Logger.debug('[redis][proxy][bullmq] defineCommand called', {
-        commandName: name,
-        numberOfKeys: definition.numberOfKeys,
-        luaLength: definition.lua.length,
-        luaPreview: definition.lua.substring(0, 100) + '...',
-    });
+const createCommandFunction = (settings, command) => {
+    return async (...args) => requestProxyCommand(settings, command, { args });
 };
-const storeScript = (name, definition) => {
-    globalScripts.set(name, {
-        numberOfKeys: definition.numberOfKeys,
-        lua: definition.lua,
-    });
-    Logger.debug('[redis][proxy][bullmq] Script stored', {
-        commandName: name,
-        totalScripts: globalScripts.size,
-        allScriptNames: Array.from(globalScripts.keys()),
-    });
-};
-const executeScriptViaEval = async (settings, name, script, args) => {
-    Logger.debug('[redis][proxy][bullmq] Executing script via SCRIPT LOAD + EVALSHA', {
-        commandName: name,
-        numberOfKeys: script.numberOfKeys,
-        luaLength: script.lua.length,
-        args: args.slice(0, 3), // Log first 3 args to avoid huge logs
-    });
-    // Load script into Redis cache
-    const sha = await requestProxyCommand(settings, 'SCRIPT', ['LOAD', script.lua]);
-    // Execute using SHA for performance
-    if (typeof sha === 'string') {
-        return requestProxyCommand(settings, 'EVALSHA', [sha, script.numberOfKeys, ...args]);
-    }
-    // Fallback to EVAL if SCRIPT LOAD fails
-    Logger.warn('[redis][proxy][bullmq] SCRIPT LOAD failed, falling back to EVAL', {
-        commandName: name,
+const createScriptsHandler = (settings) => {
+    return new Proxy({}, {
+        get(_target, prop) {
+            if (typeof prop !== 'string')
+                return undefined;
+            return async (...args) => requestProxyCommand(settings, prop, { args });
+        },
     });
-    return requestProxyCommand(settings, 'EVAL', [script.lua, script.numberOfKeys, ...args]);
-};
-const createCommandFunction = (settings, prop) => {
-    return async (...args) => {
-        Logger.debug('[redis][proxy][trap] Executing unknown property as command', {
-            property: prop,
-            argsCount: args.length,
-            args: args.slice(0, 3),
-        });
-        return requestProxyCommand(settings, typeof prop === 'string' ? prop.toUpperCase() : String(prop), args);
-    };
 };
-const handlePropertyAccess = (obj, prop, scripts, client, settings) => {
+const handlePropertyAccess = (obj, prop, client, settings) => {
     if (typeof prop !== 'string')
         return Reflect.get(obj, prop);
     if (prop === 'then')
@@ -311,52 +278,11 @@ const handlePropertyAccess = (obj, prop, scripts, client, settings) => {
         };
     }
     if (prop in obj) {
-        Logger.debug('[redis][proxy][trap] Property access on target object', {
-            property: prop,
-            hasScript: scripts.has(prop),
-        });
-        return Reflect.get(obj, prop);
-    }
-    // Log when BullMQ accesses unknown properties (potential versioned commands)
-    Logger.debug('[redis][proxy][trap] Unknown property access - potential BullMQ command', {
-        property: prop,
-        propertyType: typeof prop,
-        hasScript: typeof prop === 'string' ? scripts.has(prop) : false,
-        availableScripts: Array.from(scripts.keys()),
-        isVersionedCommand: typeof prop === 'string' ? prop.includes(':') : false,
-    });
-    if (typeof prop !== 'string') {
         return Reflect.get(obj, prop);
     }
     return createCommandFunction(settings, prop);
 };
-const createScriptsHandler = (scripts, settings) => {
-    return new Proxy({}, {
-        get(_target, prop) {
-            return async (...args) => {
-                const scriptName = String(prop);
-                Logger.debug('[redis][proxy][scripts] Script method called', {
-                    scriptName,
-                    argsCount: args.length,
-                    isVersioned: scriptName.includes(':'),
-                });
-                // Strip version suffix (e.g., moveToActive:5.77.6 -> moveToActive)
-                const baseScriptName = scriptName.includes(':') ? scriptName.split(':')[0] : scriptName;
-                const script = scripts.get(baseScriptName);
-                if (script === undefined) {
-                    Logger.warn('[redis][proxy][scripts] Script not found, falling back to direct proxy call', {
-                        scriptName,
-                        baseScriptName,
-                        availableScripts: Array.from(scripts.keys()),
-                    });
-                    return requestProxyCommand(settings, scriptName, args);
-                }
-                return executeScriptViaEval(settings, scriptName, script, args);
-            };
-        },
-    });
-};
-const createProxyTarget = (config, options, scripts, runDefinedCommand, settings, client) => {
+const createProxyTarget = (config, options, settings, client) => {
     const target = {
         __bullmq_iredis: true,
         isCluster: false,
@@ -368,66 +294,36 @@ const createProxyTarget = (config, options, scripts, runDefinedCommand, settings
         disconnect: () => undefined,
         duplicate: () => createRedisProxyConnection(config, options),
         defineCommand: (name, definition) => {
-            logDefineCommandCall(name, definition);
-            storeScript(name, definition);
+            Logger.debug('[redis][proxy][bullmq] defineCommand ignored on frontend proxy', {
+                commandName: name,
+                numberOfKeys: definition.numberOfKeys,
+            });
         },
-        runCommand: async (name, args) => runDefinedCommand(name, args),
+        runCommand: async (name, args) => requestProxyCommand(settings, name, { args }),
         on: (_event, _handler) => client ?? target,
         once: (_event, _handler) => client ?? target,
         off: (_event, _handler) => client ?? target,
         removeListener: (_event, _handler) => client ?? target,
         setMaxListeners: (_count) => client ?? target,
         getMaxListeners: () => Infinity,
-        call: async (command, ...args) => {
-            Logger.debug('[redis][proxy][call] Direct call method invoked', {
-                command,
-                argsCount: args.length,
-                hasScript: scripts.has(command),
-                isVersionedCommand: command.includes(':'),
-                args: args.slice(0, 3),
-            });
-            return requestProxyCommand(settings, command, args);
-        },
-        scripts: createScriptsHandler(scripts, settings),
-        pipeline: () => createPipeline(settings, runDefinedCommand),
-        multi: () => createPipeline(settings, runDefinedCommand),
+        call: async (command, ...args) => requestProxyCommand(settings, command, { args }),
+        scripts: createScriptsHandler(settings),
+        pipeline: () => createPipeline(settings),
+        multi: () => createPipeline(settings),
         scanStream: (scanOptions) => createScanStream(settings, scanOptions),
     };
     return target;
 };
 export const createRedisProxyConnection = (config, options) => {
-    const settings = resolveProxySettings();
-    const runDefinedCommand = async (name, args) => {
-        Logger.debug('[redis][proxy][bullmq] runDefinedCommand called', {
-            commandName: name,
-            argsCount: args.length,
-            hasScript: globalScripts.has(name),
-            scriptKeys: Array.from(globalScripts.keys()),
-        });
-        const script = globalScripts.get(name);
-        if (script === undefined) {
-            Logger.warn('[redis][proxy][bullmq] Script not found, falling back to direct proxy call', {
-                commandName: name,
-                availableScripts: Array.from(globalScripts.keys()),
-            });
-            return requestProxyCommand(settings, name, args);
-        }
-        return executeScriptViaEval(settings, name, script, args);
-    };
+    const settings = resolveProxySettings(options);
     logTransportSelection('proxy', config, options);
-    Logger.info('[redis][proxy][bullmq] Creating BullMQ-compatible proxy connection', {
-        hasBullMQFlag: true,
-        hasIsClusterFlag: true,
-        hasOptionsFlag: true,
-        hasDuplicateMethod: true,
-        hasDefineCommandMethod: true,
-        hasRunCommandMethod: true,
-        hasMultiMethod: true,
+    Logger.info('[redis][proxy] Creating opaque proxy connection', {
+        transport: 'BullMQ',
     });
-    const proxyTarget = createProxyTarget(config, options, globalScripts, runDefinedCommand, settings, null);
+    const proxyTarget = createProxyTarget(config, options, settings, null);
     const client = new Proxy(proxyTarget, {
         get(obj, prop) {
-            return handlePropertyAccess(obj, prop, globalScripts, client, settings);
+            return handlePropertyAccess(obj, prop, client, settings);
         },
     });
     return client;
@@ -437,15 +333,6 @@ export const ensureRedisTransportMode = (config, options) => {
     if (mode === 'proxy' && options?.requireDirect === true) {
         throw ErrorFactory.createConfigError(`Redis subsystem '${options.subsystem ?? 'redis'}' requires a direct Redis connection, but proxy mode is enabled.`);
     }
-    // If requireDirectForScripts is set (option or env), force direct mode for script operations
-    const requireDirectForScripts = options?.requireDirectForScripts ?? Env.REDIS_REQUIRE_DIRECT_FOR_SCRIPTS;
-    if (mode === 'proxy' && requireDirectForScripts === true) {
-        Logger.warn('[redis][transport] Forcing direct mode for scripts due to requireDirectForScripts', {
-            subsystem: options?.subsystem ?? 'redis',
-            source: options?.requireDirectForScripts === true ? 'option' : 'env',
-        });
-        return 'direct';
-    }
     if (mode === 'direct') {
         logTransportSelection(mode, config, options);
     }