fix grid bypass

extension/manifests/base.json

@@ -3,7 +3,7 @@
 
   "name": "치직치지직 (ChzkChzzk)",
   "description": "치지직(chzzk.naver.com)을 더 유용하게!",
-  "version": "2.13.3",
+  "version": "2.13.4",
 
   "options_ui": {
     "page": "options.html"
@@ -53,11 +53,8 @@
     "webRequest",
     "scripting"
   ],
-  "host_permissions": [
-    "*://*.chzzk.naver.com/*",
-    "*://chzzk.naver.com/*",
-    "https://apis.naver.com/neonplayer/vodplay/v1/playback/*"
-  ],
+
+  "host_permissions": ["<all_urls>"],
 
   "declarative_net_request": {
     "rule_resources": [
@@ -90,11 +87,6 @@
         "id": "trackerblock",
         "enabled": false,
         "path": "rules/trackerblock.json"
-      },
-      {
-        "id": "bypassnaver",
-        "enabled": true,
-        "path": "rules/bypassNaver.json"
       }
     ]
   }

extension/manifests/chrome.json

@@ -1,5 +1,6 @@
 {
   "background": {
-    "service_worker": "js/background.js"
+    "service_worker": "js/background.js",
+    "type": "module"
   }
 }

extension/public/rules/README.md

@@ -1,7 +1,7 @@
 # Alloc
 
-1000 : TrackerBlock
-1100 : Adblock
-1200 : BannerBlock
-1300 : Recommendation
-1400 : Bypass Naver
+- 1000 : TrackerBlock
+- 1100 : Adblock
+- 1200 : BannerBlock
+- 1300 : Recommendation
+- 1400 : Bypass Naver

extension/public/rules/adblock.json

@@ -38,5 +38,25 @@
     "condition": {
       "urlFilter": "*://*glad-vod.pstatic.net/*"
     }
+  },
+  {
+    "id": 1105,
+    "priority": 1,
+    "action": {
+      "type": "block"
+    },
+    "condition": {
+      "urlFilter": "https://api.chzzk.naver.com/ad-polling/v1/lives/*"
+    }
+  },
+  {
+    "id": 1106,
+    "priority": 1,
+    "action": {
+      "type": "block"
+    },
+    "condition": {
+      "urlFilter": "*://nam.veta.naver.com/call*"
+    }
   }
 ]

extension/src/background.ts

@@ -86,15 +86,15 @@ const applySidebarBlock = () => {
   })();
 };
 
-const main = () => {
+const main = async () => {
   log("Main", "Run with config", configInstance.config);
   clearRule();
   // ===============================
   applyAdBlock();
   applyTrackerBlock();
   applyBannerBlock();
   applySidebarBlock();
-  applyBypassNaver(enableRule, disableRule);
+  await applyBypassNaver();
   // ===============================
   applyRule();
 };

extension/src/backgrounds/bypassNaver.ts

@@ -1,16 +1,15 @@
+import { applyRandomAgent } from "@n/index";
+import { disable } from "@n/steps/apply";
 import configInstance, { defaultConfig } from "@config";
 
-export default function applyBypassNaver(
-  enableRule: (s: string) => void,
-  disableRule: (s: string) => void
-) {
-  const apply = (enable: boolean) => {
+export default async function applyBypassNaver() {
+  const apply = async (enable: boolean) => {
     if (!enable) {
-      disableRule("bypassnaver");
+      await disable();
       return;
     }
-
-    enableRule("bypassnaver");
+    const ua = await applyRandomAgent();
+    configInstance.set("userAgent", ua);
   };
-  apply(configInstance.get("bypassNaver", defaultConfig.bypassNaver));
+  await apply(configInstance.get("bypassNaver", defaultConfig.bypassNaver));
 }

extension/src/user-agent/README.md

@@ -0,0 +1,3 @@
+# Notice
+
+> [tarampampam/random-user-agent](https://github.com/tarampampam/random-user-agent/tree/master)에서 많은 코드를 가져왔습니다. 고마워요 [tarampampam](https://github.com/tarampampam)!

extension/src/user-agent/index.ts

@@ -0,0 +1,90 @@
+import apply from "@n/steps/apply";
+const fromRange = (min: number, max: number): number => {
+  min = Math.ceil(min);
+
+  return Math.floor(Math.random() * (Math.floor(max) - min + 1)) + min;
+};
+export async function applyRandomAgent() {
+  const macOSVersions = [
+    "14.6",
+    "14.5",
+    "14.4",
+    "14.3",
+    "14.2",
+    "14.1",
+    "14",
+    "13.7",
+    "13.6",
+    "13.5",
+    "13.4",
+    "13.3",
+    "13.2",
+    "13.1",
+    "13",
+    "12.6",
+    "12.5",
+    "12.4",
+    "12.3",
+    "12.2",
+    "12.1",
+    "12.0",
+    "11.3",
+    "11.2",
+    "11.1",
+    "11",
+    "10_13",
+    "10",
+  ];
+  const genChromeVersion = (
+    maxMajor?: number,
+    majorDelta: number = 2
+  ): [major: number, full: string] => {
+    const variants = {
+      major: { min: 122, max: 124 }, // 👈 periodically we should update those values
+      patch: { min: 6261, max: 6356 }, // 👈 same here
+      build: { min: 194, max: 226 }, // 👈 and here
+    };
+
+    if (maxMajor) {
+      variants.major.max = Math.max(maxMajor, 0);
+      variants.major.min = Math.max(maxMajor - majorDelta, 0);
+    }
+
+    const major = fromRange(variants.major.min, variants.major.max);
+
+    return [
+      major,
+      `${major}.0.${fromRange(
+        variants.patch.min,
+        variants.patch.max
+      )}.${fromRange(variants.build.min, variants.build.max)}`,
+    ];
+  };
+  const chromeVersion = genChromeVersion();
+  const ua = [
+    "Mozilla/5.0",
+    `(Macintosh; Intel Mac OS X ${
+      macOSVersions[fromRange(0, macOSVersions.length - 1)]
+    })`,
+    "AppleWebKit/537.36",
+    "(KHTML, like Gecko)",
+    `Chrome/${chromeVersion[1]}`,
+    "Safari/537.36",
+  ].join(" ");
+
+  console.log("Apply random user agent", ua);
+
+  await apply({
+    browser: "chrome",
+    os: "macOS",
+    userAgent: ua,
+    version: {
+      browser: {
+        full: chromeVersion[1],
+        major: chromeVersion[0],
+      },
+    },
+  });
+
+  return ua;
+}