@zintrust/core 0.4.77 → 0.4.79

package/package.json

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

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

@@ -15,11 +15,13 @@ type EnsureWranglerConfigOptions<TValues, TOptions> = {
 type EnsureWranglerConfigResult<TValues> = {
     createdFile: boolean;
     insertedEnv: boolean;
+    content: string;
     values: TValues;
 };
 export declare const trimNonEmptyOption: (value: string | undefined) => string | undefined;
 export declare const resolveConfigPath: (raw: string | undefined, fallback?: string) => string;
 export declare const findQuotedValue: (content: string, key: string) => string | undefined;
+export declare const renderProxyWranglerDevConfig: (content: string, envName: string) => string | undefined;
 export declare const injectEnvBlock: (content: string, envName: string, block: string) => string;
 export declare const renderDefaultWranglerConfig: (envBlock: string, compatibilityDate: string) => string;
 export declare const ensureProxyEntrypoint: (options: EnsureProxyEntrypointOptions) => {

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

@@ -1 +1 @@
-{"version":3,"file":"ProxyScaffoldUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ProxyScaffoldUtils.ts"],"names":[],"mappings":"AAKA,KAAK,4BAA4B,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,KAAK,2BAA2B,CAAC,OAAO,EAAE,QAAQ,IAAI;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,QAAQ,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC3E,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5C,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,KAAK,0BAA0B,CAAC,OAAO,IAAI;IACzC,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAIvE,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,KAAK,MAAM,GAAG,SAAS,EAAE,iBAA2B,KAAG,MAExF,CAAC;AAmBF,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,EAAE,KAAK,MAAM,KAAG,MAAM,GAAG,SAQvE,CAAC;AAmBF,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,OAAO,MAAM,KAAG,MAuBhF,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,mBAAmB,MAAM,KACxB,MAaF,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,SAAS,4BAA4B,KACpC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAmB3C,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,OAAO,EAAE,QAAQ,EACpD,SAAS,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,KACtD,0BAA0B,CAAC,OAAO,CAqBpC,CAAC"}
+{"version":3,"file":"ProxyScaffoldUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ProxyScaffoldUtils.ts"],"names":[],"mappings":"AAKA,KAAK,4BAA4B,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,KAAK,2BAA2B,CAAC,OAAO,EAAE,QAAQ,IAAI;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,QAAQ,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC3E,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5C,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,KAAK,0BAA0B,CAAC,OAAO,IAAI;IACzC,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAIvE,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,KAAK,MAAM,GAAG,SAAS,EAAE,iBAA2B,KAAG,MAExF,CAAC;AAmBF,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,EAAE,KAAK,MAAM,KAAG,MAAM,GAAG,SAQvE,CAAC;AAwKF,eAAO,MAAM,4BAA4B,GACvC,SAAS,MAAM,EACf,SAAS,MAAM,KACd,MAAM,GAAG,SAgBX,CAAC;AAQF,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,OAAO,MAAM,KAAG,MAuBhF,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,mBAAmB,MAAM,KACxB,MAaF,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,SAAS,4BAA4B,KACpC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAmB3C,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,OAAO,EAAE,QAAQ,EACpD,SAAS,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,KACtD,0BAA0B,CAAC,OAAO,CAqBpC,CAAC"}

package/src/cli/commands/ProxyScaffoldUtils.js

@@ -47,6 +47,148 @@ const findEnvObjectStart = (content) => {
         return -1;
     return valueStart;
 };
