Update server.js

server.js

@@ -34,22 +34,18 @@ app.use('/api/', rateLimit({
     legacyHeaders: false,
 }));
 
-// ==================== متغيرات البيئة ====================
 const MAXMIND_ACCOUNT_ID = process.env.Account_ID;
 const MAXMIND_LICENSE_KEY = process.env.License_key;
 
-// ==================== المتغيرات العامة ====================
 let ghosteryDB = null;
 let ddgTrackerRadar = { domains: {} };
 let tosdrCache = new Map();
 let geoReader = null;
 let useMaxMind = false;
 
-// قفل لمنع تداخل الطلبات (مهم لـ Hugging Face)
 const mutex = new Mutex();
-const scanMutex = withTimeout(mutex, 5 * 60 * 1000); // 5 دقائق كحد أقصى
+const scanMutex = withTimeout(mutex, 5 * 60 * 1000);
 
-// ==================== مجمع المتصفح (Browser Pool) ====================
 class BrowserPool {
     constructor() {
         this.browser = null;
@@ -61,7 +57,7 @@ class BrowserPool {
 
     async getBrowser() {
         if (this.requestCount >= this.maxRequestsBeforeRestart) {
-            console.log('♻️  Restarting browser to free memory...');
+            console.log('Restarting browser to free memory...');
             await this.shutdown();
             this.requestCount = 0;
         }
@@ -100,9 +96,9 @@ class BrowserPool {
                     '--disable-background-timer-throttling',
                     '--disable-renderer-backgrounding'
                 ],
-                protocolTimeout: 240000, // 4 دقائق
+                protocolTimeout: 240000,
             });
-            console.log('🚀 Browser launched');
+            console.log('Browser launched');
             this.requestCount = 1;
             this.waiters.forEach(r => r());
             this.waiters = [];
@@ -139,17 +135,16 @@ class BrowserPool {
 
 const pool = new BrowserPool();
 
-// ==================== دوال التهيئة ====================
 async function initGhosteryDB() {
     try {
         const enginePath = path.join(__dirname, 'node_modules', '@ghostery', 'trackerdb', 'dist', 'trackerdb.engine');
         if (existsSync(enginePath)) {
             const engine = readFileSync(enginePath);
             ghosteryDB = await loadTrackerDB(engine);
-            console.log('✅ Ghostery TrackerDB initialized');
+            console.log('Ghostery TrackerDB initialized');
         }
     } catch (e) {
-        console.warn('⚠️ Ghostery TrackerDB initialization failed:', e.message);
+        console.warn('Ghostery TrackerDB initialization failed:', e.message);
     }
 }
 
@@ -158,10 +153,10 @@ function loadDDGTrackerRadar() {
         const ddgPath = path.join(__dirname, 'data', 'ddg-tracker-radar.json');
         if (existsSync(ddgPath)) {
             ddgTrackerRadar = JSON.parse(readFileSync(ddgPath, 'utf-8'));
-            console.log(`✅ DDG Tracker Radar: ${Object.keys(ddgTrackerRadar.domains).length} domains`);
+            console.log(`DDG Tracker Radar: ${Object.keys(ddgTrackerRadar.domains).length} domains`);
         }
     } catch (e) {
-        console.warn('⚠️ DDG Tracker Radar load failed:', e.message);
+        console.warn('DDG Tracker Radar load failed:', e.message);
     }
 }
 
@@ -189,9 +184,9 @@ async function downloadDDGTrackerRadar() {
         if (!existsSync(dir)) mkdirSync(dir);
         writeFileSync(path.join(dir, 'ddg-tracker-radar.json'), JSON.stringify(simplified));
         ddgTrackerRadar = simplified;
-        console.log('✅ DDG Tracker Radar updated');
+        console.log('DDG Tracker Radar updated');
     } catch (e) {
-        console.error('❌ DDG download failed:', e.message);
+        console.error('DDG download failed:', e.message);
     }
 }
 
@@ -203,21 +198,21 @@ async function initGeoDatabase() {
             if (existsSync(dbPath)) {
                 geoReader = await maxmind.open(dbPath);
                 useMaxMind = true;
-                console.log('✅ MaxMind GeoLite2-City loaded');
+                console.log('MaxMind GeoLite2-City loaded');
                 return;
             }
         } catch (e) {
-            console.warn('⚠️ MaxMind initialization failed, falling back to geoip-lite:', e.message);
+            console.warn('MaxMind initialization failed, falling back to geoip-lite:', e.message);
         }
     }
