@zintrust/core 0.1.39 → 0.1.41

package/src/orm/Database.js

@@ -3,13 +3,17 @@
  * Central database connection management and query execution
  */
 import { OpenTelemetry } from '../observability/OpenTelemetry.js';
+import { Cloudflare } from '../config/cloudflare.js';
 import { Env } from '../config/env.js';
+import { Logger } from '../config/logger.js';
 import { ErrorFactory } from '../exceptions/ZintrustError.js';
 import { EventEmitter } from '../node-singletons/events.js';
 import { D1Adapter } from './adapters/D1Adapter.js';
 import { D1RemoteAdapter } from './adapters/D1RemoteAdapter.js';
 import { MySQLAdapter } from './adapters/MySQLAdapter.js';
+import { MySQLProxyAdapter } from './adapters/MySQLProxyAdapter.js';
 import { PostgreSQLAdapter } from './adapters/PostgreSQLAdapter.js';
+import { PostgreSQLProxyAdapter } from './adapters/PostgreSQLProxyAdapter.js';
 import { SQLiteAdapter } from './adapters/SQLiteAdapter.js';
 import { SQLServerAdapter } from './adapters/SQLServerAdapter.js';
 import { DatabaseAdapterRegistry } from './DatabaseAdapterRegistry.js';
@@ -21,7 +25,76 @@ import { QueryBuilder } from './QueryBuilder.js';
 /**
  * Create appropriate adapter based on driver
  */
