discord-message-transcript 1.2.0-dev.1.2.0.10.0 → 1.2.0-dev.1.2.0.12.0

package/dist/core/cdnResolver.js

@@ -1,51 +1,56 @@
-import { CustomError } from "discord-message-transcript-base";
 import https from 'https';
-import { CustomWarn } from "../../../discord-message-transcript-base/src/core/customMessages.js";
+import http from 'http';
+import { CustomWarn } from "discord-message-transcript-base";
 export async function cdnResolver(url, cdnOptions) {
     return new Promise((resolve, reject) => {
-        const request = https.get(url, async (response) => {
+        const client = url.startsWith('https') ? https : http;
+        const request = client.get(url, { headers: { "User-Agent": "discord-message-transcript" } }, async (response) => {
             if (response.statusCode !== 200) {
-                CustomWarn(`Failed to fetch attachment with status code: ${response.statusCode} from ${url}.\nUsing default url instead uploading to CDN`);
                 response.destroy();
+                CustomWarn(`This is not an issue with the package. Using the original URL as fallback instead of uploading to CDN.\nFailed to fetch attachment with status code: ${response.statusCode} from ${url}.`);
                 return resolve(url);
             }
             const contentType = response.headers["content-type"];
-            response.destroy();
             const splitContentType = contentType ? contentType?.split('/') : [];
             if (!contentType || splitContentType.length != 2 || splitContentType[0].length == 0 || splitContentType[1].length == 0) {
-                CustomWarn(`Failed to receive a valid content-type from ${url}.\nUsing default url instead uploading to CDN`);
+                response.destroy();
+                CustomWarn(`This is not an issue with the package. Using the original URL as fallback instead of uploading to CDN.\nFailed to receive a valid content-type from ${url}.`);
                 return resolve(url);
             }
+            response.destroy();
+            const isImage = contentType.startsWith('image/') && contentType !== 'image/gif';
             const isAudio = contentType.startsWith('audio/');
-            if (!cdnOptions.includeAudio && isAudio) {
-                return resolve(url);
-            }
-            const isImage = contentType.startsWith('image/');
-            if (!cdnOptions.includeImage && isImage) {
-                return resolve(url);
-            }
-            const isVideo = contentType.startsWith('video/');
-            if (!cdnOptions.includeVideo && isVideo) {
-                return resolve(url);
-            }
-            if (!cdnOptions.includeOthers && !isAudio && !isImage && !isVideo) {
-                return resolve(url);
-            }
-            switch (cdnOptions.type) {
-                case "CLOUDFLARE": {
-                    // TODO: Implement cloudflare cdn code
-                    break;
-                }
-                case "CUSTOM": {
-                    return resolve(await cdnOptions.customCdnResolver(url, contentType, cdnOptions.other));
-                }
-                default: {
-                    return reject(new CustomError("CDN type invalid!"));
-                }
+            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, contentType, cdnOptions));
             }
+            return resolve(url);
         });
         request.on('error', (err) => {
-            return reject(new CustomError(`Error fetching image from ${url}: ${err.message}`));
+            CustomWarn(`This is not an issue with the package. Using the original URL as fallback instead of uploading to CDN.\nError message: ${err.message}`);
+            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.\nRequest timeout for ${url}. Using original URL.`);
+            resolve(url);
+        });
+        request.end();
     });
 }
+async function cdnRedirectType(url, contentType, cdnOptions) {
+    switch (cdnOptions.type) {
+        case "CUSTOM": {
+            return await cdnOptions.customCdnResolver(url, contentType, cdnOptions.other);
+        }
+        case "CLOUDFLARE_R2": {
+            return await cdnCloudflareR2();
+        }
+    }
+}
+async function cdnCloudflareR2() {
+    return ''; // TODO: Implement cloudflareR2 cdn
+}

package/dist/core/componentToJson.js

@@ -95,7 +95,7 @@ export async function componentsToJson(components, options, cdnOptions) {
                         disabled: component.accessory.disabled,
                     };
                 }
-                else {
+                else if (component.accessory.type === ComponentType.Thumbnail) {
                     accessoryJson = {
                         type: JsonComponentType.Thumbnail,
                         media: {
@@ -104,6 +104,8 @@ export async function componentsToJson(components, options, cdnOptions) {
                         spoiler: component.accessory.spoiler,
                     };
                 }
+                else
+                    return null;
                 const sectionComponents = component.components.map(c => ({
                     type: JsonComponentType.TextDisplay,
                     content: c.content,

package/dist/core/imageToBase64.js

@@ -1,16 +1,19 @@
 import https from 'https';
-import { CustomError } from 'discord-message-transcript-base';
+import http from 'http';
+import { CustomWarn } from 'discord-message-transcript-base';
 export async function imageToBase64(url) {
     return new Promise((resolve, reject) => {
-        const request = https.get(url, (response) => {
+        const client = url.startsWith('https') ? https : http;
+        const request = client.get(url, { headers: { "User-Agent": "discord-message-transcript" } }, (response) => {
             if (response.statusCode !== 200) {
-                reject(new CustomError(`Failed to fetch image with status code: ${response.statusCode} from ${url}`));
-                return;
+                response.destroy();
+                CustomWarn(`This is not an issue with the package. Using the original URL as fallback instead of converting to base64.\nFailed to fetch image with status code: ${response.statusCode} from ${url}.`);
+                return resolve(url);
             }
             const contentType = response.headers['content-type'];
-            if (!contentType || !contentType.startsWith('image/')) {
-                reject(new CustomError(`URL did not point to an image. Content-Type: ${contentType} from ${url}`));
-                return;
+            if (!contentType || !contentType.startsWith('image/') || contentType === 'image/gif') {
+                response.destroy();
+                return resolve(url);
             }
             const chunks = [];
             response.on('data', (chunk) => {
@@ -21,9 +24,19 @@ export async function imageToBase64(url) {
                 const base64 = buffer.toString('base64');
                 resolve(`data:${contentType};base64,${base64}`);
             });
+            response.on('error', (err) => {
+                CustomWarn(`This is not an issue with the package. Using the original URL as fallback instead of converting to base64.\nStream error while fetching from ${url}.\nError message: ${err.message}`);
+                resolve(url);
+            });
         });
         request.on('error', (err) => {
-            reject(new CustomError(`Error fetching image from ${url}: ${err.message}`));
+            CustomWarn(`This is not an issue with the package. Using the original URL as fallback instead of converting to base64.\nError fetching image from ${url}\nError message: ${err.message}`);
+            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 converting to base64.\nRequest timeout for ${url}. Using original URL.`);
+            resolve(url);
         });
         request.end();
     });

