@ryuu-reinzz/haruka-lib 4.0.0 → 4.0.2

package/main/socket.js

@@ -51,9 +51,9 @@ import Sticker from './sticker-engine/index.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 let Button,
-   ButtonV2,
-   Carousel,
-   AIRich;
+    ButtonV2,
+    Carousel,
+    AIRich;
 /**
  * @param {import('baileys').WASocket} socket
  */
@@ -1547,111 +1547,180 @@ function addProperty(socket, baileys) {
                 text,
                 contextInfo = {}
             } = content;
-            let {
-                title,
-                description,
-                thumbnail,
-                sourceUrl,
-                largerThumbnail = false,
-                favicon = false
-            } = contextInfo?.previewThumbnail || {};
-            let buffer;
-            let favBuffer;
-            try {
-                if (!contextInfo?.previewThumbnail) return await sendMessage(jid, content, options);
-
-                if (Buffer.isBuffer(thumbnail)) {
-                    buffer = thumbnail;
-                } else if (thumbnail.url) {
-                    let response = await fetch(thumbnail.url);
-                    if (!response.ok) throw new Error(`Gagal fetch thumbnail: ${response.statusText}`);
-                    let arrayBuffer = await response.arrayBuffer();
-                    buffer = Buffer.from(arrayBuffer);
-                }
-                if (Buffer.isBuffer(favicon)) {
-                    favBuffer = favicon;
-                } else if (favicon?.url) {
-                    let response = await fetch(favicon.url);
-                    if (!response.ok) throw new Error(`Gagal fetch favicon: ${response.statusText}`);
-                    let arrayBuffer = await response.arrayBuffer();
-                    favBuffer = Buffer.from(arrayBuffer);
-                } else {
+
+            if (contextInfo?.previewThumbnail) {
+                let {
+                    title,
+                    description,
+                    thumbnail,
+                    sourceUrl,
+                    largerThumbnail = false,
                     favicon = false
-                }
-                let miniPreview = (await sharp(buffer).resize(90, 90, {
-                    fit: "cover",
-                    position: "centre"
-                }).jpeg({
-                    quality: 80
-                }).toBuffer()).toString("base64");
-
-                let miniFavicon = favicon ? await sharp(favBuffer)
-                    .resize(48, 48, {
+                } = contextInfo.previewThumbnail || {};
+
+                let buffer;
+                let favBuffer;
+
+                try {
+                    if (Buffer.isBuffer(thumbnail)) {
+                        buffer = thumbnail;
+                    } else if (thumbnail?.url) {
+                        let response = await fetch(thumbnail.url);
+                        if (!response.ok) throw new Error(`Gagal fetch thumbnail: ${response.statusText}`);
+                        let arrayBuffer = await response.arrayBuffer();
+                        buffer = Buffer.from(arrayBuffer);
+                    }
+
+                    if (Buffer.isBuffer(favicon)) {
+                        favBuffer = favicon;
+                    } else if (favicon?.url) {
+                        let response = await fetch(favicon.url);
+                        if (!response.ok) throw new Error(`Gagal fetch favicon: ${response.statusText}`);
+                        let arrayBuffer = await response.arrayBuffer();
+                        favBuffer = Buffer.from(arrayBuffer);
+                    } else {
+                        favicon = false;
+                    }
+
+                    let miniPreview = (await sharp(buffer).resize(90, 90, {
                         fit: "cover",
                         position: "centre"
-                    })
-                    .jpeg({
+                    }).jpeg({
                         quality: 80
-                    })
-                    .toBuffer() : undefined;
-                let Thumbnail = await prepareWAMessageMedia({
-                    image: buffer
-                }, {
-                    upload: socket.waUploadToServer,
-                    mediaTypeOverride: "thumbnail-link"
-                });
-                let Favicon = favicon ? await prepareWAMessageMedia({
-                    image: miniFavicon
-                }, {
-                    upload: socket.waUploadToServer,
-                    mediaTypeOverride: "thumbnail-link"
-                }) : undefined;
-                let message = {
-                    extendedTextMessage: {
-                        text: sourceUrl + "\n\n" + text,
-                        matchedText: sourceUrl,
-                        description: description,
-                        title: title,
-                        previewType: 'NONE',
-                        jpegThumbnail: miniPreview,
-                        thumbnailDirectPath: largerThumbnail ? Thumbnail?.imageMessage?.directPath : undefined,
-                        thumbnailSha256: largerThumbnail ? Thumbnail?.imageMessage?.fileSha256 : undefined,
-                        thumbnailEncSha256: largerThumbnail ? Thumbnail?.imageMessage?.fileEncSha256 : undefined,
-                        mediaKey: largerThumbnail ? Thumbnail?.imageMessage?.mediaKey : undefined,
-                        mediaKeyTimestamp: Math.floor(Date.now() / 1000).toString(),
-                        thumbnailHeight: largerThumbnail ? Thumbnail?.imageMessage?.height : undefined,
-                        thumbnailWidth: largerThumbnail ? Thumbnail?.imageMessage?.width : undefined,
-                        type: "thumbnail",
-                        faviconMMSMetadata: {
-                            thumbnailDirectPath: Favicon?.imageMessage?.directPath,
-                            thumbnailSha256: Favicon?.imageMessage?.fileSha256,
-                            thumbnailEncSha256: Favicon?.imageMessage?.fileEncSha256,
-                            mediaKey: Favicon?.imageMessage?.mediaKey,
+                    }).toBuffer()).toString("base64");
+
+                    let miniFavicon = favicon ? await sharp(favBuffer)
+                        .resize(48, 48, {
+                            fit: "cover",
+                            position: "centre"
+                        })
+                        .jpeg({
+                            quality: 80
+                        })
+                        .toBuffer() : undefined;
+
+                    let Thumbnail = await prepareWAMessageMedia({
+                        image: buffer
+                    }, {
+                        upload: socket.waUploadToServer,
+                        mediaTypeOverride: "thumbnail-link"
+                    });
+
+                    let Favicon = favicon ? await prepareWAMessageMedia({
+                        image: miniFavicon
+                    }, {
+                        upload: socket.waUploadToServer,
+                        mediaTypeOverride: "thumbnail-link"
+                    }) : undefined;
+
+                    let message = {
+                        extendedTextMessage: {
+                            text: sourceUrl + "\n\n" + text,
+                            matchedText: sourceUrl,
+                            description: description,
+                            title: title,
+                            previewType: 'NONE',
+                            jpegThumbnail: miniPreview,
+                            thumbnailDirectPath: largerThumbnail ? Thumbnail?.imageMessage?.directPath : undefined,
+                            thumbnailSha256: largerThumbnail ? Thumbnail?.imageMessage?.fileSha256 : undefined,
+                            thumbnailEncSha256: largerThumbnail ? Thumbnail?.imageMessage?.fileEncSha256 : undefined,
+                            mediaKey: largerThumbnail ? Thumbnail?.imageMessage?.mediaKey : undefined,
                             mediaKeyTimestamp: Math.floor(Date.now() / 1000).toString(),
-                            thumbnailHeight: Favicon?.imageMessage?.height,
-                            thumbnailWidth: Favicon?.imageMessage?.width
-                        },
-                        inviteLinkGroupTypeV2: 'DEFAULT',
-                        contextInfo: {
-                            ...contextInfo,
-                            ...(options.quoted ? {
-                                stanzaId: options.quoted.key.id,
-                                participant: options.quoted.key.participant || options.quoted.key.remoteJid,
-                                quotedMessage: options.quoted.message,
-                                remoteJid: options.quoted.key.remoteJid
-                            } : {})
+                            thumbnailHeight: largerThumbnail ? Thumbnail?.imageMessage?.height : undefined,
+                            thumbnailWidth: largerThumbnail ? Thumbnail?.imageMessage?.width : undefined,
+                            type: "thumbnail",
+                            faviconMMSMetadata: {
+                                thumbnailDirectPath: Favicon?.imageMessage?.directPath,
+                                thumbnailSha256: Favicon?.imageMessage?.fileSha256,
+                                thumbnailEncSha256: Favicon?.imageMessage?.fileEncSha256,
+                                mediaKey: Favicon?.imageMessage?.mediaKey,
+                                mediaKeyTimestamp: Math.floor(Date.now() / 1000).toString(),
+                                thumbnailHeight: Favicon?.imageMessage?.height,
+                                thumbnailWidth: Favicon?.imageMessage?.width
+                            },
+                            inviteLinkGroupTypeV2: 'DEFAULT',
+                            contextInfo: {
+                                ...contextInfo,
+                                ...(options.quoted ? {
+                                    stanzaId: options.quoted.key.id,
+                                    participant: options.quoted.key.participant || options.quoted.key.remoteJid,
+                                    quotedMessage: options.quoted.message,
+                                    remoteJid: options.quoted.key.remoteJid
+                                } : {})
+                            }
                         }
-                    }
-                };
+                    };
 
+                    await socket.relayMessage(jid, message, {});
+                    return message;
+                } catch (err) {
+                    console.error(err);
+                    return;
+                }
+            }
 
-                await socket.relayMessage(jid, message, {});
+            if (contextInfo?.previewThumbnailV2) {
+                let {
+                    title,
+                    description,
+                    thumbnail,
+                    sourceUrl
+                } = contextInfo.previewThumbnailV2 || {};
+
+                if (typeof jid !== "string") throw new TypeError("jid is not string");
+                if (typeof text !== "string") throw new TypeError("text is not string");
+                if (typeof sourceUrl !== "string") throw new TypeError("sourceUrl (link) is not string");
+                if (typeof title !== "string") throw new TypeError("title is not string");
+                if (description && typeof description !== "string") throw new TypeError("description is not string");
+                if (thumbnail && !Buffer.isBuffer(thumbnail) && typeof thumbnail.url !== "string") {
+                    throw new TypeError("thumbnail must be Buffer or object with url key");
+                }
 
-                return message;
-            } catch (err) {
-                console.log(err)
+                try {
+                    let bufferV2;
+                    if (Buffer.isBuffer(thumbnail)) {
+                        bufferV2 = thumbnail;
+                    } else if (thumbnail?.url) {
+                        let response = await fetch(thumbnail.url);
+                        if (!response.ok) throw new Error(`Gagal fetch thumbnail V2: ${response.statusText}`);
+                        let arrayBuffer = await response.arrayBuffer();
+                        bufferV2 = Buffer.from(arrayBuffer);
+                    }
+
+                    const image = bufferV2 ?
+                        await prepareWAMessageMedia({
+                            image: bufferV2
+                        }, {
+                            upload: socket.waUploadToServer,
+                            mediaTypeOverride: "thumbnail-link",
+                        }).then((v) => v.imageMessage) :
+                        undefined;
+
+                    text = text.includes(sourceUrl) ? text : `${sourceUrl}\n${text}`;
+                    return await socket.sendMessage(
+                        jid, {
+                            text,
+                            linkPreview: {
+                                "matched-text": sourceUrl,
+                                title,
+                                description,
+                                jpegThumbnail: image?.jpegThumbnail,
+                                highQualityThumbnail: image,
+                            },
+                            contextInfo: {
+                                ...contextInfo,
+                                previewThumbnailV2: undefined
+                            }
+                        },
+                        options
+                    );
+                } catch (err) {
+                    console.error(err);
+                    return;
+                }
             }
-        },        
+            return await socket.sendMessage(jid, content, options);
+        },
         messageBuilder: function(jid, options = {}) {
             let currentInstancePromise = null;
 
@@ -1667,7 +1736,9 @@ function addProperty(socket, baileys) {
                                 if (type === 'AIRich') return new AIRich(socket);
                                 if (type === 'tutorial') {
                                     const aiRich = new AIRich(socket);
-                                    const fullText = await Buffer.from((await axios.get("https://raw.githubusercontent.com/reinzz556/haruka/refs/heads/main/readme.md", { responseType: "arraybuffer" })).data).toString()
+                                    const fullText = await Buffer.from((await axios.get("https://raw.githubusercontent.com/reinzz556/haruka/refs/heads/main/readme.md", {
+                                        responseType: "arraybuffer"
+                                    })).data).toString()
                                     const codeBlockRegex = /```(\w*)\n([\s\S]*?)\n```/g;
 
                                     let lastIndex = 0;
@@ -1692,7 +1763,7 @@ function addProperty(socket, baileys) {
                                         aiRich.addText(remainingText);
                                     }
 
-        
+
                                     return aiRich;
                                 }
                                 throw new Error(`Type ${type} tidak dikenali. Jika belum tau cara penggunaannya, silahkan execute kode ini:\n\`\`\`js\nreturn await socket.messageBuilder(m.chat).setType("tutorial").send()\n\`\`\``);
@@ -1728,7 +1799,8 @@ function addProperty(socket, baileys) {
 
             const proxy = new Proxy({}, handler);
             return proxy;
-        }, sendStickerPack: async (jid, packData, options = {}) => {
+        },
+        sendStickerPack: async (jid, packData, options = {}) => {
             try {
                 const {
                     name,
@@ -2084,6 +2156,7 @@ function addProperty(socket, baileys) {
                         degreesLatitude: location.degressLatitude || location.degreesLatitude || 0,
                         degreesLongitude: location.degressLongitude || location.degreesLongitude || 0,
                         name: location.name || "",
+                        jpegThumbnail: location.jpegThumbnail || null,
                         address: location.address || "",
                     },
                 };
@@ -2444,8 +2517,8 @@ function addProperty(socket, baileys) {
 
 export default addProperty;
 export {
-   Button,
-   ButtonV2,
-   Carousel,
-   AIRich
+    Button,
+    ButtonV2,
+    Carousel,
+    AIRich
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ryuu-reinzz/haruka-lib",
-    "version": "4.0.0",
+    "version": "4.0.2",
     "description": "Library extra for bot WhatsApp",
     "main": "main/index.js",
     "type": "module",