@zintrust/core 2.5.9 → 2.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/core",
-  "version": "2.5.9",
+  "version": "2.7.2",
   "description": "Production-grade TypeScript backend framework for JavaScript",
   "homepage": "https://zintrust.com",
   "repository": {
@@ -213,16 +213,16 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@cloudflare/containers": "^0.3.5",
+    "@cloudflare/containers": "^0.3.7",
     "bcryptjs": "^3.0.3",
-    "bullmq": "^5.77.6",
+    "bullmq": "^5.79.0",
     "chalk": "^5.6.2",
     "commander": "^15.0.0",
     "inquirer": "^14.0.1",
-    "ioredis": "^5.11.0",
+    "ioredis": "^5.11.1",
     "jsonwebtoken": "^9.0.3",
-    "mysql2": "^3.22.4",
-    "pg": "^8.21.0",
+    "mysql2": "^3.22.5",
+    "pg": "^8.22.0",
     "redis": "^6.0.0",
     "tsx": "^4.22.4"
   },
@@ -234,18 +234,21 @@
     "node-forge": "^1.4.0",
     "fast-uri": "3.1.2",
     "fast-xml-parser": "5.8.0",
-    "protobufjs": "7.5.9",
+    "@babel/core": "^7.29.7",
+    "protobufjs": "7.6.4",
     "picomatch": "^4.0.4",
     "cross-spawn": "^7.0.5",
     "glob": "^11.1.0",
     "minimatch": "^10.2.2",
     "rollup": "^4.59.0",
-    "vite": "^8.0.5",
+    "vite": "^8.0.16",
     "flatted": "^3.4.2",
     "uuid": "14.0.0",
-    "ioredis": "^5.11.0",
+    "ioredis": "^5.11.1",
     "axios": "^1.16.1",
-    "tmp": "^0.2.6",
+    "form-data": "^4.0.6",
+    "js-yaml": "^4.2.0",
+    "tmp": "^0.2.7",
     "sonarqube-scanner": {
       "axios": "^1.16.1"
     },
@@ -256,7 +259,7 @@
       "undici": "^6.24.0"
     },
     "miniflare": {
-      "undici": "^7.24.4"
+      "undici": "^7.28.0"
     },
     "http-proxy-agent": "7.0.2",
     "retry-request": "8.0.2",
@@ -265,9 +268,10 @@
     "braces": "^3.0.3",
     "lodash": "^4.17.21",
     "semver": "^7.6.3",
-    "ws": "^8.20.0",
+    "ws": "^8.21.0",
     "micromatch": "^4.0.8",
     "brace-expansion": "^5.0.6",
