Update server.js

server.js

@@ -1,6 +1,5 @@
 const express = require('express');
 const { collect } = require('@themarkup/blacklight-collector');
-// استيراد المكتبة بشكل صحيح
 const SecureCheck = require('securecheck');
 const path = require('path');
 
@@ -22,30 +21,18 @@ function normalizeUrl(inputUrl) {
     }
 }
 
-// دالة لحساب درجة الخصوصية (A+ إلى F)
 function calculatePrivacyGrade(blacklight, securecheck) {
     let score = 100;
-    
-    // خصم على المتتبعين
     const trackerCount = blacklight?.hosts?.thirdParty?.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;
-    
-    // خصم على SSL غير صالح
     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;
@@ -55,43 +42,30 @@ 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'
         ];
 
-        // إعدادات Blacklight
-        const options = {
-            blTests: allTests,
+        // الإعدادات الأصلية التي كانت تعمل بنجاح
+        const blacklightOptions = {
+            blTests: isDeep ? allTests : ['cookies', 'third_party_trackers', 'fb_pixel_events'],
             numPages: isDeep ? 2 : 1,
             defaultWaitUntil: isDeep ? 'networkidle2' : 'domcontentloaded',
             captureHar: isDeep,
@@ -109,104 +83,66 @@ app.post('/scan', async (req, res) => {
             ]
         };
 
-        // تشغيل الفحصين بشكل متوازٍ
         const [blacklightResult, secureCheckResult] = await Promise.all([
-            collect(url, options).catch(err => {
-                console.error('Blacklight error:', err.message);
-                return { error: err.message };
-            }),
-            new SecureCheck(url).scan().catch(err => {
-                console.error('SecureCheck error:', err.message);
-                return { error: err.message };
-            })
+            collect(url, blacklightOptions).catch(err => ({ error: err.message })),
+            new SecureCheck(url).scan().catch(err => ({ error: err.message }))
         ]);
 
-        const scanTime = blacklightResult.scanTime || 0;
+        // تجنب الأخطاء إذا فشل Blacklight
+        const blacklight = blacklightResult.error ? { hosts: {} } : blacklightResult;
+        const securecheck = secureCheckResult.error ? { ssl: {}, headers: {} } : secureCheckResult;
 
-        // استخراج ملخص للمستخدم العادي
-        const thirdPartyDomains = blacklightResult.hosts?.thirdParty || [];
+        const thirdPartyDomains = blacklight.hosts?.thirdParty || [];
         const trackerCount = thirdPartyDomains.length;
-        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, secureCheckResult);
-
-        // بناء نصيحة
-        let advice = '';
-        if (grade === 'A+' || grade === 'A') {
-            advice = '✅ هذا الموقع يحترم خصوصيتك بشكل ممتاز.';
-        } else if (grade === 'B' || grade === 'C') {
-            advice = '⚠️ هذا الموقع به بعض المخاوف المتعلقة بالخصوصية.';
-        } else if (grade === 'D') {
-            advice = '🔴 هذا الموقع يستخدم العديد من المتتبعين. كن حذرًا.';
-        } else {
-            advice = '⛔️ هذا الموقع ينتهك خصوصيتك بشكل خطير. تجنب مشاركة أي معلومات حساسة.';
-        }
+        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);
+
+        const advice = grade === 'A+' || grade === 'A' ? '✅ هذا الموقع يحترم خصوصيتك بشكل ممتاز.' :
+                       grade === 'B' || grade === 'C' ? '⚠️ هذا الموقع به بعض المخاوف المتعلقة بالخصوصية.' :
+                       grade === 'D' ? '🔴 هذا الموقع يستخدم العديد من المتتبعين. كن حذرًا.' :
+                       '⛔️ هذا الموقع ينتهك خصوصيتك بشكل خطير. تجنب مشاركة أي معلومات حساسة.';
 
         const summary = {
-            url: blacklightResult.url || url,
-            final_url: blacklightResult.uri_dest || url,
-            grade: grade,
-            score: score,
-            scan_time_sec: scanTime,
-            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
-            },
+            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: secureCheckResult?.ssl?.valid || false,
-                issuer: secureCheckResult?.ssl?.issuer || 'Unknown',
-                expires_in_days: secureCheckResult?.ssl?.daysRemaining || 0,
-                grade: secureCheckResult?.ssl?.grade || 'N/A'
+                valid: securecheck?.ssl?.valid || false,
+                issuer: securecheck?.ssl?.issuer || 'Unknown',
+                expires_in_days: securecheck?.ssl?.daysRemaining || 0,
+                grade: securecheck?.ssl?.grade || 'N/A'
             },
             security_headers: {
-                hsts: !!secureCheckResult?.headers?.strictTransportSecurity,
-                csp: !!secureCheckResult?.headers?.contentSecurityPolicy,
-                x_frame_options: secureCheckResult?.headers?.xFrameOptions || 'Missing'
+                hsts: !!securecheck?.headers?.strictTransportSecurity,
+                csp: !!securecheck?.headers?.contentSecurityPolicy,
+                x_frame_options: securecheck?.headers?.xFrameOptions || 'Missing'
             },
-            advice: advice
+            advice
         };
 
         res.json({
             success: true,
-            summary: summary,
-            details: {
-                blacklight: blacklightResult,
-                securecheck: secureCheckResult
-            }
+            summary,
+            details: { blacklight: blacklightResult, securecheck: secureCheckResult }
         });
-
     } 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(`🚀 PrivacyScan v2.0 running on port ${PORT}`));