nolimit-x 1.0.19 → 1.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolimit-x",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "Advanced email sender ",
   "main": "src/cli.js",
   "bin": {
@@ -19,6 +19,7 @@
     "puppeteer": "^23.0.0",
     "qrcode": "^1.5.3",
     "p-map": "^5.0.0",
-    "ora": "^6.1.2"
+    "ora": "^6.1.2",
+    "node-fetch": "^2.6.7"
   }
 }

package/src/placeholders.js

@@ -97,15 +97,20 @@ const dynamicPlaceholders = [
     { 
         pattern: /\[\[-\s*FAVICON(?:\|([^\]]+))?\s*-\]\]/g, 
         handler: async (match, customUrl, email) => {
-            // If custom URL is provided, use it
             if (customUrl) {
                 return customUrl.trim();
             }
-            // Otherwise fetch favicon for the domain as base64
+            if (!email) {
+                console.error('FAVICON placeholder: No email provided!');
+                // Return a default favicon
+                return 'https://www.google.com/s2/favicons?sz=32&domain_url=default.com';
+            }
             const domain = utils.getDomainFromEmail(email);
+            const faviconUrl = await utils.fetchFavicon(domain);
             const dataUri = await utils.fetchFaviconBase64(domain);
-            console.log('FAVICON placeholder:', { email, domain, dataUriLength: dataUri.length, dataUri: dataUri.slice(0, 60) });
-            return dataUri;
+            console.log('FAVICON placeholder:', { email, domain, faviconUrl, dataUriLength: dataUri.length });
+            // Fallback: if dataUri is empty, use the external favicon URL
+            return dataUri || faviconUrl || 'https://www.google.com/s2/favicons?sz=32&domain_url=default.com';
         }
     },
     

package/src/utils.js

@@ -3,6 +3,7 @@ const path = require('path');
 const natural = require('natural');
 const { Buffer } = require('buffer');
 const https = require('https');
+const fetch = require('node-fetch');
 
 // Date and Time Functions
 function formatDate(date, format) {
@@ -346,22 +347,24 @@ async function batchFetchFavicons(domains) {
 // Initialize cache on module load
 loadFaviconCache();
 
-// Fetch favicon as base64 data URI
+// Fetch favicon as base64 data URI using node-fetch
 async function fetchFaviconBase64(domain) {
     const faviconUrl = await fetchFavicon(domain);
     if (!faviconUrl) return '';
-    return new Promise((resolve) => {
-        https.get(faviconUrl, (res) => {
-            const data = [];
-            res.on('data', chunk => data.push(chunk));
-            res.on('end', () => {
-                const buffer = Buffer.concat(data);
-                const base64 = buffer.toString('base64');
-                const mime = res.headers['content-type'] || 'image/png';
-                resolve(`data:${mime};base64,${base64}`);
-            });
-        }).on('error', () => resolve(''));
-    });
+    try {
+        const res = await fetch(faviconUrl, { timeout: 5000 });
+        if (!res.ok) {
+            console.error(`Failed to fetch favicon for ${domain}: HTTP ${res.status}`);
+            return '';
+        }
+        const buffer = await res.buffer();
+        const base64 = buffer.toString('base64');
+        const mime = res.headers.get('content-type') || 'image/png';
+        return `data:${mime};base64,${base64}`;
+    } catch (err) {
+        console.error(`Error fetching favicon for ${domain}:`, err.message);
+        return '';
+    }
 }
 
 // Export all functions