+const createJsonScanState = () => ({
+    inString: false,
+    isEscaped: false,
+    inLineComment: false,
+    inBlockComment: false,
+});
+const advanceWithinLineComment = (state, current) => {
+    if (!state.inLineComment)
+        return 0;
+    if (current === '\n')
+        state.inLineComment = false;
+    return 1;
+};
+const advanceWithinBlockComment = (state, current, next) => {
+    if (!state.inBlockComment)
+        return 0;
+    if (current === '*' && next === '/') {
+        state.inBlockComment = false;
+        return 2;
+    }
+    return 1;
+};
+const advanceWithinString = (state, current) => {
+    if (!state.inString)
+        return 0;
+    if (state.isEscaped) {
+        state.isEscaped = false;
+    }
+    else if (current === '\\') {
+        state.isEscaped = true;
+    }
+    else if (current === '"') {
+        state.inString = false;
+    }
+    return 1;
+};
+const startJsonScanContext = (state, current, next) => {
+    if (current === '/' && next === '/') {
+        state.inLineComment = true;
+        return 2;
+    }
+    if (current === '/' && next === '*') {
+        state.inBlockComment = true;
+        return 2;
+    }
+    if (current === '"') {
+        state.inString = true;
+        return 1;
+    }
+    return 0;
+};
+const advanceJsonScanState = (state, current, next) => {
+    return (advanceWithinLineComment(state, current) ||
+        advanceWithinBlockComment(state, current, next) ||
+        advanceWithinString(state, current) ||
+        startJsonScanContext(state, current, next));
+};
+const rewriteRelativeWranglerPaths = (content) => {
+    return content.replaceAll('": "./', '": "../../');
+};
+const findQuotedKeyFrom = (content, key, startIndex) => {
+    let cursor = Math.max(0, startIndex);
+    const state = createJsonScanState();
+    const candidate = `"${key}"`;
+    while (cursor < content.length) {
+        const current = content[cursor];
+        const next = content[cursor + 1];
+        if (!state.inString && !state.inLineComment && !state.inBlockComment) {
+            if (content.startsWith(candidate, cursor))
+                return cursor;
+        }
+        const advanced = advanceJsonScanState(state, current, next);
+        cursor += advanced > 0 ? advanced : 1;
+    }
+    return -1;
+};
+const findJsonKeyValueStartFrom = (content, key, startIndex) => {
+    const keyPosition = findQuotedKeyFrom(content, key, startIndex);
+    if (keyPosition < 0)
+        return -1;
+    let cursor = keyPosition + key.length + 2;
+    while (isJsonWhitespace(content[cursor]))
+        cursor += 1;
+    if (content[cursor] !== ':')
+        return -1;
+    cursor += 1;
+    while (isJsonWhitespace(content[cursor]))
+        cursor += 1;
+    return cursor;
+};
+const findMatchingObjectBrace = (content, objectStart) => {
+    let depth = 0;
+    const state = createJsonScanState();
+    for (let index = objectStart; index < content.length; index += 1) {
+        const current = content[index];
+        const next = content[index + 1];
+        if (!state.inString && !state.inLineComment && !state.inBlockComment) {
+            if (current === '{') {
+                depth += 1;
+            }
+            else if (current === '}') {
+                depth -= 1;
+                if (depth === 0)
+                    return index;
+            }
+        }
+        const advanced = advanceJsonScanState(state, current, next);
+        if (advanced > 1)
+            index += advanced - 1;
+    }
+    return -1;
+};
+const extractObjectBlock = (content, key, startIndex = 0) => {
+    const valueStart = findJsonKeyValueStartFrom(content, key, startIndex);
+    if (valueStart < 0 || content[valueStart] !== '{')
+        return undefined;
+    const valueEnd = findMatchingObjectBrace(content, valueStart);
+    if (valueEnd < 0)
+        return undefined;
+    return content.slice(valueStart, valueEnd + 1);
+};
+const indentBlock = (content, spaces) => {
+    const prefix = ' '.repeat(spaces);
+    return content
+        .split('\n')
+        .map((line) => (line.trim().length === 0 ? line : `${prefix}${line}`))
+        .join('\n');
+};
+export const renderProxyWranglerDevConfig = (content, envName) => {
+    const envObjectStart = findEnvObjectStart(content);
+    if (envObjectStart < 0)
+        return undefined;
+    const envBlock = extractObjectBlock(content, envName, envObjectStart);
+    if (envBlock === undefined)
+        return undefined;
+    const aliasBlock = extractObjectBlock(content, 'alias');
+    const envBody = envBlock.slice(1, -1).trim();
+    if (envBody.length === 0)
+        return undefined;
+    const aliasLine = aliasBlock === undefined ? [] : [`  "alias": ${aliasBlock},`];
+    return rewriteRelativeWranglerPaths(['{', ...aliasLine, indentBlock(envBody, 2), '}', ''].join('\n'));
+};
 const isObjectEffectivelyEmpty = (content, objectStart) => {
     let cursor = objectStart + 1;
     while (isJsonWhitespace(content[cursor]))
@@ -105,15 +247,16 @@ export const ensureProxyEntrypoint = (options) => {
 export const ensureWranglerConfig = (options) => {
     if (!existsSync(options.configPath)) {
         const values = options.resolveValues(undefined, options.options);
-        writeFileSync(options.configPath, renderDefaultWranglerConfig(options.renderEnvBlock(values), options.compatibilityDate), 'utf-8');
-        return { createdFile: true, insertedEnv: true, values };
+        const content = renderDefaultWranglerConfig(options.renderEnvBlock(values), options.compatibilityDate);
+        writeFileSync(options.configPath, content, 'utf-8');
+        return { createdFile: true, insertedEnv: true, content, values };
     }
     const content = readFileSync(options.configPath, 'utf-8');
     const values = options.resolveValues(content, options.options);
     const next = injectEnvBlock(content, options.envName, options.renderEnvBlock(values));
     if (next !== content) {
         writeFileSync(options.configPath, next, 'utf-8');
-        return { createdFile: false, insertedEnv: true, values };
+        return { createdFile: false, insertedEnv: true, content: next, values };
     }
-    return { createdFile: false, insertedEnv: false, values };
+    return { createdFile: false, insertedEnv: false, content, values };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"WranglerProxyCommandUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/WranglerProxyCommandUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAWrE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,2BAA2B,GAAG,cAAc,GAAG;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,+BAA+B,CAAC,OAAO,EAAE,QAAQ,SAAS,2BAA2B,IAAI;IAC5F,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC3E,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5C,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CACjD,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,SAAS,OAAO,EAAE,eAAe,MAAM,KAAG,IAIrF,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,OAAO,EAAE,QAAQ,SAAS,2BAA2B,EAC9F,OAAO,+BAA+B,CAAC,OAAO,EAAE,QAAQ,CAAC,KACxD,YA0DF,CAAC"}
+{"version":3,"file":"WranglerProxyCommandUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/WranglerProxyCommandUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAarE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,2BAA2B,GAAG,cAAc,GAAG;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,+BAA+B,CAAC,OAAO,EAAE,QAAQ,SAAS,2BAA2B,IAAI;IAC5F,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC3E,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5C,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CACjD,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,SAAS,OAAO,EAAE,eAAe,MAAM,KAAG,IAIrF,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,OAAO,EAAE,QAAQ,SAAS,2BAA2B,EAC9F,OAAO,+BAA+B,CAAC,OAAO,EAAE,QAAQ,CAAC,KACxD,YAuEF,CAAC"}

package/src/cli/commands/WranglerProxyCommandUtils.js

@@ -1,8 +1,9 @@
 import { BaseCommand } from '../BaseCommand.js';
 import { maybeRunProxyWatchMode, parseIntOption } from '../commands/ProxyCommandUtils.js';
-import { ensureProxyEntrypoint, ensureWranglerConfig, resolveConfigPath, } from '../commands/ProxyScaffoldUtils.js';
+import { ensureProxyEntrypoint, ensureWranglerConfig, renderProxyWranglerDevConfig, resolveConfigPath, } from '../commands/ProxyScaffoldUtils.js';
 import { SpawnUtil } from '../utils/spawn.js';
 import { Logger } from '../../config/logger.js';
+import { mkdirSync, writeFileSync } from '../../node-singletons/fs.js';
 import { join } from '../../node-singletons/path.js';
 export const addWranglerProxyBaseOptions = (command, defaultConfig) => {
     command.option('-c, --config <path>', 'Wrangler config file', defaultConfig);
@@ -45,7 +46,18 @@ export const createWranglerProxyCommand = (input) => {
                 Logger.info(`Added env.${input.envName} to ${configPath}.`);
             }
             input.afterConfigResolved?.(result.values);
-            const args = ['dev', '--config', configPath, '--env', input.envName];
+            const proxyConfigContent = renderProxyWranglerDevConfig(result.content, input.envName);
+            const proxyConfigDir = join(cwd, '.wrangler', 'tmp');
+            const proxyConfigPath = join(proxyConfigDir, `zin.proxy.${input.envName}.jsonc`);
+            if (proxyConfigContent !== undefined) {
+                mkdirSync(proxyConfigDir, { recursive: true });
+                writeFileSync(proxyConfigPath, proxyConfigContent, 'utf-8');
+            }
+            const args = [
+                'dev',
+                '--config',
+                proxyConfigContent === undefined ? configPath : proxyConfigPath,
+            ];
             if (port !== undefined) {
                 args.push('--port', String(port));
             }

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

@@ -1 +1 @@
-{"version":3,"file":"workers.d.ts","sourceRoot":"","sources":["../../../src/config/workers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAGL,KAAK,qBAAqB,EAC3B,MAAM,8BAA8B,CAAC;AAItC,OAAO,KAAK,EACV,WAAW,EAIX,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAItB,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAiTnC,eAAO,MAAM,qBAAqB,GAChC,QAAQ,WAAW,EACnB,mBAAc,EACd,UAAU,qBAAqB,KAC9B,OA6CF,CAAC;AAEF,eAAO,MAAM,wBAAwB,QAAa,OAAO,CAAC,IAAI,CA4B7D,CAAC;AAgFF,QAAA,MAAM,mBAAmB,QAAO,mBA2D/B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAqBnE,eAAO,MAAM,aAAa,EAAE,aAY1B,CAAC"}
+{"version":3,"file":"workers.d.ts","sourceRoot":"","sources":["../../../src/config/workers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAGL,KAAK,qBAAqB,EAC3B,MAAM,8BAA8B,CAAC;AAItC,OAAO,KAAK,EACV,WAAW,EAIX,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAItB,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAgXnC,eAAO,MAAM,qBAAqB,GAChC,QAAQ,WAAW,EACnB,mBAAc,EACd,UAAU,qBAAqB,KAC9B,OA6CF,CAAC;AAEF,eAAO,MAAM,wBAAwB,QAAa,OAAO,CAAC,IAAI,CAmB7D,CAAC;AAgFF,QAAA,MAAM,mBAAmB,QAAO,mBA2D/B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAqBnE,eAAO,MAAM,aAAa,EAAE,aAY1B,CAAC"}

package/src/config/workers.js

@@ -28,6 +28,56 @@ const unregisterRedisConnection = (client) => {
         registry.cachedConnections.delete(registryKey);
     }
 };
+const awaitRedisQuitWithin = async (client, timeoutMs) => {
+    if (typeof client.quit !== 'function')
+        return true;
+    if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) {
+        await client.quit();
+        return true;
+    }
+    let timeoutId;
+    try {
+        await Promise.race([
+            client.quit(),
+            new Promise((_, reject) => {
+                timeoutId = globalThis.setTimeout(() => {
+                    reject(ErrorFactory.createGeneralError('Redis graceful shutdown timed out', { timeoutMs }));
+                }, timeoutMs);
+            }),
+        ]);
+        return true;
+    }
+    catch {
+        return false;
+    }
+    finally {
+        if (timeoutId !== undefined) {
+            globalThis.clearTimeout(timeoutId);
+        }
+    }
+};
+const forceDisconnectRedisClient = (client, error) => {
+    if (error !== undefined) {
+        Logger.warn('Tracked Redis graceful shutdown failed, forcing disconnect', error);
+    }
+    try {
+        client.disconnect();
+    }
+    catch (disconnectError) {
+        Logger.error('Tracked Redis forced disconnect failed', disconnectError);
+    }
+};
+const shutdownTrackedRedisConnection = async (client, timeoutMs) => {
+    try {
+        const quitCompleted = await awaitRedisQuitWithin(client, timeoutMs);
+        if (!quitCompleted) {
+            forceDisconnectRedisClient(client, ErrorFactory.createGeneralError('Redis graceful shutdown timed out', { timeoutMs }));
+        }
+    }
+    catch (error) {
+        forceDisconnectRedisClient(client, error);
+    }
+};
 const hasReusableRedisStatus = (client) => {
     return client.status !== 'end' && client.status !== 'close';
 };
@@ -263,6 +313,7 @@ export const createRedisConnection = (config, maxRetries = 3, options) => {
 export const shutdownRedisConnections = async () => {
     const registry = getRedisConnectionRegistry();
     const trackedConnections = Array.from(registry.activeConnections);
+    const perConnectionTimeoutMs = 750;
     if (trackedConnections.length === 0)
         return;
     registry.activeConnections.clear();
@@ -271,18 +322,7 @@ export const shutdownRedisConnections = async () => {
         count: trackedConnections.length,
     });
     await Promise.allSettled(trackedConnections.map(async (client) => {
-        try {
-            await client.quit();
-        }
-        catch (error) {
-            Logger.warn('Tracked Redis graceful shutdown failed, forcing disconnect', error);
-            try {
-                client.disconnect();
-            }
-            catch (disconnectError) {
-                Logger.error('Tracked Redis forced disconnect failed', disconnectError);
-            }
-        }
+        await shutdownTrackedRedisConnection(client, perConnectionTimeoutMs);
     }));
 };
 const createIntervalConfig = () => Env.SSE_SNAPSHOT_INTERVAL;

package/src/index.js

@@ -1,11 +1,11 @@
 /**
- * @zintrust/core v0.4.77
+ * @zintrust/core v0.4.79
  *
  * ZinTrust Framework - Production-Grade TypeScript Backend
  * Built for performance, type safety, and exceptional developer experience
  *
  * Build Information:
- *   Built: 2026-04-08T09:22:49.437Z
+ *   Built: 2026-04-08T11:45:55.486Z
  *   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-04-08T09:22:49.403Z'; // Replaced during build
+export const ZINTRUST_BUILD_DATE = '2026-04-08T11:45:55.451Z'; // Replaced during build
 export { Application } from './boot/Application.js';
 export { AwsSigV4 } from './common/index.js';
 export { SignedRequest } from './security/SignedRequest.js';

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

@@ -1 +1 @@
-{"version":3,"file":"ErrorHandlerMiddleware.d.ts","sourceRoot":"","sources":["../../../src/middleware/ErrorHandlerMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAG9D,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,0BAA0B,CAAC;CACxC;AA0BD,eAAO,MAAM,sBAAsB;qBACjB,mBAAmB,GAAQ,UAAU;EA8CrD,CAAC;AAEH,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"ErrorHandlerMiddleware.d.ts","sourceRoot":"","sources":["../../../src/middleware/ErrorHandlerMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAG9D,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,0BAA0B,CAAC;CACxC;AA6CD,eAAO,MAAM,sBAAsB;qBACjB,mBAAmB,GAAQ,UAAU;EA8CrD,CAAC;AAEH,eAAe,sBAAsB,CAAC"}

package/src/middleware/ErrorHandlerMiddleware.js

@@ -5,6 +5,18 @@ import { ErrorResponse } from '../http/ErrorResponse.js';
 import { RequestContext } from '../http/RequestContext.js';
 import { respondWithMiddlewareFailure, } from './MiddlewareFailureResponder.js';
 import { captureTraceException } from '../runtime/plugins/trace-runtime.js';
+const resolveTraceExceptionContext = (req) => {
+    const requestContext = RequestContext.get(req);
+    const context = req.context ?? {};
+    const batchId = requestContext?.traceId ??
+        (typeof context['traceId'] === 'string' ? context['traceId'] : undefined);
+    const path = requestContext?.path ?? (typeof context['path'] === 'string' ? context['path'] : undefined);
+    const userId = requestContext?.userId ??
+        (typeof context['userId'] === 'string' ? context['userId'] : undefined);
+    if (batchId === undefined && path === undefined && userId === undefined)
+        return undefined;
+    return { batchId, path, userId };
+};
 const isWritableEnded = (res) => {
     if (typeof res.getRaw !== 'function')
         return false;
@@ -30,7 +42,7 @@ export const ErrorHandlerMiddleware = Object.freeze({
                 await next();
             }
             catch (error) {
-                captureTraceException(error);
+                captureTraceException(error, resolveTraceExceptionContext(req));
                 Logger.error('Unhandled request error:', error);
                 const requestId = RequestContext.get(req)?.requestId ?? req.context['requestId'];
                 const includeStack = Env.NODE_ENV !== 'production' && !shouldHideStackFromResponse(error);

package/src/orm/migrations/MigrationStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationStore.d.ts","sourceRoot":"","sources":["../../../../src/orm/migrations/MigrationStore.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAI/C,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAoahG,eAAO,MAAM,cAAc;oBACH,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;8BAKzC,SAAS,UACN,cAAc,YACZ,MAAM,GACd,OAAO,CAAC,MAAM,CAAC;sBA4BZ,SAAS,SACN,cAAc,WACZ,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;sBAmDlC,SAAS,UACL;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAC9E,OAAO,CAAC,IAAI,CAAC;mBA2DV,SAAS,UACL;QACN,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,cAAc,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,qBAAqB,CAAC;QAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC3B,GACA,OAAO,CAAC,IAAI,CAAC;kCAmDV,SAAS,UACL;QAAE,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GACnE,OAAO,CAAC,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;8BA6C5C,SAAS,UACL;QAAE,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GACjD,OAAO,CAAC,MAAM,EAAE,CAAC;qBA0Bd,SAAS,UACL;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAC/D,OAAO,CAAC,IAAI,CAAC;EAmBhB,CAAC"}
+{"version":3,"file":"MigrationStore.d.ts","sourceRoot":"","sources":["../../../../src/orm/migrations/MigrationStore.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAI/C,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AA6dhG,eAAO,MAAM,cAAc;oBACH,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;8BAKzC,SAAS,UACN,cAAc,YACZ,MAAM,GACd,OAAO,CAAC,MAAM,CAAC;sBA4BZ,SAAS,SACN,cAAc,WACZ,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;sBAmDlC,SAAS,UACL;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAC9E,OAAO,CAAC,IAAI,CAAC;mBA2DV,SAAS,UACL;QACN,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,cAAc,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,qBAAqB,CAAC;QAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC3B,GACA,OAAO,CAAC,IAAI,CAAC;kCAmDV,SAAS,UACL;QAAE,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GACnE,OAAO,CAAC,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;8BA6C5C,SAAS,UACL;QAAE,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GACjD,OAAO,CAAC,MAAM,EAAE,CAAC;qBA0Bd,SAAS,UACL;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAC/D,OAAO,CAAC,IAAI,CAAC;EAmBhB,CAAC"}

package/src/orm/migrations/MigrationStore.js

@@ -32,7 +32,9 @@ const queryExists = async (db, sql, parameters) => {
 const schemaHasTable = async (db, tableName) => {
     const driver = db.getType();
     if (driver === 'sqlite' || driver === 'd1' || driver === 'd1-remote') {
-        return queryExists(db, "SELECT 1 FROM sqlite_master WHERE type='table' AND name=? LIMIT 1", [tableName]);
+        return queryExists(db, "SELECT 1 FROM sqlite_master WHERE type='table' AND name=? LIMIT 1", [
+            tableName,
+        ]);
     }
     if (driver === 'postgresql') {
         return queryExists(db, "SELECT 1 FROM information_schema.tables WHERE table_schema='public' AND table_name=? LIMIT 1", [tableName]);
@@ -87,41 +89,70 @@ const ensureTrackingTable = async (db) => {
     await ensure();
     clearTableLayoutCache(db);
 };
+const probeTableLayout = async (db) => {
+    const [hasTable, hasName, hasMigration, hasScope, hasService, hasStatus, hasAppliedAt, hasCreatedAt,] = await Promise.all([
+        schemaHasTable(db, 'migrations'),
+        schemaHasColumn(db, 'migrations', 'name'),
+        schemaHasColumn(db, 'migrations', 'migration'),
+        schemaHasColumn(db, 'migrations', 'scope'),
+        schemaHasColumn(db, 'migrations', 'service'),
+        schemaHasColumn(db, 'migrations', 'status'),
+        schemaHasColumn(db, 'migrations', 'applied_at'),
+        schemaHasColumn(db, 'migrations', 'created_at'),
+    ]);
+    return {
+        hasAppliedAt,
+        hasCreatedAt,
+        hasMigration,
+        hasName,
+        hasScope,
+        hasService,
+        hasStatus,
+        hasTable,
+    };
+};
+const ensureProbeTableExists = async (db, probe, allowEnsure) => {
+    if (probe.hasTable || !allowEnsure)
+        return null;
+    await ensureTrackingTable(db);
+    return resolveTableLayout(db, false);
+};
+const assertProbeHasIdentityColumns = (probe) => {
+    if (probe.hasName || probe.hasMigration)
+        return;
+    throw ErrorFactory.createCliError('The migrations table is missing both `name` and `migration` columns. Update the tracking table before running migrations.');
+};
+const toTableLayout = (probe) => {
+    return {
+        hasAppliedAt: probe.hasAppliedAt,
+        hasCreatedAt: probe.hasCreatedAt,
+        hasMigration: probe.hasMigration,
+        hasName: probe.hasName,
+        hasScope: probe.hasScope,
+        hasService: probe.hasService,
+        hasStatus: probe.hasStatus,
+        requiresCompatibilityMode: probe.hasMigration ||
+            !probe.hasName ||
+            !probe.hasScope ||
+            !probe.hasService ||
+            !probe.hasStatus,
+    };
+};
+const loadTableLayout = async (db, allowEnsure) => {
+    if (typeof db.query !== 'function')
+        return DEFAULT_LAYOUT;
+    const probe = await probeTableLayout(db);
+    const ensuredLayout = await ensureProbeTableExists(db, probe, allowEnsure);
+    if (ensuredLayout !== null)
+        return ensuredLayout;
+    assertProbeHasIdentityColumns(probe);
+    return toTableLayout(probe);
+};
 const resolveTableLayout = async (db, allowEnsure = true) => {
     const cached = tableLayoutCache.get(db);
     if (cached !== undefined)
         return cached;
-    const layoutPromise = (async () => {
-        if (typeof db.query !== 'function')
-            return DEFAULT_LAYOUT;
-        const [hasTable, hasName, hasMigration, hasScope, hasService, hasStatus, hasAppliedAt, hasCreatedAt] = await Promise.all([
-            schemaHasTable(db, 'migrations'),
-            schemaHasColumn(db, 'migrations', 'name'),
-            schemaHasColumn(db, 'migrations', 'migration'),
-            schemaHasColumn(db, 'migrations', 'scope'),
-            schemaHasColumn(db, 'migrations', 'service'),
-            schemaHasColumn(db, 'migrations', 'status'),
-            schemaHasColumn(db, 'migrations', 'applied_at'),
-            schemaHasColumn(db, 'migrations', 'created_at'),
-        ]);
-        if (!hasTable && allowEnsure) {
-            await ensureTrackingTable(db);
-            return resolveTableLayout(db, false);
-        }
-        if (!hasName && !hasMigration) {
-            throw ErrorFactory.createCliError('The migrations table is missing both `name` and `migration` columns. Update the tracking table before running migrations.');
-        }
-        return {
-            hasAppliedAt,
-            hasCreatedAt,
-            hasMigration,
-            hasName,
-            hasScope,
-            hasService,
-            hasStatus,
-            requiresCompatibilityMode: hasMigration || !hasName || !hasScope || !hasService || !hasStatus,
-        };
-    })();
+    const layoutPromise = loadTableLayout(db, allowEnsure);
     tableLayoutCache.set(db, layoutPromise);
     return layoutPromise.catch((error) => {
         if (tableLayoutCache.get(db) === layoutPromise) {

package/src/proxy/d1/ZintrustD1Proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZintrustD1Proxy.d.ts","sourceRoot":"","sources":["../../../../src/proxy/d1/ZintrustD1Proxy.ts"],"names":[],"mappings":"AAWA,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC;AAEjD,KAAK,qBAAqB,GAAG;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE;QACH,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;QACtC,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACrE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;QAChE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,WAAW,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;KAChG,CAAC;IACF,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrF,CAAC;AAEF,KAAK,WAAW,CAAC,CAAC,IAAI;IACpB,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;CACf,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,KAAK,mBAAmB,CAAC;IACpD,GAAG,EAAE,CAAC,CAAC,GAAG,OAAO,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,KAAK,EAAE,CAAC,CAAC,GAAG,OAAO,OAAO,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5C,GAAG,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;CACjC,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,mBAAmB,CAAC;CAC/C,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AA6QF,eAAO,MAAM,eAAe;;;mBAGL,OAAO,OAAO,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;EAqB5D,CAAC;AAEH,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ZintrustD1Proxy.d.ts","sourceRoot":"","sources":["../../../../src/proxy/d1/ZintrustD1Proxy.ts"],"names":[],"mappings":"AASA,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC;AAEjD,KAAK,qBAAqB,GAAG;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE;QACH,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;QACtC,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACrE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;QAChE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,WAAW,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;KAChG,CAAC;IACF,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrF,CAAC;AAEF,KAAK,WAAW,CAAC,CAAC,IAAI;IACpB,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;CACf,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,KAAK,mBAAmB,CAAC;IACpD,GAAG,EAAE,CAAC,CAAC,GAAG,OAAO,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,KAAK,EAAE,CAAC,CAAC,GAAG,OAAO,OAAO,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5C,GAAG,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;CACjC,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,mBAAmB,CAAC;CAC/C,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAyRF,eAAO,MAAM,eAAe;;;mBAGL,OAAO,OAAO,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;EAqB5D,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/src/proxy/d1/ZintrustD1Proxy.js

@@ -1,11 +1,12 @@
-import { Logger } from '../../config/logger.js';
-import { isArray, isObject, isString } from '../../helper/index.js';
 import { getEnvInt, json, normalizeBindingName, readAndVerifyJson, toErrorResponse, } from '../CloudflareProxyShared.js';
 import { RequestValidator } from '../RequestValidator.js';
 const DEFAULT_SIGNING_WINDOW_MS = 60_000;
 const DEFAULT_MAX_BODY_BYTES = 128 * 1024;
 const DEFAULT_MAX_SQL_BYTES = 32 * 1024;
 const DEFAULT_MAX_PARAMS = 256;
+const isRecord = (value) => typeof value === 'object' && value !== null;
+const isString = (value) => typeof value === 'string';
+const isArray = (value) => Array.isArray(value);
 const isDebugEnabled = (env) => {
     const raw = env.ZT_PROXY_DEBUG;
     if (!isString(raw))
@@ -28,10 +29,16 @@ const safeErrorMessage = (error) => {
 const logProxyError = (env, context, error) => {
     if (!isDebugEnabled(env))
         return;
-    Logger.error('[ZintrustD1Proxy] error', {
-        ...context,
-        message: safeErrorMessage(error).slice(0, 800),
-    });
+    try {
+        // eslint-disable-next-line no-console
+        console.error('[ZintrustD1Proxy] error', {
+            ...context,
+            message: safeErrorMessage(error).slice(0, 800),
+        });
+    }
+    catch {
+        // ignore logging failures in Workers proxy mode
+    }
 };
 const resolveD1Binding = (env) => {
     const candidates = ['DB', 'zintrust_db', normalizeBindingName(env.D1_BINDING)].filter((value, index, values) => isString(value) && value.trim() !== '' && values.indexOf(value) === index);
@@ -50,7 +57,7 @@ const loadStatements = (env) => {
         return null;
     try {
         const parsed = JSON.parse(raw);
-        if (!isObject(parsed))
+        if (!isRecord(parsed))
             return null;
         return parsed;
     }
@@ -80,7 +87,7 @@ const toD1ExceptionResponse = (error) => {
     return toErrorResponse(500, 'D1_ERROR', message);
 };
 const parseSqlPayload = (payload) => {
-    if (!isObject(payload)) {
+    if (!isRecord(payload)) {
         return { ok: false, response: toErrorResponse(400, 'VALIDATION_ERROR', 'Invalid body') };
     }
     const sql = payload['sql'];
@@ -181,7 +188,7 @@ const handleExec = async (request, env) => {
     }
 };
 const parseStatementPayload = (payload) => {
-    if (!isObject(payload)) {
+    if (!isRecord(payload)) {
         return { ok: false, response: toErrorResponse(400, 'VALIDATION_ERROR', 'Invalid body') };
     }
     const statementId = payload['statementId'];

package/src/runtime/plugins/trace-runtime.d.ts

@@ -18,7 +18,12 @@ export declare const registerTraceRoutes: (router: unknown, storage: unknown, op
     basePath?: string;
     middleware?: ReadonlyArray<string>;
 }) => void;
-export declare const captureTraceException: (error: unknown) => void;
+export declare const captureTraceException: (error: unknown, context?: {
+    batchId?: string;
+    hostname?: string;
+    path?: string;
+    userId?: string;
+}) => void;
 export declare const ensureSystemTraceRegistered: () => Promise<void>;
 export {};
 //# sourceMappingURL=trace-runtime.d.ts.map

package/src/runtime/plugins/trace-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trace-runtime.d.ts","sourceRoot":"","sources":["../../../../src/runtime/plugins/trace-runtime.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,GAAG;IACpB,KAAK,CAAC,SAAS,CAAC,EAAE,OAAO,GAAG;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACxE,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC;CACtC,CAAC;AA6DF,eAAO,MAAM,WAAW,QAAO,OAA0C,CAAC;AAE1E,eAAO,MAAM,WAAW,EAAE,cAIxB,CAAC;AAEH,eAAO,MAAM,YAAY,EAAE,eAIzB,CAAC;AAEH,eAAO,MAAM,sBAAsB,GACjC,QAAQ,OAAO,EACf,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,KAClE,IAEF,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,QAAQ,OAAO,EACf,SAAS,OAAO,EAChB,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,KAClE,IAEF,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,OAAO,OAAO,KAAG,IAStD,CAAC;AAEF,eAAO,MAAM,2BAA2B,QAAa,OAAO,CAAC,IAAI,CAIhE,CAAC"}
+{"version":3,"file":"trace-runtime.d.ts","sourceRoot":"","sources":["../../../../src/runtime/plugins/trace-runtime.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,GAAG;IACpB,KAAK,CAAC,SAAS,CAAC,EAAE,OAAO,GAAG;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACxE,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC;CACtC,CAAC;AAwEF,eAAO,MAAM,WAAW,QAAO,OAA0C,CAAC;AAE1E,eAAO,MAAM,WAAW,EAAE,cAIxB,CAAC;AAEH,eAAO,MAAM,YAAY,EAAE,eAIzB,CAAC;AAEH,eAAO,MAAM,sBAAsB,GACjC,QAAQ,OAAO,EACf,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,KAClE,IAEF,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,QAAQ,OAAO,EACf,SAAS,OAAO,EAChB,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,KAClE,IAEF,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,OAAO,OAAO,EACd,UAAU;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,KAChF,IASF,CAAC;AAEF,eAAO,MAAM,2BAA2B,QAAa,OAAO,CAAC,IAAI,CAIhE,CAAC"}

package/src/runtime/plugins/trace-runtime.js

@@ -6,7 +6,7 @@ const fallbackTraceStorage = Object.freeze({
 });
 const fallbackRegisterTraceDashboard = (_router, _options) => undefined;
 const fallbackRegisterTraceRoutes = (_router, _storage, _options) => undefined;
-const fallbackCaptureTraceException = (_error) => undefined;
+const fallbackCaptureTraceException = (_error, _context) => undefined;
 let systemTraceModule;
 let didAttemptSystemTraceLoad = false;
 let pendingSystemTraceLoad;
@@ -46,13 +46,13 @@ export const registerTraceDashboard = (router, options) => {
 export const registerTraceRoutes = (router, storage, options) => {
     (systemTraceModule?.registerTraceRoutes ?? fallbackRegisterTraceRoutes)(router, storage, options);
 };
-export const captureTraceException = (error) => {
+export const captureTraceException = (error, context) => {
     if (systemTraceModule?.captureTraceException !== undefined) {
-        systemTraceModule.captureTraceException(error);
+        systemTraceModule.captureTraceException(error, context);
         return;
     }
     void loadSystemTraceModule().then((module) => {
-        (module?.captureTraceException ?? fallbackCaptureTraceException)(error);
+        (module?.captureTraceException ?? fallbackCaptureTraceException)(error, context);
     });
 };
 export const ensureSystemTraceRegistered = async () => {