Update server.js

server.js

@@ -1,6 +1,6 @@
 const express = require('express');
 const { collect } = require('@themarkup/blacklight-collector');
-const SecureCheck = require('securecheck');
+const trackerdb = require('@ghostery/trackerdb');
 const path = require('path');
 
 const app = express();
@@ -9,6 +9,10 @@ const PORT = process.env.PORT || 7860;
 app.use(express.static('public'));
 app.use(express.json());
 
+// تهيئة قاعدة بيانات Ghostery TrackerDB
+const db = new trackerdb.TrackerDB();
+
+// تحسين الرابط تلقائياً
 function normalizeUrl(inputUrl) {
     let url = inputUrl.trim();
     if (!url.startsWith('http://') && !url.startsWith('https://')) {
@@ -21,18 +25,43 @@ function normalizeUrl(inputUrl) {
     }
 }
 
-function calculatePrivacyGrade(blacklight, securecheck) {
+// دالة للحصول على معلومات غنية عن المتتبع
+async function enrichTrackerInfo(domain) {
+    try {
+        const tracker = await db.getTracker(domain);
+        if (tracker) {
+            return {
+                name: tracker.name || domain,
+                category: tracker.category || 'unknown',
+                organization: tracker.organization || 'Unknown',
+                privacyPolicy: tracker.privacyPolicy || null,
+                website: tracker.website || null
+            };
+        }
+    } catch (error) {
+        // نتجاهل الأخطاء بهدوء
+    }
+    return {
+        name: domain,
+        category: 'unknown',
+        organization: 'Unknown'
+    };
+}
+
+// حساب درجة الخصوصية (A+ إلى F)
+function calculatePrivacyGrade(blacklight, enrichedTrackers) {
     let score = 100;
-    const trackerCount = blacklight?.hosts?.thirdParty?.length || 0;
+    
+    const trackerCount = enrichedTrackers?.length || 0;
     score -= Math.min(trackerCount * 5, 40);
+    
     const hasFingerprinting = (blacklight?.canvasFingerprinters?.length > 0) || 
                              (blacklight?.canvasFontFingerprinters?.length > 0);
     if (hasFingerprinting) score -= 25;
+    
     if (blacklight?.sessionRecorders?.length > 0) score -= 15;
     if (blacklight?.keyLogging?.length > 0) score -= 20;
-    if (!securecheck?.ssl?.valid) score -= 20;
-    if (!securecheck?.headers?.strictTransportSecurity) score -= 5;
-    if (!securecheck?.headers?.contentSecurityPolicy) score -= 5;
+    
     score = Math.max(0, Math.min(100, Math.round(score)));
     
     let grade;
@@ -42,29 +71,42 @@ function calculatePrivacyGrade(blacklight, securecheck) {
     else if (score >= 65) grade = 'C';
     else if (score >= 55) grade = 'D';
     else grade = 'F';
+    
     return { score, grade };
 }
 
 app.post('/scan', async (req, res) => {
     const { url: inputUrl, mode } = req.body;
-    if (!inputUrl) return res.status(400).json({ success: false, error: 'URL is required' });
+    
+    if (!inputUrl) {
+        return res.status(400).json({ success: false, error: 'URL is required' });
+    }
 
     const url = normalizeUrl(inputUrl);
-    if (!url) return res.status(400).json({ success: false, error: 'Invalid URL format' });
+    if (!url) {
+        return res.status(400).json({ success: false, error: 'Invalid URL format' });
+    }
 
     console.log(`🔍 Scanning: ${url} (Mode: ${mode || 'deep'})`);
 
     try {
         const isDeep = mode === 'deep';
+        
         const allTests = [
-            'cookies', 'third_party_trackers', 'fb_pixel_events',
-            'canvas_fingerprinters', 'canvas_font_fingerprinters',
-            'key_logging', 'session_recorders', 'google_analytics',
-            'twitter_pixel', 'tiktok_pixel'
+            'cookies',
+            'third_party_trackers',
+            'fb_pixel_events',
+            'canvas_fingerprinters',
+            'canvas_font_fingerprinters',
+            'key_logging',
+            'session_recorders',
+            'google_analytics',
+            'twitter_pixel',
+            'tiktok_pixel'
         ];
 
-        // الإعدادات الأصلية التي كانت تعمل بنجاح
-        const blacklightOptions = {
+        // إعدادات Blacklight المستقرة
+        const options = {
             blTests: isDeep ? allTests : ['cookies', 'third_party_trackers', 'fb_pixel_events'],
             numPages: isDeep ? 2 : 1,
             defaultWaitUntil: isDeep ? 'networkidle2' : 'domcontentloaded',
@@ -83,66 +125,93 @@ app.post('/scan', async (req, res) => {
             ]
         };
 
-        const [blacklightResult, secureCheckResult] = await Promise.all([
-            collect(url, blacklightOptions).catch(err => ({ error: err.message })),
-            new SecureCheck(url).scan().catch(err => ({ error: err.message }))
-        ]);
-
-        // تجنب الأخطاء إذا فشل Blacklight
-        const blacklight = blacklightResult.error ? { hosts: {} } : blacklightResult;
-        const securecheck = secureCheckResult.error ? { ssl: {}, headers: {} } : secureCheckResult;
-
-        const thirdPartyDomains = blacklight.hosts?.thirdParty || [];
-        const trackerCount = thirdPartyDomains.length;
-        const cookiesCount = blacklight.cookies?.length || 0;
-        const thirdPartyCookies = blacklight.cookies?.filter(c => c.thirdParty)?.length || 0;
-        const hasFingerprinting = (blacklight.canvasFingerprinters?.length > 0) || 
-                                 (blacklight.canvasFontFingerprinters?.length > 0);
-        const hasSessionRecording = blacklight.sessionRecorders?.length > 0;
-        const hasKeyLogging = blacklight.keyLogging?.length > 0;
-
-        const { score, grade } = calculatePrivacyGrade(blacklight, securecheck);
+        // تشغيل Blacklight فقط (بدون SecureCheck)
+        const blacklightResult = await collect(url, options).catch(err => {
+            console.error('Blacklight error:', err.message);
+            return { error: err.message };
+        });
 
-        const advice = grade === 'A+' || grade === 'A' ? '✅ هذا الموقع يحترم خصوصيتك بشكل ممتاز.' :
-                       grade === 'B' || grade === 'C' ? '⚠️ هذا الموقع به بعض المخاوف المتعلقة بالخصوصية.' :
-                       grade === 'D' ? '🔴 هذا الموقع يستخدم العديد من المتتبعين. كن حذرًا.' :
-                       '⛔️ هذا الموقع ينتهك خصوصيتك بشكل خطير. تجنب مشاركة أي معلومات حساسة.';
+        // استخراج النطاقات الخارجية من Blacklight
+        const thirdPartyDomains = blacklightResult.hosts?.thirdParty || [];
+        
+        // نصنف المتتبعين باستخدام Ghostery TrackerDB (بشكل منفصل وآمن)
+        const enrichedTrackers = [];
+        for (const domain of thirdPartyDomains) {
+            const info = await enrichTrackerInfo(domain);
+            enrichedTrackers.push({ domain, ...info });
+        }
+
+        const scanTime = blacklightResult.scanTime || 0;
+        const cookiesCount = blacklightResult.cookies?.length || 0;
+        const thirdPartyCookies = blacklightResult.cookies?.filter(c => c.thirdParty)?.length || 0;
+        
+        const hasFingerprinting = (blacklightResult.canvasFingerprinters?.length > 0) || 
+                                 (blacklightResult.canvasFontFingerprinters?.length > 0);
+        const hasSessionRecording = blacklightResult.sessionRecorders?.length > 0;
+        const hasKeyLogging = blacklightResult.keyLogging?.length > 0;
+
+        const { score, grade } = calculatePrivacyGrade(blacklightResult, enrichedTrackers);
+
+        // بناء نصيحة بالعربية
+        let advice = '';
+        if (grade === 'A+' || grade === 'A') {
+            advice = '✅ هذا الموقع يحترم خصوصيتك بشكل ممتاز.';
+        } else if (grade === 'B' || grade === 'C') {
+            advice = '⚠️ هذا الموقع به بعض المخاوف المتعلقة بالخصوصية.';
+        } else if (grade === 'D') {
+            advice = '🔴 هذا الموقع يستخدم العديد من المتتبعين. كن حذرًا.';
+        } else {
+            advice = '⛔️ هذا الموقع ينتهك خصوصيتك بشكل خطير. تجنب مشاركة أي معلومات حساسة.';
+        }
 
         const summary = {
-            url: blacklight.url || url,
-            final_url: blacklight.uri_dest || url,
-            grade, score,
-            scan_time_sec: blacklight.scanTime || 0,
-            trackers: { count: trackerCount, top_domains: thirdPartyDomains.slice(0, 5) },
-            cookies: { total: cookiesCount, third_party: thirdPartyCookies },
-            fingerprinting: { detected: hasFingerprinting },
-            session_recording: { detected: hasSessionRecording },
-            key_logging: { detected: hasKeyLogging },
-            ssl: {
-                valid: securecheck?.ssl?.valid || false,
-                issuer: securecheck?.ssl?.issuer || 'Unknown',
-                expires_in_days: securecheck?.ssl?.daysRemaining || 0,
-                grade: securecheck?.ssl?.grade || 'N/A'
+            url: blacklightResult.url || url,
+            final_url: blacklightResult.uri_dest || url,
+            grade: grade,
+            score: score,
+            scan_time_sec: scanTime,
+            trackers: {
+                count: enrichedTrackers.length,
+                list: enrichedTrackers.slice(0, 10) // أول 10 متتبعين
             },
-            security_headers: {
-                hsts: !!securecheck?.headers?.strictTransportSecurity,
-                csp: !!securecheck?.headers?.contentSecurityPolicy,
-                x_frame_options: securecheck?.headers?.xFrameOptions || 'Missing'
+            cookies: {
+                total: cookiesCount,
+                third_party: thirdPartyCookies
             },
-            advice
+            fingerprinting: {
+                detected: hasFingerprinting
+            },
+            session_recording: {
+                detected: hasSessionRecording
+            },
+            key_logging: {
+                detected: hasKeyLogging
+            },
+            advice: advice
         };
 
         res.json({
             success: true,
-            summary,
-            details: { blacklight: blacklightResult, securecheck: secureCheckResult }
+            summary: summary,
+            details: {
+                blacklight: blacklightResult,
+                trackers_enriched: enrichedTrackers
+            }
         });
+
     } catch (error) {
         console.error('Scan error:', error);
-        res.status(500).json({ success: false, error: error.message });
+        res.status(500).json({ 
+            success: false, 
+            error: error.message 
+        });
     }
 });
 
-app.get('/', (req, res) => res.sendFile(path.join(__dirname, 'public', 'index.html')));
+app.get('/', (req, res) => {
+    res.sendFile(path.join(__dirname, 'public', 'index.html'));
+});
 
-app.listen(PORT, '0.0.0.0', () => console.log(`🚀 PrivacyScan v2.0 running on port ${PORT}`));
+app.listen(PORT, '0.0.0.0', () => {
+    console.log(`🚀 Private Eye v3.0 running on port ${PORT}`);
+});