Update server.js

server.js

@@ -102,7 +102,8 @@ class BrowserPool {
                     '--disable-blink-features=AutomationControlled',
                     '--disable-background-timer-throttling',
                     '--disable-renderer-backgrounding'
-                ]
+                ],
+                protocolTimeout: 240000, // 4 دقائق لتفادي مشاكل الـ timeout
             });
             console.log('🚀 Browser launched');
             this.requestCount = 1;
@@ -523,7 +524,7 @@ async function performBlacklightScan(url) {
             captureHar: true,
             saveScreenshots: false,
             headless: true,
-            defaultTimeout: 25000, // 25 ثانية تكفي لأغلب المواقع
+            defaultTimeout: 90000, // 90 ثانية
             extraChromiumArgs: [
                 '--disable-blink-features=AutomationControlled',
                 '--no-sandbox',
@@ -531,15 +532,20 @@ async function performBlacklightScan(url) {
                 '--disable-dev-shm-usage',
                 '--disable-gpu',
                 '--ignore-certificate-errors'
-            ]
+            ],
+            puppeteerOptions: {
+                protocolTimeout: 240000, // 4 دقائق
+            },
         };
         const result = await collect(url, options);
         // تنظيف الملفات المؤقتة بعد الفحص
-        const files = await readdir(tmpDir);
-        await Promise.all(files.map(f => unlink(path.join(tmpDir, f)).catch(() => {})));
+        try {
+            const files = await readdir(tmpDir);
+            await Promise.all(files.map(f => unlink(path.join(tmpDir, f)).catch(() => {})));
+        } catch (e) {}
         return result;
     } catch (e) {
-        console.error('Blacklight scan failed:', e.message);
+        console.error('Blacklight scan failed, returning empty result:', e.message);
         return { hosts: {}, cookies: [], error: e.message };
     }
 }
@@ -611,7 +617,7 @@ function calculatePrivacyScore(blacklight, enrichedTrackers, tosdrGrade, securit
     return { score, grade };
 }
 
