@zintrust/core 0.4.80 → 0.4.83

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;AAuVF,wBAAsB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzC;AAED,eAAO,MAAM,mBAAmB;;qCArUQ,MAAM,KAAG,qBAAqB,GAAG,SAAS;mCA6C5C,MAAM,GAAG,IAAI,UAAU,MAAM,CAAC,OAAO,GAAG,IAAI,KAAG,MAAM;iCAnEzD,MAAM;8BAIP,MAAM,KAAG,MAAM;uCAsEtC,qBAAqB,WACpB,MAAM,EAAE,KAChB,OAAO,CAAC,KAAK,CAAC;oCAhEsB,MAAM,sBAAsB,MAAM,KAAG,OAAO;6CA2G7B,MAAM,EAAE,KAAG,OAAO,CAAC,OAAO,CAAC;yCAtE1E,MAAM,sBACS,MAAM,QACrB,MAAM,CAAC,UAAU,KACrB,qBAAqB,GAAG,SAAS;EAiTlC,CAAC;AAEH,OAAO,EAAE,CAAC"}
+{"version":3,"file":"zintrust-main.d.ts","sourceRoot":"","sources":["../../bin/zintrust-main.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA0WF,wBAAsB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzC;AAED,eAAO,MAAM,mBAAmB;;qCAzUQ,MAAM,KAAG,qBAAqB,GAAG,SAAS;mCA6C5C,MAAM,GAAG,IAAI,UAAU,MAAM,CAAC,OAAO,GAAG,IAAI,KAAG,MAAM;iCAnEzD,MAAM;8BAIP,MAAM,KAAG,MAAM;uCAsEtC,qBAAqB,WACpB,MAAM,EAAE,KAChB,OAAO,CAAC,KAAK,CAAC;oCAhEsB,MAAM,sBAAsB,MAAM,KAAG,OAAO;6CA2G7B,MAAM,EAAE,KAAG,OAAO,CAAC,OAAO,CAAC;yCAtE1E,MAAM,sBACS,MAAM,QACrB,MAAM,CAAC,UAAU,KACrB,qBAAqB,GAAG,SAAS;EAqTlC,CAAC;AAEH,OAAO,EAAE,CAAC"}

package/bin/zintrust-main.js

@@ -4,12 +4,20 @@
  * This module contains the CLI implementation without a hashbang so that it can
  * be imported by other bin shortcuts (zin/z/zt) without parse errors.
  */
-import { Logger } from '../src/config/logger.js';
 import { spawn } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 const CLI_HANDOFF_ENV_KEY = 'ZINTRUST_CLI_HANDOFF';
+const loadLogger = async () => {
+    try {
+        const { Logger } = await import('../src/config/logger.js');
+        return Logger;
+    }
+    catch {
+        return undefined;
+    }
+};
 const getCurrentPackageRoot = () => {
     return path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 };
@@ -199,18 +207,22 @@ const shouldDeferPluginAutoImportWarnings = (args) => {
     const command = getPrimaryCommand(args);
     return command === 'start' || command === 's';
 };
-const logPluginAutoImportFailure = (args, scope, details) => {
+const logPluginAutoImportFailure = async (args, scope, details) => {
+    const logger = await loadLogger();
+    if (logger === undefined)
+        return;
     if (shouldDeferPluginAutoImportWarnings(args)) {
-        Logger.debug(`${scope} plugin auto-import advisory deferred to runtime bootstrap`, {
+        logger.debug(`${scope} plugin auto-import advisory deferred to runtime bootstrap`, {
             details,
         });
         return;
     }
-    Logger.warn(`${scope} plugin auto-imports failed:`, details);
+    logger.warn(`${scope} plugin auto-imports failed:`, details);
 };
 const handleCliFatal = async (error, context) => {
     try {
-        Logger.error(context, error);
+        const logger = await loadLogger();
+        logger?.error(context, error);
     }
     catch {
         // best-effort logging
@@ -259,11 +271,11 @@ const runCliInternal = async () => {
         const runtimeImportMode = process.env['DOCKER_WORKER'] === 'true' ? 'worker' : 'base';
         const officialImports = await PluginAutoImports.tryImportRuntimeAutoImports(runtimeImportMode);
         if (!officialImports.ok) {
-            logPluginAutoImportFailure(args0, 'Official', officialImports.errorMessage);
+            await logPluginAutoImportFailure(args0, 'Official', officialImports.errorMessage);
         }
         const projectImports = await PluginAutoImports.tryImportProjectAutoImports();
         if (!projectImports.ok && projectImports.reason !== 'not-found') {
-            logPluginAutoImportFailure(args0, 'Project', projectImports.errorMessage);
+            await logPluginAutoImportFailure(args0, 'Project', projectImports.errorMessage);
         }
     }
     catch {

package/package.json

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

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;AA6JtD,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;AA8DH,eAAO,MAAM,KAAK;UA5HC,CAAC,OAAO,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;UAWlC,CAAC,OAAO,MAAM,SAAS,CAAC,QAAQ,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;kBAUjD,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;iBAUtB,OAAO,CAAC,IAAI,CAAC;eASb,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;qBAW3B,WAAW;mBAaX,MAAM,KAAG,UAAU;iBAuDvB,IAAI;EAcpB,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,KAAK;UA1IC,CAAC,OAAO,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;UAWlC,CAAC,OAAO,MAAM,SAAS,CAAC,QAAQ,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;kBAUjD,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;iBAUtB,OAAO,CAAC,IAAI,CAAC;eASb,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;qBAW3B,WAAW;mBAaX,MAAM,KAAG,UAAU;iBAuDvB,IAAI;EAmBI,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;AAkMtD,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;AA8FH,eAAO,MAAM,KAAK;UAhMC,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;mBAaX,MAAM,KAAG,UAAU;iBAuFvB,IAAI;EAcpB,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,KAAK;UA9MC,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;mBAaX,MAAM,KAAG,UAAU;iBAuFvB,IAAI;EAmBI,CAAC"}

package/src/cache/Cache.js

@@ -15,6 +15,7 @@ import { cacheConfig } from '../config/cache.js';
 import { Env } from '../config/env.js';
 import { ErrorFactory } from '../exceptions/ZintrustError.js';
 const instances = new Map();
+const DEFAULT_STORE_NAME = 'default';
 /**
  * Auto-prefix cache keys with 'zt:' if not already prefixed
  */
@@ -88,7 +89,7 @@ const get = async (key) => {
     const prefixedKey = autoPrefixKey(key);
     const startedAt = Date.now();
     const value = await getDriverInstance().get(prefixedKey);
-    SystemTraceBridge.emitCache('get', prefixedKey, Date.now() - startedAt, value !== null);
+    SystemTraceBridge.emitCache('get', prefixedKey, Date.now() - startedAt, value !== null, value, DEFAULT_STORE_NAME);
     return value;
 };
 /**
@@ -98,7 +99,7 @@ const set = async (key, value, ttl) => {
     const prefixedKey = autoPrefixKey(key);
     const startedAt = Date.now();
     await getDriverInstance().set(prefixedKey, value, ttl);
-    SystemTraceBridge.emitCache('set', prefixedKey, Date.now() - startedAt);
+    SystemTraceBridge.emitCache('set', prefixedKey, Date.now() - startedAt, undefined, value, DEFAULT_STORE_NAME, ttl);
 };
 /**
  * Remove an item from the cache
@@ -107,7 +108,7 @@ const del = async (key) => {
     const prefixedKey = autoPrefixKey(key);
     const startedAt = Date.now();
     await getDriverInstance().delete(prefixedKey);
-    SystemTraceBridge.emitCache('delete', prefixedKey, Date.now() - startedAt);
+    SystemTraceBridge.emitCache('delete', prefixedKey, Date.now() - startedAt, undefined, undefined, DEFAULT_STORE_NAME);
 };
 /**
  * Clear all items from the cache
@@ -115,7 +116,7 @@ const del = async (key) => {
 const clear = async () => {
     const startedAt = Date.now();
     await getDriverInstance().clear();
-    SystemTraceBridge.emitCache('clear', 'zt:*', Date.now() - startedAt);
+    SystemTraceBridge.emitCache('clear', 'zt:*', Date.now() - startedAt, undefined, undefined, DEFAULT_STORE_NAME);
 };
 /**
  * Check if an item exists in the cache
@@ -124,7 +125,7 @@ const has = async (key) => {
     const prefixedKey = autoPrefixKey(key);
     const startedAt = Date.now();
     const exists = await getDriverInstance().has(prefixedKey);
-    SystemTraceBridge.emitCache('has', prefixedKey, Date.now() - startedAt, exists);
+    SystemTraceBridge.emitCache('has', prefixedKey, Date.now() - startedAt, exists, undefined, DEFAULT_STORE_NAME);
     return exists;
 };
 /**
@@ -138,31 +139,31 @@ const store = (name) => {
         const prefixedKey = autoPrefixKey(key);
         const startedAt = Date.now();
         const value = await getDriverInstance(name).get(prefixedKey);
-        SystemTraceBridge.emitCache('get', prefixedKey, Date.now() - startedAt, value !== null);
+        SystemTraceBridge.emitCache('get', prefixedKey, Date.now() - startedAt, value !== null, value, String(name ?? DEFAULT_STORE_NAME));
         return value;
     };
     const setInStore = async (key, value, ttl) => {
         const prefixedKey = autoPrefixKey(key);
         const startedAt = Date.now();
         await getDriverInstance(name).set(prefixedKey, value, ttl);
-        SystemTraceBridge.emitCache('set', prefixedKey, Date.now() - startedAt);
+        SystemTraceBridge.emitCache('set', prefixedKey, Date.now() - startedAt, undefined, value, String(name ?? DEFAULT_STORE_NAME), ttl);
     };
     const delFromStore = async (key) => {
         const prefixedKey = autoPrefixKey(key);
         const startedAt = Date.now();
         await getDriverInstance(name).delete(prefixedKey);
-        SystemTraceBridge.emitCache('delete', prefixedKey, Date.now() - startedAt);
+        SystemTraceBridge.emitCache('delete', prefixedKey, Date.now() - startedAt, undefined, undefined, String(name ?? DEFAULT_STORE_NAME));
     };
     const clearStore = async () => {
         const startedAt = Date.now();
         await getDriverInstance(name).clear();
-        SystemTraceBridge.emitCache('clear', `store:${String(name ?? 'default')}`, Date.now() - startedAt);
+        SystemTraceBridge.emitCache('clear', `store:${String(name ?? 'default')}`, Date.now() - startedAt, undefined, undefined, String(name ?? DEFAULT_STORE_NAME));
     };
     const hasInStore = async (key) => {
         const prefixedKey = autoPrefixKey(key);
         const startedAt = Date.now();
         const exists = await getDriverInstance(name).has(prefixedKey);
-        SystemTraceBridge.emitCache('has', prefixedKey, Date.now() - startedAt, exists);
+        SystemTraceBridge.emitCache('has', prefixedKey, Date.now() - startedAt, exists, undefined, String(name ?? DEFAULT_STORE_NAME));
         return exists;
     };
     const getStoreDriver = () => {

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

@@ -1 +1 @@
-{"version":3,"file":"D1ProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/D1ProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmHrD,eAAO,MAAM,cAAc;cACf,YAAY;EAkBtB,CAAC;AAEH,eAAe,cAAc,CAAC"}
+{"version":3,"file":"D1ProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/D1ProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAkIrD,eAAO,MAAM,cAAc;cACf,YAAY;EAkBtB,CAAC;AAEH,eAAe,cAAc,CAAC"}

package/src/cli/commands/D1ProxyCommand.js

@@ -66,6 +66,17 @@ const warnOnPlaceholderDatabaseId = (values) => {
         return;
     Logger.warn('Could not resolve a D1 database id automatically. Update wrangler.jsonc or pass --database-id before relying on the generated d1-proxy environment.');
 };
+const warnOnMissingSigningSecret = () => {
+    const directSecret = trimNonEmptyOption(Env.get('D1_REMOTE_SECRET', ''));
+    const fallbackSecret = trimNonEmptyOption(Env.get('APP_KEY', ''));
+    if (directSecret !== undefined || fallbackSecret !== undefined)
+        return;
+    Logger.warn('D1 proxy signing will fail: the resolved project env does not expose D1_REMOTE_SECRET or APP_KEY to the Worker runtime. Signed requests will be rejected with 401 CONFIG_ERROR until one of those keys is set.');
+};
+const runD1ProxyDiagnostics = (values) => {
+    warnOnPlaceholderDatabaseId(values);
+    warnOnMissingSigningSecret();
+};
 const addOptions = (command) => {
     addWranglerProxyBaseOptions(command, DEFAULT_CONFIG);
     command.option('--binding <name>', 'D1 binding name', DEFAULT_BINDING);
@@ -88,7 +99,7 @@ export const D1ProxyCommand = Object.freeze({
             addOptions,
             resolveValues: resolveConfigValues,
             renderEnvBlock: renderD1ProxyEnvBlock,
-            afterConfigResolved: warnOnPlaceholderDatabaseId,
+            afterConfigResolved: runD1ProxyDiagnostics,
         });
     },
 });

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

@@ -1 +1 @@
-{"version":3,"file":"MongoDBProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MongoDBProxyCommand.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4DpC,eAAO,MAAM,mBAAmB;cACpB,OAAO;EAoEjB,CAAC"}
+{"version":3,"file":"MongoDBProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MongoDBProxyCommand.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4DpC,eAAO,MAAM,mBAAmB;cACpB,OAAO;EA0EjB,CAAC"}

package/src/cli/commands/MongoDBProxyCommand.js

@@ -1,6 +1,7 @@
 import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { ensureProxyEnvLoadedForCwd } from '../commands/ProxyCommandUtils.js';
 import { Command } from 'commander';
 const startWatchMode = async (options) => {
     Logger.info('Starting MongoDB proxy in watch mode...');
@@ -57,13 +58,14 @@ export const MongoDBProxyCommand = Object.freeze({
         const cmd = new Command('proxy:mongodb');
         cmd.description('Start MongoDB HTTP proxy server');
         const configureOptions = () => {
+            ensureProxyEnvLoadedForCwd();
             cmd.option('--host <host>', 'Proxy host', Env.get('MONGODB_PROXY_HOST', '127.0.0.1'));
             cmd.option('--port <port>', 'Proxy port', String(Env.getInt('MONGODB_PROXY_PORT', 8792)));
             cmd.option('--mongo-uri <uri>', 'MongoDB connection URI', Env.get('MONGO_URI', ''));
             cmd.option('--mongo-db <database>', 'MongoDB database name', Env.get('MONGO_DB', ''));
             cmd.option('--key-id <keyId>', 'Signing key ID', Env.get('MONGODB_PROXY_KEY_ID', 'default'));
             cmd.option('--secret <secret>', 'Signing secret', Env.get('MONGODB_PROXY_SECRET', ''));
-            cmd.option('--require-signing', 'Require request signing', Env.MONGODB_PROXY_REQUIRE_SIGNING);
+            cmd.option('--require-signing', 'Require request signing', Env.getBool('MONGODB_PROXY_REQUIRE_SIGNING', true));
             cmd.option('--signing-window-ms <ms>', 'Signing window in milliseconds', String(Env.getInt('MONGODB_PROXY_SIGNING_WINDOW_MS', 60000)));
             cmd.option('--watch', 'Watch mode: restart on file changes');
         };

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

@@ -1 +1 @@
-{"version":3,"file":"MySqlProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MySqlProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA0BrE,eAAO,MAAM,iBAAiB;cAClB,YAAY;EAatB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"MySqlProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MySqlProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAgCrE,eAAO,MAAM,iBAAiB;cAClB,YAAY;EAatB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}

package/src/cli/commands/MySqlProxyCommand.js

@@ -1,17 +1,19 @@
 import { BaseCommand } from '../BaseCommand.js';
+import { ensureProxyEnvLoadedForCwd } from '../commands/ProxyCommandUtils.js';
 import { addSqlProxyOptions, runSqlProxyCommand, } from '../commands/SqlProxyCommandUtils.js';
 import { Env } from '../../config/env.js';
 import { MySqlProxyServer } from '../../proxy/mysql/MySqlProxyServer.js';
 const addOptions = (command) => {
+    ensureProxyEnvLoadedForCwd();
     addSqlProxyOptions(command, {
-        hostDefault: Env.MYSQL_PROXY_HOST,
-        portDefault: Env.MYSQL_PROXY_PORT,
-        maxBodyBytesDefault: Env.MYSQL_PROXY_MAX_BODY_BYTES,
+        hostDefault: Env.get('MYSQL_PROXY_HOST', '127.0.0.1'),
+        portDefault: Env.getInt('MYSQL_PROXY_PORT', 8789),
+        maxBodyBytesDefault: Env.getInt('MYSQL_PROXY_MAX_BODY_BYTES', 131072),
         dbVendorLabel: 'MySQL',
-        requireSigningDefault: Env.MYSQL_PROXY_REQUIRE_SIGNING,
-        keyIdDefault: Env.MYSQL_PROXY_KEY_ID,
-        secretDefault: Env.MYSQL_PROXY_SECRET,
-        signingWindowMsDefault: Env.MYSQL_PROXY_SIGNING_WINDOW_MS,
+        requireSigningDefault: Env.getBool('MYSQL_PROXY_REQUIRE_SIGNING', true),
+        keyIdDefault: Env.get('MYSQL_PROXY_KEY_ID', Env.get('APP_NAME', 'ZinTrust')),
+        secretDefault: Env.get('MYSQL_PROXY_SECRET', Env.get('APP_KEY', '')),
+        signingWindowMsDefault: Env.getInt('MYSQL_PROXY_SIGNING_WINDOW_MS', Env.getInt('ZT_PROXY_SIGNING_WINDOW_MS', 60000)),
     });
 };
 export const MySqlProxyCommand = Object.freeze({

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

@@ -1 +1 @@
-{"version":3,"file":"PostgresProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/PostgresProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA0BrE,eAAO,MAAM,oBAAoB;cACrB,YAAY;EAatB,CAAC;AAEH,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"PostgresProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/PostgresProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAgCrE,eAAO,MAAM,oBAAoB;cACrB,YAAY;EAatB,CAAC;AAEH,eAAe,oBAAoB,CAAC"}

package/src/cli/commands/PostgresProxyCommand.js

@@ -1,17 +1,19 @@
 import { BaseCommand } from '../BaseCommand.js';
+import { ensureProxyEnvLoadedForCwd } from '../commands/ProxyCommandUtils.js';
 import { addSqlProxyOptions, runSqlProxyCommand, } from '../commands/SqlProxyCommandUtils.js';
 import { Env } from '../../config/env.js';
 import { PostgresProxyServer } from '../../proxy/postgres/PostgresProxyServer.js';
 const addOptions = (command) => {
+    ensureProxyEnvLoadedForCwd();
     addSqlProxyOptions(command, {
-        hostDefault: Env.POSTGRES_PROXY_HOST,
-        portDefault: Env.POSTGRES_PROXY_PORT,
-        maxBodyBytesDefault: Env.POSTGRES_PROXY_MAX_BODY_BYTES,
+        hostDefault: Env.get('POSTGRES_PROXY_HOST', '127.0.0.1'),
+        portDefault: Env.getInt('POSTGRES_PROXY_PORT', 8790),
+        maxBodyBytesDefault: Env.getInt('POSTGRES_PROXY_MAX_BODY_BYTES', 131072),
         dbVendorLabel: 'PostgreSQL',
-        requireSigningDefault: Env.POSTGRES_PROXY_REQUIRE_SIGNING,
-        keyIdDefault: Env.POSTGRES_PROXY_KEY_ID,
-        secretDefault: Env.POSTGRES_PROXY_SECRET,
-        signingWindowMsDefault: Env.POSTGRES_PROXY_SIGNING_WINDOW_MS,
+        requireSigningDefault: Env.getBool('POSTGRES_PROXY_REQUIRE_SIGNING', true),
+        keyIdDefault: Env.get('POSTGRES_PROXY_KEY_ID', Env.get('APP_NAME', 'ZinTrust')),
+        secretDefault: Env.get('POSTGRES_PROXY_SECRET', Env.get('APP_KEY', '')),
+        signingWindowMsDefault: Env.getInt('POSTGRES_PROXY_SIGNING_WINDOW_MS', Env.getInt('ZT_PROXY_SIGNING_WINDOW_MS', 60000)),
     });
 };
 export const PostgresProxyCommand = Object.freeze({

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

@@ -1,6 +1,8 @@
 type NumberExpectation = 'positive' | 'non-negative';
 export declare const parseIntOption: (raw: string | undefined, name: string, expectation?: NumberExpectation) => number | undefined;
 export declare const trimOption: (value: string | undefined) => string | undefined;
+export declare const resolveProxyProjectRoot: (cwd: string) => string;
+export declare const ensureProxyEnvLoadedForCwd: (cwd?: string) => string;
 export declare const maybeRunProxyWatchMode: (watch: boolean | undefined) => Promise<void>;
 export {};
 //# sourceMappingURL=ProxyCommandUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ProxyCommandUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ProxyCommandUtils.ts"],"names":[],"mappings":"AAIA,KAAK,iBAAiB,GAAG,UAAU,GAAG,cAAc,CAAC;AAErD,eAAO,MAAM,cAAc,GACzB,KAAK,MAAM,GAAG,SAAS,EACvB,MAAM,MAAM,EACZ,cAAa,iBAA8B,KAC1C,MAAM,GAAG,SAeX,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAA0B,CAAC;AAU3F,eAAO,MAAM,sBAAsB,GAAU,OAAO,OAAO,GAAG,SAAS,KAAG,OAAO,CAAC,IAAI,CAerF,CAAC"}
+{"version":3,"file":"ProxyCommandUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ProxyCommandUtils.ts"],"names":[],"mappings":"AAMA,KAAK,iBAAiB,GAAG,UAAU,GAAG,cAAc,CAAC;AAErD,eAAO,MAAM,cAAc,GACzB,KAAK,MAAM,GAAG,SAAS,EACvB,MAAM,MAAM,EACZ,cAAa,iBAA8B,KAC1C,MAAM,GAAG,SAeX,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAA0B,CAAC;AAc3F,eAAO,MAAM,uBAAuB,GAAI,KAAK,MAAM,KAAG,MAErD,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,MAAK,MAAsB,KAAG,MAUxE,CAAC;AAUF,eAAO,MAAM,sBAAsB,GAAU,OAAO,OAAO,GAAG,SAAS,KAAG,OAAO,CAAC,IAAI,CAerF,CAAC"}

package/src/cli/commands/ProxyCommandUtils.js

@@ -1,5 +1,7 @@
+import { EnvFileLoader } from '../utils/EnvFileLoader.js';
 import { SpawnUtil } from '../utils/spawn.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { existsSync } from '../../node-singletons/fs.js';
 import * as path from '../../node-singletons/path.js';
 export const parseIntOption = (raw, name, expectation = 'positive') => {
     if (raw === undefined)
@@ -15,6 +17,29 @@ export const parseIntOption = (raw, name, expectation = 'positive') => {
     return parsed;
 };
 export const trimOption = (value) => value?.trim();
+const findNearestPackageJsonDir = (cwd) => {
+    let current = cwd;
+    while (true) {
+        if (existsSync(path.join(current, 'package.json')))
+            return current;
+        const parent = path.dirname(current);
+        if (parent === current)
+            return undefined;
+        current = parent;
+    }
+};
+export const resolveProxyProjectRoot = (cwd) => {
+    return findNearestPackageJsonDir(cwd) ?? cwd;
+};
+export const ensureProxyEnvLoadedForCwd = (cwd = process.cwd()) => {
+    const projectRoot = resolveProxyProjectRoot(cwd);
+    EnvFileLoader.ensureLoaded({
+        cwd: projectRoot,
+        includeCwd: true,
+        ...(cwd === projectRoot ? {} : { extraCwds: [cwd] }),
+    });
+    return projectRoot;
+};
 const isWatchChild = () => process.env['ZINTRUST_PROXY_WATCH_CHILD'] === '1';
 const buildWatchArgs = () => {
     const rawArgs = process.argv.slice(2);

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

@@ -1 +1 @@
-{"version":3,"file":"RedisProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/RedisProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmDrE,eAAO,MAAM,iBAAiB;cAClB,YAAY;EAoCtB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"RedisProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/RedisProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA0DrE,eAAO,MAAM,iBAAiB;cAClB,YAAY;EAoCtB,CAAC;AAEH,eAAe,iBAAiB,CAAC"}

package/src/cli/commands/RedisProxyCommand.js

@@ -1,8 +1,9 @@
 import { BaseCommand } from '../BaseCommand.js';
-import { maybeRunProxyWatchMode, parseIntOption, trimOption, } from '../commands/ProxyCommandUtils.js';
+import { ensureProxyEnvLoadedForCwd, maybeRunProxyWatchMode, parseIntOption, trimOption, } from '../commands/ProxyCommandUtils.js';
 import { Env } from '../../config/env.js';
 import { RedisProxyServer } from '../../proxy/redis/RedisProxyServer.js';
 const addOptions = (command) => {
+    ensureProxyEnvLoadedForCwd();
     command.option('--host <host>', 'Host to bind', Env.get('REDIS_PROXY_HOST', '127.0.0.1'));
     command.option('--port <port>', 'Port to bind', String(Env.getInt('REDIS_PROXY_PORT', 8791)));
     command.option('--max-body-bytes <bytes>', 'Max request size in bytes', String(Env.getInt('REDIS_PROXY_MAX_BODY_BYTES', 131072)));
@@ -11,7 +12,7 @@ const addOptions = (command) => {
     command.option('--redis-port <port>', 'Redis port');
     command.option('--redis-password <password>', 'Redis password');
     command.option('--redis-db <db>', 'Redis database');
-    command.option('--require-signing', 'Require signed requests', Env.REDIS_PROXY_REQUIRE_SIGNING);
+    command.option('--require-signing', 'Require signed requests', Env.getBool('REDIS_PROXY_REQUIRE_SIGNING', true));
     command.option('--key-id <id>', 'Signing key id', Env.get('REDIS_PROXY_KEY_ID', ''));
     command.option('--secret <secret>', 'Signing secret', Env.get('REDIS_PROXY_SECRET', ''));
     command.option('--signing-window-ms <ms>', 'Signing time window in ms', String(Env.getInt('REDIS_PROXY_SIGNING_WINDOW_MS', 60000)));

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

@@ -1 +1 @@
-{"version":3,"file":"SmtpProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/SmtpProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAyDrE,eAAO,MAAM,gBAAgB;cACjB,YAAY;EAsCtB,CAAC;AAEH,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"SmtpProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/SmtpProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA4DrE,eAAO,MAAM,gBAAgB;cACjB,YAAY;EAsCtB,CAAC;AAEH,eAAe,gBAAgB,CAAC"}

package/src/cli/commands/SmtpProxyCommand.js

@@ -1,8 +1,9 @@
 import { BaseCommand } from '../BaseCommand.js';
-import { maybeRunProxyWatchMode, parseIntOption, trimOption, } from '../commands/ProxyCommandUtils.js';
+import { ensureProxyEnvLoadedForCwd, maybeRunProxyWatchMode, parseIntOption, trimOption, } from '../commands/ProxyCommandUtils.js';
 import { Env } from '../../config/env.js';
 import { SmtpProxyServer } from '../../proxy/smtp/SmtpProxyServer.js';
 const addOptions = (command) => {
+    ensureProxyEnvLoadedForCwd();
     command.option('--host <host>', 'Host to bind', Env.get('SMTP_PROXY_HOST', '127.0.0.1'));
     command.option('--port <port>', 'Port to bind', String(Env.getInt('SMTP_PROXY_PORT', 8794)));
     command.option('--max-body-bytes <bytes>', 'Max request size in bytes', String(Env.getInt('SMTP_PROXY_MAX_BODY_BYTES', 131072)));

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

@@ -1 +1 @@
-{"version":3,"file":"SqlServerProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/SqlServerProxyCommand.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2DpC,eAAO,MAAM,qBAAqB;cACtB,OAAO;EAsEjB,CAAC"}
+{"version":3,"file":"SqlServerProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/SqlServerProxyCommand.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2DpC,eAAO,MAAM,qBAAqB;cACtB,OAAO;EAwEjB,CAAC"}

package/src/cli/commands/SqlServerProxyCommand.js

@@ -1,4 +1,5 @@
 import { Env } from '../../config/env.js';
+import { ensureProxyEnvLoadedForCwd } from '../commands/ProxyCommandUtils.js';
 import { Logger } from '../../config/logger.js';
 import { Command } from 'commander';
 const startWatchMode = async (options) => {
@@ -39,6 +40,7 @@ export const SqlServerProxyCommand = Object.freeze({
         const cmd = new Command('proxy:sqlserver');
         cmd.description('Start SQL Server HTTP proxy server');
         const configureOptions = () => {
+            ensureProxyEnvLoadedForCwd();
             cmd.option('--host <host>', 'Proxy host', Env.get('SQLSERVER_PROXY_HOST', '127.0.0.1'));
             cmd.option('--port <port>', 'Proxy port', String(Env.getInt('SQLSERVER_PROXY_PORT', 8793)));
             cmd.option('--db-host <host>', 'SQL Server host', Env.get('DB_HOST_MSSQL', '127.0.0.1'));
@@ -49,7 +51,7 @@ export const SqlServerProxyCommand = Object.freeze({
             cmd.option('--connection-limit <limit>', 'Connection pool limit', String(Env.getInt('SQLSERVER_PROXY_POOL_LIMIT', 10)));
             cmd.option('--key-id <keyId>', 'Signing key ID', Env.get('SQLSERVER_PROXY_KEY_ID', 'default'));
             cmd.option('--secret <secret>', 'Signing secret', Env.get('SQLSERVER_PROXY_SECRET', ''));
-            cmd.option('--require-signing', 'Require request signing', Env.SQLSERVER_PROXY_REQUIRE_SIGNING);
+            cmd.option('--require-signing', 'Require request signing', Env.getBool('SQLSERVER_PROXY_REQUIRE_SIGNING', true));
             cmd.option('--signing-window-ms <ms>', 'Signing window in milliseconds', String(Env.getInt('SQLSERVER_PROXY_SIGNING_WINDOW_MS', 60000)));
             cmd.option('--watch', 'Watch mode: restart on file changes');
         };

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;AAerE,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;AA0BF,eAAO,MAAM,0BAA0B,GAAI,OAAO,EAAE,QAAQ,SAAS,2BAA2B,EAC9F,OAAO,+BAA+B,CAAC,OAAO,EAAE,QAAQ,CAAC,KACxD,YAsFF,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;AAkBrE,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;AAMF,eAAO,MAAM,0BAA0B,GAAI,OAAO,EAAE,QAAQ,SAAS,2BAA2B,EAC9F,OAAO,+BAA+B,CAAC,OAAO,EAAE,QAAQ,CAAC,KACxD,YAoFF,CAAC"}

package/src/cli/commands/WranglerProxyCommandUtils.js

@@ -1,37 +1,18 @@
 import { BaseCommand } from '../BaseCommand.js';
 import { withWranglerDevVarsSnapshot } from '../cloudflare/CloudflareWranglerDevEnv.js';
-import { maybeRunProxyWatchMode, parseIntOption } from '../commands/ProxyCommandUtils.js';
+import { ensureProxyEnvLoadedForCwd, maybeRunProxyWatchMode, parseIntOption, } from '../commands/ProxyCommandUtils.js';
 import { ensureProxyEntrypoint, ensureWranglerConfig, renderProxyWranglerDevConfig, resolveConfigPath, } from '../commands/ProxyScaffoldUtils.js';
-import { EnvFileLoader } from '../utils/EnvFileLoader.js';
 import { SpawnUtil } from '../utils/spawn.js';
 import { Logger } from '../../config/logger.js';
-import { existsSync, mkdirSync, writeFileSync } from '../../node-singletons/fs.js';
+import { mkdirSync, writeFileSync } from '../../node-singletons/fs.js';
 import { dirname, join } from '../../node-singletons/path.js';
 export const addWranglerProxyBaseOptions = (command, defaultConfig) => {
     command.option('-c, --config <path>', 'Wrangler config file', defaultConfig);
     command.option('--port <port>', 'Local Wrangler dev port');
     command.option('--watch', 'Auto-restart proxy on file changes');
 };
-const findNearestPackageJsonDir = (cwd) => {
-    let current = cwd;
-    while (true) {
-        if (existsSync(join(current, 'package.json')))
-            return current;
-        const parent = dirname(current);
-        if (parent === current)
-            return undefined;
-        current = parent;
-    }
-};
-const resolveProxyProjectRoot = (cwd) => {
-    return findNearestPackageJsonDir(cwd) ?? cwd;
-};
-const ensureProxyEnvLoaded = (cwd, projectRoot) => {
-    EnvFileLoader.ensureLoaded({
-        cwd: projectRoot,
-        includeCwd: true,
-        ...(cwd === projectRoot ? {} : { extraCwds: [cwd] }),
-    });
+const toRootedProxyConfigContent = (content) => {
+    return content.replaceAll('": "../../', '": "./');
 };
 export const createWranglerProxyCommand = (input) => {
     return BaseCommand.create({
@@ -44,8 +25,7 @@ export const createWranglerProxyCommand = (input) => {
             await maybeRunProxyWatchMode(typedOptions.watch);
             const port = parseIntOption(typedOptions.port, 'port');
             const cwd = process.cwd();
-            const projectRoot = resolveProxyProjectRoot(cwd);
-            ensureProxyEnvLoaded(cwd, projectRoot);
+            const projectRoot = ensureProxyEnvLoadedForCwd(cwd);
             const entrypoint = ensureProxyEntrypoint({
                 cwd,
                 entryFile: input.entryFile,
@@ -72,24 +52,23 @@ export const createWranglerProxyCommand = (input) => {
             }
             input.afterConfigResolved?.(result.values);
             const proxyConfigContent = renderProxyWranglerDevConfig(result.content, input.envName);
-            const proxyConfigDir = join(cwd, '.wrangler', 'tmp');
-            const proxyConfigPath = join(proxyConfigDir, `zin.proxy.${input.envName}.jsonc`);
+            const proxyConfigDir = cwd;
+            const proxyConfigPath = join(proxyConfigDir, `.zin.proxy.${input.envName}.jsonc`);
             if (proxyConfigContent !== undefined) {
                 mkdirSync(proxyConfigDir, { recursive: true });
-                writeFileSync(proxyConfigPath, proxyConfigContent, 'utf-8');
+                writeFileSync(proxyConfigPath, toRootedProxyConfigContent(proxyConfigContent), 'utf-8');
             }
-            const args = [
-                'dev',
-                '--config',
-                proxyConfigContent === undefined ? configPath : proxyConfigPath,
-            ];
+            const wranglerRunConfigPath = proxyConfigContent === undefined ? configPath : proxyConfigPath;
+            const wranglerDevVarsCwd = proxyConfigContent === undefined ? cwd : dirname(proxyConfigPath);
+            const wranglerDevVarsEnvName = proxyConfigContent === undefined ? input.envName : '';
+            const args = ['dev', '--config', wranglerRunConfigPath];
             if (port !== undefined) {
                 args.push('--port', String(port));
             }
             const exitCode = await withWranglerDevVarsSnapshot({
-                cwd,
+                cwd: wranglerDevVarsCwd,
                 projectRoot,
-                envName: input.envName,
+                envName: wranglerDevVarsEnvName,
                 configPath,
                 runtimeEnv: process.env,
             }, async () => {

package/src/index.js

@@ -1,11 +1,11 @@
 /**
- * @zintrust/core v0.4.80
+ * @zintrust/core v0.4.83
  *
  * ZinTrust Framework - Production-Grade TypeScript Backend
  * Built for performance, type safety, and exceptional developer experience
  *
  * Build Information:
- *   Built: 2026-04-08T12:38:34.978Z
+ *   Built: 2026-04-08T17:11:55.886Z
  *   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-08T12:38:34.943Z'; // Replaced during build
+export const ZINTRUST_BUILD_DATE = '2026-04-08T17:11:55.852Z'; // Replaced during build
 export { Application } from './boot/Application.js';
 export { AwsSigV4 } from './common/index.js';
 export { SignedRequest } from './security/SignedRequest.js';

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":"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"}
+{"version":3,"file":"ZintrustD1Proxy.d.ts","sourceRoot":"","sources":["../../../../src/proxy/d1/ZintrustD1Proxy.ts"],"names":[],"mappings":"AAUA,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;AAkSF,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,3 +1,4 @@
+import { SystemTraceBridge } from '../../trace/SystemTraceBridge.js';
 import { getEnvInt, json, normalizeBindingName, readAndVerifyJson, toErrorResponse, } from '../CloudflareProxyShared.js';
 import { RequestValidator } from '../RequestValidator.js';
 const DEFAULT_SIGNING_WINDOW_MS = 60_000;
@@ -143,10 +144,12 @@ const handleQuery = async (request, env) => {
         const resolved = await resolveSqlRequest(request, env);
         if (!resolved.ok)
             return resolved.response;
+        const startedAt = Date.now();
         const result = await resolved.db
             .prepare(resolved.sql)
             .bind(...resolved.params)
             .all();
+        SystemTraceBridge.emitQuery(resolved.sql, resolved.params, Date.now() - startedAt, 'd1-proxy');
         const rows = result.results ?? [];
         return json(200, { rows, rowCount: rows.length });
     }
@@ -160,10 +163,12 @@ const handleQueryOne = async (request, env) => {
         const resolved = await resolveSqlRequest(request, env);
         if (!resolved.ok)
             return resolved.response;
+        const startedAt = Date.now();
         const row = await resolved.db
             .prepare(resolved.sql)
             .bind(...resolved.params)
             .first();
+        SystemTraceBridge.emitQuery(resolved.sql, resolved.params, Date.now() - startedAt, 'd1-proxy');
         return json(200, { row: row ?? null });
     }
     catch (error) {
@@ -176,10 +181,12 @@ const handleExec = async (request, env) => {
         const resolved = await resolveSqlRequest(request, env);
         if (!resolved.ok)
             return resolved.response;
+        const startedAt = Date.now();
         const out = await resolved.db
             .prepare(resolved.sql)
             .bind(...resolved.params)
             .run();
+        SystemTraceBridge.emitQuery(resolved.sql, resolved.params, Date.now() - startedAt, 'd1-proxy');
         return json(200, { ok: true, meta: out.meta });
     }
     catch (error) {
@@ -217,17 +224,20 @@ const handleStatement = async (request, env) => {
         if (!isString(sql) || sql.trim() === '') {
             return toErrorResponse(404, 'NOT_FOUND', 'Unknown statementId');
         }
+        const startedAt = Date.now();
         if (isMutatingSql(sql)) {
             const out = await resolved.db
                 .prepare(sql)
                 .bind(...parsed.params)
                 .run();
+            SystemTraceBridge.emitQuery(sql, parsed.params, Date.now() - startedAt, 'd1-proxy');
             return json(200, { ok: true, meta: out.meta });
         }
         const out = await resolved.db
             .prepare(sql)
             .bind(...parsed.params)
             .all();
+        SystemTraceBridge.emitQuery(sql, parsed.params, Date.now() - startedAt, 'd1-proxy');
         const rows = out.results ?? [];
         return json(200, { rows, rowCount: rows.length });
     }

package/src/proxy/kv/ZintrustKvProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZintrustKvProxy.d.ts","sourceRoot":"","sources":["../../../../src/proxy/kv/ZintrustKvProxy.ts"],"names":[],"mappings":"AAUA,KAAK,qBAAqB,GAAG;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC;AAEjD,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,OAAO,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;IACpF,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,EAAE,CAAC,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;CAChG,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAwOF,eAAO,MAAM,eAAe;;;mBAGL,OAAO,OAAO,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;EAqB5D,CAAC;AAEH,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ZintrustKvProxy.d.ts","sourceRoot":"","sources":["../../../../src/proxy/kv/ZintrustKvProxy.ts"],"names":[],"mappings":"AAWA,KAAK,qBAAqB,GAAG;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC;AAEjD,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,OAAO,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;IACpF,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,EAAE,CAAC,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;CAChG,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AA0RF,eAAO,MAAM,eAAe;;;mBAGL,OAAO,OAAO,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;EAqB5D,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/src/proxy/kv/ZintrustKvProxy.js

@@ -1,3 +1,4 @@
+import { SystemTraceBridge } from '../../trace/SystemTraceBridge.js';
 import { isObject, isString } from '../../helper/index.js';
 import { getEnvInt, json, normalizeBindingName, readAndVerifyJson, toErrorResponse, } from '../CloudflareProxyShared.js';
 import { RequestValidator } from '../RequestValidator.js';
@@ -68,15 +69,19 @@ const handleGet = async (request, env) => {
     if (!parsed.ok)
         return parsed.response;
     const storageKey = buildStorageKey(env, { namespace: parsed.namespace, key: parsed.key });
+    const startedAt = Date.now();
     if (parsed.type === 'json') {
         const value = await resolved.cache.get(storageKey, 'json');
+        SystemTraceBridge.emitCache('get', storageKey, Date.now() - startedAt, value !== null, value, 'kv-proxy');
         return json(200, { value: value ?? null });
     }
     if (parsed.type === 'arrayBuffer') {
         const value = await resolved.cache.get(storageKey, 'arrayBuffer');
+        SystemTraceBridge.emitCache('get', storageKey, Date.now() - startedAt, value !== null, value, 'kv-proxy');
         return json(200, { value: value ?? null });
     }
     const value = await resolved.cache.get(storageKey);
+    SystemTraceBridge.emitCache('get', storageKey, Date.now() - startedAt, value !== null, value, 'kv-proxy');
     return json(200, { value: value ?? null });
 };
 const parsePutPayload = (payload) => {
@@ -108,11 +113,13 @@ const handlePut = async (request, env) => {
         return parsed.response;
     const storageKey = buildStorageKey(env, { namespace: parsed.namespace, key: parsed.key });
     const value = JSON.stringify(parsed.value);
+    const startedAt = Date.now();
     const options = {};
     if (parsed.ttlSeconds !== undefined) {
         options.expirationTtl = Math.floor(parsed.ttlSeconds);
     }
     await resolved.cache.put(storageKey, value, options);
+    SystemTraceBridge.emitCache('set', storageKey, Date.now() - startedAt, undefined, parsed.value, 'kv-proxy', parsed.ttlSeconds);
     return json(200, { ok: true });
 };
 const parseDeletePayload = (payload) => {
@@ -133,7 +140,9 @@ const handleDelete = async (request, env) => {
     if (!parsed.ok)
         return parsed.response;
     const storageKey = buildStorageKey(env, { namespace: parsed.namespace, key: parsed.key });
+    const startedAt = Date.now();
     await resolved.cache.delete(storageKey);
+    SystemTraceBridge.emitCache('delete', storageKey, Date.now() - startedAt, undefined, undefined, 'kv-proxy');
     return json(200, { ok: true });
 };
 const parseListPayload = (payload) => {
@@ -168,6 +177,11 @@ const handleList = async (request, env) => {
         limit,
         cursor: parsed.params.cursor,
     });
+    SystemTraceBridge.emitEvent('kv-proxy.list', 1, {
+        prefix: fullPrefix,
+        limit,
+        cursor: parsed.params.cursor,
+    });
     return json(200, {
         keys: out.keys.map((key) => key.name),
         cursor: out.cursor,

package/src/proxy/mongodb/MongoDBProxyServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MongoDBProxyServer.d.ts","sourceRoot":"","sources":["../../../../src/proxy/mongodb/MongoDBProxyServer.ts"],"names":[],"mappings":"AAYA,KAAK,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACnD,KAAK,iBAAiB,GAAG;IACvB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,mBAAmB,CAAC;CACnD,CAAC;AACF,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,iBAAiB,CAAC;IACxC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAaF,KAAK,cAAc,GAAG,OAAO,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC,CAAC;AA4PH,eAAO,MAAM,kBAAkB;sBACN,cAAc;;;;;;;;;EA+BrC,CAAC"}
+{"version":3,"file":"MongoDBProxyServer.d.ts","sourceRoot":"","sources":["../../../../src/proxy/mongodb/MongoDBProxyServer.ts"],"names":[],"mappings":"AAaA,KAAK,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACnD,KAAK,iBAAiB,GAAG;IACvB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,mBAAmB,CAAC;CACnD,CAAC;AACF,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,iBAAiB,CAAC;IACxC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAaF,KAAK,cAAc,GAAG,OAAO,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC,CAAC;AAoQH,eAAO,MAAM,kBAAkB;sBACN,cAAc;;;;;;;;;EA+BrC,CAAC"}

package/src/proxy/mongodb/MongoDBProxyServer.js

@@ -1,3 +1,4 @@
+import { SystemTraceBridge } from '../../trace/SystemTraceBridge.js';
 import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
@@ -140,7 +141,14 @@ const createBackend = (client, config) => ({
             };
         }
         try {
+            const startedAt = Date.now();
             const result = await executeOperation(client, config.mongoOptions.database, validated.collection ?? '', validated.operation ?? '', validated.args ?? {});
+            SystemTraceBridge.emitEvent('mongodb-proxy.operation', 1, {
+                operation: validated.operation,
+                collection: validated.collection,
+                args: validated.args,
+                duration: Date.now() - startedAt,
+            });
             return { status: 200, body: { success: true, result } };
         }
         catch (error) {

package/src/proxy/mysql/MySqlProxyServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MySqlProxyServer.d.ts","sourceRoot":"","sources":["../../../../src/proxy/mysql/MySqlProxyServer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAa5E,KAAK,cAAc,GAAG,kBAAkB,GAAG,yBAAyB,CAAC;AAkNrE,eAAO,MAAM,gBAAgB;sBACJ,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EA0D1D,CAAC;AAEH,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"MySqlProxyServer.d.ts","sourceRoot":"","sources":["../../../../src/proxy/mysql/MySqlProxyServer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAa5E,KAAK,cAAc,GAAG,kBAAkB,GAAG,yBAAyB,CAAC;AAgOrE,eAAO,MAAM,gBAAgB;sBACJ,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EA0D1D,CAAC;AAEH,eAAe,gBAAgB,CAAC"}

package/src/proxy/mysql/MySqlProxyServer.js

@@ -1,3 +1,4 @@
+import { SystemTraceBridge } from '../../trace/SystemTraceBridge.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
 import * as Deps from '../SqlProxyServerDeps.js';
 import { createPool } from 'mysql2/promise';
@@ -83,7 +84,9 @@ const handleStatementRequest = async (params) => {
     if (!resolved.ok)
         return resolved.response;
     try {
+        const startedAt = Date.now();
         const [rows] = await params.pool.query(resolved.value.sql, resolved.value.params);
+        SystemTraceBridge.emitQuery(resolved.value.sql, resolved.value.params, Date.now() - startedAt, 'mysql-proxy');
         const normalized = normalizeResult(rows);
         if (!resolved.value.mutating) {
             return { status: 200, body: { rows: normalized.rows, rowCount: normalized.rowCount } };
@@ -117,7 +120,9 @@ const handleSqlRequest = async (params) => {
         return Deps.ErrorHandler.toProxyError(400, error.code, error.message);
     }
     try {
+        const startedAt = Date.now();
         const [rows] = await params.pool.query(sqlValidation.sql ?? '', sqlValidation.params ?? []);
+        SystemTraceBridge.emitQuery(sqlValidation.sql ?? '', sqlValidation.params ?? [], Date.now() - startedAt, 'mysql-proxy');
         return handleEndpoint(params.request.path, rows);
     }
     catch (error) {

package/src/proxy/postgres/PostgresProxyServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostgresProxyServer.d.ts","sourceRoot":"","sources":["../../../../src/proxy/postgres/PostgresProxyServer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAoB5E,KAAK,cAAc,GAAG,kBAAkB,GAAG,yBAAyB,CAAC;AA2LrE,eAAO,MAAM,mBAAmB;sBACP,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EAyC1D,CAAC;AAEH,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"PostgresProxyServer.d.ts","sourceRoot":"","sources":["../../../../src/proxy/postgres/PostgresProxyServer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAoB5E,KAAK,cAAc,GAAG,kBAAkB,GAAG,yBAAyB,CAAC;AAyMrE,eAAO,MAAM,mBAAmB;sBACP,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EAyC1D,CAAC;AAEH,eAAe,mBAAmB,CAAC"}

package/src/proxy/postgres/PostgresProxyServer.js

@@ -1,3 +1,4 @@
+import { SystemTraceBridge } from '../../trace/SystemTraceBridge.js';
 import * as Deps from '../SqlProxyServerDeps.js';
 import { Pool } from 'pg';
 const resolveDatabaseConfig = (overrides = {}) => {
@@ -72,7 +73,9 @@ const handleStatementRequest = async (params) => {
         return resolved.response;
     try {
         const normalizedSql = normalizeSql(resolved.value.sql);
+        const startedAt = Date.now();
         const result = await params.pool.query(normalizedSql, resolved.value.params);
+        SystemTraceBridge.emitQuery(normalizedSql, resolved.value.params, Date.now() - startedAt, 'postgres-proxy');
         const rows = (result.rows ?? []);
         const rowCount = result.rowCount ?? rows.length ?? 0;
         if (!resolved.value.mutating) {
@@ -108,7 +111,9 @@ const handleSqlRequest = async (params) => {
     }
     try {
         const sql = normalizeSql(sqlValidation.sql ?? '');
+        const startedAt = Date.now();
         const result = await params.pool.query(sql, sqlValidation.params ?? []);
+        SystemTraceBridge.emitQuery(sql, sqlValidation.params ?? [], Date.now() - startedAt, 'postgres-proxy');
         return handleEndpoint(params.request.path, {
             rows: (result.rows ?? []),
             rowCount: result.rowCount ?? result.rows?.length ?? 0,

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":"AAOA,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;AAyNL,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;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;AA2NL,eAAO,MAAM,gBAAgB;sBACJ,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EAqB1D,CAAC;AAEH,eAAe,gBAAgB,CAAC"}

package/src/proxy/redis/RedisProxyServer.js

@@ -1,3 +1,4 @@
+import { SystemTraceBridge } from '../../trace/SystemTraceBridge.js';
 import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
@@ -138,7 +139,9 @@ const createBackend = (config) => ({
         try {
             const client = await createClient(config);
             try {
+                const startedAt = Date.now();
                 const result = await executeCommand(client, command, validated.args ?? []);
+                SystemTraceBridge.emitRedis(command, Date.now() - startedAt);
                 return { status: 200, body: { result } };
             }
             finally {

package/src/proxy/smtp/SmtpProxyServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SmtpProxyServer.d.ts","sourceRoot":"","sources":["../../../../src/proxy/smtp/SmtpProxyServer.ts"],"names":[],"mappings":"AA4BA,KAAK,cAAc,GAAG,OAAO,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,GAAG,MAAM,CAAC;IAC7B,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC,CAAC;AAoUH,eAAO,MAAM,eAAe;sBACH,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EA2B1D,CAAC;AAEH,eAAe,eAAe,CAAC"}
+{"version":3,"file":"SmtpProxyServer.d.ts","sourceRoot":"","sources":["../../../../src/proxy/smtp/SmtpProxyServer.ts"],"names":[],"mappings":"AA6BA,KAAK,cAAc,GAAG,OAAO,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,GAAG,MAAM,CAAC;IAC7B,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC,CAAC;AA6UH,eAAO,MAAM,eAAe;sBACH,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EA2B1D,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/src/proxy/smtp/SmtpProxyServer.js

@@ -1,3 +1,4 @@
+import { SystemTraceBridge } from '../../trace/SystemTraceBridge.js';
 import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
@@ -239,6 +240,9 @@ const createBackend = (config) => ({
         try {
             Logger.info('[SmtpProxy] Sending email via SmtpDriver', { to: messageValidation.value.to });
             await SmtpDriver.send(config.smtp, messageValidation.value);
+            SystemTraceBridge.emitMail(Array.isArray(messageValidation.value.to)
+                ? messageValidation.value.to.join(', ')
+                : messageValidation.value.to, messageValidation.value.subject, undefined, messageValidation.value.text, messageValidation.value.html);
             Logger.info('[SmtpProxy] Email sent successfully');
             return { status: 200, body: { ok: true } };
         }

package/src/proxy/sqlserver/SqlServerProxyServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SqlServerProxyServer.d.ts","sourceRoot":"","sources":["../../../../src/proxy/sqlserver/SqlServerProxyServer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAA0B,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAepG,KAAK,cAAc,GAAG,kBAAkB,GAAG,yBAAyB,CAAC;AAmOrE,eAAO,MAAM,oBAAoB;sBACR,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EAwC1D,CAAC"}
+{"version":3,"file":"SqlServerProxyServer.d.ts","sourceRoot":"","sources":["../../../../src/proxy/sqlserver/SqlServerProxyServer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAA0B,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAepG,KAAK,cAAc,GAAG,kBAAkB,GAAG,yBAAyB,CAAC;AAiPrE,eAAO,MAAM,oBAAoB;sBACR,cAAc,GAAQ,OAAO,CAAC,IAAI,CAAC;EAwC1D,CAAC"}

package/src/proxy/sqlserver/SqlServerProxyServer.js

@@ -1,3 +1,4 @@
+import { SystemTraceBridge } from '../../trace/SystemTraceBridge.js';
 import * as Deps from '../SqlProxyServerDeps.js';
 const resolveDatabaseConfig = (overrides = {}) => {
     const dbHost = overrides.dbHost ?? Deps.Env.get('DB_HOST_MSSQL', Deps.Env.get('DB_HOST', '127.0.0.1'));
@@ -111,7 +112,9 @@ const handleStatementRequest = async (pool, statements, requestPath, payload) =>
     if (!resolved.ok)
         return resolved.response;
     try {
+        const startedAt = Date.now();
         const result = await executeQuery(pool, resolved.value.sql, resolved.value.params);
+        SystemTraceBridge.emitQuery(resolved.value.sql, resolved.value.params, Date.now() - startedAt, 'sqlserver-proxy');
         if (!resolved.value.mutating)
             return handleEndpoint('/zin/sqlserver/statement', result);
         return toMutatingStatementResponse(result);
@@ -137,7 +140,9 @@ const handleSqlRequest = async (pool, requestPath, payload) => {
         return Deps.ErrorHandler.toProxyError(400, error.code, error.message);
     }
     try {
+        const startedAt = Date.now();
         const result = await executeQuery(pool, sqlValidation.sql ?? '', sqlValidation.params ?? []);
+        SystemTraceBridge.emitQuery(sqlValidation.sql ?? '', sqlValidation.params ?? [], Date.now() - startedAt, 'sqlserver-proxy');
         return handleEndpoint(requestPath, result);
     }
     catch (error) {

package/src/tools/http/Http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Http.d.ts","sourceRoot":"","sources":["../../../../src/tools/http/Http.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAElF,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC;IACtD,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC;IAC3D,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,YAAY,CAAC;IACnE,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,YAAY,CAAC;IAChE,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY,CAAC;IACtC,MAAM,IAAI,YAAY,CAAC;IACvB,MAAM,IAAI,YAAY,CAAC;IACvB,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAC/B,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7B,UAAU,IAAI,OAAO,CAAC;QAAE,QAAQ,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;CAC1F;AAoLD;;GAEG;AACH,eAAO,MAAM,UAAU;IACrB;;OAEG;aACM,MAAM,GAAG,YAAY;IAI9B;;OAEG;cACO,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY;IAQ/D;;OAEG;aACM,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY;IAQ9D;;OAEG;eACQ,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY;IAQhE;;OAEG;gBACS,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY;EAOjE,CAAC;AAEH,eAAe,UAAU,CAAC"}
+{"version":3,"file":"Http.d.ts","sourceRoot":"","sources":["../../../../src/tools/http/Http.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAElF,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC;IACtD,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC;IAC3D,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,YAAY,CAAC;IACnE,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,YAAY,CAAC;IAChE,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY,CAAC;IACtC,MAAM,IAAI,YAAY,CAAC;IACvB,MAAM,IAAI,YAAY,CAAC;IACvB,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAC/B,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7B,UAAU,IAAI,OAAO,CAAC;QAAE,QAAQ,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;CAC1F;AA4QD;;GAEG;AACH,eAAO,MAAM,UAAU;IACrB;;OAEG;aACM,MAAM,GAAG,YAAY;IAI9B;;OAEG;cACO,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY;IAQ/D;;OAEG;aACM,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY;IAQ9D;;OAEG;eACQ,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY;IAQhE;;OAEG;gBACS,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY;EAOjE,CAAC;AAEH,eAAe,UAAU,CAAC"}

package/src/tools/http/Http.js

@@ -11,6 +11,64 @@ import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
 import { createHttpResponse } from './HttpResponse.js';
+const headersToRecord = (headers) => {
+    if (!headers)
+        return {};
+    if (headers instanceof Headers) {
+        return Object.fromEntries(headers.entries());
+    }
+    if (headers instanceof Map) {
+        return Object.fromEntries(headers.entries());
+    }
+    if (typeof headers === 'object' && typeof headers.entries === 'function') {
+        return Object.fromEntries(headers.entries());
+    }
+    if (typeof headers === 'object') {
+        return Object.fromEntries(Object.entries(headers).filter((entry) => typeof entry[1] === 'string'));
+    }
+    return {};
+};
+const bodyToTracePayload = (body) => {
+    if (body === null || body === undefined)
+        return undefined;
+    if (typeof body === 'string') {
+        try {
+            return JSON.parse(body);
+        }
+        catch {
+            return body;
+        }
+    }
+    if (body instanceof URLSearchParams) {
+        return body.toString();
+    }
+    if (typeof FormData !== 'undefined' && body instanceof FormData) {
+        return Array.from(body.entries()).map(([key, value]) => [key, String(value)]);
+    }
+    return '[stream]';
+};
+const emitHttpClientTrace = (input) => {
+    const { state, durationMs, response, responseBody, error } = input;
+    SystemTraceBridge.emitHttpClient({
+        method: state.method,
+        url: state.url,
+        requestHeaders: { ...state.headers },
+        responseStatus: response?.status,
+        duration: durationMs,
+        requestBody: bodyToTracePayload(state.body),
+        responseHeaders: headersToRecord(response?.headers),
+        responseBody,
+        error,
+    });
+};
+const captureTraceResponseBody = async (response) => {
+    try {
+        return await response.clone().text();
+    }
+    catch {
+        return undefined;
+    }
+};
 /**
  * Perform the actual request for a given state. Separated to keep the builder small
  */
@@ -26,6 +84,7 @@ async function performRequest(state) {
 async function performRequestRaw(state) {
     const { response, durationMs } = await performFetch(state);
     const bodyText = await response.text();
+    emitHttpClientTrace({ state, response, responseBody: bodyText, durationMs });
     return { response, bodyText, durationMs };
 }
 async function performFetch(state) {
@@ -51,15 +110,20 @@ async function performFetch(state) {
         }
         return init;
     };
+    const startTime = Date.now();
     try {
         const init = buildInit();
-        const startTime = Date.now();
         const response = await globalThis.fetch(state.url, init);
         const duration = Date.now() - startTime;
-        SystemTraceBridge.emitHttpClient(state.method, state.url, { ...state.headers }, response.status, duration);
         return { response, durationMs: duration };
     }
     catch (error) {
+        const duration = Date.now() - startTime;
+        emitHttpClientTrace({
+            state,
+            durationMs: duration,
+            error: error instanceof Error ? error.message : String(error),
+        });
         if (error instanceof Error && error.name === 'AbortError') {
             throw ErrorFactory.createConnectionError(`HTTP request timeout after ${timeout}ms`, {
                 url: state.url,
@@ -127,11 +191,15 @@ function createRequestBuilder(method, url, initialBody) {
             return performRequest(state);
         },
         async sendRaw() {
-            const { response } = await performFetch(state);
+            const { response, durationMs } = await performFetch(state);
+            const responseBody = await captureTraceResponseBody(response);
+            emitHttpClientTrace({ state, response, responseBody, durationMs });
             return response;
         },
         async sendStream() {
-            const { response } = await performFetch(state);
+            const { response, durationMs } = await performFetch(state);
+            const responseBody = await captureTraceResponseBody(response);
+            emitHttpClientTrace({ state, response, responseBody, durationMs });
             return { response, stream: response.body };
         },
     };

package/src/tools/mail/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tools/mail/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAI7E,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF,WAAW,CAAC,EAAE,eAAe,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,UAAU,GAAG,UAAU,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,YAAY,CAAC;IAC5E,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAuJF,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AAsBD,eAAO,MAAM,IAAI;IACf;;OAEG;kBACiB,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrD,sBAAsB;gBACJ,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAGnD;;;;OAIG;iBACU,MAAM;cAtEb,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,cAAc,CAAC;;gBA0ErC,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;EAGzD,CAAC;AAEH,eAAe,IAAI,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tools/mail/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAI7E,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF,WAAW,CAAC,EAAE,eAAe,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,UAAU,GAAG,UAAU,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,YAAY,CAAC;IAC5E,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AA6JF,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AAsBD,eAAO,MAAM,IAAI;IACf;;OAEG;kBACiB,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrD,sBAAsB;gBACJ,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAGnD;;;;OAIG;iBACU,MAAM;cA5Eb,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,cAAc,CAAC;;gBAgFrC,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;EAGzD,CAAC;AAEH,eAAe,IAAI,CAAC"}

package/src/tools/mail/index.js

@@ -94,7 +94,7 @@ const createMailer = (name) => Object.freeze({
             html: input.html,
             attachments,
         });
-        SystemTraceBridge.emitMail(normalizeMailRecipients(input.to), input.subject);
+        SystemTraceBridge.emitMail(normalizeMailRecipients(input.to), input.subject, undefined, input.text, input.html);
         return result;
     },
 });

package/src/tools/notification/Service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../../../../src/tools/notification/Service.ts"],"names":[],"mappings":"AAqEA,eAAO,MAAM,mBAAmB;oBACR,MAAM,WAAW,MAAM,YAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;yBAWhE,MAAM,aACR,MAAM,WACR,MAAM,YACN,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;mBAyDnB,MAAM,EAAE;EAGvB,CAAC;AAEH,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../../../../src/tools/notification/Service.ts"],"names":[],"mappings":"AAqEA,eAAO,MAAM,mBAAmB;oBACR,MAAM,WAAW,MAAM,YAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;yBAWhE,MAAM,aACR,MAAM,WACR,MAAM,YACN,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;mBA4DnB,MAAM,EAAE;EAGvB,CAAC;AAEH,eAAe,mBAAmB,CAAC"}

package/src/tools/notification/Service.js

@@ -58,7 +58,7 @@ export const NotificationService = Object.freeze({
         const driverName = NotificationConfig.getDriver();
         const driver = NotificationRegistry.get(driverName);
         const result = await driver.send(recipient, message, options);
-        SystemTraceBridge.emitNotification(driverName, [driverName], recipient);
+        SystemTraceBridge.emitNotification(driverName, [driverName], recipient, message, options);
         return result;
     },
     async sendVia(channelName, recipient, message, options = {}) {
@@ -67,14 +67,14 @@ export const NotificationService = Object.freeze({
         switch (cfg.driver) {
             case 'console': {
                 const result = await ConsoleDriver.send(recipient, message, options);
-                SystemTraceBridge.emitNotification(channelName, ['console'], recipient);
+                SystemTraceBridge.emitNotification(channelName, ['console'], recipient, message, options);
                 return result;
             }
             case 'slack': {
                 const slackCfg = cfg;
                 const payload = { text: message, ...options };
                 const result = await SlackDriver.send({ webhookUrl: slackCfg.webhookUrl }, payload);
-                SystemTraceBridge.emitNotification(channelName, ['slack'], recipient);
+                SystemTraceBridge.emitNotification(channelName, ['slack'], recipient, message, payload);
                 return result;
             }
             case 'twilio': {
@@ -84,12 +84,15 @@ export const NotificationService = Object.freeze({
                     authToken: twilioCfg.authToken,
                     from: twilioCfg.fromNumber,
                 }, { to: recipient, body: message });
-                SystemTraceBridge.emitNotification(channelName, ['twilio'], recipient);
+                SystemTraceBridge.emitNotification(channelName, ['twilio'], recipient, message, {
+                    to: recipient,
+                    body: message,
+                });
                 return result;
             }
             case 'termii': {
                 const result = await sendTermii(cfg, recipient, message, options);
-                SystemTraceBridge.emitNotification(channelName, ['termii'], recipient);
+                SystemTraceBridge.emitNotification(channelName, ['termii'], recipient, message, options);
                 return result;
             }
             default:

package/src/trace/SystemTraceBridge.d.ts

@@ -1,15 +1,27 @@
 export declare const SystemTraceBridge: Readonly<{
     preload: () => Promise<boolean>;
     emitAuth: (event: "login" | "logout" | "failed", userId?: string) => void;
-    emitCache: (operation: "get" | "set" | "delete" | "clear" | "has", key: string, duration: number, hit?: boolean) => void;
+    emitCache: (operation: "get" | "set" | "delete" | "clear" | "has", key: string, duration: number, hit?: boolean, payload?: unknown, store?: string, ttl?: number) => void;
     emitCommand: (name: string, args: Record<string, unknown>, exitCode: number, duration: number, output?: string) => void;
     emitEvent: (name: string, listenerCount: number, payload?: unknown) => void;
-    emitHttpClient: (method: string, url: string, requestHeaders: Record<string, string>, responseStatus: number, duration: number) => void;
+    emitHttpClient: (payload: {
+        method: string;
+        url: string;
+        requestHeaders: Record<string, string>;
+        responseStatus?: number;
+        duration: number;
+        requestBody?: unknown;
+        responseHeaders?: Record<string, string>;
+        responseBody?: unknown;
+        error?: string;
+    }) => void;
     emitJobDispatch: (name: string, queue: string, connection: string, data?: unknown) => void;
     emitJobFailed: (name: string, error: Error) => void;
     emitJobProcessed: (name: string) => void;
-    emitMail: (to: string, subject: string, template?: string) => void;
-    emitNotification: (notification: string, channels: string[], notifiable?: string) => void;
+    emitMail: (to: string, subject: string, template?: string, text?: string, html?: string) => void;
+    emitNotification: (notification: string, channels: string[], notifiable?: string, message?: string, payload?: unknown) => void;
+    emitQuery: (query: string, params: unknown[], duration: number, connection?: string) => void;
+    emitRedis: (command: string, duration: number) => void;
 }>;
 export default SystemTraceBridge;
 //# sourceMappingURL=SystemTraceBridge.d.ts.map

package/src/trace/SystemTraceBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SystemTraceBridge.d.ts","sourceRoot":"","sources":["../../../src/trace/SystemTraceBridge.ts"],"names":[],"mappings":"AA6KA,eAAO,MAAM,iBAAiB;mBALJ,OAAO,CAAC,OAAO,CAAC;sBAlBjB,OAAO,GAAG,QAAQ,GAAG,QAAQ,WAAW,MAAM,KAAG,IAAI;2BA1DjE,KAAK,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,KAAK,OAChD,MAAM,YACD,MAAM,QACV,OAAO,KACZ,IAAI;wBA6DC,MAAM,QACN,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,YACnB,MAAM,YACN,MAAM,WACP,MAAM,KACd,IAAI;sBAlBkB,MAAM,iBAAiB,MAAM,YAAY,OAAO,KAAG,IAAI;6BAXtE,MAAM,OACT,MAAM,kBACK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,kBACtB,MAAM,YACZ,MAAM,KACf,IAAI;4BApCwB,MAAM,SAAS,MAAM,cAAc,MAAM,SAAS,OAAO,KAAG,IAAI;0BAYlE,MAAM,SAAS,KAAK,KAAG,IAAI;6BANxB,MAAM,KAAG,IAAI;mBAkBvB,MAAM,WAAW,MAAM,aAAa,MAAM,KAAG,IAAI;qCAN/B,MAAM,YAAY,MAAM,EAAE,eAAe,MAAM,KAAG,IAAI;EAiE5F,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"SystemTraceBridge.d.ts","sourceRoot":"","sources":["../../../src/trace/SystemTraceBridge.ts"],"names":[],"mappings":"AAoOA,eAAO,MAAM,iBAAiB;mBALJ,OAAO,CAAC,OAAO,CAAC;sBAlBjB,OAAO,GAAG,QAAQ,GAAG,QAAQ,WAAW,MAAM,KAAG,IAAI;2BA9FjE,KAAK,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,KAAK,OAChD,MAAM,YACD,MAAM,QACV,OAAO,YACH,OAAO,UACT,MAAM,QACR,MAAM,KACX,IAAI;wBA8FC,MAAM,QACN,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,YACnB,MAAM,YACN,MAAM,WACP,MAAM,KACd,IAAI;sBAlBkB,MAAM,iBAAiB,MAAM,YAAY,OAAO,KAAG,IAAI;8BAjC/C;QAC/B,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,EAAE,MAAM,CAAC;QACZ,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACvC,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACzC,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,KAAG,IAAI;4BApDuB,MAAM,SAAS,MAAM,cAAc,MAAM,SAAS,OAAO,KAAG,IAAI;0BAYlE,MAAM,SAAS,KAAK,KAAG,IAAI;6BANxB,MAAM,KAAG,IAAI;mBAyBvC,MAAM,WACD,MAAM,aACJ,MAAM,SACV,MAAM,SACN,MAAM,KACZ,IAAI;qCAjBS,MAAM,YACV,MAAM,EAAE,eACL,MAAM,YACT,MAAM,YACN,OAAO,KAChB,IAAI;uBAmCE,MAAM,UACL,OAAO,EAAE,YACP,MAAM,eACH,MAAM,KAClB,IAAI;yBAMqB,MAAM,YAAY,MAAM,KAAG,IAAI;EAiDzD,CAAC;AAEH,eAAe,iBAAiB,CAAC"}

package/src/trace/SystemTraceBridge.js

@@ -39,9 +39,9 @@ const withSystemTrace = (run) => {
         .then(invoke)
         .catch(() => undefined);
 };
-const emitCache = (operation, key, duration, hit) => {
+const emitCache = (operation, key, duration, hit, payload, store, ttl) => {
     withSystemTrace((module) => {
-        module.CacheWatcher?.emit(operation, key, duration, hit);
+        module.CacheWatcher?.emit(operation, key, duration, hit, payload, store, ttl);
     });
 };
 const emitJobDispatch = (name, queue, connection, data) => {
@@ -59,19 +59,29 @@ const emitJobFailed = (name, error) => {
         module.JobWatcher?.onFailed(name, error);
     });
 };
-const emitNotification = (notification, channels, notifiable) => {
+const emitNotification = (notification, channels, notifiable, message, payload) => {
     withSystemTrace((module) => {
-        module.NotificationWatcher?.emit(notification, channels, notifiable);
+        module.NotificationWatcher?.emit(notification, channels, notifiable, message, payload);
     });
 };
-const emitMail = (to, subject, template) => {
+const emitMail = (to, subject, template, text, html) => {
     withSystemTrace((module) => {
-        module.MailWatcher?.emit(to, subject, template);
+        module.MailWatcher?.emit(to, subject, template, text, html);
     });
 };
-const emitHttpClient = (method, url, requestHeaders, responseStatus, duration) => {
+const emitHttpClient = (payload) => {
     withSystemTrace((module) => {
-        module.HttpClientWatcher?.emit(method, url, requestHeaders, responseStatus, duration);
+        module.HttpClientWatcher?.emit(payload);
+    });
+};
+const emitQuery = (query, params, duration, connection) => {
+    withSystemTrace((module) => {
+        module.QueryWatcher?.emit(query, params, duration, connection);
+    });
+};
+const emitRedis = (command, duration) => {
+    withSystemTrace((module) => {
+        module.RedisWatcher?.emit(command, duration);
     });
 };
 const emitEvent = (name, listenerCount, payload) => {
@@ -105,5 +115,7 @@ export const SystemTraceBridge = Object.freeze({
     emitJobProcessed,
     emitMail,
     emitNotification,
+    emitQuery,
+    emitRedis,
 });
 export default SystemTraceBridge;