updated 浏览器完善

mumuy · Sep 26, 2024 · f4249c9 · f4249c9
1 parent 776da84
commit f4249c9
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 7 deletions.
diff --git a/dist/browser.min.js b/dist/browser.min.js
diff --git a/dist/browser.min.mjs b/dist/browser.min.mjs
diff --git a/src/module/browser-parser.js b/src/module/browser-parser.js
@@ -174,12 +174,15 @@ export default {
             browserVersion = ua.match(/Version\/([\d.]+)/)?.[1]||'';
         }
 
+        let cookieEnabled = globalThis?.navigator?.cookieEnabled;
+
         return {
             browser,
             browserVersion,
             engine,
             isWebview,
             isRobot,
+            cookieEnabled,
             userAgent:ua
         };
     }

diff --git a/src/module/language-parser.js b/src/module/language-parser.js
@@ -6,7 +6,7 @@ export default {
         return {};
     },
     async getInfo(){
-        let g = globalThis?.navigator?.language||globalThis?.navigator?.browserLanguage;
+        let g = globalThis?.navigator?.language||globalThis?.navigator?.browserLanguage||globalThis?.navigator?.systemLanguage;
         if (typeof g !== 'string') return 'Unknown language'
         let arr = g.split('-');
         if (arr[1]) {

diff --git a/src/module/screen-parser.js b/src/module/screen-parser.js
@@ -37,10 +37,12 @@ export default {
         // 屏幕尺寸
         let screenWidth = globalThis?.screen?.width||0;
         let screenHeight = globalThis?.screen?.height||0;
-        let clientWidth = globalThis?.document?.documentElement?.clientWidth||0;
-        let clientHeight = globalThis?.document?.documentElement?.clientHeight||0;
+        let clientWidth = globalThis?.document?.documentElement?.clientWidth||globalThis?.document?.body?.clientWidth||0;
+        let clientHeight = globalThis?.document?.documentElement?.clientHeight||globalThis?.document?.body?.clientHeight||0;
         // 屏幕刷新率
         let screenFPS = await getScreenFPS();
+        let screenColorDepth = globalThis?.screen.colorDepth;
+        let screenPixelDepth = globalThis?.screen.pixelDepth;
         let isTouch = globalThis?.navigator?.maxTouchPoints>0||false;
 
         return {
@@ -49,6 +51,8 @@ export default {
             clientWidth,
             clientHeight,
             screenFPS,
+            screenColorDepth,
+            screenPixelDepth,
             isTouch
         };
     }

diff --git a/static/script/index.js b/static/script/index.js
@@ -187,6 +187,24 @@ let getTemplate = function(info){
                     <span class="text-gray">FPS</span>
                 </td>
             </tr>
+            <tr>
+                <td class="th">
+                    <p class="title">屏幕颜色深度</p>
+                    <p class="subtitle">Screen ColorDepth</p>
+                </td>
+                <td>
+                    <span>${info.screenColorDepth?info.screenColorDepth+'-bit':''}</span>
+                </td>
+            </tr>
+            <tr>
+                <td class="th">
+                    <p class="title">屏幕像素深度</p>
+                    <p class="subtitle">Screen PixelDepth</p>
+                </td>
+                <td>
+                    <span>${info.screenPixelDepth?info.screenPixelDepth+'-bit':''}</span>
+                </td>
+            </tr>
             <tr>
                 <td class="th">
                     <p class="title">处理器架构</p>
@@ -292,6 +310,13 @@ let getTemplate = function(info){
                 </td>
                 <td>${info.isTouch?'是 <span class="text-gray">(true)</span>':'否 <span class="text-gray">(false)</span>'}</td>
             </tr>
+            <tr>
+                <td class="th">
+                    <p class="title">Cookie是否可用</p>
+                    <p class="subtitle">Cookie Enabled</p>
+                </td>
+                <td>${info.cookieEnabled?'是 <span class="text-gray">(true)</span>':'否 <span class="text-gray">(false)</span>'}</td>
+            </tr>
             <tr>
                 <td class="th">
                     <p class="title">是否支持WebGL</p>
@@ -316,6 +341,7 @@ let getTemplate = function(info){
 $module.innerHTML = getTemplate(info);
 
 browser.getInfo().then(function(info){
+    console.log('[getInfo()]',info);
     $module.innerHTML = getTemplate(info) + `
         <iframe style="display:none;" src="https://passer-by.com/browser/stat.html?browser=${info.browser}&ua=${info.userAgent}" width="" height=""></iframe>
     `;