@zintrust/core 0.1.40 → 0.1.42

package/src/common/RemoteSignedJson.js

@@ -1,4 +1,6 @@
 import { ErrorFactory } from '../exceptions/ZintrustError.js';
+import { isObject } from '../helper/index.js';
+import { normalizeSigningCredentials } from '../proxy/SigningService.js';
 import { SignedRequest } from '../security/SignedRequest.js';
 const joinUrl = (baseUrl, path) => {
     const u = new URL(baseUrl);
@@ -19,6 +21,29 @@ const asJson = async (resp) => {
         return { message: text };
     }
 };
+const isRecord = (value) => isObject(value);
+const describeProxyError = (details) => {
+    // Expected Worker proxy error shape: { status: number, body: { code: string, message: string } }
+    if (!isRecord(details))
+        return '';
+    const body = details['body'];
+    if (!isRecord(body))
+        return '';
+    const code = typeof body['code'] === 'string' ? body['code'] : '';
+    const message = typeof body['message'] === 'string' ? body['message'] : '';
+    if (code === '' && message === '')
+        return '';
+    if (code !== '' && message !== '')
+        return `${code}: ${message}`;
+    return code === '' ? message : code;
+};
+const normalizeSettings = (settings) => {
+    const creds = normalizeSigningCredentials({
+        keyId: settings.keyId,
+        secret: settings.secret,
+    });
+    return { ...settings, keyId: creds.keyId, secret: creds.secret };
+};
 const requireConfigured = (settings) => {
     if (settings.baseUrl.trim() === '') {
         throw ErrorFactory.createConfigError(settings.missingUrlMessage);
@@ -33,53 +58,80 @@ const createTimeoutSignal = (timeoutMs) => {
     const timeout = AbortSignal.timeout;
     return typeof timeout === 'function' ? timeout(timeoutMs) : undefined;
 };
+const buildSigningUrl = (url, settings) => {
+    const rawPrefix = settings.signaturePathPrefixToStrip?.trim() ?? '';
+    if (rawPrefix === '' || rawPrefix === '/') {
+        return new URL(url.toString());
+    }
+    const normalizedPrefix = rawPrefix.startsWith('/') ? rawPrefix : `/${rawPrefix}`;
+    const signingUrl = new URL(url.toString());
+    if (signingUrl.pathname === normalizedPrefix) {
+        signingUrl.pathname = '/';
+        return signingUrl;
+    }
+    if (signingUrl.pathname.startsWith(`${normalizedPrefix}/`)) {
+        signingUrl.pathname = signingUrl.pathname.slice(normalizedPrefix.length);
+    }
+    return signingUrl;
+};
+const throwForNonOkResponse = async (resp, settings) => {
+    const details = await asJson(resp);
+    switch (resp.status) {
+        case 401:
+            throw ErrorFactory.createUnauthorizedError(settings.messages.unauthorized, details);
+        case 403:
+            throw ErrorFactory.createForbiddenError(settings.messages.forbidden, details);
+        case 429:
+            throw ErrorFactory.createSecurityError(settings.messages.rateLimited, details);
+        default: {
+            if (resp.status >= 400 && resp.status < 500) {
+                throw ErrorFactory.createValidationError(settings.messages.rejected, details);
+            }
+            const extra = describeProxyError(details);
+            const msg = extra === '' ? settings.messages.error : `${settings.messages.error} (${extra})`;
+            throw ErrorFactory.createConnectionError(msg, {
+                status: resp.status,
+                details,
+            });
+        }
+    }
+};
+const rethrowRequestError = (error, settings) => {
+    if (error instanceof Error && error.name === 'AbortError') {
+        throw ErrorFactory.createConnectionError(settings.messages.timedOut, {
+            timeoutMs: settings.timeoutMs,
+        });
+    }
+    throw error;
+};
 export const RemoteSignedJson = Object.freeze({
     async request(settings, path, payload) {
-        requireConfigured(settings);
-        const url = joinUrl(settings.baseUrl, path);
+        const normalized = normalizeSettings(settings);
+        requireConfigured(normalized);
+        const url = joinUrl(normalized.baseUrl, path);
+        const signingUrl = buildSigningUrl(url, normalized);
         const body = JSON.stringify(payload);
         const signed = await SignedRequest.createHeaders({
             method: 'POST',
-            url,
+            url: signingUrl,
             body,
-            keyId: settings.keyId,
-            secret: settings.secret,
+            keyId: normalized.keyId,
+            secret: normalized.secret,
         });
         try {
             const resp = await fetch(url, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json', ...signed },
                 body,
-                signal: createTimeoutSignal(settings.timeoutMs),
+                signal: createTimeoutSignal(normalized.timeoutMs),
             });
             if (!resp.ok) {
-                const details = await asJson(resp);
-                if (resp.status === 401) {
-                    throw ErrorFactory.createUnauthorizedError(settings.messages.unauthorized, details);
-                }
-                if (resp.status === 403) {
-                    throw ErrorFactory.createForbiddenError(settings.messages.forbidden, details);
-                }
-                if (resp.status === 429) {
-                    throw ErrorFactory.createSecurityError(settings.messages.rateLimited, details);
-                }
-                if (resp.status >= 400 && resp.status < 500) {
-                    throw ErrorFactory.createValidationError(settings.messages.rejected, details);
-                }
-                throw ErrorFactory.createConnectionError(settings.messages.error, {
-                    status: resp.status,
-                    details,
-                });
+                await throwForNonOkResponse(resp, normalized);
             }
             return (await asJson(resp));
         }
         catch (error) {
-            if (error instanceof Error && error.name === 'AbortError') {
-                throw ErrorFactory.createConnectionError(settings.messages.timedOut, {
-                    timeoutMs: settings.timeoutMs,
-                });
-            }
-            throw error;
+            return rethrowRequestError(error, normalized);
         }
     },
 });

package/src/common/index.d.ts

@@ -131,4 +131,5 @@ export declare const ensureDir: (dirPath: string) => void;
 export declare const ensureDirSafe: (dirPath: string) => void;
 export declare const readFile: (filePath: string) => string;
 export declare const writeFile: (filePath: string, content: string, createDir?: boolean) => void;
+export declare const runFromSource: () => boolean;
 //# sourceMappingURL=index.d.ts.map

package/src/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,eAAO,MAAM,WAAW;qBACL,MAAM,GAAG,OAAO;CAOlC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW;IACtB;;OAEG;sBACe,MAAM;IAgBxB;;OAEG;IAEH;;OAEG;cACa,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtC;;OAEG;yBACkB,MAAM,GAAG,GAAG,GAAG,MAAM;IAI1C;;OAEG;wBACiB,MAAM,GAAG,GAAG,GAAG,MAAM;IAIzC;;OAEG;IAEH;;OAEG;mBACY,MAAM,GAAG,MAAM;IAgB9B;;OAEG;qBACc,MAAM,GAAG,MAAM;IAUhC;;OAEG;sBACe,MAAM,GAAG,MAAM;IAQjC;;OAEG;IAEH;;OAEG;yBACkB,MAAM,GAAG,OAAO;IAIrC;;OAEG;uBACgB,MAAM,GAAG,IAAI;IAMhC;;OAEG;2BACoB,MAAM,GAAG,IAAI;IAQpC;;OAEG;uBACgB,MAAM,GAAG,MAAM;IAUlC;;OAEG;4BAC2B,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWtD;;OAEG;wBACiB,MAAM,WAAW,MAAM,wBAAqB,IAAI;IAcpE;;OAEG;6BAC4B,MAAM,WAAW,MAAM,wBAAqB,OAAO,CAAC,IAAI,CAAC;IAexF;;OAEG;yBACkB,MAAM,GAAG,IAAI;IAYlC;;OAEG;IAEH;;OAEG;2BACoB,MAAM;IAI7B;;OAEG;2BACmB,IAAI,GAAgB,MAAM;IAIhD;;OAEG;8BACuB,MAAM,GAAG,IAAI;IAYvC;;OAEG;IAEH;;OAEG;+BACwB,OAAO,GAAG,MAAM;IAa3C;;OAEG;6BAEQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAChB,MAAM,EAAE,WACf,MAAM,GACd,IAAI;IAWP;;OAEG;mBACY,OAAO,GAAG,OAAO;IAIhC;;OAEG;wBACiB,OAAO,aAAa,MAAM,GAAG,MAAM;IAOvD;;OAEG;wBACiB,OAAO,aAAa,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAOxE;;;OAGG;sCAC+B,MAAM,EAAE,GAAG,MAAM;EAgBnD,CAAC;AAGH,eAAO,MAAM,cAAc,QAAO,MAAsC,CAAC;AAEzE,eAAO,MAAM,KAAK,GAAU,IAAI,MAAM,KAAG,OAAO,CAAC,IAAI,CAA0B,CAAC;AAEhF,eAAO,MAAM,WAAW,GAAI,SAAS,MAAM,GAAG,GAAG,KAAG,MAA0C,CAAC;AAC/F,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,GAAG,GAAG,KAAG,MAAyC,CAAC;AAE7F,eAAO,MAAM,qBAAqB,GAAI,YAAY,MAAM,EAAE,KAAG,MAE5D,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,OAAO,OAAO,KAAG,MACb,CAAC;AAIzC,eAAO,MAAM,yBAAyB,GAAI,OAAO,OAAO,KAAG,MAM1D,CAAC;AAGF,eAAO,MAAM,UAAU,GAAI,UAAU,MAAM,KAAG,OAA2C,CAAC;AAC1F,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,KAAG,IAAsC,CAAC;AACnF,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,KAAG,IAA0C,CAAC;AAC3F,eAAO,MAAM,QAAQ,GAAI,UAAU,MAAM,KAAG,MAAwC,CAAC;AACrF,eAAO,MAAM,SAAS,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,EAAE,mBAAgB,KAAG,IAC3B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,eAAO,MAAM,WAAW;qBACL,MAAM,GAAG,OAAO;CAOlC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW;IACtB;;OAEG;sBACe,MAAM;IAgBxB;;OAEG;IAEH;;OAEG;cACa,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtC;;OAEG;yBACkB,MAAM,GAAG,GAAG,GAAG,MAAM;IAO1C;;OAEG;wBACiB,MAAM,GAAG,GAAG,GAAG,MAAM;IAKzC;;OAEG;IAEH;;OAEG;mBACY,MAAM,GAAG,MAAM;IAgB9B;;OAEG;qBACc,MAAM,GAAG,MAAM;IAUhC;;OAEG;sBACe,MAAM,GAAG,MAAM;IAQjC;;OAEG;IAEH;;OAEG;yBACkB,MAAM,GAAG,OAAO;IAIrC;;OAEG;uBACgB,MAAM,GAAG,IAAI;IAMhC;;OAEG;2BACoB,MAAM,GAAG,IAAI;IAQpC;;OAEG;uBACgB,MAAM,GAAG,MAAM;IAUlC;;OAEG;4BAC2B,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWtD;;OAEG;wBACiB,MAAM,WAAW,MAAM,wBAAqB,IAAI;IAcpE;;OAEG;6BAC4B,MAAM,WAAW,MAAM,wBAAqB,OAAO,CAAC,IAAI,CAAC;IAexF;;OAEG;yBACkB,MAAM,GAAG,IAAI;IAYlC;;OAEG;IAEH;;OAEG;2BACoB,MAAM;IAI7B;;OAEG;2BACmB,IAAI,GAAgB,MAAM;IAIhD;;OAEG;8BACuB,MAAM,GAAG,IAAI;IAYvC;;OAEG;IAEH;;OAEG;+BACwB,OAAO,GAAG,MAAM;IAa3C;;OAEG;6BAEQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAChB,MAAM,EAAE,WACf,MAAM,GACd,IAAI;IAWP;;OAEG;mBACY,OAAO,GAAG,OAAO;IAIhC;;OAEG;wBACiB,OAAO,aAAa,MAAM,GAAG,MAAM;IAOvD;;OAEG;wBACiB,OAAO,aAAa,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAOxE;;;OAGG;sCAC+B,MAAM,EAAE,GAAG,MAAM;EAgBnD,CAAC;AAGH,eAAO,MAAM,cAAc,QAAO,MAAsC,CAAC;AAEzE,eAAO,MAAM,KAAK,GAAU,IAAI,MAAM,KAAG,OAAO,CAAC,IAAI,CAA0B,CAAC;AAEhF,eAAO,MAAM,WAAW,GAAI,SAAS,MAAM,GAAG,GAAG,KAAG,MAA0C,CAAC;AAC/F,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,GAAG,GAAG,KAAG,MAAyC,CAAC;AAE7F,eAAO,MAAM,qBAAqB,GAAI,YAAY,MAAM,EAAE,KAAG,MAE5D,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,OAAO,OAAO,KAAG,MACb,CAAC;AAIzC,eAAO,MAAM,yBAAyB,GAAI,OAAO,OAAO,KAAG,MAM1D,CAAC;AAGF,eAAO,MAAM,UAAU,GAAI,UAAU,MAAM,KAAG,OAA2C,CAAC;AAC1F,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,KAAG,IAAsC,CAAC;AACnF,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,KAAG,IAA0C,CAAC;AAC3F,eAAO,MAAM,QAAQ,GAAI,UAAU,MAAM,KAAG,MAAwC,CAAC;AACrF,eAAO,MAAM,SAAS,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,EAAE,mBAAgB,KAAG,IAC3B,CAAC;AAEtD,eAAO,MAAM,aAAa,QAAO,OAIhC,CAAC"}

package/src/common/index.js

@@ -53,13 +53,20 @@ export const CommonUtils = Object.freeze({
      * Resolve an ESM `import.meta.url` to a filesystem path.
      */
     esmFilePath(metaUrl) {
+        if (metaUrl === undefined || metaUrl === null)
+            return '';
+        if (typeof metaUrl !== 'string' && !(metaUrl instanceof URL))
+            return '';
+        if (typeof metaUrl === 'string' && metaUrl.trim() === '')
+            return '';
         return fileURLToPath(metaUrl);
     },
     /**
      * Resolve an ESM `import.meta.url` to a filesystem directory.
      */
     esmDirname(metaUrl) {
-        return path.dirname(this.esmFilePath(metaUrl));
+        const resolved = this.esmFilePath(metaUrl);
+        return resolved === '' ? '' : path.dirname(resolved);
     },
     /**
      * STRING UTILITIES
@@ -326,3 +333,7 @@ export const ensureDir = (dirPath) => CommonUtils.ensureDir(dirPath);
 export const ensureDirSafe = (dirPath) => CommonUtils.ensureDirSafe(dirPath);
 export const readFile = (filePath) => CommonUtils.readFile(filePath);
 export const writeFile = (filePath, content, createDir = true) => CommonUtils.writeFile(filePath, content, createDir);
+export const runFromSource = () => {
+    const runFromSourceEnv = process.env['ZINTRUST_RUN_FROM_SOURCE'] ?? '';
+    return runFromSourceEnv === '1' || runFromSourceEnv.toLowerCase() === 'true';
+};

package/src/common/utility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utility.d.ts","sourceRoot":"","sources":["../../../src/common/utility.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY,QAAO,MAG/B,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,MAAM,GAAE,MAAgE,GACvE,MAAM,CAoBR;AAED,eAAO,MAAM,SAAS,GAAI,OAAO,OAAO,KAAG,MAAkD,CAAC;AAQ9F,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAS/C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAE5C;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAElD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,UAAQ,GAAG,MAAM,CAGpF;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAKtD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,SAAI,GAAG,MAAM,CAqB3D;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,SAAI,GAAG,MAAM,CAe5D;AAED,eAAO,MAAM,MAAM,QAAO,MAAkC,CAAC;AAE7D,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;IACtC,mBAAmB,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACjD,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;IACrC,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;IAClC,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;IACxC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5E,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IAC5C,aAAa,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACtD,cAAc,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACvD,MAAM,EAAE,MAAM,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,SAAS;wBA5HU,MAAM;uBA6BL,OAAO,KAAG,MAAM;;;;;;;;;kBA+EvB,MAAM;EA4B9B,CAAC"}
+{"version":3,"file":"utility.d.ts","sourceRoot":"","sources":["../../../src/common/utility.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,QAAO,MAG/B,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,MAAM,GAAE,MAAgE,GACvE,MAAM,CAoBR;AAED,eAAO,MAAM,SAAS,GAAI,OAAO,OAAO,KAAG,MAAkD,CAAC;AAQ9F,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAE/C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAE5C;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAElD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,UAAQ,GAAG,MAAM,CAGpF;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAKtD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,SAAI,GAAG,MAAM,CAqB3D;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,SAAI,GAAG,MAAM,CAe5D;AAED,eAAO,MAAM,MAAM,QAAO,MAAkC,CAAC;AAE7D,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;IACtC,mBAAmB,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACjD,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;IACrC,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;IAClC,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;IACxC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5E,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IAC5C,aAAa,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACtD,cAAc,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACvD,MAAM,EAAE,MAAM,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,SAAS;wBArHU,MAAM;uBA6BL,OAAO,KAAG,MAAM;;;;;;;;;kBAwEvB,MAAM;EA4B9B,CAAC"}

package/src/common/utility.js

@@ -1,4 +1,5 @@
 import { ErrorFactory } from '../exceptions/ZintrustError.js';
+import { isEmpty as isEmptyHelper } from '../helper/index.js';
 import { randomBytes } from '../node-singletons/crypto.js';
 export const generateUuid = () => {
     if (typeof globalThis?.crypto?.randomUUID === 'function')
@@ -30,12 +31,7 @@ function bytesToHex(bytes) {
     return out;
 }
 export function isEmpty(value) {
-    return (value === null ||
-        value === undefined ||
-        value === false ||
-        value === 0 ||
-        value === '' ||
-        value === '0');
+    return isEmptyHelper(value);
 }
 export function toStr(value) {
     return String(value ?? '');

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

@@ -1 +1 @@
-{"version":3,"file":"FileLogWriter.d.ts","sourceRoot":"","sources":["../../../src/config/FileLogWriter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAwGH,KAAK,gBAAgB,GAAG;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAiFF;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,UAAU,gBAAgB,KAAG,MAAM,EAsB5D,CAAC;AAwEF,eAAO,MAAM,aAAa;gBACZ,MAAM,GAAG,IAAI;aAqChB,IAAI;EAQb,CAAC;AAEH,eAAe,aAAa,CAAC"}
+{"version":3,"file":"FileLogWriter.d.ts","sourceRoot":"","sources":["../../../src/config/FileLogWriter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA8GH,KAAK,gBAAgB,GAAG;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAiFF;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,UAAU,gBAAgB,KAAG,MAAM,EAsB5D,CAAC;AA2EF,eAAO,MAAM,aAAa;gBACZ,MAAM,GAAG,IAAI;aAsChB,IAAI;EAQb,CAAC;AAEH,eAAe,aAAa,CAAC"}

package/src/config/FileLogWriter.js

@@ -11,7 +11,13 @@ import * as path from '../node-singletons/path.js';
 // Write stream cache to avoid recreating streams
 const streamCache = new Map();
 const pendingWrites = new Map();
+const isWorkersRuntime = () => {
+    const g = globalThis;
+    return g.CF !== undefined || g.caches !== undefined || g.WebSocketPair !== undefined;
+};
 const canUseWriteStreams = () => {
+    if (isWorkersRuntime())
+        return false;
     try {
         // Vitest's ESM module mocks can throw when accessing missing exports.
         // Treat missing createWriteStream as "no stream support".
@@ -22,6 +28,8 @@ const canUseWriteStreams = () => {
     }
 };
 const appendFileSafe = (logFile, content) => {
+    if (isWorkersRuntime())
+        return;
     try {
         // Some tests/mock environments provide only appendFileSync (no streams).
         fs.appendFileSync(logFile, content);
@@ -221,16 +229,23 @@ const flushPendingWrites = (logFile) => {
         pendingWrites.delete(logFile);
         return;
     }
-    const stream = getOrCreateStream(logFile);
-    stream.write(lines, (error) => {
-        if (error !== null && error !== undefined) {
-            // Silent failure for best-effort logging
-        }
-    });
+    try {
+        const stream = getOrCreateStream(logFile);
+        stream.write(lines, (error) => {
+            if (error !== null && error !== undefined) {
+                // Silent failure for best-effort logging
+            }
+        });
+    }
+    catch {
+        appendFileSafe(logFile, lines);
+    }
     pendingWrites.delete(logFile);
 };
 export const FileLogWriter = Object.freeze({
     write(line) {
+        if (isWorkersRuntime())
+            return;
         const cwd = getCwdSafe();
         if (cwd === '')
             return;

package/src/config/app.d.ts

@@ -42,6 +42,10 @@ export declare const appConfig: Readonly<{
      * Application debug mode
      */
     readonly debug: boolean;
+    /**
+     *  Indicates if the application is running inside a Docker worker container
+     */
+    readonly dockerWorker: boolean;
     /**
      * Application timezone
      */

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

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/config/app.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAe,SAAS,EAAE,MAAM,cAAc,CAAC;AAoI3D,QAAA,MAAM,UAAU,QAAO,MAAM,CAAC,UAA2B,CAAC;AAsF1D,eAAO,MAAM,SAAS;IAtEpB;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;kCACc,OAAO;IAIxB;;OAEG;iCACa,OAAO;IAIvB;;OAEG;8BACU,OAAO;IAIpB;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;+BA/EkB,MAAM,CAAC,UAAU;kCAhDd,MAAM;EAsIoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/config/app.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAe,SAAS,EAAE,MAAM,cAAc,CAAC;AAoI3D,QAAA,MAAM,UAAU,QAAO,MAAM,CAAC,UAA2B,CAAC;AA2F1D,eAAO,MAAM,SAAS;IA3EpB;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;kCACc,OAAO;IAIxB;;OAEG;iCACa,OAAO;IAIvB;;OAEG;8BACU,OAAO;IAIpB;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;+BApFkB,MAAM,CAAC,UAAU;kCAhDd,MAAM;EA2IoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC"}

package/src/config/app.js

@@ -165,6 +165,10 @@ const appConfigObj = {
      * Application debug mode
      */
     debug: readEnvBool('DEBUG', Env.DEBUG),
+    /**
+     *  Indicates if the application is running inside a Docker worker container
+     */
+    dockerWorker: readEnvBool('DOCKER_WORKER', Env.DOCKER_WORKER),
     /**
      * Application timezone
      */

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

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../src/config/cache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAIxE,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC,CAAC;AA0BH,QAAA,MAAM,iBAAiB,QAAO;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACrC,SAAS,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,iBAAiB,CAAC;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CA4Fb,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAqB/D,eAAO,MAAM,WAAW,EAAE,WAYxB,CAAC"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../src/config/cache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAIxE,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC,CAAC;AAqDH,QAAA,MAAM,iBAAiB,QAAO;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACrC,SAAS,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,iBAAiB,CAAC;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CA4Fb,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAqB/D,eAAO,MAAM,WAAW,EAAE,WAYxB,CAAC"}

package/src/config/cache.js

@@ -4,6 +4,7 @@
  * Sealed namespace for immutability
  */
 import { Env } from './env.js';
+import { Cloudflare } from './cloudflare.js';
 import { ErrorFactory } from '../exceptions/ZintrustError.js';
 import { StartupConfigFile, StartupConfigFileRegistry } from '../runtime/StartupConfigFileRegistry.js';
 const getCacheDriver = (config, name) => {
@@ -23,6 +24,25 @@ const getCacheDriver = (config, name) => {
     }
     throw ErrorFactory.createConfigError(`Cache default store not configured: ${storeName || '<empty>'}`);
 };
+const readWorkersEnvString = (key) => {
+    const workerValue = Cloudflare.getWorkersVar(key);
+    if (workerValue !== null && workerValue.trim() !== '')
+        return workerValue;
+    return '';
+};
+const readWorkersFallbackString = (workersKey, fallbackKey, fallback = '') => {
+    const workerValue = readWorkersEnvString(workersKey);
+    if (workerValue.trim() !== '')
+        return workerValue;
+    return Env.get(fallbackKey, fallback);
+};
+const readWorkersFallbackInt = (workersKey, fallbackKey, fallback) => {
+    const raw = readWorkersFallbackString(workersKey, fallbackKey, String(fallback));
+    if (raw.trim() === '')
+        return fallback;
+    const parsed = Number.parseInt(raw, 10);
+    return Number.isFinite(parsed) ? parsed : fallback;
+};
 const createCacheConfig = () => {
     const baseDefault = (() => {
         const envConnection = Env.get('CACHE_CONNECTION', '').trim();
@@ -39,8 +59,8 @@ const createCacheConfig = () => {
         },
         redis: {
             driver: 'redis',
-            host: Env.get('REDIS_HOST', 'localhost'),
-            port: Env.getInt('REDIS_PORT', 6379),
+            host: readWorkersFallbackString('WORKERS_REDIS_HOST', 'REDIS_HOST', 'localhost'),
+            port: readWorkersFallbackInt('WORKERS_REDIS_PORT', 'REDIS_PORT', 6379),
             ttl: Env.getInt('CACHE_REDIS_TTL', 3600),
         },
         mongodb: {

package/src/config/cloudflare.d.ts

@@ -4,11 +4,15 @@
  * Centralizes access to Workers bindings via globalThis.env.
  * This keeps runtime-specific globals out of adapters/drivers.
  */
-import type { KVNamespace, WorkersEnv } from './type';
+import type { AssetsBinding, KVNamespace, WorkersEnv } from './type';
 import type { DatabaseConfig, ID1Database } from '../orm/DatabaseAdapter';
 export declare const Cloudflare: Readonly<{
     getWorkersEnv: () => WorkersEnv | null;
     getD1Binding: (config: DatabaseConfig) => ID1Database | null;
     getKVBinding: (bindingName?: string) => KVNamespace | null;
+    getR2Binding: (bindingName?: string) => unknown;
+    getAssetsBinding: () => AssetsBinding | null;
+    getWorkersVar: (key: string) => string | null;
+    isCloudflareSocketsEnabled: () => boolean;
 }>;
 //# sourceMappingURL=cloudflare.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cloudflare.d.ts","sourceRoot":"","sources":["../../../src/config/cloudflare.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AA8BxE,eAAO,MAAM,UAAU;yBA5BG,UAAU,GAAG,IAAI;2BAOb,cAAc,KAAG,WAAW,GAAG,IAAI;4CAanB,WAAW,GAAG,IAAI;EAY9D,CAAC"}
+{"version":3,"file":"cloudflare.d.ts","sourceRoot":"","sources":["../../../src/config/cloudflare.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAwFxE,eAAO,MAAM,UAAU;yBAtFG,UAAU,GAAG,IAAI;2BAOb,cAAc,KAAG,WAAW,GAAG,IAAI;iCAwB7B,MAAM,KAAG,WAAW,GAAG,IAAI;iCAa3B,MAAM,KAAG,OAAO;4BA0BvB,aAAa,GAAG,IAAI;yBATrB,MAAM,KAAG,MAAM,GAAG,IAAI;sCAiBX,OAAO;EAgB5C,CAAC"}

package/src/config/cloudflare.js

@@ -16,23 +16,82 @@ const getD1Binding = (config) => {
     if (config.d1 !== undefined && config.d1 !== null)
         return config.d1;
     const env = getWorkersEnv();
-    const envDb = env === null ? undefined : env['DB'];
-    if (envDb !== undefined)
-        return envDb;
-    const globalDb = globalThis.DB;
-    if (globalDb !== undefined)
-        return globalDb;
+    const candidateNames = ['DB', 'zintrust_db', getWorkersVar('D1_BINDING') ?? ''].filter((name, idx, arr) => name.trim() !== '' && arr.indexOf(name) === idx);
+    if (env !== null) {
+        for (const name of candidateNames) {
+            const binding = env[name];
+            if (binding !== undefined && binding !== null)
+                return binding;
+        }
+    }
+    const globalRef = globalThis;
+    for (const name of candidateNames) {
+        const binding = globalRef[name];
+        if (binding !== undefined && binding !== null)
+            return binding;
+    }
     return null;
 };
-const getKVBinding = (bindingName = 'CACHE') => {
+const getKVBinding = (bindingName) => {
     const env = getWorkersEnv();
     if (env === null)
         return null;
-    const kv = env[bindingName];
+    const resolvedName = typeof bindingName === 'string' && bindingName.trim() !== ''
+        ? bindingName
+        : (getWorkersVar('KV_NAMESPACE') ?? 'CACHE');
+    const kv = env[resolvedName];
     return kv ?? null;
 };
+const getR2Binding = (bindingName) => {
+    const env = getWorkersEnv();
+    if (env === null)
+        return null;
+    if (typeof bindingName === 'string' && bindingName.trim() !== '') {
+        return env[bindingName] ?? null;
+    }
+    const defaultNames = ['R2_BUCKET', 'R2', 'BUCKET'];
+    for (const name of defaultNames) {
+        const binding = env[name];
+        if (binding !== undefined && binding !== null)
+            return binding;
+    }
+    return null;
+};
+const getWorkersVar = (key) => {
+    const env = getWorkersEnv();
+    if (env === null)
+        return null;
+    const value = env[key];
+    if (value === undefined || value === null)
+        return null;
+    if (typeof value === 'string')
+        return value;
+    return String(value);
+};
+const getAssetsBinding = () => {
+    const env = getWorkersEnv();
+    if (env === null)
+        return null;
+    const binding = env['ASSETS'];
+    if (binding && typeof binding.fetch === 'function')
+        return binding;
+    return null;
+};
+const isCloudflareSocketsEnabled = () => {
+    const raw = getWorkersVar('ENABLE_CLOUDFLARE_SOCKETS');
+    if (raw === null)
+        return false;
+    const normalized = raw.trim().toLowerCase();
+    if (normalized === '')
+        return false;
+    return normalized === 'true' || normalized === '1';
+};
 export const Cloudflare = Object.freeze({
     getWorkersEnv,
     getD1Binding,
     getKVBinding,
+    getR2Binding,
+    getAssetsBinding,
+    getWorkersVar,
+    isCloudflareSocketsEnabled,
 });

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

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../src/config/database.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EACV,mBAAmB,EACnB,wBAAwB,EACxB,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAItB,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAC;IAC5C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,mBAAmB,CAAC;IACjC,OAAO,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,UAAU,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,OAAO,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CAChC,CAAC,CAAC;AAgNH,QAAA,MAAM,oBAAoB,QAAO;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,mBAAmB,CAAC;IACjC,aAAa,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,wBAAwB,CAAC;IACvE,OAAO,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,UAAU,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,OAAO,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CAyEhC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAqBrE,eAAO,MAAM,cAAc,EAAE,cAY3B,CAAC"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../src/config/database.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EACV,mBAAmB,EACnB,wBAAwB,EACxB,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAItB,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAC;IAC5C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,mBAAmB,CAAC;IACjC,OAAO,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,UAAU,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,OAAO,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CAChC,CAAC,CAAC;AAuQH,QAAA,MAAM,oBAAoB,QAAO;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,mBAAmB,CAAC;IACjC,aAAa,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,wBAAwB,CAAC;IACvE,OAAO,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,UAAU,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,OAAO,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CAyEhC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAqBrE,eAAO,MAAM,cAAc,EAAE,cAY3B,CAAC"}

package/src/config/database.js

@@ -3,6 +3,7 @@
  * Database connections and pooling settings
  * Sealed namespace for immutability
  */
+import { Cloudflare } from './cloudflare.js';
 import { Env } from './env.js';
 import { ErrorFactory } from '../exceptions/ZintrustError.js';
 import { StartupConfigFile, StartupConfigFileRegistry } from '../runtime/StartupConfigFileRegistry.js';
@@ -21,6 +22,29 @@ const readEnvString = (key, fallback = '') => {
     }
     return fromEnv ?? '';
 };
+const readWorkersEnvString = (key) => {
+    const workerValue = Cloudflare.getWorkersVar(key);
+    if (workerValue !== null && workerValue.trim() !== '')
+        return workerValue;
+    return '';
+};
+const readWorkersFallbackString = (workersKey, fallbackKey) => {
+    const workerValue = readWorkersEnvString(workersKey);
+    if (workerValue.trim() !== '')
+        return workerValue;
+    // Also check if the fallback key is present in the Workers bindings (e.g. DB_PASSWORD)
+    const fallbackWorkerValue = readWorkersEnvString(fallbackKey);
+    if (fallbackWorkerValue.trim() !== '')
+        return fallbackWorkerValue;
+    return readEnvString(fallbackKey, '');
+};
+const readWorkersFallbackInt = (workersKey, fallbackKey, fallback) => {
+    const raw = readWorkersFallbackString(workersKey, fallbackKey);
+    if (raw.trim() === '')
+        return fallback;
+    const parsed = Number.parseInt(raw, 10);
+    return Number.isFinite(parsed) ? parsed : fallback;
+};
 const isExplicitEnvValue = (key) => {
     if (!isNodeProcess())
         return false;
@@ -121,6 +145,13 @@ const parseReadHosts = (raw) => {
         .filter((v) => v.length > 0);
     return list.length > 0 ? list : undefined;
 };
+const normalizeReadHosts = (primaryHost, hosts) => {
+    if (hosts === undefined || hosts.length === 0)
+        return undefined;
+    const primary = String(primaryHost ?? '').trim();
+    const filtered = hosts.filter((host) => host !== '' && host !== primary);
+    return filtered.length > 0 ? filtered : undefined;
+};
 const getDefaultConnection = (connections) => {
     const envSelectedRaw = Env.get('DB_CONNECTION', '');
     const value = String(envSelectedRaw ?? '').trim();
@@ -159,13 +190,17 @@ const connections = {
     },
     postgresql: {
         driver: 'postgresql',
-        host: Env.DB_HOST,
-        port: Env.DB_PORT_POSTGRESQL,
-        database: Env.DB_DATABASE_POSTGRESQL,
-        username: Env.DB_USERNAME_POSTGRESQL,
-        password: Env.DB_PASSWORD_POSTGRESQL,
+        host: readWorkersFallbackString('WORKERS_PG_HOST', 'DB_HOST') || Env.DB_HOST,
+        port: readWorkersFallbackInt('WORKERS_PG_PORT', 'DB_PORT_POSTGRESQL', Env.DB_PORT_POSTGRESQL),
+        database: readWorkersFallbackString('WORKERS_PG_DATABASE', 'DB_DATABASE_POSTGRESQL') ||
+            Env.DB_DATABASE_POSTGRESQL,
+        username: readWorkersFallbackString('WORKERS_PG_USER', 'DB_USERNAME_POSTGRESQL') ||
+            Env.DB_USERNAME_POSTGRESQL,
+        password: readWorkersFallbackString('WORKERS_PG_PASSWORD', 'DB_PASSWORD_POSTGRESQL') ||
+            Env.DB_PASSWORD_POSTGRESQL,
         ssl: Env.getBool('DB_SSL', false),
-        readHosts: parseReadHosts(Env.DB_READ_HOSTS_POSTGRESQL),
+        readHosts: normalizeReadHosts(readWorkersFallbackString('WORKERS_PG_HOST', 'DB_HOST') || Env.DB_HOST, parseReadHosts(readWorkersFallbackString('WORKERS_PG_READ_HOSTS', 'DB_READ_HOSTS_POSTGRESQL') ||
+            Env.DB_READ_HOSTS_POSTGRESQL)),
         pooling: {
             enabled: Env.getBool('DB_POOLING', true),
             min: Env.getInt('DB_POOL_MIN', 5),
@@ -176,12 +211,12 @@ const connections = {
     },
     mysql: {
         driver: 'mysql',
-        host: Env.DB_HOST,
-        port: Env.DB_PORT,
-        database: Env.DB_DATABASE,
-        username: Env.DB_USERNAME,
-        password: Env.DB_PASSWORD,
-        readHosts: parseReadHosts(Env.DB_READ_HOSTS),
+        host: readWorkersFallbackString('WORKERS_MYSQL_HOST', 'DB_HOST') || Env.DB_HOST,
+        port: readWorkersFallbackInt('WORKERS_MYSQL_PORT', 'DB_PORT', Env.DB_PORT),
+        database: readWorkersFallbackString('WORKERS_MYSQL_DATABASE', 'DB_DATABASE') || Env.DB_DATABASE,
+        username: readWorkersFallbackString('WORKERS_MYSQL_USER', 'DB_USERNAME') || Env.DB_USERNAME,
+        password: readWorkersFallbackString('WORKERS_MYSQL_PASSWORD', 'DB_PASSWORD') || Env.DB_PASSWORD,
+        readHosts: normalizeReadHosts(readWorkersFallbackString('WORKERS_MYSQL_HOST', 'DB_HOST') || Env.DB_HOST, parseReadHosts(readWorkersFallbackString('WORKERS_MYSQL_READ_HOSTS', 'DB_READ_HOSTS') || Env.DB_READ_HOSTS)),
         pooling: {
             enabled: Env.getBool('DB_POOLING', true),
             min: Env.getInt('DB_POOL_MIN', 5),
@@ -195,7 +230,7 @@ const connections = {
         database: Env.DB_DATABASE_MSSQL,
         username: Env.DB_USERNAME_MSSQL,
         password: Env.DB_PASSWORD_MSSQL,
-        readHosts: parseReadHosts(Env.DB_READ_HOSTS_MSSQL),
+        readHosts: normalizeReadHosts(Env.DB_HOST_MSSQL, parseReadHosts(Env.DB_READ_HOSTS_MSSQL)),
     },
 };
 const createDatabaseConfig = () => {