discord-message-transcript 1.3.1-dev.1.46 → 1.3.1-dev.1.48

package/dist/core/componentToJson.js

@@ -3,137 +3,151 @@ import { mapButtonStyle, mapSelectorType, mapSeparatorSpacing } from "./mappers.
 import { JsonComponentType } from "discord-message-transcript-base";
 import { isValidHexColor } from "discord-message-transcript-base";
 export async function componentsToJson(components, options) {
-    const processedComponents = await Promise.all(components.filter(component => !(!options.includeV2Components && component.type != ComponentType.ActionRow))
-        .map(async (component) => {
-        switch (component.type) {
-            case ComponentType.ActionRow: {
-                const actionRowComponents = await Promise.all(component.components.filter(c => {
-                    if (c.type == ComponentType.Button && !options.includeButtons)
-                        return false;
-                    if (c.type != ComponentType.Button && !options.includeComponents)
-                        return false;
-                    return true;
-                }).map(async (c) => {
-                    if (c.type === ComponentType.Button) {
-                        return {
-                            type: JsonComponentType.Button,
-                            style: mapButtonStyle(c.style),
-                            label: c.label,
-                            emoji: c.emoji?.name ? c.emoji.name : null,
-                            url: c.url,
-                            disabled: c.disabled,
-                        };
-                    }
-                    else if (c.type === ComponentType.StringSelect) {
-                        return {
-                            type: JsonComponentType.StringSelect,
-                            placeholder: c.placeholder,
-                            disabled: c.disabled,
-                            options: c.options.map(option => ({
-                                label: option.label,
-                                description: option.description ?? null,
-                                emoji: option.emoji ? {
-                                    id: option.emoji.id ?? null,
-                                    name: option.emoji.name ?? null,
-                                    animated: option.emoji.animated ?? false,
-                                } : null,
-                            }))
-                        };
-                    }
-                    else {
-                        return {
-                            type: mapSelectorType(c.type),
-                            placeholder: c.placeholder,
-                            disabled: c.disabled,
-                        };
-                    }
-                }));
-                if (actionRowComponents.length > 0)
-                    return { type: JsonComponentType.ActionRow, components: actionRowComponents };
-                return null;
-            }
-            case ComponentType.Container: {
-                const newOptions = { ...options, includeComponents: true, includeButtons: true };
-                const componentsJson = await componentsToJson(component.components, newOptions);
-                return {
-                    type: JsonComponentType.Container,
-                    components: componentsJson.filter(isJsonComponentInContainer), // Input components that are container-safe must always produce container-safe output.
-                    hexAccentColor: isValidHexColor(component.hexAccentColor, false),
-                    spoiler: component.spoiler,
-                };
-            }
-            case ComponentType.File: {
-                return {
-                    type: JsonComponentType.File,
-                    fileName: component.data.name ?? null,
-                    size: component.data.size ?? 0,
-                    url: component.file.url,
-                    spoiler: component.spoiler,
-                };
-            }
-            case ComponentType.MediaGallery: {
-                const mediaItems = component.items.map(item => {
-                    return {
-                        media: { url: item.media.url },
-                        spoiler: item.spoiler,
-                    };
-                });
-                return {
-                    type: JsonComponentType.MediaGallery,
-                    items: mediaItems,
-                };
-            }
-            case ComponentType.Section: {
-                let accessoryJson;
-                if (component.accessory.type === ComponentType.Button) {
-                    accessoryJson = {
-                        type: JsonComponentType.Button,
-                        style: mapButtonStyle(component.accessory.style),
-                        label: component.accessory.label,
-                        emoji: component.accessory.emoji?.name ? component.accessory.emoji.name : null,
-                        url: component.accessory.url,
-                        disabled: component.accessory.disabled,
-                    };
-                }
-                else if (component.accessory.type === ComponentType.Thumbnail) {
-                    accessoryJson = {
-                        type: JsonComponentType.Thumbnail,
-                        media: {
-                            url: component.accessory.media.url,
-                        },
-                        spoiler: component.accessory.spoiler,
-                    };
-                }
-                else
-                    return null;
-                const sectionComponents = component.components.map(c => ({
-                    type: JsonComponentType.TextDisplay,
-                    content: c.content,
-                }));
-                return {
-                    type: JsonComponentType.Section,
-                    accessory: accessoryJson,
-                    components: sectionComponents,
-                };
-            }
-            case ComponentType.Separator: {
-                return {
-                    type: JsonComponentType.Separator,
-                    spacing: mapSeparatorSpacing(component.spacing),
-                    divider: component.divider,
-                };
-            }
-            case ComponentType.TextDisplay: {
-                return {
-                    type: JsonComponentType.TextDisplay,
-                    content: component.content,
-                };
-            }
-            default:
-                return null;
+    const filtered = components.filter(c => options.includeV2Components || c.type === ComponentType.ActionRow);
+    const processed = await Promise.all(filtered.map(c => convertComponent(c, options)));
+    return processed.filter(c => c != null);
+}
+async function convertComponent(component, options) {
+    switch (component.type) {
+        case ComponentType.ActionRow:
+            return convertActionRow(component, options);
+        case ComponentType.Container:
+            return convertContainer(component, options);
+        case ComponentType.File:
+            return convertFile(component);
+        case ComponentType.MediaGallery:
+            return convertMediaGallery(component);
+        case ComponentType.Section:
+            return convertSection(component);
+        case ComponentType.Separator:
+            return convertSeparator(component);
+        case ComponentType.TextDisplay:
+            return convertTextDisplay(component);
+        default:
+            return null;
+    }
+}
+async function convertActionRow(component, options) {
+    const rowComponents = await Promise.all(component.components
+        .filter(c => (c.type === ComponentType.Button ? options.includeButtons : options.includeComponents))
+        .map(c => convertActionRowChild(c)));
+    if (rowComponents.length === 0)
+        return null;
+    return { type: JsonComponentType.ActionRow, components: rowComponents };
+}
+async function convertActionRowChild(component) {
+    switch (component.type) {
+        case ComponentType.Button: {
+            return {
+                type: JsonComponentType.Button,
+                style: mapButtonStyle(component.style),
+                label: component.label,
+                emoji: component.emoji?.name ?? null,
+                url: component.url,
+                disabled: component.disabled,
+            };
+        }
+        case ComponentType.StringSelect: {
+            return {
+                type: JsonComponentType.StringSelect,
+                placeholder: component.placeholder,
+                disabled: component.disabled,
+                options: component.options.map(option => ({
+                    label: option.label,
+                    description: option.description ?? null,
+                    emoji: option.emoji ? { id: option.emoji.id ?? null, name: option.emoji.name ?? null, animated: option.emoji.animated ?? false } : null,
+                })),
+            };
+        }
+        default: {
+            return {
+                type: mapSelectorType(component.type),
+                placeholder: component.placeholder,
+                disabled: component.disabled,
+            };
+        }
+    }
+}
+async function convertContainer(component, options) {
+    const newOptions = { ...options, includeComponents: true, includeButtons: true };
+    const componentsJson = await componentsToJson(component.components, newOptions);
+    return {
+        type: JsonComponentType.Container,
+        components: componentsJson.filter(isJsonComponentInContainer), // Input components that are container-safe must always produce container-safe output.
+        hexAccentColor: isValidHexColor(component.hexAccentColor, false),
+        spoiler: component.spoiler,
+    };
+}
+function convertFile(component) {
+    return {
+        type: JsonComponentType.File,
+        fileName: component.data.name ?? null,
+        size: component.data.size ?? 0,
+        url: component.file.url,
+        spoiler: component.spoiler,
+    };
+}
+async function convertMediaGallery(component) {
+    const mediaItems = await Promise.all(component.items.map(item => {
+        return {
+            media: { url: item.media.url },
+            spoiler: item.spoiler,
+        };
+    }));
+    return {
+        type: JsonComponentType.MediaGallery,
+        items: mediaItems,
+    };
+}
+function convertSection(component) {
+    let accessoryJson = null;
+    switch (component.accessory.type) {
+        case ComponentType.Button: {
+            accessoryJson = {
+                type: JsonComponentType.Button,
+                style: mapButtonStyle(component.accessory.style),
+                label: component.accessory.label,
+                emoji: component.accessory.emoji?.name ? component.accessory.emoji.name : null,
+                url: component.accessory.url,
+                disabled: component.accessory.disabled,
+            };
+            break;
         }
+        case ComponentType.Thumbnail: {
+            accessoryJson = {
+                type: JsonComponentType.Thumbnail,
+                media: {
+                    url: component.accessory.media.url,
+                },
+                spoiler: component.accessory.spoiler,
+            };
+            break;
+        }
+        default:
+            break;
+    }
+    const sectionComponents = component.components.map(c => ({
+        type: JsonComponentType.TextDisplay,
+        content: c.content,
     }));
-    return processedComponents.filter(c => c != null);
+    return {
+        type: JsonComponentType.Section,
+        accessory: accessoryJson,
+        components: sectionComponents,
+    };
+}
+function convertSeparator(component) {
+    return {
+        type: JsonComponentType.Separator,
+        spacing: mapSeparatorSpacing(component.spacing),
+        divider: component.divider,
+    };
+}
+function convertTextDisplay(component) {
+    return {
+        type: JsonComponentType.TextDisplay,
+        content: component.content,
+    };
 }
 export function isJsonComponentInContainer(component) {
     return (component.type == JsonComponentType.ActionRow ||

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { CreateTranscriptOptions, ConvertTranscriptOptions, TranscriptOptions, ReturnType, CDNOptions, MimeType } from "@/types";
 export { ReturnFormat, LocalDate, TimeZone } from "discord-message-transcript-base";
-export { setBase64Concurrency, setCDNConcurrency } from '@/core/limiter.js';
+export { setBase64Concurrency, setCDNConcurrency } from '@/assetResolver';
 import { TextBasedChannel } from "discord.js";
 import { ConvertTranscriptOptions, CreateTranscriptOptions, OutputType, ReturnType } from "@/types";
 /**

package/dist/index.js

@@ -1,6 +1,6 @@
 export { ReturnType } from "@/types";
 export { ReturnFormat } from "discord-message-transcript-base";
-export { setBase64Concurrency, setCDNConcurrency } from '@/core/limiter.js';
+export { setBase64Concurrency, setCDNConcurrency } from '@/assetResolver';
 import { AttachmentBuilder } from "discord.js";
 import { Json } from "@/renderers/json/json.js";
 import { fetchMessages } from "@/core/fetchMessages.js";
@@ -8,7 +8,7 @@ import { ReturnType } from "@/types";
 import { output } from "@/core/output.js";
 import { ReturnTypeBase, ReturnFormat, outputBase, CustomError, CustomWarn } from "discord-message-transcript-base";
 import { returnTypeMapper } from "@/core/mappers.js";
-import { authorUrlResolver, messagesUrlResolver } from "@/core/urlResolver.js";
+import { authorUrlResolver, messagesUrlResolver } from "@/assetResolver";
 /**
  * Creates a transcript of a Discord channel's messages.
  * Depending on the `returnType` option, this function can return an `AttachmentBuilder`,

package/dist/renderers/json/json.js

@@ -1,6 +1,5 @@
 import { BaseGuildTextChannel, DMChannel } from "discord.js";
-import { urlResolver } from "@/core/urlResolver.js";
-import { resolveImageURL } from "@/core/resolveImageUrl.js";
+import { imageUrlResolver, urlResolver } from "@/assetResolver";
 export class Json {
     guild;
     channel;
@@ -44,9 +43,9 @@ export class Json {
     async toJson() {
         const channel = await this.channel.fetch();
         const channelImg = channel instanceof DMChannel ? channel.recipient?.displayAvatarURL() ?? "cdn.discordapp.com/embed/avatars/4.png" : channel.isDMBased() ? channel.iconURL() ?? (await channel.fetchOwner()).displayAvatarURL() : null;
-        const safeChannelImg = await resolveImageURL(channelImg, this.options, true);
+        const safeChannelImg = await imageUrlResolver(channelImg, this.options, true);
         const guild = !channel.isDMBased() ? this.guild : null;
-        const guildIcon = guild ? await resolveImageURL(guild.iconURL(), this.options, true) : null;
+        const guildIcon = guild ? await imageUrlResolver(guild.iconURL(), this.options, true) : null;
         const guildJson = !guild ? null : {
             name: guild.name,
             id: guild.id,

package/dist/utils/sleep.d.ts

@@ -0,0 +1 @@
+export declare function sleep(ms: number): Promise<unknown>;

package/dist/utils/sleep.js

@@ -0,0 +1,3 @@
+export function sleep(ms) {
+    return new Promise(r => setTimeout(r, ms));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-message-transcript",
-  "version": "1.3.1-dev.1.46",
+  "version": "1.3.1-dev.1.48",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,7 +45,7 @@
   },
   "homepage": "https://github.com/HenriqueMairesse/discord-message-transcript#readme",
   "dependencies": {
-    "discord-message-transcript-base": "1.3.1-dev.1.46"
+    "discord-message-transcript-base": "1.3.1-dev.1.48"
   },
   "peerDependencies": {
     "discord.js": ">=14.19.0 <15"

package/dist/core/cdnResolver.d.ts

@@ -1,5 +0,0 @@
-import { CDNOptions, safeUrlReturn } from "@/types";
-import { TranscriptOptionsBase } from "discord-message-transcript-base";
-export declare function cdnResolver(safeUrlObject: safeUrlReturn, options: TranscriptOptionsBase, cdnOptions: CDNOptions): Promise<string>;
-export declare function uploadCareResolver(url: string, publicKey: string, cdnDomain: string, disableWarnings: boolean): Promise<string>;
-export declare function cloudinaryResolver(url: string, fileName: string, cloudName: string, apiKey: string, apiSecret: string, disableWarnings: boolean): Promise<string>;

package/dist/core/cdnResolver.js

@@ -1,213 +0,0 @@
-import { CustomWarn } from "discord-message-transcript-base";
-import crypto from 'crypto';
-import { getCDNLimiter } from "./limiter.js";
-import https from 'https';
-import http from 'http';
-import { createLookup } from "@/networkSecurity";
-export async function cdnResolver(safeUrlObject, options, cdnOptions) {
-    const url = safeUrlObject.url;
-    const limit = getCDNLimiter();
-    return limit(async () => {
-        return new Promise((resolve, reject) => {
-            const client = safeUrlObject.url.startsWith('https') ? https : http;
-            const lookup = createLookup(safeUrlObject.safeIps);
-            const request = client.get(url, {
-                headers: { "User-Agent": "discord-message-transcript" },
-                lookup: lookup
-            }, async (response) => {
-                if (response.statusCode !== 200) {
-                    response.destroy();
-                    CustomWarn(`This is not an issue with the package. Using the original URL as fallback instead of uploading to CDN.
-Failed to fetch attachment with status code: ${response.statusCode} from ${safeUrlObject.url}.`, options.disableWarnings);
-                    return resolve(url);
-                }
-                const contentType = response.headers["content-type"];
-                const splitContentType = contentType ? contentType?.split('/') : [];
-                if (!contentType || splitContentType.length != 2 || splitContentType[0].length == 0 || splitContentType[1].length == 0) {
-                    response.destroy();
-                    CustomWarn(`This is not an issue with the package. Using the original URL as fallback instead of uploading to CDN.
-Failed to receive a valid content-type from ${url}.`, options.disableWarnings);
-                    return resolve(url);
-                }
-                response.destroy();
-                const isImage = contentType.startsWith('image/') && contentType !== 'image/gif';
-                const isAudio = contentType.startsWith('audio/');
-                const isVideo = contentType.startsWith('video/') || contentType === 'image/gif';
-                if ((cdnOptions.includeImage && isImage) ||
-                    (cdnOptions.includeAudio && isAudio) ||
-                    (cdnOptions.includeVideo && isVideo) ||
-                    (cdnOptions.includeOthers && !isAudio && !isImage && !isVideo)) {
-                    return resolve(await cdnRedirectType(url, options, contentType, cdnOptions));
-                }
-                return resolve(url);
-            });
-            request.on('error', (err) => {
-                CustomWarn(`This is not an issue with the package. Using the original URL as fallback instead of uploading to CDN.
-Error: ${err.message}`, options.disableWarnings);
-                return resolve(url);
-            });
-            request.setTimeout(15000, () => {
-                request.destroy();
-                CustomWarn(`This is not an issue with the package. Using the original URL as fallback instead of uploading to CDN.
-Request timeout for ${url}.`, options.disableWarnings);
-                return resolve(url);
-            });
-            request.end();
-        });
-    });
-}
-async function cdnRedirectType(url, options, contentType, cdnOptions) {
-    let newUrl;
-    switch (cdnOptions.provider) {
-        case "CUSTOM": {
-            try {
-                newUrl = await cdnOptions.resolver(url, contentType, cdnOptions.customData);
-                break;
-            }
-            catch (error) {
-                CustomWarn(`Custom CDN resolver threw an error. Falling back to original URL.
-This is most likely an issue in the custom CDN implementation provided by the user.
-URL: ${url}
-Error: ${error?.message ?? error}`, options.disableWarnings);
-                return url;
-            }
-        }
-        case "CLOUDINARY": {
-            newUrl = await cloudinaryResolver(url, options.fileName, cdnOptions.cloudName, cdnOptions.apiKey, cdnOptions.apiSecret, options.disableWarnings);
-            break;
-        }
-        case "UPLOADCARE": {
-            newUrl = await uploadCareResolver(url, cdnOptions.publicKey, cdnOptions.cdnDomain, options.disableWarnings);
-            break;
-        }
-    }
-    if (validateCdnUrl(newUrl, options.disableWarnings))
-        return newUrl;
-    return url;
-}
-function sleep(ms) {
-    return new Promise(r => setTimeout(r, ms));
-}
-export async function uploadCareResolver(url, publicKey, cdnDomain, disableWarnings) {
-    try {
-        const form = new FormData();
-        form.append("pub_key", publicKey);
-        form.append("source_url", url);
-        form.append("store", "1");
-        form.append("check_URL_duplicates", "1");
-        form.append("save_URL_duplicates", "1");
-        const res = await fetch("https://upload.uploadcare.com/from_url/", {
-            method: "POST",
-            body: form,
-            headers: {
-                "User-Agent": "discord-message-transcript"
-            }
-        });
-        if (!res.ok) {
-            switch (res.status) {
-                case 400:
-                    throw new Error(`Uploadcare initial request failed with status code ${res.status} - Request failed input parameters validation.`);
-                case 403:
-                    throw new Error(`Uploadcare initial request failed with status code ${res.status} - Request was not allowed.`);
-                case 429:
-                    throw new Error(`Uploadcare initial request failed with status code ${res.status} - Request was throttled.`);
-                default:
-                    throw new Error(`Uploadcare initial request failed with status code ${res.status}`);
-            }
-        }
-        const json = await res.json();
-        if (json.uuid) {
-            return `https://${cdnDomain}/${json.uuid}/`;
-        }
-        let delay = 200;
-        let maxDelay = 2000;
-        if (json.token) {
-            for (let i = 0; i < 10; i++) {
-                await sleep(delay);
-                delay = Math.min(delay * 2, maxDelay);
-                const resToken = await fetch(`https://upload.uploadcare.com/from_url/status/?token=${json.token}&pub_key=${publicKey}`, { headers: { "User-Agent": "discord-message-transcript" } });
-                if (!resToken.ok)
-                    throw new Error(`Uploadcare status failed with status code ${resToken.status}`);
-                const jsonToken = await resToken.json();
-                if (jsonToken.status === "success" && jsonToken.file_id) {
-                    return `https://${cdnDomain}/${jsonToken.file_id}/`;
-                }
-                if (jsonToken.status === "error") {
-                    throw new Error(jsonToken.error || "Uploadcare failed");
-                }
-            }
-            throw new Error("Uploadcare polling timeout");
-        }
-        return url;
-    }
-    catch (error) {
-        CustomWarn(`Uploadcare CDN upload failed. Using original URL as fallback.
-Check Uploadcare public key, CDN domain, project settings, rate limits, and network access.
-URL: ${url}
-Error: ${error?.message ?? error}`, disableWarnings);
-        return url;
-    }
-}
-export async function cloudinaryResolver(url, fileName, cloudName, apiKey, apiSecret, disableWarnings) {
-    try {
-        const paramsToSign = {
-            folder: `discord-message-transcript/${fileName}`,
-            timestamp: Math.floor(Date.now() / 1000).toString(),
-            unique_filename: "true",
-            use_filename: "true",
-        };
-        const stringToSign = Object.keys(paramsToSign).sort().map(k => `${k}=${paramsToSign[k]}`).join("&");
-        // signature SHA256
-        const signature = crypto
-            .createHash("sha256")
-            .update(stringToSign + apiSecret)
-            .digest("hex");
-        const form = new FormData();
-        form.append("folder", paramsToSign.folder);
-        form.append("file", url);
-        form.append("api_key", apiKey);
-        form.append("timestamp", paramsToSign.timestamp);
-        form.append("signature", signature);
-        form.append("use_filename", paramsToSign.use_filename);
-        form.append("unique_filename", paramsToSign.unique_filename);
-        const res = await fetch(`https://api.cloudinary.com/v1_1/${cloudName}/auto/upload`, {
-            method: "POST",
-            body: form,
-            headers: {
-                "User-Agent": "discord-message-transcript"
-            }
-        });
-        if (!res.ok) {
-            switch (res.status) {
-                case 400:
-                    throw new Error(`Cloudinary upload failed with status code ${res.status} - Bad request / invalid params.`);
-                case 403:
-                    throw new Error(`Cloudinary upload failed with status code ${res.status} - Invalid credentials or unauthorized.`);
-                case 429:
-                    throw new Error(`Cloudinary upload failed with status code ${res.status} - Rate limited.`);
-                default:
-                    throw new Error(`Cloudinary upload failed with status code ${res.status}.`);
-            }
-        }
-        const json = await res.json();
-        if (!json.secure_url) {
-            throw new Error("Cloudinary response missing secure_url");
-        }
-        return json.secure_url;
-    }
-    catch (error) {
-        CustomWarn(`Failed to upload asset to Cloudinary CDN. Using original URL as fallback.
-Check Cloudinary configuration (cloud name, API key, API secret) and network access.
-URL: ${url}
-Error: ${error?.message ?? error}`, disableWarnings);
-        return url;
-    }
-}
-// Note: for debug use ${JSON.stringify(await res.json())} to understand the error
-function validateCdnUrl(url, disableWarnings) {
-    if (url.includes('"') || url.includes('<') || url.includes('>')) {
-        CustomWarn(`Unsafe URL received from CDN, using fallback.\nURL: ${url}`, disableWarnings);
-        return false;
-    }
-    return true;
-}

package/dist/core/resolveImageUrl.d.ts

@@ -1,4 +0,0 @@
-import { JsonAttachment, TranscriptOptionsBase } from "discord-message-transcript-base";
-import { safeUrlReturn } from "@/types";
-export declare function resolveImageURL(url: string, options: TranscriptOptionsBase, canReturnNull: false, attachments?: JsonAttachment[]): Promise<safeUrlReturn>;
-export declare function resolveImageURL(url: string | null, options: TranscriptOptionsBase, canReturnNull: true, attachments?: JsonAttachment[]): Promise<safeUrlReturn | null>;

package/dist/core/urlResolver.d.ts

@@ -1,5 +0,0 @@
-import { JsonAuthor, JsonMessage, TranscriptOptionsBase } from "discord-message-transcript-base";
-import { CDNOptions, safeUrlReturn } from "@/types";
-export declare function urlResolver(safeUrlObject: safeUrlReturn, options: TranscriptOptionsBase, cdnOptions: CDNOptions | null, urlCache: Map<string, Promise<string>>): Promise<string>;
-export declare function messagesUrlResolver(messages: JsonMessage[], options: TranscriptOptionsBase, cdnOptions: CDNOptions | null, urlCache: Map<string, Promise<string>>): Promise<JsonMessage[]>;
-export declare function authorUrlResolver(authors: Map<string, JsonAuthor>, options: TranscriptOptionsBase, cdnOptions: CDNOptions | null, urlCache: Map<string, Promise<string>>): Promise<JsonAuthor[]>;