package/dist/core/urlResolver.js

@@ -1,11 +1,9 @@
 import { cdnResolver } from "./cdnResolver.js";
 import { imageToBase64 } from "./imageToBase64.js";
 export async function urlResolver(url, options, cdnOptions) {
-    if (cdnOptions) {
+    if (cdnOptions)
         return await cdnResolver(url, cdnOptions);
-    }
-    if (options.saveImages) {
+    if (options.saveImages)
         return await imageToBase64(url);
-    }
     return url;
 }

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { CreateTranscriptOptions, ConvertTranscriptOptions, TranscriptOptions, ReturnType, CDNOptions, CDNType, MimeType } from "./types/types.js";
+export { CreateTranscriptOptions, ConvertTranscriptOptions, TranscriptOptions, ReturnType, CDNOptions, MimeType } from "./types/types.js";
 export { ReturnFormat, LocalDate, TimeZone } from "discord-message-transcript-base";
 import { TextBasedChannel } from "discord.js";
 import { ConvertTranscriptOptions, CreateTranscriptOptions, OutputType, ReturnType } from "./types/types.js";

package/dist/index.js

@@ -1,4 +1,4 @@
-export { ReturnType, CDNType } from "./types/types.js";
+export { ReturnType } from "./types/types.js";
 export { ReturnFormat } from "discord-message-transcript-base";
 import { AttachmentBuilder } from "discord.js";
 import { Json } from "./renderers/json/json.js";

package/dist/types/types.d.ts

@@ -139,11 +139,6 @@ export interface MapMentions {
     roles: Map<string, JsonMessageMentionsRoles>;
     users: Map<string, JsonMessageMentionsUsers>;
 }
-export declare const CDNType: {
-    readonly CUSTOM: "CUSTOM";
-    readonly CLOUDFLARE: "CLOUDFLARE";
-};
-export type CDNType = typeof CDNType[keyof typeof CDNType];
 export type MimeType = `${string}/${string}`;
 export type CDNOptions<Other> = (Partial<{
     includeAudio: boolean;
@@ -151,9 +146,14 @@ export type CDNOptions<Other> = (Partial<{
     includeVideo: boolean;
     includeOthers: boolean;
 }>) & ({
-    type: Exclude<CDNType, "CUSTOM">;
-} | {
     type: "CUSTOM";
     customCdnResolver: (url: string, contentType: MimeType | null, other: Other) => Promise<string> | string;
     other: Other;
+} | {
+    type: "CLOUDFLARE_R2";
+    accountId: string;
+    accessKey: string;
+    secretKey: string;
+    bucket: string;
+    publicUrl: string;
 });

package/dist/types/types.js

@@ -5,7 +5,3 @@ export const ReturnType = {
     String: "string",
     Uploadable: "uploadable"
 };
-export const CDNType = {
-    CUSTOM: "CUSTOM",
-    CLOUDFLARE: "CLOUDFLARE",
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-message-transcript",
-  "version": "1.2.0-dev.1.2.0.10.0",
+  "version": "1.2.0-dev.1.2.0.12.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -48,7 +48,7 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "discord-message-transcript-base": "1.2.0-dev.1.2.0.10.0"
+    "discord-message-transcript-base": "1.2.0-dev.1.2.0.12.0"
   },
   "peerDependencies": {
     "discord.js": ">=14.19.0 <15"