+const resolveMySqlProxyAdapter = (cfg) => {
+    if (cfg.driver !== 'mysql')
+        return null;
+    const proxyUrl = Env.get('MYSQL_PROXY_URL', '').trim();
+    const useProxy = Env.getBool('USE_MYSQL_PROXY', false);
+    if (useProxy || proxyUrl.length > 0) {
+        Logger.info('[Database] Selecting MySQL proxy adapter for Workers runtime', {
+            driver: cfg.driver,
+            useMySqlProxy: useProxy,
+            mysqlProxyUrlConfigured: proxyUrl.length > 0,
+            mysqlProxyUrl: proxyUrl,
+        });
+        return MySQLProxyAdapter.create(cfg);
+    }
+    return null;
+};
+const resolvePostgresProxyAdapter = (cfg) => {
+    if (cfg.driver !== 'postgresql')
+        return null;
+    const proxyUrl = Env.get('POSTGRES_PROXY_URL', '').trim();
+    const useProxy = Env.getBool('USE_POSTGRES_PROXY', false);
+    if (useProxy || proxyUrl.length > 0) {
+        Logger.info('[Database] Selecting PostgreSQL proxy adapter for Workers runtime', {
+            driver: cfg.driver,
+            usePostgresProxy: useProxy,
+            postgresProxyUrlConfigured: proxyUrl.length > 0,
+            postgresProxyUrl: proxyUrl,
+        });
+        return PostgreSQLProxyAdapter.create(cfg);
+    }
+    return null;
+};
+const ensureCloudflareSocketSupport = (cfg) => {
+    const isSocketDriver = cfg.driver === 'postgresql' || cfg.driver === 'mysql';
+    if (!isSocketDriver)
+        return;
+    if (Cloudflare.isCloudflareSocketsEnabled())
+        return;
+    Logger.warn('[Database] Cloudflare socket driver selected but sockets are disabled', {
+        driver: cfg.driver,
+        enableCloudflareSockets: Env.getBool('ENABLE_CLOUDFLARE_SOCKETS', false),
+    });
+    throw ErrorFactory.createConfigError('Cloudflare sockets are disabled. Set ENABLE_CLOUDFLARE_SOCKETS=true to use SQL adapters on Workers.');
+};
+const resolveWorkersAdapter = (cfg) => {
+    const workersEnv = Cloudflare.getWorkersEnv();
+    if (workersEnv === null)
+        return null;
+    Logger.info('[Database] Resolving adapter for Cloudflare Workers runtime', {
+        driver: cfg.driver,
+        useMySqlProxy: Env.getBool('USE_MYSQL_PROXY', false),
+        mysqlProxyUrlConfigured: Env.get('MYSQL_PROXY_URL', '').trim() !== '',
+        usePostgresProxy: Env.getBool('USE_POSTGRES_PROXY', false),
+        postgresProxyUrlConfigured: Env.get('POSTGRES_PROXY_URL', '').trim() !== '',
+        cloudflareSocketsEnabled: Cloudflare.isCloudflareSocketsEnabled(),
+        workersBindingsCount: Object.keys(workersEnv).length,
+    });
+    const mysqlProxy = resolveMySqlProxyAdapter(cfg);
+    if (mysqlProxy)
+        return mysqlProxy;
+    const postgresProxy = resolvePostgresProxyAdapter(cfg);
+    if (postgresProxy)
+        return postgresProxy;
+    ensureCloudflareSocketSupport(cfg);
+    return null;
+};
 const createAdapter = (cfg) => {
+    const workersAdapter = resolveWorkersAdapter(cfg);
+    if (workersAdapter)
+        return workersAdapter;
     const registered = DatabaseAdapterRegistry.get(cfg.driver);
     if (registered !== undefined) {
         return registered(cfg);
@@ -47,15 +120,7 @@ const createAdapter = (cfg) => {
  */
 const initializeAdapters = (dbConfig) => {
     const writeAdapter = createAdapter(dbConfig);
-    const readAdapters = [];
-    if (dbConfig.readHosts !== undefined && dbConfig.readHosts.length > 0) {
-        for (const host of dbConfig.readHosts) {
-            readAdapters.push(createAdapter({ ...dbConfig, host }));
-        }
-    }
-    else {
-        readAdapters.push(writeAdapter);
-    }
+    const readAdapters = [writeAdapter];
     return { writeAdapter, readAdapters };
 };
 /**
@@ -237,6 +302,9 @@ const createDbFacade = (input) => {
         query: queryHandlers.query,
         queryOne: queryHandlers.queryOne,
         execute: queryHandlers.execute,
+        raw(value) {
+            return { __raw: value };
+        },
         transaction: queryHandlers.transaction,
         table(name) {
             return QueryBuilder.create(name, db);
@@ -319,6 +387,9 @@ export const useEnsureDbConnected = async (config = undefined, connectionName =
 export function useDatabase(config, connection = 'default') {
     if (databaseInstances.has(connection) === false) {
         if (config === undefined) {
+            // Diagnostic logging
+            Logger.error('[DEBUG] Database instances keys:', Array.from(databaseInstances.keys()));
+            Logger.error('[DEBUG] Requesting connection:', connection);
             throw ErrorFactory.createConfigError(`Database connection '${connection}' is not registered. ` +
                 `Call useDatabase(config, '${connection}') during startup to register it.`);
         }

package/src/orm/DatabaseRuntimeRegistration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DatabaseRuntimeRegistration.d.ts","sourceRoot":"","sources":["../../../src/orm/DatabaseRuntimeRegistration.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,mBAAmB,EAGpB,MAAM,cAAc,CAAC;AAwDtB;;;;;;;GAOG;AACH,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAWpF"}
+{"version":3,"file":"DatabaseRuntimeRegistration.d.ts","sourceRoot":"","sources":["../../../src/orm/DatabaseRuntimeRegistration.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,mBAAmB,EAGpB,MAAM,cAAc,CAAC;AA0DtB;;;;;;;GAOG;AACH,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAYpF"}

package/src/orm/DatabaseRuntimeRegistration.js

@@ -55,6 +55,7 @@ const registerConnections = (connections) => {
         useDatabase(toOrmConfig(runtimeCfg), name);
     }
 };
+import { Logger } from '../config/logger.js';
 /**
  * Register all connections from runtime config.
  *
@@ -69,5 +70,6 @@ export function registerDatabasesFromRuntimeConfig(config) {
     if (defaultCfg === undefined) {
         throw ErrorFactory.createConfigError(`Database default connection not configured: ${String(config.default ?? '')}`);
     }
+    Logger.info(`✓ Registering default database connection: ${config.default}`);
     useDatabase(toOrmConfig(defaultCfg), 'default');
 }

package/src/orm/QueryBuilder.d.ts

@@ -37,6 +37,7 @@ export interface IQueryBuilder {
     where(column: string, operator: string | number | boolean | null, value?: unknown): IQueryBuilder;
     andWhere(column: string, operator: string, value?: unknown): IQueryBuilder;
     orWhere(column: string, operator: string, value?: unknown): IQueryBuilder;
+    whereNull(column: string): IQueryBuilder;
     whereIn(column: string, values: unknown[]): IQueryBuilder;
     whereNotIn(column: string, values: unknown[]): IQueryBuilder;
     withTrashed(): IQueryBuilder;

package/src/orm/QueryBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/orm/QueryBuilder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;AAE5D,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,aAAa,CAAC;AAC5E,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAEvE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACvD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;IACnD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAClG,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAC3E,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAC1E,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAC1D,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAC7D,WAAW,IAAI,aAAa,CAAC;IAC7B,WAAW,IAAI,aAAa,CAAC;IAC7B,cAAc,IAAI,aAAa,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,aAAa,CAAC;IACnD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,aAAa,CAAC;IACnE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACpC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IACrC,eAAe,IAAI,WAAW,EAAE,CAAC;IACjC,gBAAgB,IAAI,MAAM,EAAE,CAAC;IAC7B,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,IAAI,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,IAAI,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,IAAI;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IACxE,QAAQ,IAAI,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjD,eAAe,IAAI,OAAO,CAAC;IAC3B,KAAK,IAAI,MAAM,CAAC;IAChB,aAAa,IAAI,OAAO,EAAE,CAAC;IAC3B,KAAK,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC9B,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7C,GAAG,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IACvB,GAAG,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IACvB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/F,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,oBAAoB,GAAG,aAAa,CAAC;IAC7D,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,CAAC;IAC3C,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1F,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAChG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;AAy0CD;;;;;GAKG;AACH,eAAO,MAAM,YAAY;IACvB;;OAEG;sBAEU,MAAM,GAAG,SAAS,OACxB,SAAS,YACL,mBAAmB,GAC3B,aAAa;IA8BhB;;;;;OAKG;aACY,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;EAIxC,CAAC"}
+{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/orm/QueryBuilder.ts"],"names":[],"mappings":"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"}

package/src/orm/QueryBuilder.js

@@ -36,6 +36,7 @@ const escapeIdentifier = (id, dialect) => {
 };
 const SAFE_IDENTIFIER_PATH = /^[A-Za-z_]\w*(?:\.[A-Za-z_]\w*)*$/;
 const SAFE_IDENTIFIER = /^[A-Za-z_]\w*$/;
+const SAFE_FUNCTION_CALL = /^[A-Za-z_]\w*\(\)$/;
 const assertSafeIdentifierPath = (id, label) => {
     const trimmed = id.trim();
     if (trimmed.length === 0) {
@@ -54,6 +55,20 @@ const assertSafeIdentifier = (id, label) => {
         throw ErrorFactory.createDatabaseError(`Unsafe SQL identifier for ${label}`);
     }
 };
+const isRawValue = (value) => typeof value === 'object' &&
+    value !== null &&
+    '__raw' in value &&
+    typeof value.__raw === 'string';
+const assertSafeRawExpression = (raw) => {
+    const trimmed = raw.trim();
+    if (trimmed.length === 0) {
+        throw ErrorFactory.createDatabaseError('Empty raw SQL expression');
+    }
+    if (SAFE_IDENTIFIER_PATH.test(trimmed) || SAFE_FUNCTION_CALL.test(trimmed)) {
+        return trimmed;
+    }
+    throw ErrorFactory.createDatabaseError('Unsafe raw SQL expression');
+};
 const normalizeOrderDirection = (direction) => {
     if (direction === undefined || direction === null)
         return 'ASC';
@@ -370,7 +385,9 @@ const compileInsert = (tableName, values, dialect) => {
             parameters.push(item[key]);
         }
     }
-    const sql = `INSERT INTO ${escapeIdentifier(tableName, dialect)} (${colsSql}) VALUES ${placeholders}`;
+    const baseSql = `INSERT INTO ${escapeIdentifier(tableName, dialect)} (${colsSql}) VALUES ${placeholders}`;
+    const wantsReturning = dialect === 'postgresql' && items.length === 1;
+    const sql = wantsReturning ? `${baseSql} RETURNING id` : baseSql;
     return { sql, parameters };
 };
 const compileUpdate = (tableName, values, conditions, dialect) => {
@@ -384,8 +401,20 @@ const compileUpdate = (tableName, values, conditions, dialect) => {
     assertSafeIdentifierPath(tableName, 'table name');
     for (const key of keys)
         assertSafeIdentifier(key, 'update column');
-    const setSql = keys.map((k) => `${escapeIdentifier(k, dialect)} = ?`).join(', ');
-    const setParams = keys.map((k) => values[k]);
+    const setParts = [];
+    const setParams = [];
+    for (const key of keys) {
+        const value = values[key];
+        if (isRawValue(value)) {
+            const rawSql = assertSafeRawExpression(value.__raw);
+            setParts.push(`${escapeIdentifier(key, dialect)} = ${rawSql}`);
+        }
+        else {
+            setParts.push(`${escapeIdentifier(key, dialect)} = ?`);
+            setParams.push(value);
+        }
+    }
+    const setSql = setParts.join(', ');
     const where = compileWhere(conditions, dialect);
     const sql = `UPDATE ${escapeIdentifier(tableName, dialect)} SET ${setSql}${where.sql}`;
     return { sql, parameters: [...setParams, ...where.parameters] };
@@ -479,6 +508,7 @@ function attachWhereMethods(builder, state) {
     };
     builder.andWhere = (column, operator, value) => builder.where(column, operator, value);
     builder.orWhere = (column, operator, value) => builder.where(column, operator, value);
+    builder.whereNull = (column) => builder.where(column, 'IS', null);
     builder.whereIn = (column, values) => {
         builder.where(column, 'IN', values);
         return builder;

package/src/orm/SchemaCompiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaCompiler.d.ts","sourceRoot":"","sources":["../../../src/orm/SchemaCompiler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAoB,OAAO,EAAE,MAAM,aAAa,CAAC;AA4I7D,eAAO,MAAM,cAAc;oBAEnB,SAAS,UACL,OAAO,SACR;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAC/B,OAAO,CAAC,IAAI,CAAC;kBAMI,SAAS,SAAS,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;EAM5D,CAAC"}
+{"version":3,"file":"SchemaCompiler.d.ts","sourceRoot":"","sources":["../../../src/orm/SchemaCompiler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAoB,OAAO,EAAE,MAAM,aAAa,CAAC;AA+I7D,eAAO,MAAM,cAAc;oBAEnB,SAAS,UACL,OAAO,SACR;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAC/B,OAAO,CAAC,IAAI,CAAC;kBAMI,SAAS,SAAS,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;EAM5D,CAAC"}

package/src/orm/SchemaCompiler.js

@@ -80,7 +80,7 @@ function getColumnTypeSql(driver, def) {
         return specialSql;
     return 'TEXT';
 }
-function getDefaultValueSql(table, def) {
+function getDefaultValueSql(driver, table, def) {
     if (def.default === undefined)
         return null;
     const dv = def.default;
@@ -88,8 +88,11 @@ function getDefaultValueSql(table, def) {
         return 'DEFAULT NULL';
     if (typeof dv === 'number' && Number.isFinite(dv))
         return `DEFAULT ${dv}`;
-    if (typeof dv === 'boolean')
+    if (typeof dv === 'boolean') {
+        if (driver === 'postgresql')
+            return `DEFAULT ${dv ? 'true' : 'false'}`;
         return `DEFAULT ${dv ? 1 : 0}`;
+    }
     if (typeof dv === 'string') {
         const escaped = dv.replaceAll("'", "''");
         return `DEFAULT '${escaped}'`;
@@ -113,7 +116,7 @@ function columnSql(driver, table, def) {
         parts.push('UNIQUE');
     if (isPrimary)
         parts.push('PRIMARY KEY');
-    const defaultVal = getDefaultValueSql(table, def);
+    const defaultVal = getDefaultValueSql(driver, table, def);
     if (defaultVal !== null)
         parts.push(defaultVal);
     return parts.join(' ');

package/src/orm/adapters/D1RemoteAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"D1RemoteAdapter.d.ts","sourceRoot":"","sources":["../../../../src/orm/adapters/D1RemoteAdapter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAe,MAAM,sBAAsB,CAAC;AA+I1F,eAAO,MAAM,eAAe;oBACV,cAAc,GAAG,gBAAgB;EA+EjD,CAAC;AAEH,eAAe,eAAe,CAAC"}
+{"version":3,"file":"D1RemoteAdapter.d.ts","sourceRoot":"","sources":["../../../../src/orm/adapters/D1RemoteAdapter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAe,MAAM,sBAAsB,CAAC;AA2J1F,eAAO,MAAM,eAAe;oBACV,cAAc,GAAG,gBAAgB;EA+EjD,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/src/orm/adapters/D1RemoteAdapter.js

@@ -9,11 +9,23 @@ import { ErrorFactory } from '../../exceptions/ZintrustError.js';
 import { AdaptersEnum } from '../../migrations/enum/index.js';
 import { QueryBuilder } from '../QueryBuilder.js';
 import { SignedRequest } from '../../security/SignedRequest.js';
+const resolveSigningPrefix = (baseUrl) => {
+    try {
+        const parsed = new URL(baseUrl);
+        const path = parsed.pathname.endsWith('/') ? parsed.pathname.slice(0, -1) : parsed.pathname;
+        if (path === '' || path === '/')
+            return undefined;
+        return path;
+    }
+    catch {
+        return undefined;
+    }
+};
 const createRemoteConfig = () => {
     const settings = {
         baseUrl: Env.get('D1_REMOTE_URL'),
         keyId: Env.get('D1_REMOTE_KEY_ID'),
-        secret: Env.get('D1_REMOTE_SECRET'),
+        secret: Env.get('D1_REMOTE_SECRET', Env.APP_KEY),
         mode: Env.get('D1_REMOTE_MODE', 'registry') ?? 'registry',
         timeoutMs: Env.getInt('ZT_PROXY_TIMEOUT_MS', Env.REQUEST_TIMEOUT),
     };
@@ -22,6 +34,7 @@ const createRemoteConfig = () => {
         keyId: settings.keyId,
         secret: settings.secret,
         timeoutMs: settings.timeoutMs,
+        signaturePathPrefixToStrip: resolveSigningPrefix(settings.baseUrl),
         missingUrlMessage: 'D1 remote proxy URL is missing (D1_REMOTE_URL)',
         missingCredentialsMessage: 'D1 remote signing credentials are missing (D1_REMOTE_KEY_ID / D1_REMOTE_SECRET)',
         messages: {

package/src/orm/adapters/MongoDBProxyAdapter.d.ts

@@ -0,0 +1,3 @@
+import type { IDatabaseAdapter } from '../DatabaseAdapter';
+export declare function createMongoDBProxyAdapter(): IDatabaseAdapter;
+//# sourceMappingURL=MongoDBProxyAdapter.d.ts.map

package/src/orm/adapters/MongoDBProxyAdapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MongoDBProxyAdapter.d.ts","sourceRoot":"","sources":["../../../../src/orm/adapters/MongoDBProxyAdapter.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAe,MAAM,sBAAsB,CAAC;AA6D1E,wBAAgB,yBAAyB,IAAI,gBAAgB,CA4F5D"}

package/src/orm/adapters/MongoDBProxyAdapter.js

@@ -0,0 +1,128 @@
+/* eslint-disable @typescript-eslint/require-await */
+import { Env } from '../../config/env.js';
+import { Logger } from '../../config/logger.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { ProxyCache } from '../adapters/ProxyCache.js';
+import { ensureSignedSettings, isRecord, requestSignedProxy, } from '../adapters/SqlProxyAdapterUtils.js';
+const normalizeRows = (value) => {
+    if (value === null)
+        return [];
+    if (Array.isArray(value))
+        return value;
+    return [value];
+};
+const extractResultPayload = (response) => {
+    if (!isRecord(response))
+        return response;
+    if ('result' in response)
+        return response['result'];
+    if ('rows' in response)
+        return response['rows'];
+    return response;
+};
+const getCacheKey = (collection, operation, args) => {
+    return `${collection}:${operation}:${JSON.stringify(args)}`;
+};
+const resolveProxyUrl = () => {
+    const url = Env.get('MONGODB_PROXY_URL', '');
+    if (typeof url === 'string' && url.trim() !== '')
+        return url;
+    const host = Env.get('MONGODB_PROXY_HOST', '127.0.0.1');
+    const port = Env.getInt('MONGODB_PROXY_PORT', 8792);
+    return `http://${host}:${port}`;
+};
+const buildProxySettings = () => {
+    const baseUrl = resolveProxyUrl();
+    const keyId = Env.get('MONGODB_PROXY_KEY_ID', '');
+    const secret = Env.get('MONGODB_PROXY_SECRET', '');
+    const timeoutMs = Env.getInt('MONGODB_PROXY_TIMEOUT_MS', 30000);
+    return { baseUrl, keyId, secret, timeoutMs };
+};
+const buildSignedProxyConfig = (settings) => ({
+    settings,
+    missingUrlMessage: 'MongoDB proxy URL is missing',
+    missingCredentialsMessage: 'MongoDB proxy signing credentials are missing',
+    messages: {
+        unauthorized: 'MongoDB proxy unauthorized',
+        forbidden: 'MongoDB proxy forbidden',
+        rateLimited: 'MongoDB proxy rate limited',
+        rejected: 'MongoDB proxy rejected',
+        error: 'MongoDB proxy error',
+        timedOut: 'MongoDB proxy timed out',
+    },
+});
+const MONGODB_OPERATION_PATH = '/zin/mongodb/operation';
+export function createMongoDBProxyAdapter() {
+    let connected = false;
+    const cache = ProxyCache.create();
+    const settings = buildProxySettings();
+    return {
+        async connect() {
+            ensureSignedSettings(buildSignedProxyConfig(settings));
+            Logger.info(`Connecting to MongoDB via proxy: ${settings.baseUrl}`);
+            connected = true;
+        },
+        async disconnect() {
+            connected = false;
+            cache.clear();
+            Logger.info('Disconnected from MongoDB proxy');
+        },
+        async query(_sql, _parameters) {
+            if (!connected) {
+                throw ErrorFactory.createConnectionError('Not connected to MongoDB proxy');
+            }
+            // Parse MongoDB-like query (simple implementation)
+            // Expected format: collection.operation({...})
+            const pattern = /^(\w+)\.(\w+)\((.+)\$/;
+            const match = pattern.exec(_sql);
+            if (!match) {
+                throw ErrorFactory.createGeneralError('Invalid MongoDB query format');
+            }
+            const [, collection, operation, argsStr] = match;
+            const args = JSON.parse(argsStr);
+            const cacheKey = getCacheKey(collection, operation, args);
+            const cached = cache.get(cacheKey);
+            if (cached)
+                return cached;
+            const response = await requestSignedProxy(buildSignedProxyConfig({
+                ...settings,
+                signaturePathPrefixToStrip: MONGODB_OPERATION_PATH,
+            }), MONGODB_OPERATION_PATH, { collection, operation, args });
+            const result = extractResultPayload(response);
+            const rows = normalizeRows(result);
+            const queryResult = {
+                rows,
+                rowCount: rows.length,
+            };
+            cache.set(cacheKey, queryResult);
+            return queryResult;
+        },
+        async queryOne(sql, parameters) {
+            const result = await this.query(sql, parameters);
+            return result.rows[0] ?? null;
+        },
+        async ping() {
+            if (!connected) {
+                throw ErrorFactory.createConnectionError('Not connected to MongoDB proxy');
+            }
+        },
+        async transaction(callback) {
+            // MongoDB proxy doesn't support traditional transactions via HTTP
+            Logger.warn('MongoDB proxy adapter does not support transactions');
+            return callback(this);
+        },
+        async rawQuery(sql, parameters) {
+            const result = await this.query(sql, parameters ?? []);
+            return result.rows;
+        },
+        getType() {
+            return 'mongodb-proxy';
+        },
+        isConnected() {
+            return connected;
+        },
+        getPlaceholder(index) {
+            return `$${index}`;
+        },
+    };
+}

package/src/orm/adapters/MySQLProxyAdapter.d.ts

@@ -0,0 +1,11 @@
+/**
+ * MySQL Proxy Adapter (HTTP)
+ *
+ * Used in Cloudflare Workers when MYSQL_PROXY_URL is configured.
+ */
+import type { DatabaseConfig, IDatabaseAdapter } from '../DatabaseAdapter';
+export declare const MySQLProxyAdapter: Readonly<{
+    create(_config: DatabaseConfig): IDatabaseAdapter;
+}>;
+export default MySQLProxyAdapter;
+//# sourceMappingURL=MySQLProxyAdapter.d.ts.map

package/src/orm/adapters/MySQLProxyAdapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MySQLProxyAdapter.d.ts","sourceRoot":"","sources":["../../../../src/orm/adapters/MySQLProxyAdapter.ts"],"names":[],"mappings":"AACA;;;;GAIG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAe,MAAM,sBAAsB,CAAC;AAuF1F,eAAO,MAAM,iBAAiB;oBACZ,cAAc,GAAG,gBAAgB;EAqFjD,CAAC;AAEH,eAAe,iBAAiB,CAAC"}

package/src/orm/adapters/MySQLProxyAdapter.js

@@ -0,0 +1,143 @@
+/* eslint-disable @typescript-eslint/require-await */
+/**
+ * MySQL Proxy Adapter (HTTP)
+ *
+ * Used in Cloudflare Workers when MYSQL_PROXY_URL is configured.
+ */
+import { Env } from '../../config/env.js';
+import { Logger } from '../../config/logger.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { AdaptersEnum } from '../../migrations/enum/index.js';
+import { QueryBuilder } from '../QueryBuilder.js';
+import { ensureSignedSettings, isRecord, requestSignedProxy, } from '../adapters/SqlProxyAdapterUtils.js';
+const buildProxySettings = () => {
+    const baseUrl = Env.MYSQL_PROXY_URL;
+    const keyId = Env.MYSQL_PROXY_KEY_ID ?? '';
+    const secret = Env.MYSQL_PROXY_SECRET ?? '';
+    const timeoutMs = Env.MYSQL_PROXY_TIMEOUT_MS;
+    return { baseUrl, keyId, secret, timeoutMs };
+};
+const buildSignedProxyConfig = (settings) => ({
+    settings,
+    missingUrlMessage: 'MySQL proxy URL is missing (MYSQL_PROXY_URL)',
+    missingCredentialsMessage: 'MySQL proxy signing credentials are missing (MYSQL_PROXY_KEY_ID / MYSQL_PROXY_SECRET)',
+    messages: {
+        unauthorized: 'MySQL proxy unauthorized',
+        forbidden: 'MySQL proxy forbidden',
+        rateLimited: 'MySQL proxy rate limited',
+        rejected: 'MySQL proxy rejected request',
+        error: 'MySQL proxy error',
+        timedOut: 'MySQL proxy request timed out',
+    },
+});
+const isQueryResponse = (value) => isRecord(value) && Array.isArray(value['rows']) && typeof value['rowCount'] === 'number';
+const isQueryOneResponse = (value) => isRecord(value) && 'row' in value;
+const getExecMeta = (value) => {
+    if (!isRecord(value) || typeof value['ok'] !== 'boolean')
+        return { changes: 0 };
+    const meta = value['meta'];
+    if (!isRecord(meta))
+        return { changes: 0 };
+    const changes = typeof meta['changes'] === 'number' ? meta['changes'] : 0;
+    const lastRowId = meta['lastRowId'];
+    return { changes, lastRowId: lastRowId };
+};
+const requestProxy = async (settings, path, payload) => {
+    const signedProxyConfig = buildSignedProxyConfig(settings);
+    try {
+        return await requestSignedProxy(signedProxyConfig, path, payload);
+    }
+    catch (error) {
+        Logger.error('[MySQLProxyAdapter] Proxy request failed', {
+            path,
+            baseUrl: settings.baseUrl,
+            timeoutMs: settings.timeoutMs,
+            hasKeyId: (settings.keyId ?? '').trim() !== '',
+            hasSecret: (settings.secret ?? '').trim() !== '',
+            error: error instanceof Error ? error.message : String(error),
+        });
+        throw error;
+    }
+};
+export const MySQLProxyAdapter = Object.freeze({
+    create(_config) {
+        let connected = false;
+        const settings = buildProxySettings();
+        Logger.info('[MySQLProxyAdapter] Created with runtime settings', {
+            baseUrl: settings.baseUrl,
+            timeoutMs: settings.timeoutMs,
+            hasKeyId: (settings.keyId ?? '').trim() !== '',
+            hasSecret: (settings.secret ?? '').trim() !== '',
+        });
+        return {
+            async connect() {
+                ensureSignedSettings(buildSignedProxyConfig(settings));
+                connected = true;
+            },
+            async disconnect() {
+                connected = false;
+            },
+            async query(sql, parameters) {
+                if (!connected)
+                    throw ErrorFactory.createConnectionError('Database not connected');
+                const out = await requestProxy(settings, '/zin/mysql/query', {
+                    sql,
+                    params: parameters,
+                });
+                if (isQueryResponse(out)) {
+                    return {
+                        rows: out.rows,
+                        rowCount: out.rowCount,
+                        lastInsertId: out.lastInsertId,
+                    };
+                }
+                if (isQueryOneResponse(out)) {
+                    const row = out.row;
+                    return { rows: row ? [row] : [], rowCount: row ? 1 : 0 };
+                }
+                const meta = getExecMeta(out);
+                return { rows: [], rowCount: meta.changes, lastInsertId: meta.lastRowId };
+            },
+            async queryOne(sql, parameters) {
+                if (!connected)
+                    throw ErrorFactory.createConnectionError('Database not connected');
+                const out = await requestProxy(settings, '/zin/mysql/queryOne', {
+                    sql,
+                    params: parameters,
+                });
+                return out.row ?? null;
+            },
+            async ping() {
+                if (!connected)
+                    throw ErrorFactory.createConnectionError('Database not connected');
+                await this.queryOne(QueryBuilder.create('').select('1').toSQL(), []);
+            },
+            async transaction(callback) {
+                if (!connected)
+                    throw ErrorFactory.createConnectionError('Database not connected');
+                try {
+                    return await callback(this);
+                }
+                catch (error) {
+                    throw ErrorFactory.createTryCatchError('MySQL proxy transaction failed', error);
+                }
+            },
+            async rawQuery(sql, parameters = []) {
+                if (!connected)
+                    throw ErrorFactory.createConnectionError('Database not connected');
+                const out = await this.query(sql, parameters);
+                return out.rows;
+            },
+            getType() {
+                return AdaptersEnum.mysql;
+            },
+            isConnected() {
+                return connected;
+            },
+            getPlaceholder(_index) {
+                return '?';
+            },
+        };
+    },
+});
+export default MySQLProxyAdapter;

package/src/orm/adapters/PostgreSQLProxyAdapter.d.ts

@@ -0,0 +1,11 @@
+/**
+ * PostgreSQL Proxy Adapter (HTTP)
+ *
+ * Used in Cloudflare Workers when POSTGRES_PROXY_URL is configured.
+ */
+import type { DatabaseConfig, IDatabaseAdapter } from '../DatabaseAdapter';
+export declare const PostgreSQLProxyAdapter: Readonly<{
+    create(_config: DatabaseConfig): IDatabaseAdapter;
+}>;
+export default PostgreSQLProxyAdapter;
+//# sourceMappingURL=PostgreSQLProxyAdapter.d.ts.map

package/src/orm/adapters/PostgreSQLProxyAdapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostgreSQLProxyAdapter.d.ts","sourceRoot":"","sources":["../../../../src/orm/adapters/PostgreSQLProxyAdapter.ts"],"names":[],"mappings":"AACA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAe,MAAM,sBAAsB,CAAC;AAkH1F,eAAO,MAAM,sBAAsB;oBACjB,cAAc,GAAG,gBAAgB;EA+DjD,CAAC;AAEH,eAAe,sBAAsB,CAAC"}