-// ==================== نقطة نهاية API ====================
+// ==================== نقطة نهاية API عادية (JSON) ====================
 app.get('/api/scan', async (req, res) => {
     const url = normalizeUrl(req.query.url);
     if (!url) return res.status(400).json({ error: 'Invalid URL' });
@@ -624,7 +630,6 @@ app.get('/api/scan', async (req, res) => {
     const startTime = Date.now();
 
     try {
-        // تنفيذ جميع الفحوصات بالتوازي (مع حماية كل منها ضد الفشل)
         const [
             screenshotResult, hiddenStorageResult, cookieConsentResult,
             fingerprintResult, redirectChainResult, blacklightResult,
@@ -775,6 +780,190 @@ app.get('/api/scan', async (req, res) => {
     }
 });
 
+// ==================== نقطة نهاية SSE (تقدم حي) ====================
+app.get('/api/scan/live', async (req, res) => {
+    const url = normalizeUrl(req.query.url);
+    if (!url) {
+        res.status(400).send('Invalid URL');
+        return;
+    }
+
+    // إعداد رؤوس SSE
+    res.writeHead(200, {
+        'Content-Type': 'text/event-stream',
+        'Cache-Control': 'no-cache',
+        'Connection': 'keep-alive',
+    });
+
+    const sendEvent = (event, data) => {
+        res.write(`event: ${event}\n`);
+        res.write(`data: ${JSON.stringify(data)}\n\n`);
+    };
+
+    sendEvent('start', { url, message: 'Scan started...' });
+
+    if (scanMutex.isLocked()) {
+        sendEvent('error', { error: 'Scanner is busy, please try again in a moment.' });
+        res.end();
+        return;
+    }
+
+    const release = await scanMutex.acquire();
+    const startTime = Date.now();
+
+    try {
+        // تنفيذ الفحوصات مع إرسال التقدم عند اكتمال كل خطوة
+        const promises = [
+            takeScreenshot(url).then(r => { sendEvent('progress', { step: 'screenshot', status: 'done' }); return r; }).catch(() => null),
+            checkHiddenStorage(url).then(r => { sendEvent('progress', { step: 'hidden_storage', status: 'done' }); return r; }).catch(() => null),
+            analyzeCookieConsent(url).then(r => { sendEvent('progress', { step: 'cookie_consent', status: 'done' }); return r; }).catch(() => null),
+            collectFingerprintRisks(url).then(r => { sendEvent('progress', { step: 'fingerprint_risks', status: 'done' }); return r; }).catch(() => null),
+            trackRedirectChain(url).then(r => { sendEvent('progress', { step: 'redirect_chain', status: 'done' }); return r; }).catch(() => null),
+            performBlacklightScan(url).then(r => { sendEvent('progress', { step: 'blacklight_scan', status: 'done' }); return r; }).catch(() => null),
+            getTosdrGrade(url).then(r => { sendEvent('progress', { step: 'tosdr', status: 'done' }); return r; }).catch(() => null),
+            performSecurityCheck(url).then(r => { sendEvent('progress', { step: 'security', status: 'done' }); return r; }).catch(() => null),
+            analyzePrivacyPolicy(url).then(r => { sendEvent('progress', { step: 'privacy_policy', status: 'done' }); return r; }).catch(() => null),
+        ];
+
+        const results = await Promise.allSettled(promises);
+        
+        const screenshotData = results[0].status === 'fulfilled' ? results[0].value : null;
+        const hiddenData = results[1].status === 'fulfilled' ? results[1].value : null;
+        const cookieConsentData = results[2].status === 'fulfilled' ? results[2].value : null;
+        const fingerprintData = results[3].status === 'fulfilled' ? results[3].value : null;
+        const redirectData = results[4].status === 'fulfilled' ? results[4].value : null;
+        const blacklightData = results[5].status === 'fulfilled' ? results[5].value : { hosts: {}, cookies: [] };
+        const tosdrData = results[6].status === 'fulfilled' ? results[6].value : null;
+        const securityData = results[7].status === 'fulfilled' ? results[7].value : { ssl: { valid: false } };
+        const privacyPolicyData = results[8].status === 'fulfilled' ? results[8].value : null;
+
+        // تجميع المتتبعين
+        const thirdPartyDomains = [
+            ...(blacklightData.hosts?.thirdParty || []),
+            ...(blacklightData.hosts?.requests?.third_party || [])
+        ];
+        const uniqueDomains = [...new Set(thirdPartyDomains)];
+        const enrichedTrackers = [];
+        for (const domain of uniqueDomains) {
+            try {
+                const ddgInfo = getDDGInfo(domain);
+                const ghosteryInfo = await getGhosteryInfo(domain);
+                enrichedTrackers.push({
+                    domain,
+                    owner: ghosteryInfo?.organization || ddgInfo?.owner || getBaseDomain(domain),
+                    category: ghosteryInfo?.category || ddgInfo?.category || 'unknown',
+                    prevalence: ddgInfo?.prevalence || 0
+                });
+            } catch (e) {
+                enrichedTrackers.push({ domain, owner: getBaseDomain(domain), category: 'unknown', prevalence: 0 });
+            }
+        }
+
+        // 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) {
+            try {
+                let geoData = null;
+                if (useMaxMind && geoReader) {
+                    const mmGeo = geoReader.get(ip);
+                    if (mmGeo) {
+                        geoData = {
+                            ip,
+                            country: mmGeo.country?.names?.en || 'Unknown',
+                            city: mmGeo.city?.names?.en || 'Unknown',
+                            latitude: mmGeo.location?.latitude,
+                            longitude: mmGeo.location?.longitude
+                        };
+                    }
+                }
+                if (!geoData) {
+                    const geoLite = geoip.lookup(ip);
+                    if (geoLite) {
+                        geoData = {
+                            ip,
+                            country: geoLite.country,
+                            city: geoLite.city,
+                            latitude: geoLite.ll?.[0] || null,
+                            longitude: geoLite.ll?.[1] || null
+                        };
+                    }
+                }
+                if (geoData) geoDestinations.push(geoData);
+            } catch (e) {}
+        }
+
+        // PII Leakage
+        const leakageAlerts = [];
+        for (const r of (blacklightData.hosts?.requests?.third_party || [])) {
+            if ((r.method === 'POST' || r.method === 'PUT') && r.body) {
+                try {
+                    const detected = piiFilter.detect(r.body);
+                    if (detected?.length > 0) {
+                        leakageAlerts.push({
+                            severity: 'high',
+                            destination: r.url,
+                            method: r.method,
+                            types: detected.map(p => p.type),
+                            message: 'Potential PII detected in request to third-party domain.'
+                        });
+                    }
+                } catch (e) {}
+            }
+        }
+
+        const { score, grade } = calculatePrivacyScore(
+            blacklightData, enrichedTrackers, tosdrData,
+            securityData, cookieConsentData, fingerprintData,
+            redirectData, privacyPolicyData
+        );
+
+        const finalResult = {
+            success: true,
+            url,
+            final_url: blacklightData.uri_dest || url,
+            scan_time_sec: (Date.now() - startTime) / 1000,
+            privacy_score: { score, grade },
+            trackers: { count: enrichedTrackers.length, list: enrichedTrackers.slice(0, 20) },
+            cookies: {
+                total: blacklightData.cookies?.length || 0,
+                third_party: blacklightData.cookies?.filter(c => c.thirdParty)?.length || 0
+            },
+            fingerprinting: {
+                canvas: !!(blacklightData.canvasFingerprinters?.length),
+                fonts: !!(blacklightData.canvasFontFingerprinters?.length),
+                live_risks: fingerprintData
+            },
+            session_recording: !!(blacklightData.sessionRecorders?.length),
+            key_logging: !!(blacklightData.keyLogging?.length),
+            hidden_storage: hiddenData ? {
+                localStorage: hiddenData.localStorage?.length || 0,
+                sessionStorage: hiddenData.sessionStorage?.length || 0,
+                indexedDB: hiddenData.indexedDB
+            } : null,
+            cookie_consent: cookieConsentData,
+            redirect_chain: redirectData,
+            security: securityData,
+            tosdr: tosdrData,
+            privacy_policy_analysis: privacyPolicyData,
+            geo_mapping: { data_destinations: geoDestinations },
+            leakage_detection: { alerts: leakageAlerts },
+            screenshot: screenshotData,
+            raw: blacklightData
+        };
+
+        sendEvent('result', finalResult);
+        sendEvent('end', { message: 'Scan completed.' });
+
+    } catch (e) {
+        console.error('Live scan error:', e);
+        sendEvent('error', { error: e.message });
+    } finally {
+        release();
+        res.end();
+    }
+});
+
 app.get('/health', (req, res) => res.json({ status: 'ok' }));
 
 // ==================== بدء التشغيل ====================