@kanaraa/baileys 3.2.0 → 3.4.0

package/lib/Socket/groups.js

@@ -16,9 +16,23 @@ export const makeGroupsSocket = (config) => {
         },
         content
     });
-    const groupMetadata = async (jid) => {
+    const fetchJoinRequests = async (jid) => {
+        const req = await groupQuery(jid, 'get', [
+            {
+                tag: 'membership_approval_requests',
+                attrs: {}
+            }
+        ]);
+        const node = getBinaryNodeChild(req, 'membership_approval_requests');
+        return getBinaryNodeChildren(node, 'membership_approval_request').map(v => v.attrs);
+    };
+    const groupMetadata = async (jid, opts = {}) => {
         const result = await groupQuery(jid, 'get', [{ tag: 'query', attrs: { request: 'interactive' } }]);
-        return extractGroupMetadata(result);
+        const metadata = extractGroupMetadata(result);
+        if (opts.joinRequests) {
+            metadata.joinRequests = await fetchJoinRequests(jid).catch(() => []);
+        }
+        return metadata;
     };
     const groupFetchAllParticipating = async () => {
         const result = await query({
@@ -103,15 +117,7 @@ export const makeGroupsSocket = (config) => {
             ]);
         },
         groupRequestParticipantsList: async (jid) => {
-            const result = await groupQuery(jid, 'get', [
-                {
-                    tag: 'membership_approval_requests',
-                    attrs: {}
-                }
-            ]);
-            const node = getBinaryNodeChild(result, 'membership_approval_requests');
-            const participants = getBinaryNodeChildren(node, 'membership_approval_request');
-            return participants.map(v => v.attrs);
+            return fetchJoinRequests(jid).catch(() => []);
         },
         groupRequestParticipantsUpdate: async (jid, participants, action) => {
             const result = await groupQuery(jid, 'set', [
@@ -342,5 +348,6 @@ export const extractGroupMetadata = (result) => {
         }),
         ephemeralDuration: eph ? +eph : undefined
     };
+    metadata.admins = metadata.participants.filter(p => p.admin);
     return metadata;
 };

package/lib/Utils/link-preview.js

@@ -1,84 +1,122 @@
 import { prepareWAMessageMedia } from './messages.js';
 import { extractImageThumb, getHttpStream } from './messages-media.js';
+
 const THUMBNAIL_WIDTH_PX = 192;
-/** Fetches an image and generates a thumbnail for it */
+
+const htmlDecode = (s) => s
+    .replace(/&#x([0-9a-f]+);/gi, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
+    .replace(/&#(\d+);/g, (_, dec) => String.fromCharCode(Number(dec)))
+    .replace(/"/g, '"')
+    .replace(/'/g, "'")
+    .replace(/&lt;/g, '<')
+    .replace(/&gt;/g, '>')
+    .replace(/&amp;/g, '&');
+
+const getMetaContent = (html, keys) => {
+    const pattern = new RegExp(`<meta[^>]+(?:property|name)=["'](?:${keys.join('|')})["'][^>]*content=["']([^"']*)["']`, 'i');
+    const match = html.match(pattern);
+    if (match) return htmlDecode(match[1]);
+    const reversed = new RegExp(`<meta[^>]+content=["']([^"']*)["'][^>]*(?:property|name)=["'](?:${keys.join('|')})["']`, 'i');
+    const alt = html.match(reversed);
+    if (alt) return htmlDecode(alt[1]);
+    return null;
+};
+
+const getTitle = (html) => {
+    const meta = getMetaContent(html, ['og:title', 'twitter:title']);
+    if (meta) return meta;
+    const match = html.match(/<title[^>]*>([^<]*)<\/title>/i);
+    return match ? htmlDecode(match[1].trim()) : null;
+};
+
+const getFavicon = (html, baseUrl) => {
+    const match = html.match(/<link[^>]+href=["']([^"']+)["'][^>]*rel=["'](?:shortcut\s+)?icon["']/i) ||
+                  html.match(/<link[^>]+rel=["'](?:shortcut\s+)?icon["'][^>]*href=["']([^"']+)["']/i);
+    const href = match ? match[1] || match[2] : null;
+    try {
+        return new URL(href || '/favicon.ico', baseUrl).href;
+    } catch {
+        return href || `${baseUrl}/favicon.ico`;
+    }
+};
+
 const getCompressedJpegThumbnail = async (url, { thumbnailWidth, fetchOpts }) => {
     const stream = await getHttpStream(url, fetchOpts);
     const result = await extractImageThumb(stream, thumbnailWidth);
     return result;
 };
-/**
- * Given a piece of text, checks for any URL present, generates link preview for the same and returns it
- * Return undefined if the fetch failed or no URL was found
- * @param text first matched URL in text
- * @returns the URL info required to generate link preview
- */
+
+const fetchPage = async (url, fetchOpts = {}) => {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), fetchOpts.timeout || 3000);
+    try {
+        const response = await fetch(url, {
+            method: 'GET',
+            redirect: 'follow',
+            signal: controller.signal,
+            headers: {
+                'user-agent': 'WhatsApp/2.24.6.77',
+                accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+                ...(fetchOpts.headers || {})
+            }
+        });
+        if (!response.ok) {
+            throw new Error(`HTTP ${response.status}`);
+        }
+        const html = await response.text();
+        return {
+            html,
+            finalUrl: response.url || url
+        };
+    } finally {
+        clearTimeout(timer);
+    }
+};
+
 export const getUrlInfo = async (text, opts = {
     thumbnailWidth: THUMBNAIL_WIDTH_PX,
     fetchOpts: { timeout: 3000 }
 }) => {
     try {
-        // retries
-        let retries = 0;
-        const maxRetry = 5;
-        const { getLinkPreview } = await import('link-preview-js');
         let previewLink = text;
-        if (!text.startsWith('https://') && !text.startsWith('http://')) {
+        if (!previewLink.startsWith('https://') && !previewLink.startsWith('http://')) {
             previewLink = 'https://' + previewLink;
         }
-        const info = await getLinkPreview(previewLink, {
-            ...opts.fetchOpts,
-            followRedirects: 'follow',
-            handleRedirects: (baseURL, forwardedURL) => {
-                const urlObj = new URL(baseURL);
-                const forwardedURLObj = new URL(forwardedURL);
-                if (retries >= maxRetry) {
-                    return false;
-                }
-                if (forwardedURLObj.hostname === urlObj.hostname ||
-                    forwardedURLObj.hostname === 'www.' + urlObj.hostname ||
-                    'www.' + forwardedURLObj.hostname === urlObj.hostname) {
-                    retries += 1;
-                    return true;
-                }
-                else {
-                    return false;
-                }
-            },
-            headers: opts.fetchOpts?.headers
-        });
-        if (info && 'title' in info && info.title) {
-            const [image] = info.images;
-            const urlInfo = {
-                'canonical-url': info.url,
-                'matched-text': text,
-                title: info.title,
-                description: info.description,
-                originalThumbnailUrl: image
-            };
-            if (opts.uploadImage) {
-                const { imageMessage } = await prepareWAMessageMedia({ image: { url: image } }, {
-                    upload: opts.uploadImage,
-                    mediaTypeOverride: 'thumbnail-link',
-                    options: opts.fetchOpts
-                });
-                urlInfo.jpegThumbnail = imageMessage?.jpegThumbnail ? Buffer.from(imageMessage.jpegThumbnail) : undefined;
-                urlInfo.highQualityThumbnail = imageMessage || undefined;
+        const { html, finalUrl } = await fetchPage(previewLink, opts.fetchOpts);
+        const title = getTitle(html);
+        if (!title) {
+            return undefined;
+        }
+        const description = getMetaContent(html, ['og:description', 'twitter:description', 'description']);
+        const image = getMetaContent(html, ['og:image', 'twitter:image']);
+        const favicon = getFavicon(html, finalUrl);
+        const urlInfo = {
+            'canonical-url': finalUrl,
+            'matched-text': text,
+            title,
+            description,
+            originalThumbnailUrl: image || favicon
+        };
+        if (opts.uploadImage) {
+            const { imageMessage } = await prepareWAMessageMedia({ image: { url: urlInfo.originalThumbnailUrl } }, {
+                upload: opts.uploadImage,
+                mediaTypeOverride: 'thumbnail-link',
+                options: opts.fetchOpts
+            });
+            urlInfo.jpegThumbnail = imageMessage?.jpegThumbnail ? Buffer.from(imageMessage.jpegThumbnail) : undefined;
+            urlInfo.highQualityThumbnail = imageMessage || undefined;
+        }
+        else {
+            try {
+                urlInfo.jpegThumbnail = (await getCompressedJpegThumbnail(urlInfo.originalThumbnailUrl, opts)).buffer;
             }
-            else {
-                try {
-                    urlInfo.jpegThumbnail = image ? (await getCompressedJpegThumbnail(image, opts)).buffer : undefined;
-                }
-                catch (error) {
-                    opts.logger?.debug({ err: error.stack, url: previewLink }, 'error in generating thumbnail');
-                }
+            catch (error) {
+                opts.logger?.debug({ err: error.stack, url: previewLink }, 'error in generating thumbnail');
             }
-            return urlInfo;
         }
+        return urlInfo;
     }
     catch (error) {
-        if (!error.message.includes('receive a valid')) {
-            throw error;
-        }
+        opts.logger?.debug({ err: error.stack, url: text }, 'error in generating link preview');
     }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kanaraa/baileys",
   "type": "module",
-  "version": "3.2.0",
+  "version": "3.4.0",
   "description": "Modded Baileys v7, Rebuilt on top of official @whiskeysockets/baileys 7.0.0-rc13, with the interactive & rich-message content types (buttons, lists, carousel, cards, shop/collection, native flow, AI rich response, sticker packs, admin invite, payments, etc.).",
   "keywords": [
     "whatsapp",
@@ -43,10 +43,9 @@
   "peerDependencies": {
     "adm-zip": "^0.5.10",
     "audio-decode": "^2.1.3",
-    "fluent-ffmpeg": "^2.1.2",
+    "fluent-ffmpeg": "^2.1.3",
     "jimp": "^1.6.1",
-    "link-preview-js": "^3.0.0",
-    "sharp": "*"
+    "sharp": "^0.35.3"
   },
   "peerDependenciesMeta": {
     "adm-zip": {
@@ -61,9 +60,6 @@
     "jimp": {
       "optional": true
     },
-    "link-preview-js": {
-      "optional": true
-    },
     "sharp": {
       "optional": true
     }