-    console.log('✅ Using geoip-lite for Geo mapping');
+    console.log('Using geoip-lite for Geo mapping');
 }
 
 async function downloadMaxMindDatabase(dbPath) {
     const url = `https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=${MAXMIND_LICENSE_KEY}&suffix=tar.gz`;
     const dir = path.dirname(dbPath);
     if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-    console.log('📥 Downloading MaxMind GeoLite2-City...');
+    console.log('Downloading MaxMind GeoLite2-City...');
     const response = await axios.get(url, { responseType: 'stream', timeout: 120000 });
     const tarPath = path.join(dir, 'GeoLite2-City.tar.gz');
     const writer = createWriteStream(tarPath);
@@ -226,10 +221,9 @@ async function downloadMaxMindDatabase(dbPath) {
         writer.on('finish', resolve);
         writer.on('error', reject);
     });
-    console.warn('⚠️ MaxMind DB downloaded but auto-extraction not implemented. Using geoip-lite instead.');
+    console.warn('MaxMind DB downloaded but auto-extraction not implemented. Using geoip-lite instead.');
 }
 
-// ==================== دوال مساعدة ====================
 function normalizeUrl(inputUrl) {
     let url = inputUrl.trim();
     if (!url.startsWith('http://') && !url.startsWith('https://')) url = 'https://' + url;
@@ -288,9 +282,6 @@ async function getTosdrGrade(url) {
     }
 }
 
-// ==================== أدوات المتصفح (كل منها تفتح وتغلق context فورًا) ====================
-
-/** لقطة شاشة سريعة وخفيفة */
 async function takeScreenshot(url) {
     const { page, context } = await pool.newTab();
     try {
@@ -488,8 +479,6 @@ async function analyzePrivacyPolicy(url) {
     }
 }
 
-// ==================== أدوات لا تحتاج متصفح ====================
-
 async function trackRedirectChain(url) {
     const TRACKING_PARAMS = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'mc_eid', 'ref', 'affiliate', 'clickid', 'adid', 'msclkid', 'twclid', '_ga', 'igshid'];
     const chain = [];
@@ -597,7 +586,6 @@ async function performSecurityCheck(url) {
     }
 }
 
