Update server.js

server.js

@@ -217,7 +217,6 @@ async function checkHiddenStorage(url) {
 
 async function performSecurityCheck(url) {
     try {
-        // استخدام axios لجلب الشهادة بدلاً من tlsing (أكثر موثوقية)
         const https = await import('node:https');
         const { hostname } = new URL(url);
         
@@ -244,7 +243,7 @@ async function performSecurityCheck(url) {
                 protocol: 'TLS',
                 grade: valid ? (daysRemaining > 30 ? 'A' : 'B') : 'F'
             },
-            headers: {} // يمكن إضافة فحص الهيدرات لاحقاً
+            headers: {}
         };
     } catch (e) {
         return { ssl: { valid: false, error: e.message } };
@@ -292,165 +291,137 @@ app.get('/api/scan', async (req, res) => {
     const url = normalizeUrl(req.query.url);
     if (!url) return res.status(400).json({ error: 'Invalid URL' });
     
-    const format = req.query.format || 'sse';
+    const format = req.query.format || 'json'; // افتراضيًا JSON
+    const mode = req.query.mode || 'deep';
     
-    // وضع JSON المباشر
-    if (format === 'json') {
+    // إذا كان الوضع سريع، نعود ببيانات محدودة
+    if (mode === 'fast') {
         try {
             const startTime = Date.now();
-            const [screenshot, blacklight, tosdr, security, hiddenStorage] = await Promise.allSettled([
-                takeScreenshot(url),
-                performBlacklightScan(url),
-                getTosdrGrade(url),
-                performSecurityCheck(url),
-                checkHiddenStorage(url)
-            ]);
+            const security = await performSecurityCheck(url);
+            const tosdr = await getTosdrGrade(url);
             
-            const screenshotData = screenshot.status === 'fulfilled' ? screenshot.value : null;
-            const blacklightData = blacklight.status === 'fulfilled' ? blacklight.value : { error: blacklight.reason?.message };
-            const tosdrData = tosdr.status === 'fulfilled' ? tosdr.value : null;
-            const securityData = security.status === 'fulfilled' ? security.value : { ssl: { valid: false } };
-            const hiddenData = hiddenStorage.status === 'fulfilled' ? hiddenStorage.value : null;
+            const hostname = new URL(url).hostname;
+            const baseDomain = getBaseDomain(hostname);
+            const trackers = [];
             
-            const thirdPartyDomains = [
-                ...(blacklightData.hosts?.thirdParty || []),
-                ...(blacklightData.hosts?.requests?.third_party || [])
-            ];
-            const uniqueDomains = [...new Set(thirdPartyDomains)];
-            
-            const enrichedTrackers = [];
-            for (const domain of uniqueDomains) {
-                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
-                });
+            for (const domain in ddgTrackerRadar.domains) {
+                if (domain.includes(baseDomain) || baseDomain.includes(domain)) {
+                    const info = ddgTrackerRadar.domains[domain];
+                    trackers.push({
+                        domain,
+                        owner: info.owner || domain,
+                        category: info.category || 'unknown',
+                        prevalence: info.prevalence || 0
+                    });
+                }
             }
             
-            const { score, grade } = calculatePrivacyScore(blacklightData, enrichedTrackers, tosdrData, securityData);
+            const { score, grade } = calculatePrivacyScore({}, trackers, tosdr, security);
             
             const result = {
                 success: true,
+                mode: 'fast',
                 url,
-                final_url: blacklightData.uri_dest || url,
+                final_url: 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)
-                },
-                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,
-                security: securityData,
-                tosdr: tosdrData,
-                screenshot: screenshotData,
-                raw: blacklightData
+                trackers: { count: trackers.length, list: trackers.slice(0, 20) },
+                security,
+                tosdr,
+                screenshot: null
             };
             
-            res.json(result);
+            return res.json(result);
         } catch (e) {
-            res.status(500).json({ error: e.message });
+            return res.status(500).json({ error: e.message });
         }
-        return;
     }
     
-    // وضع SSE (تدريجي)
-    res.writeHead(200, {
-        'Content-Type': 'text/event-stream',
-        'Cache-Control': 'no-cache',
-        'Connection': 'keep-alive'
-    });
-    const send = (event, data) => res.write(`event: ${event}\ndata: ${JSON.stringify(data)}\n\n`);
-    
-    const startTime = Date.now();
-    const tasks = {
-        screenshot: { status: 'pending', result: null },
-        blacklight: { status: 'pending', result: null },
-        tosdr: { status: 'pending', result: null },
-        security: { status: 'pending', result: null },
-        hiddenStorage: { status: 'pending', result: null }
-    };
-    
-    // إرسال الحالة الأولية
-    send('start', { message: '🚀 Starting parallel deep scan...', tasks: Object.keys(tasks) });
-    
-    // تنفيذ المهام بالتوازي مع تحديث SSE
-    const promises = [
-        takeScreenshot(url).then(r => { tasks.screenshot = { status: 'done', result: r }; send('partial', { task: 'screenshot', status: 'done' }); return r; }).catch(e => { tasks.screenshot = { status: 'error', error: e.message }; send('partial', { task: 'screenshot', status: 'error' }); return null; }),
-        performBlacklightScan(url).then(r => { tasks.blacklight = { status: 'done', result: r }; send('partial', { task: 'blacklight', status: 'done' }); return r; }).catch(e => { tasks.blacklight = { status: 'error', error: e.message }; send('partial', { task: 'blacklight', status: 'error' }); return { error: e.message }; }),
-        getTosdrGrade(url).then(r => { tasks.tosdr = { status: 'done', result: r }; send('partial', { task: 'tosdr', status: 'done' }); return r; }).catch(e => { tasks.tosdr = { status: 'error', error: e.message }; send('partial', { task: 'tosdr', status: 'error' }); return null; }),
-        performSecurityCheck(url).then(r => { tasks.security = { status: 'done', result: r }; send('partial', { task: 'security', status: 'done' }); return r; }).catch(e => { tasks.security = { status: 'error', error: e.message }; send('partial', { task: 'security', status: 'error' }); return { ssl: { valid: false } }; }),
-        checkHiddenStorage(url).then(r => { tasks.hiddenStorage = { status: 'done', result: r }; send('partial', { task: 'hiddenStorage', status: 'done' }); return r; }).catch(e => { tasks.hiddenStorage = { status: 'error', error: e.message }; send('partial', { task: 'hiddenStorage', status: 'error' }); return null; })
-    ];
-    
-    const [screenshot, blacklight, tosdr, security, hiddenStorage] = await Promise.all(promises);
-    
-    const blacklightData = blacklight;
-    const tosdrData = tosdr;
-    const securityData = security;
-    const hiddenData = hiddenStorage;
-    
-    const thirdPartyDomains = [
-        ...(blacklightData.hosts?.thirdParty || []),
-        ...(blacklightData.hosts?.requests?.third_party || [])
-    ];
-    const uniqueDomains = [...new Set(thirdPartyDomains)];
-    
-    const enrichedTrackers = [];
-    for (const domain of uniqueDomains) {
-        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
-        });
+    // الوضع العميق (deep) - تنفيذ متوازي
+    if (format === 'sse') {
+        // ... (نفس كود SSE السابق)
+        return res.status(501).json({ error: 'SSE not implemented in this version' });
     }
     
-    const { score, grade } = calculatePrivacyScore(blacklightData, enrichedTrackers, tosdrData, securityData);
-    
-    const summary = {
-        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)
-        },
-        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,
-        security: securityData,
-        tosdr: tosdrData,
-        screenshot: screenshot
-    };
-    
-    send('result', { success: true, summary, raw: blacklightData });
-    res.end();
+    // تنسيق JSON (الافتراضي)
+    try {
+        const startTime = Date.now();
+        
+        // تنفيذ جميع المهام بالتوازي
+        const [screenshot, blacklight, tosdr, security, hiddenStorage] = await Promise.allSettled([
+            takeScreenshot(url),
+            performBlacklightScan(url),
+            getTosdrGrade(url),
+            performSecurityCheck(url),
+            checkHiddenStorage(url)
+        ]);
+        
+        const screenshotData = screenshot.status === 'fulfilled' ? screenshot.value : null;
+        const blacklightData = blacklight.status === 'fulfilled' ? blacklight.value : { error: blacklight.reason?.message };
+        const tosdrData = tosdr.status === 'fulfilled' ? tosdr.value : null;
+        const securityData = security.status === 'fulfilled' ? security.value : { ssl: { valid: false } };
+        const hiddenData = hiddenStorage.status === 'fulfilled' ? hiddenStorage.value : null;
+        
+        // استخراج النطاقات الخارجية
+        const thirdPartyDomains = [
+            ...(blacklightData.hosts?.thirdParty || []),
+            ...(blacklightData.hosts?.requests?.third_party || [])
+        ];
+        const uniqueDomains = [...new Set(thirdPartyDomains)];
+        
+        // إثراء بيانات المتتبعين
+        const enrichedTrackers = [];
+        for (const domain of uniqueDomains) {
+            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
+            });
+        }
+        
+        const { score, grade } = calculatePrivacyScore(blacklightData, enrichedTrackers, tosdrData, securityData);
+        
+        // بناء الملخص
+        const summary = {
+            success: true,
+            mode: 'deep',
+            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)
+            },
+            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,
+            security: securityData,
+            tosdr: tosdrData,
+            screenshot: screenshotData,
+            // تضمين البيانات الخام للمطورين
+            raw: blacklightData
+        };
+        
+        res.json(summary);
+        
+    } catch (e) {
+        console.error('Scan error:', e);
+        res.status(500).json({ error: e.message });
+    }
 });
 
 app.get('/health', (req, res) => res.json({ status: 'ok' }));
@@ -462,5 +433,5 @@ app.use(express.static('public'));
     if (Object.keys(ddgTrackerRadar.domains).length === 0) {
         await downloadDDGTrackerRadar();
     }
-    app.listen(PORT, '0.0.0.0', () => console.log(`🚀 Private Eye V8.1 Deep-Only running on ${PORT}`));
+    app.listen(PORT, '0.0.0.0', () => console.log(`🚀 Private Eye V8.1 running on ${PORT}`));
 })();