+    "esbuild": "0.28.1",
     "qs": "^6.15.2"
   },
   "bin": {

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

@@ -1 +1 @@
-{"version":3,"file":"D1MigrateCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/D1MigrateCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA0IrE;;;GAGG;AAEH;;GAEG;AACH,eAAO,MAAM,gBAAgB;IAC3B;;OAEG;cACO,YAAY;EAgCtB,CAAC"}
+{"version":3,"file":"D1MigrateCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/D1MigrateCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA4IrE;;;GAGG;AAEH;;GAEG;AACH,eAAO,MAAM,gBAAgB;IAC3B;;OAEG;cACO,YAAY;EAgCtB,CAAC"}

package/src/cli/commands/D1MigrateCommand.js

@@ -37,8 +37,10 @@ const buildExecutionContext = (options) => {
     const dbName = getDbName(projectRoot, options);
     const env = typeof options['env'] === 'string' ? options['env'].trim() : undefined;
     const config = (typeof options['config'] === 'string' ? options['config'].trim() : undefined) ??
-        (typeof options.wranglerConfig === 'string' ? options.wranglerConfig.trim() : undefined) ??
-        (typeof options.wc === 'string' ? options.wc.trim() : undefined);
+        (typeof options['wranglerConfig'] === 'string'
+            ? options['wranglerConfig'].trim()
+            : undefined) ??
+        (typeof options['wc'] === 'string' ? options['wc'].trim() : undefined);
     const migrationsRelDir = isWorkerCommand
         ? path.join('database', 'migrations', 'd1')
         : WranglerConfig.getD1MigrationsDir(projectRoot, dbName);

package/src/http/middleware/BodyParsingMiddleware.d.ts

@@ -2,7 +2,35 @@
  * Content Type Detection & Body Parsing Middleware
  * Detects content-type and parses non-JSON request bodies
  */
+import type { IRequest } from '../Request';
 import type { Middleware } from '../../middleware/MiddlewareStack';
+type ReadBodyResult = {
+    ok: true;
+    bytes: Buffer;
+    text?: string;
+} | {
+    ok: false;
+    statusCode: 400 | 413;
+    message: string;
+};
+/**
+ * Attempt to recover a JSON string that was stored as raw text or bytes
+ * due to a missing or incorrect Content-Type header.
+ *
+ * Only plain objects `{...}` are considered for recovery — arrays, strings,
+ * and primitives are left unchanged. This minimizes false positives for
+ * legitimate text or binary payloads that happen to start with `{`.
+ */
+export declare const tryRecoverTextJsonBody: (body: string) => string | Record<string, unknown>;
+export declare const setRequestBody: (req: IRequest, rawResult: ReadBodyResult & {
+    ok: true;
+}, contentType: string) => void;
+/**
+ * Attempt to parse a string as a JSON object.
+ * Returns the parsed object on success, or null if the string is not
+ * a valid JSON object literal (plain object `{...}`, not array or primitive).
+ */
+export declare const tryParseJsonObject: (text: string) => Record<string, unknown> | null;
 /**
  * Body parsing middleware
  * Automatically detects content-type and parses non-JSON bodies

package/src/http/middleware/BodyParsingMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BodyParsingMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/http/middleware/BodyParsingMiddleware.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAkY9D;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,UA4CnC,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"BodyParsingMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/http/middleware/BodyParsingMiddleware.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAG9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE9D,KAAK,cAAc,GACf;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAC1C;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,UAAU,EAAE,GAAG,GAAG,GAAG,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AA+J1D;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,GAAI,MAAM,MAAM,KAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAapF,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,KAAK,QAAQ,EACb,WAAW,cAAc,GAAG;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,EACxC,aAAa,MAAM,KAClB,IA4BF,CAAC;AA+CF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAY3E,CAAC;AAwGF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,UA4CnC,CAAC;AAEF,eAAe,qBAAqB,CAAC"}

package/src/http/middleware/BodyParsingMiddleware.js

@@ -164,7 +164,7 @@ const parseJsonBody = (text, contentType, res) => {
  * and primitives are left unchanged. This minimizes false positives for
  * legitimate text or binary payloads that happen to start with `{`.
  */
-const tryRecoverTextJsonBody = (body) => {
+export const tryRecoverTextJsonBody = (body) => {
     const trimmed = body.trim();
     if (trimmed.startsWith('{') && trimmed.endsWith('}')) {
         try {
@@ -179,7 +179,7 @@ const tryRecoverTextJsonBody = (body) => {
     }
     return body;
 };
-const setRequestBody = (req, rawResult, contentType) => {
+export const setRequestBody = (req, rawResult, contentType) => {
     const isUrlEncoded = contentType.includes('application/x-www-form-urlencoded');
     const isText = contentType.startsWith('text/') || contentType.includes('application/xml');
     const text = getTextFromRaw(rawResult);
@@ -243,7 +243,7 @@ const reuseExistingRawBody = (req, res, contentType, existingBytes, existingText
  * Returns the parsed object on success, or null if the string is not
  * a valid JSON object literal (plain object `{...}`, not array or primitive).
  */
-const tryParseJsonObject = (text) => {
+export const tryParseJsonObject = (text) => {
     const trimmed = text.trim();
     if (!trimmed.startsWith('{') || !trimmed.endsWith('}'))
         return null;

package/src/http/middleware/FileUploadMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileUploadMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/http/middleware/FileUploadMiddleware.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAW9D;;;GAGG;AACH,eAAO,MAAM,oBAAoB,EAAE,UA8DlC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"FileUploadMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/http/middleware/FileUploadMiddleware.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAaH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAqJ9D;;;GAGG;AACH,eAAO,MAAM,oBAAoB,EAAE,UAsDlC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/src/http/middleware/FileUploadMiddleware.js

@@ -6,69 +6,176 @@ import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
 import { MultipartParser } from '../parsers/MultipartParser.js';
-import { MultipartParserRegistry } from '../parsers/MultipartParserRegistry.js';
+import { MultipartParserRegistry, } from '../parsers/MultipartParserRegistry.js';
 /**
- * Extract content-type header safely
+ * Extract the original content-type header value.
+ *
+ * The value is NOT lowercased: multipart boundaries are case-sensitive, so a
+ * browser boundary containing uppercase characters must be preserved verbatim.
+ * Only the multipart check (MultipartParser.isMultipart) is case-insensitive.
  */
 const getContentType = (req) => {
     const contentType = req.getHeader('content-type');
     if (typeof contentType === 'string')
-        return contentType.toLowerCase().trim();
+        return contentType.trim();
+    if (Array.isArray(contentType) && typeof contentType[0] === 'string') {
+        return contentType[0].trim();
+    }
     return '';
 };
+/**
+ * Convert a buffered request body (Buffer or string) to a Buffer, if present.
+ * Worker adapters often expose a buffered body rather than a Node stream.
+ */
+const getBufferedBody = (req) => {
+    const raw = req.getRaw();
+    const body = raw.body;
+    if (Buffer.isBuffer(body))
+        return body;
+    if (typeof body === 'string')
+        return Buffer.from(body);
+    return undefined;
+};
+/**
+ * A raw request is pipeable when it exposes a Node-style readable stream, which
+ * the registered streaming parser (e.g. busboy) consumes via `.pipe(...)`.
+ */
+const isPipeable = (req) => {
+    const raw = req.getRaw();
+    return typeof raw.pipe === 'function';
+};
+/**
+ * Convert a bracket-notation field name to dotted notation.
+ * e.g. `doc[reg_cer]` -> `doc.reg_cer`, `doc[reg_cer][file]` -> `doc.reg_cer.file`.
+ * Empty brackets (`files[]`) collapse to the base name (`files`).
+ */
+const toDottedName = (name) => {
+    let result = '';
+    let cursor = 0;
+    while (cursor < name.length) {
+        const openBracket = name.indexOf('[', cursor);
+        if (openBracket === -1) {
+            result += name.slice(cursor);
+            break;
+        }
+        result += name.slice(cursor, openBracket);
+        const closeBracket = name.indexOf(']', openBracket + 1);
+        if (closeBracket === -1) {
+            result += name.slice(openBracket);
+            break;
+        }
+        const inner = name.slice(openBracket + 1, closeBracket);
+        if (inner !== '') {
+            result += `.${inner}`;
+        }
+        cursor = closeBracket + 1;
+    }
+    return result;
+};
+/**
+ * Add dotted-notation aliases for any bracket-notation keys, without removing
+ * the original field names. Existing keys are never overwritten.
+ */
+const addDottedAliases = (record) => {
+    const out = { ...record };
+    for (const [key, value] of Object.entries(record)) {
+        if (!key.includes('['))
+            continue;
+        const dotted = toDottedName(key);
+        if (dotted !== '' && dotted !== key && !(dotted in out)) {
+            out[dotted] = value;
+        }
+    }
+    return out;
+};
+/**
+ * Parse a buffered multipart body using the built-in parser and the original
+ * (case-sensitive) boundary from the content-type header.
+ */
+const parseBufferedMultipart = (body, contentType) => {
+    const boundary = MultipartParser.getBoundary(contentType);
+    if (boundary === undefined || boundary === '') {
+        throw ErrorFactory.createValidationError('Multipart upload is missing a boundary.', {
+            contentType,
+        });
+    }
+    return MultipartParser.parse(body, boundary);
+};
+/**
+ * Resolve parsed multipart data from the request.
+ *
+ * Prefers a buffered binary body (Worker adapters) parsed with the built-in
+ * parser. Falls back to a registered streaming parser only when the raw request
+ * is pipeable (Node-style request streams).
+ */
+const resolveParsedMultipart = async (req, contentType, limits) => {
+    const bufferedBody = getBufferedBody(req);
+    if (bufferedBody !== undefined) {
+        return parseBufferedMultipart(bufferedBody, contentType);
+    }
+    if (isPipeable(req)) {
+        const provider = MultipartParserRegistry.get();
+        if (provider === null) {
+            throw ErrorFactory.createConfigError('Multipart upload parser is not configured.', {
+                contentType,
+                hint: 'Install @zintrust/storage to enable multipart/form-data uploads.',
+            });
+        }
+        return provider({ req: req.getRaw(), contentType, limits });
+    }
+    throw ErrorFactory.createValidationError('Multipart upload has no readable body.', {
+        contentType,
+    });
+};
+const isConfigError = (error) => typeof error === 'object' &&
+    error !== null &&
+    error.code === 'CONFIG_ERROR';
 /**
  * File upload middleware
  * Automatically parses multipart/form-data and makes files available
  */
 export const fileUploadMiddleware = async (req, _res, next) => {
     const contentType = getContentType(req);
-    // Only process multipart/form-data requests
+    // Only process multipart/form-data requests (case-insensitive check).
     if (!MultipartParser.isMultipart(contentType)) {
         await next();
         return;
     }
-    // Phase 4 default behavior: multipart requires external streaming parser.
-    const provider = MultipartParserRegistry.get();
-    if (provider === null) {
-        throw ErrorFactory.createConfigError('Multipart upload parser is not configured.', {
-            contentType,
-            hint: 'Install @zintrust/storage to enable multipart/form-data uploads.',
-        });
-    }
     try {
-        const maxFileSizeBytes = Env.getInt('MAX_FILE_SIZE', 50 * 1024 * 1024);
-        const maxFiles = Env.getInt('MAX_FILES', 20);
-        const maxFields = Env.getInt('MAX_FIELDS', 200);
-        const maxFieldSizeBytes = Env.getInt('MAX_FIELD_SIZE', 128 * 1024);
-        const parsed = await provider({
-            req: req.getRaw(),
-            contentType,
-            limits: {
-                maxFileSizeBytes,
-                maxFiles,
-                maxFields,
-                maxFieldSizeBytes,
-            },
-        });
+        const limits = {
+            maxFileSizeBytes: Env.getInt('MAX_FILE_SIZE', 50 * 1024 * 1024),
+            maxFiles: Env.getInt('MAX_FILES', 20),
+            maxFields: Env.getInt('MAX_FIELDS', 200),
+            maxFieldSizeBytes: Env.getInt('MAX_FIELD_SIZE', 128 * 1024),
+        };
+        const parsed = await resolveParsedMultipart(req, contentType, limits);
+        // Add dotted aliases for bracket-notation names without dropping originals,
+        // so `doc[reg_cer]` is also addressable as `doc.reg_cer`.
+        const fields = addDottedAliases(parsed.fields);
+        const files = addDottedAliases(parsed.files);
         const currentBody = req.getBody?.();
         const updatedBody = typeof currentBody === 'object' && currentBody !== null ? currentBody : {};
         // Merge fields directly into the request body for ergonomics.
         // Files remain under __files for FileUpload helper compatibility.
         req.setBody({
             ...updatedBody,
-            ...parsed.fields,
-            __files: parsed.files,
+            ...fields,
+            __files: files,
         });
         if (Env.getBool('ZIN_DEBUG_FILE_UPLOAD', false)) {
             Logger.debug('[File Upload] Successfully parsed multipart data', {
-                fieldsCount: Object.keys(parsed.fields).length,
-                filesCount: Object.keys(parsed.files).length,
+                fieldsCount: Object.keys(fields).length,
+                filesCount: Object.keys(files).length,
             });
         }
     }
     catch (error) {
+        // A missing streaming parser is a hard configuration error (e.g. multipart
+        // arrives as a Node stream but @zintrust/storage is not installed): surface it.
+        if (isConfigError(error))
+            throw error;
+        // Other parse failures are non-fatal: log and continue with the unparsed body.
         Logger.error('[File Upload] Error parsing multipart data', error);
-        // Continue with unparsed body
     }
     await next();
 };

package/src/http/parsers/MultipartParser.d.ts

@@ -17,7 +17,9 @@ export declare const parseMultipartFormData: (body: Buffer | string, boundary: s
  */
 export declare const MultipartParser: Readonly<{
     /**
-     * Check if content-type is multipart/form-data
+     * Check if content-type is multipart/form-data.
+     * The check is case-insensitive so callers can preserve the original
+     * content-type value (and its case-sensitive boundary) for parsing.
      */
     isMultipart(contentType: string): boolean;
     /**

package/src/http/parsers/MultipartParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MultipartParser.d.ts","sourceRoot":"","sources":["../../../../src/http/parsers/MultipartParser.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC1C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;CACvC;AAwJD;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,MAAM,GAAG,MAAM,EACrB,UAAU,MAAM,KACf,mBAaF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe;IAC1B;;OAEG;6BACsB,MAAM,GAAG,OAAO;IAIzC;;OAEG;6BACsB,MAAM,GAAG,MAAM,GAAG,SAAS;IAIpD;;OAEG;gBACS,MAAM,GAAG,MAAM,YAAY,MAAM,GAAG,mBAAmB;EAGnE,CAAC;AAEH,eAAe,eAAe,CAAC"}
+{"version":3,"file":"MultipartParser.d.ts","sourceRoot":"","sources":["../../../../src/http/parsers/MultipartParser.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC1C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;CACvC;AAwJD;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GACjC,MAAM,MAAM,GAAG,MAAM,EACrB,UAAU,MAAM,KACf,mBAaF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe;IAC1B;;;;OAIG;6BACsB,MAAM,GAAG,OAAO;IAIzC;;OAEG;6BACsB,MAAM,GAAG,MAAM,GAAG,SAAS;IAIpD;;OAEG;gBACS,MAAM,GAAG,MAAM,YAAY,MAAM,GAAG,mBAAmB;EAGnE,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/src/http/parsers/MultipartParser.js

@@ -135,10 +135,12 @@ export const parseMultipartFormData = (body, boundary) => {
  */
 export const MultipartParser = Object.freeze({
     /**
-     * Check if content-type is multipart/form-data
+     * Check if content-type is multipart/form-data.
+     * The check is case-insensitive so callers can preserve the original
+     * content-type value (and its case-sensitive boundary) for parsing.
      */
     isMultipart(contentType) {
-        return contentType.includes('multipart/form-data');
+        return contentType.toLowerCase().includes('multipart/form-data');
     },
     /**
      * Get boundary from content-type header

package/src/index.js

@@ -1,11 +1,11 @@
 /**
- * @zintrust/core v2.5.9
+ * @zintrust/core v2.7.2
  *
  * ZinTrust Framework - Production-Grade TypeScript Backend
  * Built for performance, type safety, and exceptional developer experience
  *
  * Build Information:
- *   Built: 2026-06-13T09:17:52.095Z
+ *   Built: 2026-06-19T10:18:51.959Z
  *   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-06-13T09:17:51.999Z'; // Replaced during build
+export const ZINTRUST_BUILD_DATE = '2026-06-19T10:18:51.925Z'; // Replaced during build
 export { Application } from './boot/Application.js';
 export { AwsSigV4 } from './common/index.js';
 export { SignedRequest } from './security/SignedRequest.js';

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

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/orm/QueryBuilder.ts"],"names":[],"mappings":"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"}
+{"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,EAAY,MAAM,eAAe,CAAC;AACzD,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;IACf,OAAO,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACvB,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,aAAa,CAAC,EAAE,qBAAqB,CAAC;CACvC;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAUD;;;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,UAAU,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,GAAG,aAAa,CAAC;IACzE,YAAY,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,GAAG,aAAa,CAAC;IAC3E,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,aAAa,CAAC;IAChG,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,aAAa,CAAC;IAClG,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IACzC,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,aAAa,IAAI,aAAa,CAAC;IAC/B,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;AAqvDD;;;;;GAKG;AACH,eAAO,MAAM,YAAY;IACvB;;OAEG;sBAEU,MAAM,GAAG,SAAS,OACxB,SAAS,YACL,mBAAmB,GAC3B,aAAa;IA+BhB;;;;;OAKG;aACY,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;EAIxC,CAAC"}

package/src/orm/QueryBuilder.js

@@ -382,14 +382,30 @@ const buildLimitOffsetClause = (limit, offset) => {
     }
     return sql;
 };
+// Matches `left OP right` where both sides are identifier paths (e.g.
+// `users.id = profiles.user_id`). Operator alternation lists the two-char
+// operators before their single-char prefixes so `<=`/`>=`/`<>` win the match.
+const JOIN_CONDITION = /^([A-Za-z_]\w*(?:\.[A-Za-z_]\w*)*)\s*(=|!=|<>|<=|>=|<|>)\s*([A-Za-z_]\w*(?:\.[A-Za-z_]\w*)*)$/;
+const buildJoinClause = (joins, dialect) => joins
+    .map(({ table, on, type }) => {
+    assertSafeIdentifierPath(table, 'join table');
+    const match = JOIN_CONDITION.exec(on.trim());
+    if (!match) {
+        throw ErrorFactory.createDatabaseError('Unsafe SQL join condition');
+    }
+    const [, left, op, right] = match;
+    return ` ${type} JOIN ${escapeIdentifier(table, dialect)} ON ${escapeIdentifier(left, dialect)} ${op} ${escapeIdentifier(right, dialect)}`;
+})
+    .join('');
 const buildSelectQuery = (state) => {
     if (state.tableName.length > 0) {
         assertSafeIdentifierPath(state.tableName, 'table name');
     }
     const columns = buildSelectClause(state.selectColumns, state.dialect);
     const fromClause = state.tableName.length > 0 ? ` FROM ${escapeIdentifier(state.tableName, state.dialect)}` : '';
+    const joinClause = buildJoinClause(state.joins, state.dialect);
     const where = compileWhere(getEffectiveWhereConditions(state), state.dialect);
-    const sql = `SELECT ${columns}${fromClause}${where.sql}${buildOrderByClause(state.orderByClauses, state.randomOrder, state.dialect)}${buildLimitOffsetClause(state.limitValue, state.offsetValue)}`;
+    const sql = `SELECT ${columns}${fromClause}${joinClause}${where.sql}${buildOrderByClause(state.orderByClauses, state.randomOrder, state.dialect)}${buildLimitOffsetClause(state.limitValue, state.offsetValue)}`;
     return { sql, parameters: where.parameters };
 };
 const buildCountQuery = (state) => {
@@ -706,10 +722,13 @@ function attachSoftDeleteMethods(builder, state) {
 }
 function attachJoinOrderPagingMethods(builder, state) {
     builder.join = (tableJoin, on) => {
-        state.joins.push({ table: tableJoin, on });
+        state.joins.push({ table: tableJoin, on, type: 'INNER' });
+        return builder;
+    };
+    builder.leftJoin = (tableJoin, on) => {
+        state.joins.push({ table: tableJoin, on, type: 'LEFT' });
         return builder;
     };
-    builder.leftJoin = (tableJoin, on) => builder.join(tableJoin, on);
     builder.orderBy = (column, direction = 'ASC') => {
         applyOrderByClause(state, column, direction);
         return builder;

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

@@ -39,6 +39,13 @@ type D1Env = {
     ZT_MAX_PARAMS?: string;
     ZT_D1_STATEMENTS_JSON?: string;
 };
+/**
+ * Normalize bind parameters before passing to D1's bind().
+ *
+ * D1 rejects JS objects and needs integer-valued numbers serialized for TEXT
+ * column compatibility, Dates as ISO strings, while blobs must be untouched.
+ */
+export declare const normalizeParams: (params: unknown[]) => unknown[];
 export declare const ZintrustD1Proxy: Readonly<{
     _ZINTRUST_CLOUDFLARE_D1_PROXY_VERSION: "0.1.15";
     _ZINTRUST_CLOUDFLARE_D1_PROXY_BUILD_DATE: "__BUILD_DATE__";

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":"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;AAsWF,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;AA2LF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAI,QAAQ,OAAO,EAAE,KAAG,OAAO,EAe1D,CAAC;AAsJF,eAAO,MAAM,eAAe;;;mBAGL,OAAO,OAAO,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;EAqB5D,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/src/proxy/d1/ZintrustD1Proxy.js

@@ -157,7 +157,7 @@ const resolveSqlRequest = async (request, env) => {
  * D1 rejects JS objects and needs integer-valued numbers serialized for TEXT
  * column compatibility, Dates as ISO strings, while blobs must be untouched.
  */
-const normalizeParams = (params) => {
+export const normalizeParams = (params) => {
     if (!Array.isArray(params))
         return params;
     return params.map((value) => {

package/src/runtime/adapters/CloudflareAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CloudflareAdapter.d.ts","sourceRoot":"","sources":["../../../../src/runtime/adapters/CloudflareAdapter.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,aAAa,EAGb,cAAc,EACf,MAAM,yBAAyB,CAAC;AAIjC;;;;GAIG;AACH,eAAO,MAAM,iBAAiB;IAC5B;;OAEG;mBACY,aAAa,GAAG,cAAc;IA8D7C;;;OAGG;qBACc,OAAO;IAKxB;;;OAGG;qBACc,MAAM,GAAG,OAAO;EAIjC,CAAC;AA8KH;;;;GAIG;AACH,MAAM,WAAW,iBAAkB,SAAQ,OAAO;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACjC,EAAE,CAAC,EAAE;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;CACH"}
+{"version":3,"file":"CloudflareAdapter.d.ts","sourceRoot":"","sources":["../../../../src/runtime/adapters/CloudflareAdapter.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,aAAa,EAGb,cAAc,EACf,MAAM,yBAAyB,CAAC;AAIjC;;;;GAIG;AACH,eAAO,MAAM,iBAAiB;IAC5B;;OAEG;mBACY,aAAa,GAAG,cAAc;IA8D7C;;;OAGG;qBACc,OAAO;IAKxB;;;OAGG;qBACc,MAAM,GAAG,OAAO;EAIjC,CAAC;AAyMH;;;;GAIG;AACH,MAAM,WAAW,iBAAkB,SAAQ,OAAO;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACjC,EAAE,CAAC,EAAE;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;CACH"}

package/src/runtime/adapters/CloudflareAdapter.js

@@ -74,6 +74,26 @@ export const CloudflareAdapter = Object.freeze({
         return globalThis.env?.[namespace] ?? null;
     },
 });
+/**
+ * Read the Cloudflare request body in a content-type aware way.
+ *
+ * Multipart bodies are read as a binary Buffer (via arrayBuffer) so uploaded
+ * files are not corrupted by text decoding. All other bodies are read as text,
+ * preserving the previous behavior for JSON / urlencoded / text payloads.
+ */
+async function readCloudflareRequestBody(request, platformRequest) {
+    if (request.method === 'GET' || request.method === 'HEAD')
+        return null;
+    const rawContentType = platformRequest.headers['content-type'];
+    const contentType = Array.isArray(rawContentType)
+        ? (rawContentType[0] ?? '')
+        : (rawContentType ?? '');
+    if (contentType.toLowerCase().includes('multipart/form-data')) {
+        const arrayBuffer = await request.arrayBuffer();
+        return Buffer.from(arrayBuffer);
+    }
+    return request.text();
+}
 /**
  * Handle Cloudflare request
  */
@@ -82,8 +102,10 @@ async function handleCloudflareRequest(adapter, config, logger, event) {
         const request = event;
         // Parse incoming request
         const platformRequest = adapter.parseRequest(request);
-        // Read request body
-        const body = request.method !== 'GET' && request.method !== 'HEAD' ? await request.text() : null;
+        // Read request body. Multipart bodies may contain binary bytes, so read them
+        // as an ArrayBuffer and keep a binary Buffer — converting to text first would
+        // corrupt uploaded files. Other content types remain text for downstream parsing.
+        const body = await readCloudflareRequestBody(request, platformRequest);
         platformRequest.body = body;
         // Create mock Node.js request/response objects
         const { req, res, responseData } = createMockHttpObjects(platformRequest);

package/src/runtime/adapters/DenoAdapter.js

@@ -175,7 +175,7 @@ function formatDenoResponse(response) {
  */
 function getDenoEnvironment() {
     // @ts-ignore - Deno.env is available in Deno runtime
-    const env = (typeof Deno === 'undefined' ? {} : Deno.env.toObject?.() ?? {});
+    const env = (typeof Deno === 'undefined' ? {} : (Deno.env.toObject?.() ?? {}));
     return {
         nodeEnv: (env['DENO_ENV'] ?? 'production'),
         runtime: 'deno',

package/src/tools/broadcast/Broadcast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Broadcast.d.ts","sourceRoot":"","sources":["../../../../src/tools/broadcast/Broadcast.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,KAAK,WAAW,GAAG,QAAQ,CAAC;IAC1B,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1E,OAAO,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,OAAO,CAAC,sBAAsB,CAAC,CAAC;CAC5E,CAAC,CAAC;AAEH,KAAK,qBAAqB,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,GAAG,YAAY,CAAC;AAC9E,KAAK,qBAAqB,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAC1D,KAAK,kBAAkB,GAAG,eAAe,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAShE,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,KAAK,CAAC,EAAE,qBAAqB,CAAC;IAC9B,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC,CAAC;AA0BH,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAAC;IAC5C,EAAE,EAAE,IAAI,CAAC;IACT,SAAS,EAAE,kBAAkB,CAAC;IAC9B,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACpD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,SAAS,OAAO,EAAE,CAAC;CAC9B,CAAC,CAAC;AA4yBH,eAAO,MAAM,SAAS;mBACC,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAC;kBAIxD,MAAM,SAAS,MAAM,QAAQ,OAAO;0BAU5B,MAAM,SAAS,MAAM,QAAQ,OAAO;wBAKvD,qBAAqB,YACnB;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;4BAO1C,MAAM,SACR,MAAM,QACP,OAAO,YACJ;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;qBAKpC,MAAM;8BAES,qBAAqB;kCAEjB,MAAM,SAAS,MAAM,QAAQ,OAAO;;uBAKrD,MAAM,GAAG,WAAW;EAmBvC,CAAC;AAEH,eAAe,SAAS,CAAC"}
+{"version":3,"file":"Broadcast.d.ts","sourceRoot":"","sources":["../../../../src/tools/broadcast/Broadcast.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,KAAK,WAAW,GAAG,QAAQ,CAAC;IAC1B,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1E,OAAO,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,OAAO,CAAC,sBAAsB,CAAC,CAAC;CAC5E,CAAC,CAAC;AAEH,KAAK,qBAAqB,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,GAAG,YAAY,CAAC;AAC9E,KAAK,qBAAqB,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAC1D,KAAK,kBAAkB,GAAG,eAAe,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAShE,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,KAAK,CAAC,EAAE,qBAAqB,CAAC;IAC9B,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC,CAAC;AA0BH,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAAC;IAC5C,EAAE,EAAE,IAAI,CAAC;IACT,SAAS,EAAE,kBAAkB,CAAC;IAC9B,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACpD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,SAAS,OAAO,EAAE,CAAC;CAC9B,CAAC,CAAC;AAo3BH,eAAO,MAAM,SAAS;mBACC,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAC;kBAIxD,MAAM,SAAS,MAAM,QAAQ,OAAO;0BAU5B,MAAM,SAAS,MAAM,QAAQ,OAAO;wBAKvD,qBAAqB,YACnB;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;4BAO1C,MAAM,SACR,MAAM,QACP,OAAO,YACJ;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;qBAKpC,MAAM;8BAES,qBAAqB;kCAEjB,MAAM,SAAS,MAAM,QAAQ,OAAO;;uBAKrD,MAAM,GAAG,WAAW;EAmBvC,CAAC;AAEH,eAAe,SAAS,CAAC"}

package/src/tools/broadcast/Broadcast.js

@@ -1,4 +1,5 @@
 import { isArray, isNonEmptyString, isObject } from '../../helper/index.js';
+import { delay } from '../../common/index.js';
 import { InMemoryDriver } from './drivers/InMemory.js';
 import { PusherDriver } from './drivers/Pusher.js';
 import { RedisDriver } from './drivers/Redis.js';
@@ -15,6 +16,24 @@ const BROADCAST_CHANNEL_SCOPES = new Set([
 ]);
 const INTERNAL_SOCKET_SECRET_HEADER = 'x-zintrust-socket-secret';
 const DEFAULT_BROADCAST_EVENTS_PATH_TEMPLATE = '/apps/{appId}/events';
+// A POST that returns one of these never completed at the application origin, so
+// re-sending it cannot duplicate a delivered event. 520-524 are the edge->origin
+// (e.g. Cloudflare) statuses: a 522 means the edge could not connect to the origin,
+// not that the broadcast was processed. Genuine application responses (2xx and 4xx
+// such as 401/403/422) reached the origin and are never retried.
+const TRANSIENT_PUBLISH_STATUSES = new Set([
+    408, 425, 429, 500, 502, 503, 504, 520, 521, 522, 523, 524,
+]);
+const resolveInternalPublishRetryConfig = () => ({
+    maxAttempts: Math.max(1, Env.getInt('BROADCAST_INTERNAL_PUBLISH_RETRIES', 3)),
+    baseDelayMs: Math.max(0, Env.getInt('BROADCAST_INTERNAL_PUBLISH_RETRY_BASE_MS', 200)),
+});
+// exponential backoff + full jitter
+const computeRetryDelayMs = (baseDelayMs, attempt) => {
+    const exponential = baseDelayMs * Math.pow(2, attempt - 1);
+    const jitter = baseDelayMs === 0 ? 0 : Math.floor(Math.random() * baseDelayMs);
+    return exponential + jitter;
+};
 const pickFirstNonEmpty = (...values) => {
     for (const value of values) {
         if (value.trim() !== '') {
@@ -224,7 +243,7 @@ const logTransportFallback = (transport, details) => {
         ...details,
     });
 };
-const requestInternalPublishEndpoint = async (endpoint, secret, payload) => {
+const attemptInternalPublishEndpoint = async (endpoint, secret, payload) => {
     try {
         const response = await tracedFetch(endpoint, {
             method: 'POST',
@@ -251,7 +270,12 @@ const requestInternalPublishEndpoint = async (endpoint, secret, payload) => {
                 status: response.status,
                 body: responseBody,
             });
-            return { result: null, error };
+            return {
+                result: null,
+                error,
+                status: response.status,
+                transient: TRANSIENT_PUBLISH_STATUSES.has(response.status),
+            };
         }
         const resolvedChannels = isObject(responseBody) && isArray(responseBody['channels'])
             ? responseBody['channels'].filter(isNonEmptyString).map((channel) => channel.trim())
@@ -276,8 +300,34 @@ const requestInternalPublishEndpoint = async (endpoint, secret, payload) => {
             endpoint,
             error: describeError(error),
         });
-        return { result: null, error };
+        // A thrown error means the POST never completed at the application origin, so
+        // it is safe to retry.
+        return { result: null, error, transient: true };
+    }
+};
+const requestInternalPublishEndpoint = async (endpoint, secret, payload) => {
+    const { maxAttempts, baseDelayMs } = resolveInternalPublishRetryConfig();
+    let lastAttempt = { result: null };
+    for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+        lastAttempt = await attemptInternalPublishEndpoint(endpoint, secret, payload);
+        if (lastAttempt.result !== null) {
+            return lastAttempt;
+        }
+        // Non-transient failures (application 4xx, etc.) reached the origin; do not retry.
+        if (lastAttempt.transient !== true || attempt >= maxAttempts) {
+            break;
+        }
+        const delayMs = computeRetryDelayMs(baseDelayMs, attempt);
+        Logger.warn('Broadcast internal publish retrying transient failure.', {
+            endpoint,
+            attempt,
+            maxAttempts,
+            delayMs,
+            status: lastAttempt.status,
+        });
+        await delay(delayMs);
     }
+    return lastAttempt;
 };
 const tryInternalPublishEndpoints = async (endpoints, secret, payload, index = 0, lastError) => {
     const endpoint = endpoints[index];

package/src/tools/storage/drivers/R2.d.ts

@@ -4,6 +4,7 @@ export type R2Config = {
     accessKeyId: string;
     secretAccessKey: string;
     endpoint?: string;
+    url?: string;
     binding?: string;
 };
 export type R2MultipartUploadInfo = {

package/src/tools/storage/drivers/R2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"R2.d.ts","sourceRoot":"","sources":["../../../../../src/tools/storage/drivers/R2.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA6EF,eAAO,MAAM,QAAQ;kCAET,QAAQ,OACX,MAAM,YACD,OAAO,GAChB,OAAO,CAAC,qBAAqB,CAAC;uBAOvB,QAAQ,OACX,MAAM,YACD,MAAM,cACJ,MAAM,SACX,OAAO,YACJ,OAAO,GAChB,OAAO,CAAC,cAAc,CAAC;oCAOhB,QAAQ,OACX,MAAM,YACD,MAAM,iBACD,cAAc,EAAE,GAC9B,OAAO,CAAC,MAAM,CAAC;iCAOiB,QAAQ,OAAO,MAAM,YAAY,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;gBAMxE,QAAQ,OAAO,MAAM,WAAW,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;gBAyBjE,QAAQ,OAAO,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;mBAmBpC,QAAQ,OAAO,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;mBAmBxC,QAAQ,OAAO,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;gBAmB9C,QAAQ,OAAO,MAAM,GAAG,MAAM;oBAQhC,QAAQ,OACX,MAAM,YACD;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAA;KAAE,GACvD,MAAM;EAgBT,CAAC;AAEH,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"R2.d.ts","sourceRoot":"","sources":["../../../../../src/tools/storage/drivers/R2.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA6EF,eAAO,MAAM,QAAQ;kCAET,QAAQ,OACX,MAAM,YACD,OAAO,GAChB,OAAO,CAAC,qBAAqB,CAAC;uBAOvB,QAAQ,OACX,MAAM,YACD,MAAM,cACJ,MAAM,SACX,OAAO,YACJ,OAAO,GAChB,OAAO,CAAC,cAAc,CAAC;oCAOhB,QAAQ,OACX,MAAM,YACD,MAAM,iBACD,cAAc,EAAE,GAC9B,OAAO,CAAC,MAAM,CAAC;iCAOiB,QAAQ,OAAO,MAAM,YAAY,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;gBAMxE,QAAQ,OAAO,MAAM,WAAW,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;gBA4BjE,QAAQ,OAAO,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;mBAmBpC,QAAQ,OAAO,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;mBAmBxC,QAAQ,OAAO,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;gBAmB9C,QAAQ,OAAO,MAAM,GAAG,MAAM;oBAchC,QAAQ,OACX,MAAM,YACD;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAA;KAAE,GACvD,MAAM;EAgBT,CAAC;AAEH,eAAe,QAAQ,CAAC"}

package/src/tools/storage/drivers/R2.js

@@ -77,7 +77,10 @@ export const R2Driver = Object.freeze({
             endpoint: config.endpoint,
             usePathStyle: true,
         };
-        return S3Driver.put(s3Config, key, content);
+        await S3Driver.put(s3Config, key, content);
+        // Return the public-facing URL (custom domain when configured), not the
+        // path-style signing URL produced by S3Driver.put.
+        return R2Driver.url(config, key);
     },
     async get(config, key) {
         if (hasWorkersBucketBinding(config)) {
@@ -128,6 +131,12 @@ export const R2Driver = Object.freeze({
         return S3Driver.delete(s3Config, key);
     },
     url(config, key) {
+        // Prefer an explicit public base URL (custom domain CNAME'd to the bucket root):
+        // no bucket segment, since the domain already resolves to the bucket. The signing
+        // `endpoint` (used by tempUrl/put/get) stays path-style and independent.
+        const publicBase = config.url?.trim() ?? '';
+        if (publicBase !== '')
+            return `${publicBase.replace(/\/$/, '')}/${key}`;
         if (config.endpoint !== undefined && config.endpoint.trim() !== '') {
             return `${config.endpoint.replace(/\/$/, '')}/${config.bucket}/${key}`;
         }

package/src/tools/storage/drivers/S3.d.ts

@@ -5,6 +5,7 @@ export type S3Config = {
     secretAccessKey: string;
     endpoint?: string;
     usePathStyle?: boolean;
+    url?: string;
 };
 export type GS3Cred = {
     accessKeyId: string;

package/src/tools/storage/drivers/S3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"S3.d.ts","sourceRoot":"","sources":["../../../../../src/tools/storage/drivers/S3.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,CAAC;AAwGF,eAAO,MAAM,QAAQ;gBACD,QAAQ,OAAO,MAAM,WAAW,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;gBAkDjE,QAAQ,OAAO,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;mBA8CpC,QAAQ,OAAO,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;mBAsCxC,QAAQ,OAAO,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;gBAwC9C,QAAQ,OAAO,MAAM,GAAG,MAAM;oBAOhC,QAAQ,OACX,MAAM,YACD;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAA;KAAE,GACvD,MAAM;EAqDT,CAAC;AAEH,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"S3.d.ts","sourceRoot":"","sources":["../../../../../src/tools/storage/drivers/S3.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IAIvB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,CAAC;AAwGF,eAAO,MAAM,QAAQ;gBACD,QAAQ,OAAO,MAAM,WAAW,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;gBAkDjE,QAAQ,OAAO,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;mBA8CpC,QAAQ,OAAO,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;mBAsCxC,QAAQ,OAAO,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;gBAwC9C,QAAQ,OAAO,MAAM,GAAG,MAAM;oBAYhC,QAAQ,OACX,MAAM,YACD;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAA;KAAE,GACvD,MAAM;EAqDT,CAAC;AAEH,eAAe,QAAQ,CAAC"}

package/src/tools/storage/drivers/S3.js

@@ -209,6 +209,11 @@ export const S3Driver = Object.freeze({
         }
     },
     url(config, key) {
+        // Prefer an explicit public base URL (custom domain mapped to the bucket root):
+        // no bucket segment, since the domain already resolves to the bucket.
+        const publicBase = config.url?.trim() ?? '';
+        if (publicBase !== '')
+            return `${publicBase.replace(/\/$/, '')}/${key}`;
         const endpoint = config.endpoint?.trim() ?? '';
         if (endpoint !== '')
             return `${endpoint.replace(/\/$/, '')}/${config.bucket}/${key}`;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tools/storage/index.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC;AAErD,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,cAAc,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAA;CAAE,CAAC;AAuFrE,eAAO,MAAM,OAAO;mBACH,MAAM,GAAG,WAAW;cAuCnB,MAAM,GAAG,SAAS,QAAQ,MAAM,YAAY,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAW7E,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;iBAW/C,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;iBASnD,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cASzD,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,MAAM;kBAY/B,MAAM,GAAG,SAAS,QAAQ,MAAM,YAAY,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;EAqBhG,CAAC;AAEH,eAAe,OAAO,CAAC;AAEvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tools/storage/index.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC;AAErD,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,cAAc,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAA;CAAE,CAAC;AAwFrE,eAAO,MAAM,OAAO;mBACH,MAAM,GAAG,WAAW;cAuCnB,MAAM,GAAG,SAAS,QAAQ,MAAM,YAAY,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAW7E,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;iBAW/C,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;iBASnD,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cASzD,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,MAAM;kBAY/B,MAAM,GAAG,SAAS,QAAQ,MAAM,YAAY,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;EAqBhG,CAAC;AAEH,eAAe,OAAO,CAAC;AAEvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC"}

package/src/tools/storage/index.js

@@ -14,6 +14,7 @@ const normalizers = {
         accessKeyId: String(raw['accessKeyId'] ?? raw['key'] ?? ''),
         secretAccessKey: String(raw['secretAccessKey'] ?? raw['secret'] ?? ''),
         endpoint: typeof raw['endpoint'] === 'string' ? raw['endpoint'] : undefined,
+        url: typeof raw['url'] === 'string' ? raw['url'] : undefined,
         usePathStyle: Boolean(raw['usePathStyle'] ?? raw['usePathStyleUrl'] ?? false),
     }),
     r2: (raw) => ({

package/src/worker-runtime/drain.d.ts

@@ -1,4 +1,15 @@
 import type { WorkerModule } from './processor-registry';
+export declare const csvEnvSet: (key: string) => Set<string>;
+type DrainTarget = {
+    queueName: string;
+    processorSpec: string;
+};
+/**
+ * Narrow drain targets by env allowlist/denylist:
+ * - `WORKER_DRAIN_QUEUES`: if set, only these queues are drained.
+ * - `WORKER_DRAIN_EXCLUDE_QUEUES`: these queues are always skipped.
+ */
+export declare const filterDrainTargetsByEnv: (targets: DrainTarget[]) => DrainTarget[];
 export type AppWorkerDefinition = Readonly<{
     name: string;
     queueName: string;
@@ -8,6 +19,13 @@ export type AppWorkerDefinition = Readonly<{
     concurrency: number;
     processorSpec: string;
 }>;
+/**
+ * Resolve which queues this Worker should drain: app manifest workers that have a bundled
+ * processor and are not disabled. The backend lifecycle registry is authoritative for
+ * start/stop — a worker explicitly `stopped` there is skipped; otherwise the manifest's
+ * `autoStart` decides.
+ */
+export declare const resolveDrainTargets: (appWorkerDefinitions: AppWorkerDefinition[], workerModules: ReadonlyArray<WorkerModule>) => Promise<DrainTarget[]>;
 /**
  * Ensure a drain loop is running. Returns immediately. If a loop is already active this is
  * a no-op (concurrent-PING guard). The returned promise resolves when the active loop ends
@@ -15,4 +33,5 @@ export type AppWorkerDefinition = Readonly<{
  */
 export declare const ensureDraining: (appWorkerDefinitions: AppWorkerDefinition[], workerModules: ReadonlyArray<WorkerModule>) => Promise<void>;
 export declare const isDraining: () => boolean;
+export {};
 //# sourceMappingURL=drain.d.ts.map

package/src/worker-runtime/drain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drain.d.ts","sourceRoot":"","sources":["../../../src/worker-runtime/drain.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAgCvE,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAsKH;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACzB,sBAAsB,mBAAmB,EAAE,EAC3C,eAAe,aAAa,CAAC,YAAY,CAAC,KACzC,OAAO,CAAC,IAAI,CAUd,CAAC;AAEF,eAAO,MAAM,UAAU,QAAO,OAA+B,CAAC"}
+{"version":3,"file":"drain.d.ts","sourceRoot":"","sources":["../../../src/worker-runtime/drain.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAoBvE,eAAO,MAAM,SAAS,GAAI,KAAK,MAAM,KAAG,GAAG,CAAC,MAAM,CAM/C,CAAC;AAEJ,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,GAAI,SAAS,WAAW,EAAE,KAAG,WAAW,EAW3E,CAAC;AASF,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAC9B,sBAAsB,mBAAmB,EAAE,EAC3C,eAAe,aAAa,CAAC,YAAY,CAAC,KACzC,OAAO,CAAC,WAAW,EAAE,CA6BvB,CAAC;AA8HF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACzB,sBAAsB,mBAAmB,EAAE,EAC3C,eAAe,aAAa,CAAC,YAAY,CAAC,KACzC,OAAO,CAAC,IAAI,CAUd,CAAC;AAEF,eAAO,MAAM,UAAU,QAAO,OAA+B,CAAC"}

package/src/worker-runtime/drain.js

@@ -21,13 +21,32 @@ const intEnv = (key, fallback) => {
     const parsed = Number.parseInt(Env.get(key, '').trim(), 10);
     return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
 };
+export const csvEnvSet = (key) => new Set(Env.get(key, '')
+    .split(',')
+    .map((value) => value.trim())
+    .filter((value) => value.length > 0));
+/**
+ * Narrow drain targets by env allowlist/denylist:
+ * - `WORKER_DRAIN_QUEUES`: if set, only these queues are drained.
+ * - `WORKER_DRAIN_EXCLUDE_QUEUES`: these queues are always skipped.
+ */
+export const filterDrainTargetsByEnv = (targets) => {
+    const onlyQueues = csvEnvSet('WORKER_DRAIN_QUEUES');
+    const excludeQueues = csvEnvSet('WORKER_DRAIN_EXCLUDE_QUEUES');
+    return targets.filter((target) => {
+        if (onlyQueues.size > 0 && !onlyQueues.has(target.queueName)) {
+            return false;
+        }
+        return !excludeQueues.has(target.queueName);
+    });
+};
 /**
  * Resolve which queues this Worker should drain: app manifest workers that have a bundled
  * processor and are not disabled. The backend lifecycle registry is authoritative for
  * start/stop — a worker explicitly `stopped` there is skipped; otherwise the manifest's
  * `autoStart` decides.
  */
-const resolveDrainTargets = async (appWorkerDefinitions, workerModules) => {
+export const resolveDrainTargets = async (appWorkerDefinitions, workerModules) => {
     let statusByQueue = new Map();
     try {
         const registered = await listWorkers();
@@ -50,7 +69,7 @@ const resolveDrainTargets = async (appWorkerDefinitions, workerModules) => {
             targets.push({ queueName: definition.queueName, processorSpec: definition.processorSpec });
         }
     }
-    return targets;
+    return filterDrainTargetsByEnv(targets);
 };
 const toJob = (queueName, pulled) => {
     return {