-// ==================== حساب درجة الخصوصية ====================
 function calculatePrivacyScore(blacklight, enrichedTrackers, tosdrGrade, security, cookieConsent, fingerprintRisks, redirectChain, privacyPolicy) {
     let score = 100;
     score -= Math.min(enrichedTrackers.length * 4, 30);
@@ -634,7 +622,6 @@ function calculatePrivacyScore(blacklight, enrichedTrackers, tosdrGrade, securit
     return { score, grade };
 }
 
-// ==================== نقطة النهاية الوحيدة: SSE Live Scan ====================
 app.get('/api/scan', async (req, res) => {
     const url = normalizeUrl(req.query.url);
     if (!url) {
@@ -642,7 +629,6 @@ app.get('/api/scan', async (req, res) => {
         return;
     }
 
-    // إعداد رؤوس SSE
     res.writeHead(200, {
         'Content-Type': 'text/event-stream',
         'Cache-Control': 'no-cache',
@@ -656,12 +642,10 @@ app.get('/api/scan', async (req, res) => {
 
     sendEvent('start', { url, message: 'Scan started...' });
 
-    // استخدام القفل لضمان طلب واحد فقط في وقت واحد
     try {
         await scanMutex.runExclusive(async () => {
             const startTime = Date.now();
 
-            // تخزين النتائج مؤقتًا
             const results = {
                 screenshot: null,
                 hiddenStorage: null,
@@ -674,70 +658,72 @@ app.get('/api/scan', async (req, res) => {
                 privacyPolicy: null
             };
 
-            // تعريف الأدوات مع وظيفة إرسال التقدم فور الانتهاء
             const tools = [
                 {
                     name: 'screenshot',
                     fn: () => takeScreenshot(url),
-                    onDone: (data) => { results.screenshot = data; sendEvent('progress', { step: 'screenshot', status: 'done' }); }
+                    onDone: (data) => { results.screenshot = data; }
                 },
                 {
                     name: 'hidden_storage',
                     fn: () => checkHiddenStorage(url),
-                    onDone: (data) => { results.hiddenStorage = data; sendEvent('progress', { step: 'hidden_storage', status: 'done' }); }
+                    onDone: (data) => { results.hiddenStorage = data; }
                 },
                 {
                     name: 'cookie_consent',
                     fn: () => analyzeCookieConsent(url),
-                    onDone: (data) => { results.cookieConsent = data; sendEvent('progress', { step: 'cookie_consent', status: 'done' }); }
+                    onDone: (data) => { results.cookieConsent = data; }
                 },
                 {
                     name: 'fingerprint_risks',
                     fn: () => collectFingerprintRisks(url),
-                    onDone: (data) => { results.fingerprint = data; sendEvent('progress', { step: 'fingerprint_risks', status: 'done' }); }
+                    onDone: (data) => { results.fingerprint = data; }
                 },
                 {
                     name: 'redirect_chain',
                     fn: () => trackRedirectChain(url),
-                    onDone: (data) => { results.redirectChain = data; sendEvent('progress', { step: 'redirect_chain', status: 'done' }); }
+                    onDone: (data) => { results.redirectChain = data; }
                 },
                 {
                     name: 'blacklight_scan',
                     fn: () => performBlacklightScan(url),
-                    onDone: (data) => { results.blacklight = data; sendEvent('progress', { step: 'blacklight_scan', status: 'done' }); }
+                    onDone: (data) => { results.blacklight = data; }
                 },
                 {
                     name: 'tosdr',
                     fn: () => getTosdrGrade(url),
-                    onDone: (data) => { results.tosdr = data; sendEvent('progress', { step: 'tosdr', status: 'done' }); }
+                    onDone: (data) => { results.tosdr = data; }
                 },
                 {
                     name: 'security',
                     fn: () => performSecurityCheck(url),
-                    onDone: (data) => { results.security = data; sendEvent('progress', { step: 'security', status: 'done' }); }
+                    onDone: (data) => { results.security = data; }
                 },
                 {
                     name: 'privacy_policy',
                     fn: () => analyzePrivacyPolicy(url),
-                    onDone: (data) => { results.privacyPolicy = data; sendEvent('progress', { step: 'privacy_policy', status: 'done' }); }
+                    onDone: (data) => { results.privacyPolicy = data; }
                 }
             ];
 
-            // بدء جميع الأدوات بالتوازي
-            const promises = tools.map(tool =>
+            const toolPromises = tools.map(tool =>
                 tool.fn()
-                    .then(data => { tool.onDone(data); return data; })
-                    .catch(err => { console.error(`${tool.name} failed:`, err.message); tool.onDone(null); return null; })
+                    .then(data => {
+                        tool.onDone(data);
+                        sendEvent('progress', { step: tool.name, status: 'completed' });
+                        return data;
+                    })
+                    .catch(err => {
+                        console.error(`${tool.name} failed:`, err.message);
+                        tool.onDone(null);
+                        sendEvent('progress', { step: tool.name, status: 'failed', error: err.message });
+                        return null;
+                    })
             );
 
-            // انتظار انتهاء الجميع
-            const settled = await Promise.allSettled(promises);
-            // (القيم الفعلية موجودة في results لأننا خزناها عبر onDone)
+            await Promise.all(toolPromises);
 
-            // معالجة البيانات النهائية (خاصة blacklight)
             const blacklightData = results.blacklight || { hosts: {}, cookies: [] };
-
-            // تجميع المتتبعين
             const thirdPartyDomains = [
                 ...(blacklightData.hosts?.thirdParty || []),
                 ...(blacklightData.hosts?.requests?.third_party || [])
@@ -759,7 +745,6 @@ app.get('/api/scan', async (req, res) => {
                 }
             }
 
-            // Geo mapping
             const uniqueIps = [...new Set((blacklightData.hosts?.requests?.third_party || []).map(r => r.ip_addr).filter(Boolean))];
             const geoDestinations = [];
             for (const ip of uniqueIps) {
@@ -793,7 +778,6 @@ app.get('/api/scan', async (req, res) => {
                 } catch (e) {}
             }
 
-            // PII Leakage
             const leakageAlerts = [];
             for (const r of (blacklightData.hosts?.requests?.third_party || [])) {
                 if ((r.method === 'POST' || r.method === 'PUT') && r.body) {
@@ -812,7 +796,6 @@ app.get('/api/scan', async (req, res) => {
                 }
             }
 
-            // حساب النتيجة
             const securityData = results.security || { ssl: { valid: false } };
             const { score, grade } = calculatePrivacyScore(
                 blacklightData,
@@ -825,7 +808,6 @@ app.get('/api/scan', async (req, res) => {
                 results.privacyPolicy
             );
 
-            // بناء النتيجة النهائية
             const finalResult = {
                 success: true,
                 url,
@@ -873,7 +855,6 @@ app.get('/api/scan', async (req, res) => {
 
 app.get('/health', (req, res) => res.json({ status: 'ok' }));
 
-// ==================== بدء التشغيل ====================
 (async () => {
     const dirs = [path.join(__dirname, 'data'), path.join(__dirname, 'bl-tmp')];
     for (const dir of dirs) {
@@ -886,6 +867,6 @@ app.get('/health', (req, res) => res.json({ status: 'ok' }));
         await downloadDDGTrackerRadar();
     }
     app.listen(PORT, '0.0.0.0', () => {
-        console.log(`🚀 Private Eye Live API running on port ${PORT}`);
+        console.log(`Private Eye Live API running on port ${PORT}`);
     });
 })();