@zintrust/core 2.4.0 → 2.4.2

package/bin/zintrust-main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zintrust-main.d.ts","sourceRoot":"","sources":["../../bin/zintrust-main.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAwaF,wBAAsB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzC;AAED,eAAO,MAAM,mBAAmB;;qCAtYQ,MAAM,KAAG,qBAAqB,GAAG,SAAS;mCA6C5C,MAAM,GAAG,IAAI,UAAU,MAAM,CAAC,OAAO,GAAG,IAAI,KAAG,MAAM;iCAnEzD,MAAM;8BAIP,MAAM,KAAG,MAAM;uCAoGtC,qBAAqB,WACpB,MAAM,EAAE,KAChB,OAAO,CAAC,KAAK,CAAC;oCA9FsB,MAAM,sBAAsB,MAAM,KAAG,OAAO;6CAsI7B,MAAM,EAAE,KAAG,OAAO,CAAC,OAAO,CAAC;yCAjG1E,MAAM,sBACS,MAAM,QACrB,MAAM,CAAC,UAAU,KACrB,qBAAqB,GAAG,SAAS;EAkXlC,CAAC;AAaH,OAAO,EAAE,CAAC"}
+{"version":3,"file":"zintrust-main.d.ts","sourceRoot":"","sources":["../../bin/zintrust-main.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAkbF,wBAAsB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzC;AAED,eAAO,MAAM,mBAAmB;;qCAhZQ,MAAM,KAAG,qBAAqB,GAAG,SAAS;mCA6C5C,MAAM,GAAG,IAAI,UAAU,MAAM,CAAC,OAAO,GAAG,IAAI,KAAG,MAAM;iCAnEzD,MAAM;8BAIP,MAAM,KAAG,MAAM;uCAoGtC,qBAAqB,WACpB,MAAM,EAAE,KAChB,OAAO,CAAC,KAAK,CAAC;oCA9FsB,MAAM,sBAAsB,MAAM,KAAG,OAAO;6CAsI7B,MAAM,EAAE,KAAG,OAAO,CAAC,OAAO,CAAC;yCAjG1E,MAAM,sBACS,MAAM,QACrB,MAAM,CAAC,UAAU,KACrB,qBAAqB,GAAG,SAAS;EA4XlC,CAAC;AAaH,OAAO,EAAE,CAAC"}

package/bin/zintrust-main.js

@@ -216,6 +216,16 @@ const normalizeProxyTargetArgs = (args) => {
         return args;
     return [`proxy:${mappedTarget}`, ...args.slice(2)];
 };
+const normalizeRedisRpcStartArgs = (args) => {
+    if (args.length < 2)
+        return args;
+    const command = args[0]?.trim().toLowerCase();
+    const target = args[1]?.trim().toLowerCase();
+    if ((command === 'start' || command === 's') && target === 'redis-rpc') {
+        return ['redis-rpc', ...args.slice(2)];
+    }
+    return args;
+};
 const getPrimaryCommand = (args) => {
     for (const arg of args) {
         const normalized = arg.trim().toLowerCase();
@@ -336,7 +346,7 @@ const runCliInternal = async () => {
             // ignore
         }
     }
-    await cli.run(normalizeProxyTargetArgs(args));
+    await cli.run(normalizeProxyTargetArgs(normalizeRedisRpcStartArgs(args)));
 };
 export async function run() {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/core",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "Production-grade TypeScript backend framework for JavaScript",
   "homepage": "https://zintrust.com",
   "repository": {
@@ -216,7 +216,7 @@
     "mysql2": "^3.22.4",
     "pg": "^8.21.0",
     "redis": "^6.0.0",
-    "tsx": "^4.22.3"
+    "tsx": "^4.22.4"
   },
   "overrides": {
     "ajv": "^8.18.0",

package/src/cache/Cache.d.ts

@@ -10,6 +10,8 @@ type CacheStore = Readonly<{
     delete: (key: string) => Promise<void>;
     clear: () => Promise<void>;
     has: (key: string) => Promise<boolean>;
+    increment: (key: string, amount?: number) => Promise<number>;
+    decrement: (key: string, amount?: number) => Promise<number>;
     getDriver: () => CacheDriver;
 }>;
 export declare const Cache: Readonly<{
@@ -18,6 +20,8 @@ export declare const Cache: Readonly<{
     delete: (key: string) => Promise<void>;
     clear: () => Promise<void>;
     has: (key: string) => Promise<boolean>;
+    increment: (key: string, amount?: number) => Promise<number>;
+    decrement: (key: string, amount?: number) => Promise<number>;
     getDriver: () => CacheDriver;
     getRedisClient: (storeName?: string) => unknown;
     store: (name?: string) => CacheStore;
@@ -32,6 +36,8 @@ export declare const cache: Readonly<{
     delete: (key: string) => Promise<void>;
     clear: () => Promise<void>;
     has: (key: string) => Promise<boolean>;
+    increment: (key: string, amount?: number) => Promise<number>;
+    decrement: (key: string, amount?: number) => Promise<number>;
     getDriver: () => CacheDriver;
     getRedisClient: (storeName?: string) => unknown;
     store: (name?: string) => CacheStore;

package/src/cache/Cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Cache.d.ts","sourceRoot":"","sources":["../../../src/cache/Cache.ts"],"names":[],"mappings":"AACA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAuMtD,KAAK,UAAU,GAAG,QAAQ,CAAC;IACzB,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC3C,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,SAAS,EAAE,MAAM,WAAW,CAAC;CAC9B,CAAC,CAAC;AAwGH,eAAO,MAAM,KAAK;UA1MC,CAAC,OAAO,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;UAkBlC,CAAC,OAAO,MAAM,SAAS,CAAC,QAAQ,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;kBAkBjD,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;iBAiBtB,OAAO,CAAC,IAAI,CAAC;eAgBb,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;qBAkB3B,WAAW;iCAwGG,MAAM,KAAG,OAAO;mBA3F9B,MAAM,KAAG,UAAU;iBAuFvB,IAAI;EAyBpB,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,KAAK;UAzNC,CAAC,OAAO,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;UAkBlC,CAAC,OAAO,MAAM,SAAS,CAAC,QAAQ,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;kBAkBjD,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;iBAiBtB,OAAO,CAAC,IAAI,CAAC;eAgBb,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;qBAkB3B,WAAW;iCAwGG,MAAM,KAAG,OAAO;mBA3F9B,MAAM,KAAG,UAAU;iBAuFvB,IAAI;EA8BI,CAAC"}
+{"version":3,"file":"Cache.d.ts","sourceRoot":"","sources":["../../../src/cache/Cache.ts"],"names":[],"mappings":"AACA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAiOtD,KAAK,UAAU,GAAG,QAAQ,CAAC;IACzB,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC3C,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7D,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7D,SAAS,EAAE,MAAM,WAAW,CAAC;CAC9B,CAAC,CAAC;AAsIH,eAAO,MAAM,KAAK;UApQC,CAAC,OAAO,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;UAkBlC,CAAC,OAAO,MAAM,SAAS,CAAC,QAAQ,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;kBAkBjD,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;iBAiBtB,OAAO,CAAC,IAAI,CAAC;eAgBb,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;qBAenB,MAAM,sBAAe,OAAO,CAAC,MAAM,CAAC;qBAapC,MAAM,sBAAe,OAAO,CAAC,MAAM,CAAC;qBAgB5C,WAAW;iCAwIG,MAAM,KAAG,OAAO;mBAvH9B,MAAM,KAAG,UAAU;iBAmHvB,IAAI;EA2BpB,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,KAAK;UArRC,CAAC,OAAO,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;UAkBlC,CAAC,OAAO,MAAM,SAAS,CAAC,QAAQ,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;kBAkBjD,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;iBAiBtB,OAAO,CAAC,IAAI,CAAC;eAgBb,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;qBAenB,MAAM,sBAAe,OAAO,CAAC,MAAM,CAAC;qBAapC,MAAM,sBAAe,OAAO,CAAC,MAAM,CAAC;qBAgB5C,WAAW;iCAwIG,MAAM,KAAG,OAAO;mBAvH9B,MAAM,KAAG,UAAU;iBAmHvB,IAAI;EAgCI,CAAC"}

package/src/cache/Cache.js

@@ -131,12 +131,36 @@ const has = async (key) => {
     SystemTraceBridge.emitCache('has', prefixedKey, Date.now() - startedAt, exists, undefined, DEFAULT_STORE_NAME);
     return exists;
 };
+const increment = async (key, amount = 1) => {
+    const prefixedKey = autoPrefixKey(key);
+    const driver = getDriverInstance();
+    if (typeof driver.increment === 'function') {
+        return driver.increment(prefixedKey, amount);
+    }
+    const current = Number((await driver.get(prefixedKey)) ?? 0);
+    const next = current + amount;
+    await driver.set(prefixedKey, next);
+    return next;
+};
+const decrement = async (key, amount = 1) => {
+    const prefixedKey = autoPrefixKey(key);
+    const driver = getDriverInstance();
+    if (typeof driver.decrement === 'function') {
+        return driver.decrement(prefixedKey, amount);
+    }
+    const current = Number((await driver.get(prefixedKey)) ?? 0);
+    const next = current - amount;
+    await driver.set(prefixedKey, next);
+    return next;
+};
 /**
  * Get the underlying driver instance
  */
 const getDriver = () => {
     return getDriverInstance();
 };
+// Store factories expose a compact per-store facade with traced operations.
+// eslint-disable-next-line max-lines-per-function
 const store = (name) => {
     const getFromStore = async (key) => {
         const prefixedKey = autoPrefixKey(key);
@@ -169,6 +193,28 @@ const store = (name) => {
         SystemTraceBridge.emitCache('has', prefixedKey, Date.now() - startedAt, exists, undefined, String(name ?? DEFAULT_STORE_NAME));
         return exists;
     };
+    const incrementInStore = async (key, amount = 1) => {
+        const prefixedKey = autoPrefixKey(key);
+        const driver = getDriverInstance(name);
+        if (typeof driver.increment === 'function') {
+            return driver.increment(prefixedKey, amount);
+        }
+        const current = Number((await driver.get(prefixedKey)) ?? 0);
+        const next = current + amount;
+        await driver.set(prefixedKey, next);
+        return next;
+    };
+    const decrementInStore = async (key, amount = 1) => {
+        const prefixedKey = autoPrefixKey(key);
+        const driver = getDriverInstance(name);
+        if (typeof driver.decrement === 'function') {
+            return driver.decrement(prefixedKey, amount);
+        }
+        const current = Number((await driver.get(prefixedKey)) ?? 0);
+        const next = current - amount;
+        await driver.set(prefixedKey, next);
+        return next;
+    };
     const getStoreDriver = () => {
         return getDriverInstance(name);
     };
@@ -178,6 +224,8 @@ const store = (name) => {
         delete: delFromStore,
         clear: clearStore,
         has: hasInStore,
+        increment: incrementInStore,
+        decrement: decrementInStore,
         getDriver: getStoreDriver,
     });
 };
@@ -198,6 +246,8 @@ export const Cache = Object.freeze({
     delete: del,
     clear,
     has,
+    increment,
+    decrement,
     getDriver,
     getRedisClient,
     store,

package/src/cache/CacheDriver.d.ts

@@ -23,6 +23,14 @@ export interface CacheDriver {
      * Check if an item exists in the cache
      */
     has(key: string): Promise<boolean>;
+    /**
+     * Atomically increment a numeric cache value when the driver supports it.
+     */
+    increment?(key: string, amount?: number): Promise<number>;
+    /**
+     * Atomically decrement a numeric cache value when the driver supports it.
+     */
+    decrement?(key: string, amount?: number): Promise<number>;
     /**
      * Dispose of resources (optional cleanup method)
      */

package/src/cache/CacheDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CacheDriver.d.ts","sourceRoot":"","sources":["../../../src/cache/CacheDriver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAEvC;;OAEG;IACH,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3D;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnC;;OAEG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB;;OAEG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEnC;;OAEG;IACH,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B;;;OAGG;IACH,cAAc,CAAC,IAAI,OAAO,CAAC;CAC5B;AAGD,eAAO,MAAM,sBAAsB,gBAAgB,CAAC"}
+{"version":3,"file":"CacheDriver.d.ts","sourceRoot":"","sources":["../../../src/cache/CacheDriver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAEvC;;OAEG;IACH,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3D;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnC;;OAEG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB;;OAEG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEnC;;OAEG;IACH,SAAS,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE1D;;OAEG;IACH,SAAS,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE1D;;OAEG;IACH,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B;;;OAGG;IACH,cAAc,CAAC,IAAI,OAAO,CAAC;CAC5B;AAGD,eAAO,MAAM,sBAAsB,gBAAgB,CAAC"}

package/src/cache/drivers/RedisDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RedisDriver.d.ts","sourceRoot":"","sources":["../../../../src/cache/drivers/RedisDriver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AA6XtD;;GAEG;AACH,eAAO,MAAM,WAAW;kBAXL,WAAW;EAa5B,CAAC"}
+{"version":3,"file":"RedisDriver.d.ts","sourceRoot":"","sources":["../../../../src/cache/drivers/RedisDriver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AA+btD;;GAEG;AACH,eAAO,MAAM,WAAW;kBAbL,WAAW;EAe5B,CAAC"}

package/src/cache/drivers/RedisDriver.js

@@ -38,7 +38,7 @@ const createIoredisClient = (params) => {
             port: Env.REDIS_PORT,
             password: Env.get('REDIS_PASSWORD', ''),
             db,
-        }, 3, { subsystem: 'cache', requireDirectForScripts: false });
+        }, 3, { subsystem: 'cache' });
         return client !== null && typeof client.get === 'function' ? client : null;
     }
     catch (error) {
@@ -53,6 +53,8 @@ const createIoredisClient = (params) => {
         return null;
     }
 };
+// Redis driver objects keep each cache operation together for parity across transports.
+// eslint-disable-next-line max-lines-per-function
 const createCacheDriverFromIoredisClient = (client) => ({
     async get(key) {
         try {
@@ -109,6 +111,38 @@ const createCacheDriverFromIoredisClient = (client) => ({
             return false;
         }
     },
+    async increment(key, amount = 1) {
+        try {
+            const prefixedKey = RedisKeys.createCacheKey(key);
+            if (typeof client.incrby === 'function') {
+                return await client.incrby(prefixedKey, amount);
+            }
+            const current = Number((await client.get(prefixedKey)) ?? 0);
+            const next = current + amount;
+            await client.set(prefixedKey, String(next));
+            return next;
+        }
+        catch (error) {
+            Logger.error('Redis INCRBY failed', error);
+            return 0;
+        }
+    },
+    async decrement(key, amount = 1) {
+        try {
+            const prefixedKey = RedisKeys.createCacheKey(key);
+            if (typeof client.decrby === 'function') {
+                return await client.decrby(prefixedKey, amount);
+            }
+            const current = Number((await client.get(prefixedKey)) ?? 0);
+            const next = current - amount;
+            await client.set(prefixedKey, String(next));
+            return next;
+        }
+        catch (error) {
+            Logger.error('Redis DECRBY failed', error);
+            return 0;
+        }
+    },
     getRedisClient() {
         return client;
     },
@@ -227,6 +261,8 @@ const createTcpSendCommand = (params) => {
         });
     };
 };
+// TCP fallback mirrors the same Redis cache method table without an external client.
+// eslint-disable-next-line max-lines-per-function
 const createTcpCacheDriver = () => {
     const host = Env.REDIS_HOST;
     const port = Env.REDIS_PORT;
@@ -291,6 +327,30 @@ const createTcpCacheDriver = () => {
                 return false;
             }
         },
+        async increment(key, amount = 1) {
+            try {
+                const prefixedKey = RedisKeys.createCacheKey(key);
+                const response = await sendCommand(`INCRBY ${prefixedKey} ${amount}\r\n`);
+                const value = Number.parseInt(response.replace(':', '').trim(), 10);
+                return Number.isFinite(value) ? value : 0;
+            }
+            catch (error) {
+                Logger.error('Redis INCRBY failed', error);
+                return 0;
+            }
+        },
+        async decrement(key, amount = 1) {
+            try {
+                const prefixedKey = RedisKeys.createCacheKey(key);
+                const response = await sendCommand(`DECRBY ${prefixedKey} ${amount}\r\n`);
+                const value = Number.parseInt(response.replace(':', '').trim(), 10);
+                return Number.isFinite(value) ? value : 0;
+            }
+            catch (error) {
+                Logger.error('Redis DECRBY failed', error);
+                return 0;
+            }
+        },
         getRedisClient() {
             throw ErrorFactory.createConfigError('getRedisClient() is only supported with ioredis driver, not TCP socket driver');
         },
@@ -301,7 +361,9 @@ const createTcpCacheDriver = () => {
  */
 const create = () => {
     const isWorkersRuntime = Cloudflare.getWorkersEnv() !== null;
-    const wantsProxy = Env.USE_REDIS_PROXY === true || (Env.get('REDIS_PROXY_URL', '') || '').trim() !== '';
+    const wantsProxy = Env.USE_REDIS_PROXY === true &&
+        ((Env.get('REDIS_PROXY_URL', '') || '').trim() !== '' ||
+            (Env.get('REDIS_RPC_URL', '') || '').trim() !== '');
     const ioredisDriver = createIoredisCacheDriver({ isWorkersRuntime, wantsProxy });
     return ioredisDriver ?? createTcpCacheDriver();
 };

package/src/cli/CLI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CLI.d.ts","sourceRoot":"","sources":["../../../src/cli/CLI.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA2EH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,MAAM,WAAW,IAAI;IACnB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,UAAU,IAAI,OAAO,CAAC;CACvB;AAsQD;;;;;;;GAOG;AACH,eAAO,MAAM,GAAG;cACJ,IAAI;EAed,CAAC"}
+{"version":3,"file":"CLI.d.ts","sourceRoot":"","sources":["../../../src/cli/CLI.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA4EH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,MAAM,WAAW,IAAI;IACnB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,UAAU,IAAI,OAAO,CAAC;CACvB;AAuQD;;;;;;;GAOG;AACH,eAAO,MAAM,GAAG;cACJ,IAAI;EAed,CAAC"}

package/src/cli/CLI.js

@@ -50,6 +50,7 @@ import { QACommand } from './commands/QACommand.js';
 import { QueueCommand } from './commands/QueueCommand.js';
 import { QueueRecoveryCommand } from './commands/QueueRecoveryCommand.js';
 import { RedisProxyCommand } from './commands/RedisProxyCommand.js';
+import { RedisRpcCommand } from './commands/RedisRpcCommand.js';
 import { ResourceControlCommand } from './commands/ResourceControlCommand.js';
 import { RoutesCommand } from './commands/RoutesCommand.js';
 import { ScheduleListCommand } from './commands/ScheduleListCommand.js';
@@ -143,6 +144,7 @@ const buildCommandRegistry = () => {
         MongoDBProxyCommand.create(),
         SqlServerProxyCommand.create(),
         RedisProxyCommand.create(),
+        RedisRpcCommand.create(),
         SmtpProxyCommand.create(),
         ...OptionalCliCommandRegistry.list(),
     ];

package/src/cli/commands/DoctorArchitectureCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DoctorArchitectureCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/DoctorArchitectureCommand.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIlE,eAAO,MAAM,yBAAyB;cAC1B,YAAY;EAgEtB,CAAC"}
+{"version":3,"file":"DoctorArchitectureCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/DoctorArchitectureCommand.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIlE,eAAO,MAAM,yBAAyB;cAC1B,YAAY;EAkEtB,CAAC"}

package/src/cli/commands/DoctorArchitectureCommand.js

@@ -33,10 +33,12 @@ export const DoctorArchitectureCommand = Object.freeze({
                 }
                 // Rule 3: Proxy requirement for Cloudflare
                 if (mode === 'cloudflare-workers') {
-                    const useProxy = Env.getBool('USE_REDIS_PROXY', false) ||
+                    const useProxy = (Env.getBool('USE_REDIS_PROXY', false) &&
+                        (Env.get('REDIS_RPC_URL', '').trim() !== '' ||
+                            Env.get('REDIS_PROXY_URL', '').trim() !== '')) ||
                         Env.getBool('ENABLE_CLOUDFLARE_SOCKETS', false);
                     if (!useProxy) {
-                        issues.push('❌ CRITICAL: Cloudflare runtime requires USE_REDIS_PROXY=true or ENABLE_CLOUDFLARE_SOCKETS=true for Queue producers.');
+                        issues.push('❌ CRITICAL: Cloudflare runtime requires USE_REDIS_PROXY=true with REDIS_RPC_URL/REDIS_PROXY_URL, or ENABLE_CLOUDFLARE_SOCKETS=true for Queue producers.');
                     }
                 }
                 if (issues.length > 0) {

package/src/cli/commands/RedisRpcCommand.d.ts

@@ -0,0 +1,6 @@
+import type { IBaseCommand } from '../BaseCommand';
+export declare const RedisRpcCommand: Readonly<{
+    create(): IBaseCommand;
+}>;
+export default RedisRpcCommand;
+//# sourceMappingURL=RedisRpcCommand.d.ts.map

package/src/cli/commands/RedisRpcCommand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RedisRpcCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/RedisRpcCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAwHrE,eAAO,MAAM,eAAe;cAChB,YAAY;EAgCtB,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/src/cli/commands/RedisRpcCommand.js

@@ -0,0 +1,96 @@
+import { BaseCommand } from '../BaseCommand.js';
+import { ensureProxyEnvLoadedForCwd, maybeRunProxyWatchMode, parseIntOption, trimOption, } from '../commands/ProxyCommandUtils.js';
+import { Env } from '../../config/env.js';
+import { Logger } from '../../config/logger.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+const REDIS_RPC_SERVER_PACKAGE = '@zintrust/redis-rpc/server';
+const addOptions = (command) => {
+    ensureProxyEnvLoadedForCwd();
+    command.option('--host <host>', 'Host to bind', Env.get('REDIS_RPC_HOST', '127.0.0.1'));
+    command.option('--port <port>', 'Port to bind', String(Env.getInt('REDIS_RPC_PORT', 8794)));
+    command.option('--secret <secret>', 'Shared RPC secret', Env.get('REDIS_RPC_SECRET', ''));
+    command.option('--prefix <prefix>', 'BullMQ key prefix', Env.get('REDIS_RPC_BULLMQ_PREFIX', ''));
+    command.option('--watch', 'Auto-restart Redis RPC server on file changes');
+    command.option('--redis-host <host>', 'Redis host');
+    command.option('--redis-port <port>', 'Redis port');
+    command.option('--redis-password <password>', 'Redis password');
+    command.option('--redis-db <db>', 'Redis database');
+};
+const resolveRedisOptions = (options) => {
+    const redisHost = trimOption(options.redisHost);
+    const redisPort = parseIntOption(options.redisPort, 'redis-port', 'non-negative');
+    const redisPassword = options.redisPassword;
+    const redisDb = parseIntOption(options.redisDb, 'redis-db', 'non-negative');
+    if (redisHost === undefined &&
+        redisPort === undefined &&
+        redisPassword === undefined &&
+        redisDb === undefined) {
+        return undefined;
+    }
+    const password = redisPassword ?? Env.get('REDIS_RPC_REDIS_PASSWORD', Env.get('REDIS_PASSWORD', ''));
+    return {
+        host: redisHost ?? Env.get('REDIS_RPC_REDIS_HOST', Env.get('REDIS_HOST', '127.0.0.1')),
+        port: redisPort ?? Env.getInt('REDIS_RPC_REDIS_PORT', Env.getInt('REDIS_PORT', 6379)),
+        password: password || undefined,
+        db: redisDb ?? Env.getInt('REDIS_RPC_REDIS_DB', Env.getInt('REDIS_QUEUE_DB', Env.REDIS_DB)),
+        maxRetriesPerRequest: null,
+    };
+};
+const loadRedisRpcServer = async () => {
+    try {
+        return (await import(REDIS_RPC_SERVER_PACKAGE));
+    }
+    catch (error) {
+        throw ErrorFactory.createCliError('Install @zintrust/redis-rpc to use `zin redis-rpc` or `zin s redis-rpc`.', error);
+    }
+};
+const setDefinedOption = (target, key, value) => {
+    if (value === undefined)
+        return;
+    target[key] = value;
+};
+const waitForShutdown = async (created) => {
+    await new Promise((resolve) => {
+        const shutdown = async () => {
+            process.off('SIGINT', onSignal);
+            process.off('SIGTERM', onSignal);
+            await created.backend.close();
+            created.server.close(resolve);
+        };
+        const onSignal = () => {
+            void shutdown();
+        };
+        process.on('SIGINT', onSignal);
+        process.on('SIGTERM', onSignal);
+    });
+    process.exit(0);
+};
+export const RedisRpcCommand = Object.freeze({
+    create() {
+        return BaseCommand.create({
+            name: 'redis-rpc',
+            aliases: ['rpc:redis'],
+            description: 'Start the Redis RPC server for queue, worker, monitor, and Redis operations',
+            addOptions,
+            execute: async (options) => {
+                await maybeRunProxyWatchMode(options.watch);
+                const mod = await loadRedisRpcServer();
+                const host = trimOption(options.host);
+                const port = parseIntOption(options.port, 'port');
+                const secret = trimOption(options.secret);
+                const prefix = trimOption(options.prefix);
+                const redis = resolveRedisOptions(options);
+                const serverOptions = {};
+                setDefinedOption(serverOptions, 'host', host);
+                setDefinedOption(serverOptions, 'port', port);
+                setDefinedOption(serverOptions, 'secret', secret);
+                setDefinedOption(serverOptions, 'prefix', prefix);
+                setDefinedOption(serverOptions, 'redis', redis);
+                const created = await mod.listenRedisRpcServer(serverOptions);
+                Logger.info(`Redis RPC server listening on http://${created.settings.host}:${created.settings.port}`);
+                await waitForShutdown(created);
+            },
+        });
+    },
+});
+export default RedisRpcCommand;

package/src/cli/commands/index.d.ts

@@ -20,6 +20,7 @@ export { NotificationWorkCommand } from '../commands/NotificationWorkCommand';
 export { PrepareCommand } from '../commands/PrepareCommand';
 export { QueueCommand } from '../commands/QueueCommand';
 export { QueueRecoveryCommand } from '../commands/QueueRecoveryCommand';
+export { RedisRpcCommand } from '../commands/RedisRpcCommand';
 export { ResourceControlCommand } from '../commands/ResourceControlCommand';
 export { RoutesCommand } from '../commands/RoutesCommand';
 export { SecretsCommand } from '../commands/SecretsCommand';

package/src/cli/commands/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,sBAAsB,GACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,+BAA+B,EAAE,MAAM,+CAA+C,CAAC;AAChG,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,sBAAsB,GACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,+BAA+B,EAAE,MAAM,+CAA+C,CAAC;AAChG,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC"}

package/src/cli/commands/index.js

@@ -20,6 +20,7 @@ export { NotificationWorkCommand } from '../commands/NotificationWorkCommand.js'
 export { PrepareCommand } from '../commands/PrepareCommand.js';
 export { QueueCommand } from '../commands/QueueCommand.js';
 export { QueueRecoveryCommand } from '../commands/QueueRecoveryCommand.js';
+export { RedisRpcCommand } from '../commands/RedisRpcCommand.js';
 export { ResourceControlCommand } from '../commands/ResourceControlCommand.js';
 export { RoutesCommand } from '../commands/RoutesCommand.js';
 export { SecretsCommand } from '../commands/SecretsCommand.js';

package/src/cli/scaffolding/env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/env.ts"],"names":[],"mappings":"AA2iBA,eAAO,MAAM,OAAO,GAClB,MAAM,MAAM,EACZ,MAAM,MAAM,EACZ,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,oBAAoB,MAAM,EAC1B,SAAS,MAAM,EAAE,EACjB,cAAc,MAAM,KACnB,MAAM,EAWR,CAAC"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/env.ts"],"names":[],"mappings":"AAojBA,eAAO,MAAM,OAAO,GAClB,MAAM,MAAM,EACZ,MAAM,MAAM,EACZ,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,oBAAoB,MAAM,EAC1B,SAAS,MAAM,EAAE,EACjB,cAAc,MAAM,KACnB,MAAM,EAWR,CAAC"}

package/src/cli/scaffolding/env.js

@@ -201,6 +201,7 @@ const DatabaseAndCloudflare = (databaseNormalized, dbLines, sqliteDbPath) => [
     'CLOUDFLARE_KV_NAMESPACE_ID=',
     '',
 ];
+// eslint-disable-next-line max-lines-per-function
 const HttpProxies = () => [
     '# ============================================================================',
     '# HTTP PROXIES (for Workers compatibility)',
@@ -243,6 +244,14 @@ const HttpProxies = () => [
     'REDIS_PROXY_TIMEOUT_MS=30000',
     'REDIS_PROXY_REQUIRE_SIGNING=true',
     'REDIS_PROXY_SIGNING_WINDOW_MS=60000',
+    '# Redis RPC is selected only when USE_REDIS_PROXY=true and REDIS_RPC_URL is non-empty.',
+    'REDIS_RPC_URL=',
+    'REDIS_RPC_HOST=127.0.0.1',
+    'REDIS_RPC_PORT=8794',
+    'REDIS_RPC_SECRET=',
+    'REDIS_RPC_TIMEOUT_MS=30000',
+    'REDIS_RPC_RETRY_MAX=2',
+    'REDIS_RPC_RETRY_DELAY_MS=500',
     '',
     'USE_SMTP_PROXY=false',
     'SMTP_PROXY_URL=',

package/src/cli/services/WorkerStartupDiagnostics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerStartupDiagnostics.d.ts","sourceRoot":"","sources":["../../../../src/cli/services/WorkerStartupDiagnostics.ts"],"names":[],"mappings":"AAMA,KAAK,aAAa,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AAE/C,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACxC,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAChC,CAAC,CAAC;AAEH,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAAC;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,MAAM,8BAA8B,GAAG,QAAQ,CAAC;IACpD,KAAK,EAAE,QAAQ,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,EAAE,OAAO,CAAC;QACvB,eAAe,EAAE,OAAO,CAAC;QACzB,YAAY,EAAE,OAAO,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC,CAAC;IACH,MAAM,EAAE,aAAa,CAAC,kBAAkB,CAAC,CAAC;IAC1C,cAAc,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACtC,SAAS,EAAE,aAAa,CAAC,sBAAsB,CAAC,CAAC;IACjD,UAAU,EAAE,QAAQ,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC,GAAG,IAAI,CAAC;IACV,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACnC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAClC,CAAC,CAAC;AA4bH,eAAO,MAAM,wBAAwB;sBAxFZ,OAAO,KAAG,8BAA8B;0BAwCpC,8BAA8B,KAAG,MAAM,EAAE;kBA0BjD,OAAO,uBAA+B,8BAA8B;gCAmBtD,8BAA8B,KAAG,OAAO;4BAQjD,MAAM,GAAG,KAAK;EAGtC,CAAC"}
+{"version":3,"file":"WorkerStartupDiagnostics.d.ts","sourceRoot":"","sources":["../../../../src/cli/services/WorkerStartupDiagnostics.ts"],"names":[],"mappings":"AAMA,KAAK,aAAa,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AAE/C,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACxC,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAChC,CAAC,CAAC;AAEH,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAAC;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,MAAM,8BAA8B,GAAG,QAAQ,CAAC;IACpD,KAAK,EAAE,QAAQ,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,EAAE,OAAO,CAAC;QACvB,eAAe,EAAE,OAAO,CAAC;QACzB,YAAY,EAAE,OAAO,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC,CAAC;IACH,MAAM,EAAE,aAAa,CAAC,kBAAkB,CAAC,CAAC;IAC1C,cAAc,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACtC,SAAS,EAAE,aAAa,CAAC,sBAAsB,CAAC,CAAC;IACjD,UAAU,EAAE,QAAQ,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC,GAAG,IAAI,CAAC;IACV,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACnC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAClC,CAAC,CAAC;AA8bH,eAAO,MAAM,wBAAwB;sBAxFZ,OAAO,KAAG,8BAA8B;0BAwCpC,8BAA8B,KAAG,MAAM,EAAE;kBA0BjD,OAAO,uBAA+B,8BAA8B;gCAmBtD,8BAA8B,KAAG,OAAO;4BAQjD,MAAM,GAAG,KAAK;EAGtC,CAAC"}

package/src/cli/services/WorkerStartupDiagnostics.js

@@ -141,10 +141,12 @@ const getQueueDriverEnvKeys = (snapshot, queueDriver) => {
     if (queueDriver === 'rabbitmq') {
         return ['RABBITMQ_HOST', 'RABBITMQ_PORT', 'RABBITMQ_USER', 'RABBITMQ_PASSWORD'];
     }
-    const usesRedisProxy = Env.getBool('USE_REDIS_PROXY', false) ||
-        isNonEmptyString(getExplicitEnv(snapshot, 'REDIS_PROXY_URL'));
+    const usesRedisProxy = Env.getBool('USE_REDIS_PROXY', false) &&
+        (isNonEmptyString(getExplicitEnv(snapshot, 'REDIS_RPC_URL')) ||
+            isNonEmptyString(getExplicitEnv(snapshot, 'REDIS_PROXY_URL')));
     if (queueDriver === 'redis' && usesRedisProxy) {
         return [
+            'REDIS_RPC_URL',
             'REDIS_PROXY_URL',
             'REDIS_PROXY_HOST',
             'REDIS_PROXY_SECRET',

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

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/config/app.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAe,SAAS,EAAE,MAAM,cAAc,CAAC;AAgJ3D,QAAA,MAAM,UAAU,QAAO,MAAM,CAAC,UAA2B,CAAC;AAmH1D,eAAO,MAAM,SAAS;IAnGpB;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;kCACc,OAAO;IAIxB;;OAEG;iCACa,OAAO;IAIvB;;OAEG;8BACU,OAAO;IAIpB;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;;;;OAKG;;+BAtGkB,MAAM,CAAC,UAAU;kCAhDd,MAAM;EAmKoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/config/app.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAe,SAAS,EAAE,MAAM,cAAc,CAAC;AAmJ3D,QAAA,MAAM,UAAU,QAAO,MAAM,CAAC,UAA2B,CAAC;AAmH1D,eAAO,MAAM,SAAS;IAnGpB;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;kCACc,OAAO;IAIxB;;OAEG;iCACa,OAAO;IAIvB;;OAEG;8BACU,OAAO;IAIpB;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;;;;OAKG;;+BAtGkB,MAAM,CAAC,UAAU;kCAhDd,MAAM;EAmKoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC"}

package/src/config/app.js

@@ -29,6 +29,9 @@ const readEnvBool = (key, defaultValue = false) => {
     if (typeof anyEnv.getBool === 'function') {
         return anyEnv.getBool(key, defaultValue);
     }
+    const directValue = Env[key];
+    if (typeof directValue === 'boolean')
+        return directValue;
     const raw = readEnvString(key, '');
     if (raw === '')
         return defaultValue;

package/src/config/env.d.ts

@@ -105,6 +105,13 @@ export declare const Env: Readonly<{
     REDIS_PROXY_TIMEOUT_MS: number;
     REDIS_PROXY_REQUIRE_SIGNING: boolean;
     REDIS_PROXY_SIGNING_WINDOW_MS: number;
+    REDIS_RPC_URL: string;
+    REDIS_RPC_HOST: string;
+    REDIS_RPC_PORT: number;
+    REDIS_RPC_SECRET: string;
+    REDIS_RPC_TIMEOUT_MS: number;
+    REDIS_RPC_RETRY_MAX: number;
+    REDIS_RPC_RETRY_DELAY_MS: number;
     REDIS_REQUIRE_DIRECT_FOR_SCRIPTS: boolean;
     USE_REDIS_PROXY: boolean;
     SMTP_PROXY_URL: string;

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

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../src/config/env.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../src/config/env.ts"],"names":[],"mappings":"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"}

package/src/config/env.js

@@ -345,6 +345,13 @@ export const Env = Object.freeze({
     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)),
+    REDIS_RPC_URL: get('REDIS_RPC_URL', ''),
+    REDIS_RPC_HOST: get('REDIS_RPC_HOST', '127.0.0.1'),
+    REDIS_RPC_PORT: getInt('REDIS_RPC_PORT', 8794),
+    REDIS_RPC_SECRET: get('REDIS_RPC_SECRET', PROXY_SECRET_FALLBACK),
+    REDIS_RPC_TIMEOUT_MS: getInt('REDIS_RPC_TIMEOUT_MS', ZT_PROXY_TIMEOUT_MS),
+    REDIS_RPC_RETRY_MAX: getInt('REDIS_RPC_RETRY_MAX', 2),
+    REDIS_RPC_RETRY_DELAY_MS: getInt('REDIS_RPC_RETRY_DELAY_MS', 500),
     REDIS_REQUIRE_DIRECT_FOR_SCRIPTS: getBool('REDIS_REQUIRE_DIRECT_FOR_SCRIPTS', true),
     USE_REDIS_PROXY: getBool('USE_REDIS_PROXY', false),
     SMTP_PROXY_URL: get('SMTP_PROXY_URL', ''),

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;AASH,OAAO,KAAK,EACV,sBAAsB,EACtB,eAAe,EACf,kBAAkB,EAInB,MAAM,cAAc,CAAC;AAyCtB,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;QAC1B,kBAAkB,EAAE,MAAM,CAAC;KAC5B,CAAC;CACH,CAAC,CAAC;AAmKH;;GAEG;AACH,eAAO,MAAM,iBAAiB,QAAO,kBAgBnC,CAAC;AAkDH,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;QAC1B,kBAAkB,EAAE,MAAM,CAAC;KAC5B,CAAC;CAuEH,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAkB/D,eAAO,MAAM,WAAW,EAAE,WAYxB,CAAC"}
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../src/config/queue.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,KAAK,EACV,sBAAsB,EACtB,eAAe,EACf,kBAAkB,EAInB,MAAM,cAAc,CAAC;AAyCtB,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;QAC1B,kBAAkB,EAAE,MAAM,CAAC;KAC5B,CAAC;CACH,CAAC,CAAC;AAiHH;;GAEG;AACH,eAAO,MAAM,iBAAiB,QAAO,kBAgBnC,CAAC;AAkDH,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;QAC1B,kBAAkB,EAAE,MAAM,CAAC;KAC5B,CAAC;CAuEH,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAkB/D,eAAO,MAAM,WAAW,EAAE,WAYxB,CAAC"}