@venizia/ignis 0.2.0-3 → 0.2.0-31

package/dist/components/mail/utilities/mime.utility.js

@@ -0,0 +1,412 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatAddressHeader = formatAddressHeader;
+exports.buildRawMimeMessage = buildRawMimeMessage;
+const node_crypto_1 = require("node:crypto");
+const promises_1 = require("node:fs/promises");
+const core_1 = require("@venizia/ignis-helpers/core");
+const common_1 = require("../common");
+const address_utility_1 = require("./address.utility");
+const CRLF = '\r\n';
+const BASE64_LINE_LENGTH = 76;
+/** RFC 5322 recommends folding well under its own 998-byte hard limit; 78 matches common MTA
+ * practice. This is a *soft* preferred width, not a hard requirement - {@link foldHeaderLine}
+ * only forces a line break past it when a natural whitespace break point exists nearby. */
+const MAX_HEADER_LINE_LENGTH = 78;
+/** The real hard requirement: SES rejects any raw-message physical line at or over 1000 bytes.
+ * A 10-byte margin below that, and comfortably under RFC 5322's own 998-octet hard limit. Only
+ * an unbroken token that would itself cross this line forces {@link foldHeaderLine}'s
+ * content-altering hard-wrap fallback - below it, one long line is safer than corrupting an
+ * atomic value (a single very long address, an unbroken encoded-word) by splitting it. */
+const MAX_HEADER_HARD_LIMIT = 990;
+/** RFC 2047 caps one encoded-word (`=?charset?B?...?=` included) at 75 characters. */
+const ENCODED_WORD_MAX_LENGTH = 75;
+function isAscii(value) {
+    for (let index = 0; index < value.length; index++) {
+        if (value.charCodeAt(index) > 127) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * RFC 2047 §5(3) requires each encoded-word to carry whole characters - a multi-byte UTF-8
+ * sequence split across two encoded-words decodes to mojibake or invalid UTF-8 on either side of
+ * the cut. `bytesPerChunk` is a fixed byte budget, not a character-aligned one, so after slicing
+ * at that budget we walk the boundary back over any UTF-8 continuation bytes (`10xxxxxx`, i.e.
+ * `byte & 0xC0 === 0x80`) until it lands on the leading byte of a character. `bytesPerChunk` is
+ * always far larger than the longest UTF-8 sequence (4 bytes), so this walk-back can never
+ * consume the whole chunk. Words are joined with a single space - the required separator between
+ * adjacent encoded-words, and also a valid header-folding point.
+ */
+function encodeWord(text) {
+    const prefix = '=?UTF-8?B?';
+    const suffix = '?=';
+    const maxPayloadChars = ENCODED_WORD_MAX_LENGTH - prefix.length - suffix.length;
+    const bytesPerChunk = Math.floor(maxPayloadChars / 4) * 3;
+    const bytes = Buffer.from(text, 'utf-8');
+    const words = [];
+    let offset = 0;
+    while (offset < bytes.length) {
+        let end = Math.min(offset + bytesPerChunk, bytes.length);
+        while (end < bytes.length && (bytes[end] & 0xc0) === 0x80) {
+            end--;
+        }
+        const chunk = bytes.subarray(offset, end);
+        words.push(`${prefix}${chunk.toString('base64')}${suffix}`);
+        offset = end;
+    }
+    return words.join(' ');
+}
+/** Only non-ASCII values pay for RFC 2047 encoding, so a plain-English subject or custom header
+ * stays byte-for-byte readable. */
+function encodeHeaderValue(value) {
+    return isAscii(value) ? value : encodeWord(value);
+}
+/**
+ * Encodes only the *display-name* portion of `"Name" <addr@x.com>` (or bare `Name <addr@x.com>`).
+ * The `<addr-spec>` must stay 7-bit ASCII per RFC 5321/5322 and per the SES raw-message
+ * requirements - only the free-text name may become an RFC 2047 encoded-word. A bare address with
+ * no display name is returned unchanged.
+ */
+function encodeAddress(address) {
+    const match = /^(.*)<([^<>]+)>\s*$/.exec(address);
+    if (!match) {
+        return address;
+    }
+    const [, rawName, addr] = match;
+    const name = rawName.trim().replace(/^"|"$/g, '');
+    if (name.length === 0 || isAscii(name)) {
+        return rawName.trim().length > 0 ? `${rawName.trim()} <${addr}>` : `<${addr}>`;
+    }
+    return `${encodeWord(name)} <${addr}>`;
+}
+/** Formats a `to`/`cc`/`from`/`replyTo` field as one RFC 5322 address list: splits a
+ * comma-separated string or array into individual mailboxes, RFC 2047-encodes each display name,
+ * and rejoins with `, ` - the same shape whether the caller passed a string or an array. */
+function formatAddressHeader(value) {
+    return (0, address_utility_1.splitAddressList)(value).map(encodeAddress).join(', ');
+}
+/**
+ * RFC 5322 §2.2.3 header folding: inserting CRLF immediately before an existing whitespace
+ * character splits one logical header value across physical lines without changing its content
+ * (the folded whitespace is still there, just after a line break). SES enforces a 1000-byte
+ * ceiling per raw-message line; folding at {@link MAX_HEADER_LINE_LENGTH} keeps arbitrarily long
+ * recipient lists, subjects, or encoded display names deliverable regardless of how many
+ * addresses or how much non-ASCII text a caller supplies - purely by adding more physical
+ * lines, never by dropping or truncating anything (verified: rejoining every folded line always
+ * reproduces the original value exactly).
+ *
+ * The one value-altering fallback is deliberately gated on the *hard* limit, not the soft one:
+ * an unbroken token (a single very long address, an encoded-word with no adjacent break) that
+ * fits under {@link MAX_HEADER_HARD_LIMIT} is left on one long physical line rather than
+ * force-broken at the soft width - forcing a break through the middle of an atomic token (an
+ * email address has no internal whitespace) would insert a space that was never there,
+ * corrupting it. Only a token that would itself violate the real transport limit gets the
+ * content-altering hard-wrap - a case that essentially never occurs with real-world input.
+ */
+function foldHeaderLine(line) {
+    const lines = [];
+    let remaining = line;
+    while (remaining.length > MAX_HEADER_LINE_LENGTH) {
+        let breakAt = remaining.lastIndexOf(' ', MAX_HEADER_LINE_LENGTH);
+        if (breakAt <= 0) {
+            // No break within the soft width - look further ahead instead of forcing one through an
+            // atomic token. Still bounded by the hard limit, so the physical line this produces can
+            // never violate the real transport constraint.
+            const nextBreak = remaining.indexOf(' ', MAX_HEADER_LINE_LENGTH);
+            breakAt = nextBreak > 0 && nextBreak <= MAX_HEADER_HARD_LIMIT ? nextBreak : -1;
+        }
+        if (breakAt > 0) {
+            lines.push(remaining.slice(0, breakAt));
+            remaining = remaining.slice(breakAt);
+            continue;
+        }
+        if (remaining.length <= MAX_HEADER_HARD_LIMIT) {
+            break;
+        }
+        // Truly no natural break within the hard limit - an unbroken token that would itself
+        // violate the transport line cap. This is the only path that can alter the value.
+        lines.push(remaining.slice(0, MAX_HEADER_HARD_LIMIT));
+        remaining = ` ${remaining.slice(MAX_HEADER_HARD_LIMIT)}`;
+    }
+    lines.push(remaining);
+    return lines.join(CRLF);
+}
+/** MIME requires encoded body lines capped well under the RFC 5322 998-byte hard limit. */
+function foldBase64(base64) {
+    const lines = [];
+    for (let index = 0; index < base64.length; index += BASE64_LINE_LENGTH) {
+        lines.push(base64.slice(index, index + BASE64_LINE_LENGTH));
+    }
+    return lines.join(CRLF);
+}
+/** UTF-8 text (`text`/`html` bodies) must be encoded before folding - unlike {@link encodeBufferBase64}, which folds bytes that are already final. Two names instead of one so the caller can never feed raw bytes through the wrong path and silently double-encode them. */
+function encodeTextBase64(text) {
+    return foldBase64(Buffer.from(text, 'utf-8').toString('base64'));
+}
+/** Attachment bytes are already final binary content - only folding applies, no UTF-8 re-encode. */
+function encodeBufferBase64(buffer) {
+    return foldBase64(buffer.toString('base64'));
+}
+async function streamToBuffer(stream) {
+    const chunks = [];
+    for await (const chunk of stream) {
+        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+    }
+    return Buffer.concat(chunks);
+}
+/** A string `content` is raw text unless `encoding` says otherwise (nodemailer's convention) - a
+ * caller that already holds a base64 payload sets `encoding: 'base64'` instead of handing over
+ * decoded bytes. */
+async function readAttachmentContent(attachment) {
+    if (attachment.content !== undefined) {
+        if (Buffer.isBuffer(attachment.content)) {
+            return attachment.content;
+        }
+        if (typeof attachment.content === 'string') {
+            return Buffer.from(attachment.content, attachment.encoding ?? 'utf-8');
+        }
+        return streamToBuffer(attachment.content);
+    }
+    if (attachment.path) {
+        return (0, promises_1.readFile)(attachment.path);
+    }
+    return Buffer.alloc(0);
+}
+/** A literal CR/LF/NUL inside a header-bound value would let it break out of its own header line and forge additional headers or smuggle body content - classic email header injection. Every value spliced into a raw header line is checked here first, so an attempt fails loudly instead of silently reaching the wire.
+ *
+ * `value` is `unknown`, not `string`: `IMailMessage`/`IMailAttachment` both end in
+ * `[key: string]: any`, so nothing at the type layer stops a caller (e.g. a controller
+ * forwarding a request body) from putting a non-string - notably an array - where a string is
+ * declared. `Array.prototype.includes('\r')` checks element *equality*, not substring, so
+ * `['x\r\nBcc: evil'].includes('\r')` is `false` and a naive string-only check would wave a
+ * forged header straight through once it is later stringified by a template literal. Requiring
+ * `typeof value === 'string'` up front closes that gap for every field that flows through here. */
+function assertNoHeaderInjection(opts) {
+    const { field, value } = opts;
+    if (typeof value !== 'string') {
+        throw (0, core_1.getError)({
+            statusCode: 500,
+            messageCode: common_1.MailErrorCodes.INVALID_CONFIGURATION,
+            message: `Invalid Amazon SES message | ${field} must be a string`,
+        });
+    }
+    if (!value.includes('\r') && !value.includes('\n') && !value.includes('\0')) {
+        return;
+    }
+    throw (0, core_1.getError)({
+        statusCode: 500,
+        messageCode: common_1.MailErrorCodes.INVALID_CONFIGURATION,
+        message: `Invalid Amazon SES message | ${field} contains illegal control characters`,
+    });
+}
+/** Same guard as {@link assertNoHeaderInjection}, applied to every address in a `to`/`cc`/`bcc`
+ * field individually - a string field only, not `[key: string]: any`; validating the raw
+ * caller-provided value (before splitting/joining) both types and content-checks each entry. */
+function assertNoAddressListInjection(opts) {
+    const { field, value } = opts;
+    const list = Array.isArray(value) ? value : [value];
+    for (const item of list) {
+        assertNoHeaderInjection({ field, value: item });
+    }
+}
+function extractDomain(address) {
+    const match = address ? /@([^@>\s]+)>?\s*$/.exec(address) : null;
+    return match ? match[1] : 'localhost';
+}
+function buildHeaders(message) {
+    const headers = [];
+    if (message.from) {
+        assertNoAddressListInjection({ field: 'from', value: message.from });
+        headers.push(foldHeaderLine(`From: ${formatAddressHeader(message.from)}`));
+    }
+    if (message.to) {
+        assertNoAddressListInjection({ field: 'to', value: message.to });
+        headers.push(foldHeaderLine(`To: ${formatAddressHeader(message.to)}`));
+    }
+    if (message.cc) {
+        assertNoAddressListInjection({ field: 'cc', value: message.cc });
+        headers.push(foldHeaderLine(`Cc: ${formatAddressHeader(message.cc)}`));
+    }
+    if (message.replyTo) {
+        assertNoAddressListInjection({ field: 'replyTo', value: message.replyTo });
+        headers.push(foldHeaderLine(`Reply-To: ${formatAddressHeader(message.replyTo)}`));
+    }
+    // Checked, never emitted: a `Bcc:` header would disclose the blind recipients, so they travel as
+    // `Destination.BccAddresses`. Without this, `bcc` is the one address field that fails at AWS.
+    if (message.bcc) {
+        assertNoAddressListInjection({ field: 'bcc', value: message.bcc });
+    }
+    assertNoHeaderInjection({ field: 'subject', value: message.subject });
+    headers.push(foldHeaderLine(`Subject: ${encodeHeaderValue(message.subject)}`));
+    // RFC 5322 requires both on every message; SES's raw-message parser does not synthesize them,
+    // so an omission here is an omission on the wire (some receiving MTAs reject a `Date`-less
+    // message outright, and a missing `Message-ID` breaks threading and dedup).
+    headers.push(`Date: ${new Date().toUTCString()}`);
+    headers.push(`Message-ID: <${(0, node_crypto_1.randomBytes)(16).toString('hex')}@${extractDomain(message.from)}>`);
+    headers.push('MIME-Version: 1.0');
+    if (message.headers) {
+        for (const [key, value] of Object.entries(message.headers)) {
+            assertNoHeaderInjection({ field: `headers.${key}`, value: key });
+            assertNoHeaderInjection({ field: `headers.${key}`, value });
+            headers.push(foldHeaderLine(`${key}: ${encodeHeaderValue(value)}`));
+        }
+    }
+    return headers;
+}
+/** One text/plain or text/html MIME part. `boundary` omitted only for the single-part, no-attachment case, where the content type belongs on the top-level headers instead of a nested part. */
+function textPart(boundary, contentType, content) {
+    return [
+        `--${boundary}`,
+        `Content-Type: ${contentType}; charset=UTF-8`,
+        'Content-Transfer-Encoding: base64',
+        '',
+        encodeTextBase64(content),
+    ].join(CRLF);
+}
+function escapeQuotedString(value) {
+    return value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+}
+/** RFC 2231 percent-encoding for the `filename*=`/`name*=` extended parameter form. */
+function encodeRfc2231(value) {
+    return encodeURIComponent(value).replace(/[!'()*]/g, char => `%${char.charCodeAt(0).toString(16).toUpperCase()}`);
+}
+/**
+ * Builds the `; name="..."`/`; filename="..."` (and, for non-ASCII names, the RFC 2231
+ * `; filename*=UTF-8''...` extended form) suffix for a Content-Type/Content-Disposition line.
+ * ASCII names are still quoted-string escaped - an unescaped `"` or `\` in a filename would
+ * terminate the quoted string early and let the rest of the value merge into a sibling MIME
+ * parameter, corrupting the part header for every downstream reader.
+ */
+function attachmentNameParams(attribute, value) {
+    if (isAscii(value)) {
+        return `; ${attribute}="${escapeQuotedString(value)}"`;
+    }
+    const asciiFallback = value.replace(/[^\x20-\x7E]/g, '_');
+    return (`; ${attribute}="${escapeQuotedString(asciiFallback)}"` +
+        `; ${attribute}*=UTF-8''${encodeRfc2231(value)}`);
+}
+async function attachmentPart(attachment, boundary) {
+    const content = await readAttachmentContent(attachment);
+    const contentType = attachment.contentType ?? 'application/octet-stream';
+    assertNoHeaderInjection({ field: 'attachment.contentType', value: contentType });
+    if (attachment.filename) {
+        assertNoHeaderInjection({ field: 'attachment.filename', value: attachment.filename });
+    }
+    if (attachment.cid) {
+        assertNoHeaderInjection({ field: 'attachment.cid', value: attachment.cid });
+    }
+    const nameAttribute = attachment.filename
+        ? attachmentNameParams('name', attachment.filename)
+        : '';
+    const filenameAttribute = attachment.filename
+        ? attachmentNameParams('filename', attachment.filename)
+        : '';
+    const disposition = attachment.cid ? 'inline' : 'attachment';
+    const headerLines = [
+        `--${boundary}`,
+        foldHeaderLine(`Content-Type: ${contentType}${nameAttribute}`),
+        'Content-Transfer-Encoding: base64',
+        foldHeaderLine(`Content-Disposition: ${disposition}${filenameAttribute}`),
+    ];
+    if (attachment.cid) {
+        headerLines.push(`Content-ID: <${attachment.cid}>`);
+    }
+    return [...headerLines, '', encodeBufferBase64(content)].join(CRLF);
+}
+/** Every boundary is generated the same way - a fixed prefix plus random hex - so no two nested multipart sections in one message can ever collide. */
+function newBoundary(label) {
+    return `----=_${label}_${(0, node_crypto_1.randomBytes)(12).toString('hex')}`;
+}
+/**
+ * Builds a raw RFC 822 message with zero external dependencies - Amazon SES's `SendEmailCommand`
+ * `Content.Simple` shape has no attachment field, so attachments require a raw MIME body. Written
+ * by hand instead of depending on `nodemailer`'s `MailComposer` so the `ses` provider never needs
+ * the `nodemailer` peer installed at all.
+ *
+ * Inline (`cid`) attachments nest under `multipart/related` next to the body - a mail client
+ * only renders `cid:` references inline when they share a `multipart/related` parent with the
+ * body; under `multipart/mixed` they show up as ordinary downloadable attachments instead. Plain
+ * file attachments (no `cid`) stay under `multipart/mixed`, alongside the body or the
+ * `multipart/related` group when both kinds are present.
+ */
+async function buildRawMimeMessage(message) {
+    const headers = buildHeaders(message);
+    const attachments = message.attachments ?? [];
+    const inlineAttachments = attachments.filter(attachment => Boolean(attachment.cid));
+    const fileAttachments = attachments.filter(attachment => !attachment.cid);
+    const hasBothBodies = Boolean(message.text) && Boolean(message.html);
+    const singleContentType = message.html ? 'text/html' : 'text/plain';
+    const singleContent = message.html ?? message.text ?? '';
+    const bodyPart = (boundary) => {
+        if (!hasBothBodies) {
+            return textPart(boundary, singleContentType, singleContent);
+        }
+        const altBoundary = newBoundary('Alt');
+        return [
+            `--${boundary}`,
+            `Content-Type: multipart/alternative; boundary="${altBoundary}"`,
+            '',
+            [
+                textPart(altBoundary, 'text/plain', message.text ?? ''),
+                textPart(altBoundary, 'text/html', message.html ?? ''),
+                `--${altBoundary}--`,
+            ].join(CRLF),
+        ].join(CRLF);
+    };
+    if (attachments.length === 0 && !hasBothBodies) {
+        headers.push(`Content-Type: ${singleContentType}; charset=UTF-8`);
+        headers.push('Content-Transfer-Encoding: base64');
+        return Buffer.from([...headers, '', encodeTextBase64(singleContent)].join(CRLF), 'utf-8');
+    }
+    if (attachments.length === 0) {
+        const boundary = newBoundary('Alt');
+        headers.push(`Content-Type: multipart/alternative; boundary="${boundary}"`);
+        const parts = [
+            textPart(boundary, 'text/plain', message.text ?? ''),
+            textPart(boundary, 'text/html', message.html ?? ''),
+            `--${boundary}--`,
+        ];
+        return Buffer.from([...headers, '', parts.join(CRLF)].join(CRLF), 'utf-8');
+    }
+    const buildRelatedPart = async (parentBoundary) => {
+        const relatedBoundary = newBoundary('Related');
+        const parts = [bodyPart(relatedBoundary)];
+        for (const attachment of inlineAttachments) {
+            parts.push(await attachmentPart(attachment, relatedBoundary));
+        }
+        parts.push(`--${relatedBoundary}--`);
+        return [
+            `--${parentBoundary}`,
+            `Content-Type: multipart/related; boundary="${relatedBoundary}"`,
+            '',
+            parts.join(CRLF),
+        ].join(CRLF);
+    };
+    if (inlineAttachments.length > 0 && fileAttachments.length === 0) {
+        const relatedBoundary = newBoundary('Related');
+        const parts = [bodyPart(relatedBoundary)];
+        for (const attachment of inlineAttachments) {
+            parts.push(await attachmentPart(attachment, relatedBoundary));
+        }
+        parts.push(`--${relatedBoundary}--`);
+        headers.push(`Content-Type: multipart/related; boundary="${relatedBoundary}"`);
+        return Buffer.from([...headers, '', parts.join(CRLF)].join(CRLF), 'utf-8');
+    }
+    const mixedBoundary = newBoundary('Mixed');
+    headers.push(`Content-Type: multipart/mixed; boundary="${mixedBoundary}"`);
+    const bodyParts = [];
+    if (inlineAttachments.length > 0) {
+        bodyParts.push(await buildRelatedPart(mixedBoundary));
+    }
+    else {
+        bodyParts.push(bodyPart(mixedBoundary));
+    }
+    for (const attachment of fileAttachments) {
+        bodyParts.push(await attachmentPart(attachment, mixedBoundary));
+    }
+    bodyParts.push(`--${mixedBoundary}--`);
+    return Buffer.from([...headers, '', bodyParts.join(CRLF)].join(CRLF), 'utf-8');
+}
+//# sourceMappingURL=mime.utility.js.map

package/dist/components/mail/utilities/mime.utility.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mime.utility.js","sourceRoot":"","sources":["../../../../src/components/mail/utilities/mime.utility.ts"],"names":[],"mappings":"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"}

package/dist/components/static-asset/common/constants.d.ts

@@ -1,7 +1,15 @@
 import type { TConstValue } from '@venizia/ignis-helpers/common';
-export declare const WHITELIST_HEADERS: readonly ["content-type", "content-encoding", "cache-control", "etag", "last-modified"];
+/** `content-type` is absent on purpose: it is decided from the object name, never from the backend. */
+export declare const WHITELIST_HEADERS: readonly ["content-encoding", "cache-control", "etag", "last-modified"];
+/**
+ * Types the controller will let a browser render, keyed off the object name. Anything absent here is
+ * served as an attachment, because a renderable upload on the API origin is stored XSS - and `nosniff`
+ * cannot stop a type we declared ourselves. `image/svg+xml` is deliberately excluded: SVG carries script.
+ */
+export declare const RENDERABLE_CONTENT_TYPES: Set<string>;
 export declare class StaticAssetStorageTypes {
     static readonly DISK = "disk";
+    /** @deprecated Use {@link StaticAssetStorageTypes.BUN_S3}, which reaches MinIO over the same S3 API. */
     static readonly MINIO = "minio";
     static readonly BUN_S3 = "bun-s3";
     static readonly SCHEME_SET: Set<string>;

package/dist/components/static-asset/common/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/components/static-asset/common/constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAGjE,eAAO,MAAM,iBAAiB,yFAMpB,CAAC;AAEX,qBAAa,uBAAuB;IAClC,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;IAC9B,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW;IAChC,MAAM,CAAC,QAAQ,CAAC,MAAM,YAAY;IAElC,MAAM,CAAC,QAAQ,CAAC,UAAU,cAAiD;IAE3E,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAGzC;AAED,MAAM,MAAM,uBAAuB,GAAG,WAAW,CAAC,OAAO,uBAAuB,CAAC,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/components/static-asset/common/constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAGjE,uGAAuG;AACvG,eAAO,MAAM,iBAAiB,yEAKpB,CAAC;AAEX;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,aAgBnC,CAAC;AAEH,qBAAa,uBAAuB;IAClC,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;IAC9B,wGAAwG;IACxG,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW;IAChC,MAAM,CAAC,QAAQ,CAAC,MAAM,YAAY;IAElC,MAAM,CAAC,QAAQ,CAAC,UAAU,cAAiD;IAE3E,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAGzC;AAED,MAAM,MAAM,uBAAuB,GAAG,WAAW,CAAC,OAAO,uBAAuB,CAAC,CAAC"}

package/dist/components/static-asset/common/constants.js

@@ -1,16 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StaticAssetStorageTypes = exports.WHITELIST_HEADERS = void 0;
+exports.StaticAssetStorageTypes = exports.RENDERABLE_CONTENT_TYPES = exports.WHITELIST_HEADERS = void 0;
 const common_1 = require("@venizia/ignis-helpers/common");
+/** `content-type` is absent on purpose: it is decided from the object name, never from the backend. */
 exports.WHITELIST_HEADERS = [
-    common_1.HTTP.Headers.CONTENT_TYPE,
     common_1.HTTP.Headers.CONTENT_ENCODING,
     common_1.HTTP.Headers.CACHE_CONTROL,
     common_1.HTTP.Headers.ETAG,
     common_1.HTTP.Headers.LAST_MODIFIED,
 ];
+/**
+ * Types the controller will let a browser render, keyed off the object name. Anything absent here is
+ * served as an attachment, because a renderable upload on the API origin is stored XSS - and `nosniff`
+ * cannot stop a type we declared ourselves. `image/svg+xml` is deliberately excluded: SVG carries script.
+ */
+exports.RENDERABLE_CONTENT_TYPES = new Set([
+    'image/png',
+    'image/jpeg',
+    'image/gif',
+    'image/webp',
+    'image/avif',
+    'image/bmp',
+    'image/x-icon',
+    'video/mp4',
+    'video/webm',
+    'audio/mpeg',
+    'audio/wav',
+    'audio/ogg',
+    'application/pdf',
+    'text/plain',
+    'text/csv',
+]);
 class StaticAssetStorageTypes {
     static { this.DISK = 'disk'; }
+    /** @deprecated Use {@link StaticAssetStorageTypes.BUN_S3}, which reaches MinIO over the same S3 API. */
     static { this.MINIO = 'minio'; }
     static { this.BUN_S3 = 'bun-s3'; }
     static { this.SCHEME_SET = new Set([this.DISK, this.MINIO, this.BUN_S3]); }

package/dist/components/static-asset/common/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/components/static-asset/common/constants.ts"],"names":[],"mappings":";;;AACA,0DAAqD;AAExC,QAAA,iBAAiB,GAAG;IAC/B,aAAI,CAAC,OAAO,CAAC,YAAY;IACzB,aAAI,CAAC,OAAO,CAAC,gBAAgB;IAC7B,aAAI,CAAC,OAAO,CAAC,aAAa;IAC1B,aAAI,CAAC,OAAO,CAAC,IAAI;IACjB,aAAI,CAAC,OAAO,CAAC,aAAa;CAClB,CAAC;AAEX,MAAa,uBAAuB;aAClB,SAAI,GAAG,MAAM,CAAC;aACd,UAAK,GAAG,OAAO,CAAC;aAChB,WAAM,GAAG,QAAQ,CAAC;aAElB,eAAU,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAE3E,MAAM,CAAC,OAAO,CAAC,OAAe;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;;AATH,0DAUC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/components/static-asset/common/constants.ts"],"names":[],"mappings":";;;AACA,0DAAqD;AAErD,uGAAuG;AAC1F,QAAA,iBAAiB,GAAG;IAC/B,aAAI,CAAC,OAAO,CAAC,gBAAgB;IAC7B,aAAI,CAAC,OAAO,CAAC,aAAa;IAC1B,aAAI,CAAC,OAAO,CAAC,IAAI;IACjB,aAAI,CAAC,OAAO,CAAC,aAAa;CAClB,CAAC;AAEX;;;;GAIG;AACU,QAAA,wBAAwB,GAAG,IAAI,GAAG,CAAS;IACtD,WAAW;IACX,YAAY;IACZ,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,WAAW;IACX,cAAc;IACd,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,WAAW;IACX,WAAW;IACX,iBAAiB;IACjB,YAAY;IACZ,UAAU;CACX,CAAC,CAAC;AAEH,MAAa,uBAAuB;aAClB,SAAI,GAAG,MAAM,CAAC;IAC9B,wGAAwG;aACxF,UAAK,GAAG,OAAO,CAAC;aAChB,WAAM,GAAG,QAAQ,CAAC;aAElB,eAAU,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAE3E,MAAM,CAAC,OAAO,CAAC,OAAe;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;;AAVH,0DAWC"}

package/dist/components/static-asset/common/types.d.ts

@@ -1,8 +1,9 @@
-import type { IAuthRouteConfig } from '../../../base';
+import type { BaseRestController, IAuthRouteConfig } from '../../../base';
+import type { IStorageHelper } from '@venizia/ignis-helpers';
 import type { BaseRelationalEntity } from '@venizia/ignis-connectors/postgres';
 import type { DefaultCRUDRepository } from '@venizia/ignis-connectors/postgres';
 import type { AnyType, ValueOrPromise } from '@venizia/ignis-helpers/common';
-import type { DiskHelper, IFileStat, IUploadResult } from '@venizia/ignis-helpers';
+import type { DiskHelper, IBucketRef, IFileStat, IObjectLocation, IUploadResult, TUploadNaming } from '@venizia/ignis-helpers';
 import type { BunS3Helper } from '@venizia/ignis-helpers/bun-s3';
 import type { MinioHelper } from '@venizia/ignis-helpers/minio';
 import type { TMetaLinkSchema } from '../models';
@@ -14,17 +15,26 @@ export type TStaticAssetExtraOptions = {
     };
     /** `folderPath` carries the upload query's target folder - dropping it flattens nested uploads. */
     normalizeNameFn?: (opts: {
-        originalName: string;
-        folderPath?: string;
-    }) => string;
-    normalizeLinkFn?: (opts: {
-        bucketName: string;
-        normalizeName: string;
+        file: TUploadNaming;
     }) => string;
+    normalizeLinkFn?: (opts: IObjectLocation) => string;
     /** Maximum folder nesting depth allowed in object paths. Default: 2 */
     maxFolderDepth?: number;
     [key: string]: AnyType;
 };
+/** Decides the key one uploaded file is stored under. `defaultKey` is what IGNIS would have written. */
+export type TResolveObjectName = (opts: {
+    bucket: IBucketRef;
+    file: TUploadNaming;
+    defaultKey: string;
+}) => string;
+/** Adds routes of the application's own to a generated asset controller. Runs after every built-in route, so a built-in route always wins a path collision. `basePath` is the mount path with exactly one leading slash. */
+/** Adds routes of the application's own. Registration order decides a path collision, so the same shape serves both the before and the after hook. */
+export type TDefineExtraRoutes = (opts: {
+    controller: BaseRestController;
+    helper: IStorageHelper;
+    basePath: string;
+}) => void;
 export type TBucketParams = {
     bucketName: string;
 };
@@ -61,6 +71,10 @@ export type TStaticAssetsComponentOptions = {
             name: string;
             basePath: string;
             isStrict?: boolean;
+            /** The single bucket every object route uses. It leaves the URL (`/objects/{objectName}`) and the four bucket-management routes are not registered. The function form is read per request, so an environment variable can be read lazily. */
+            bucket?: string | (() => string);
+            /** `true` serves a raw nested object path (`/objects/photos/2024/f.jpg`) - a URL shape change; a percent-encoded path keeps working either way. Default: `false`. */
+            rawObjectPath?: boolean;
             routes?: {
                 getBuckets?: Partial<Omit<IAuthRouteConfig, 'method' | 'request' | 'responses'>>;
                 getBucketByName?: Partial<Omit<IAuthRouteConfig, 'method' | 'request' | 'responses'>>;
@@ -75,6 +89,12 @@ export type TStaticAssetsComponentOptions = {
             };
         };
         extra?: TStaticAssetExtraOptions;
+        /** Decides the stored object name of each uploaded file; absent keeps the storage helper's own naming. */
+        resolveObjectName?: TResolveObjectName;
+        /** Registers the application's own routes BEFORE every built-in one, so a literal path wins over the catch-all `rawObjectPath` produces. Hono matches in registration order. */
+        defineRoutesBefore?: TDefineExtraRoutes;
+        /** Registers the application's own routes on the generated controller, after every built-in one. */
+        defineExtraRoutes?: TDefineExtraRoutes;
     } & ({
         storage: typeof StaticAssetStorageTypes.BUN_S3;
         helper: BunS3Helper;

package/dist/components/static-asset/common/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/components/static-asset/common/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/components/static-asset/common/types.ts"],"names":[],"mappings":"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"}

package/dist/components/static-asset/component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/components/static-asset/component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAI/D,qBAAa,oBAAqB,SAAQ,aAAa;IAEC,OAAO,CAAC,WAAW;gBAAX,WAAW,EAAE,eAAe;IAcjF,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC;CAoCzC"}
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/components/static-asset/component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAI/D,qBAAa,oBAAqB,SAAQ,aAAa;IAEC,OAAO,CAAC,WAAW;gBAAX,WAAW,EAAE,eAAe;IAcjF,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC;CAmDzC"}

package/dist/components/static-asset/component.js

@@ -39,21 +39,27 @@ let StaticAssetComponent = StaticAssetComponent_1 = class StaticAssetComponent e
             key: common_1.StaticAssetComponentBindingKeys.STATIC_ASSET_COMPONENT_OPTIONS,
         });
         for (const [key, opt] of Object.entries(componentOptions)) {
-            const { storage, controller, helper, extra } = opt;
+            const { storage, controller, helper, extra, resolveObjectName, defineRoutesBefore, defineExtraRoutes, } = opt;
             this.application.controller(controller_1.AssetControllerFactory.defineAssetController({
                 controller,
                 storage,
                 helper,
                 useMetaLink: opt.useMetaLink,
                 metaLink: opt.useMetaLink ? opt.metaLink : undefined,
+                resolveObjectName,
+                defineRoutesBefore,
+                defineExtraRoutes,
                 options: {
                     ...extra,
                     normalizeLinkFn: extra?.normalizeLinkFn ??
-                        (opts => {
-                            // The object route binds `{objectName}` as one Hono path segment, so a nested path must be encoded whole - a raw `/` produces a 404 link.
-                            const encodedPath = encodeURIComponent(opts.normalizeName);
-                            return `${controller.basePath}/buckets/${opts.bucketName}/objects/${encodedPath}`;
-                        }),
+                        // The link follows the URL shape the controller serves: `{objectName}` is one Hono path segment unless `rawObjectPath` widens it, and a configured bucket leaves the path.
+                        (linkOptions => (0, controller_1.buildObjectLink)({
+                            basePath: controller.basePath,
+                            bucket: linkOptions.bucket,
+                            object: linkOptions.object,
+                            hasConfiguredBucket: controller.bucket !== undefined,
+                            rawObjectPath: controller.rawObjectPath,
+                        })),
                 },
             }));
             this.application.logger.info(`[binding] Asset storage is bound | Key: %s | Storage type: %s | UseMetaLink: %s`, key, storage, Boolean(opt.useMetaLink));