fix bugs

Author: HoangTran0410

scripts/content-scripts/run_scripts.js

@@ -66,23 +66,26 @@ function checkWillRun(script) {
   let url = location.href;
   let hasWhiteList = script.whiteList?.length > 0;
   let hasBlackList = script.blackList?.length > 0;
-  let inWhiteList = matchPatterns(url, script.whiteList || []);
-  let inBlackList = matchPatterns(url, script.blackList || []);
+  let inWhiteList = matchOneOfPatterns(url, script.whiteList || []);
+  let inBlackList = matchOneOfPatterns(url, script.blackList || []);
   return (
     (!hasWhiteList && !hasBlackList) ||
     (hasWhiteList && inWhiteList) ||
     (hasBlackList && !inBlackList)
   );
 }
 
-function matchPatterns(url, patterns) {
+function matchOneOfPatterns(url, patterns) {
   for (let pattern of patterns) {
-    // Replace wildcard characters * with regex wildcard .*
-    const regexRule = pattern.replace(/\*/g, ".*");
-    // Create a regex pattern from the rule
-    const reg = new RegExp("^" + regexRule + "$");
-    // Check if the URL matches the pattern
-    if (!reg.test(url)) return false;
+    const regex = new RegExp(
+      "^" +
+        pattern
+          .split("*")
+          .map((part) => part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
+          .join(".*") +
+        "$"
+    );
+    if (regex.test(url)) return true;
   }
-  return true;
+  return false;
 }

scripts/content-scripts/scripts/ufs_global_webpage_context.js

@@ -223,6 +223,24 @@ const UsefulScriptGlobalPageContext = {
     },
   },
   Utils: {
+    formatSize(size, fixed = 0) {
+      size = Number(size);
+
+      if (!size) return "?";
+
+      // format to KB, MB, GB
+      if (size < 1024) {
+        return size + "B";
+      }
+      if (size < 1024 * 1024) {
+        return (size / 1024).toFixed(fixed) + "KB";
+      }
+      if (size < 1024 * 1024 * 1024) {
+        return (size / (1024 * 1024)).toFixed(fixed) + "MB";
+      }
+      return (size / (1024 * 1024 * 1024)).toFixed(fixed) + "GB";
+    },
+
     // modified by chatgpt based on: https://gist.github.com/jcouyang/632709f30e12a7879a73e9e132c0d56b
     promiseAllStepN(n, list) {
       const head = list.slice(0, n);
@@ -394,7 +412,7 @@ const UsefulScriptGlobalPageContext = {
         alert("Error: " + error);
       }
     },
-    async downloadBlobUrlWithProgress(url, progressCallback) {
+    async getBlobFromUrlWithProgress(url, progressCallback) {
       const response = await fetch(url, {});
       if (!response.ok) {
         throw new Error(`Error: ${response.status} - ${response.statusText}`);

scripts/douyin_downloadAllVideoUser.js

@@ -32,8 +32,8 @@ export default {
             "sec-fetch-mode": "cors",
             "sec-fetch-site": "same-origin",
           },
-          referrer:
-            "https://www.douyin.com/user/MS4wLjABAAAA5A-hCBCTdv102baOvaoZqg7nCIW_Bn_YBA0Aiz9uYPY",
+          referrer: location.href,
+          // "https://www.douyin.com/user/MS4wLjABAAAA5A-hCBCTdv102baOvaoZqg7nCIW_Bn_YBA0Aiz9uYPY",
           referrerPolicy: "strict-origin-when-cross-origin",
           body: null,
           method: "GET",
@@ -69,17 +69,22 @@ export default {
         console.log(moredata);
         hasMore = moredata["has_more"];
         max_cursor = moredata["max_cursor"];
-        for (var item of moredata["aweme_list"]) {
-          let url = item.video.play_addr.url_list[0];
+        for (var item of moredata["aweme_list"] || []) {
+          try {
+            let url = item.video.play_addr.url_list[0];
 
-          if (url.startsWith("https")) {
-            result.push(url);
-          } else {
-            result.push(url.replace("http", "https"));
+            if (url.startsWith("https")) {
+              result.push(url);
+            } else {
+              result.push(url.replace("http", "https"));
+            }
+            // console.clear();
+            console.log("Number of videos: " + result.length);
+          } catch (e) {
+            console.log("ERROR: ", e);
           }
-          // console.clear();
-          console.log("Number of videos: " + result.length);
         }
+        console.log(hasMore);
       }
       saveToFile(result.join("\n"));
       alert(

scripts/douyin_downloadWachingVideo.js

@@ -1,4 +1,4 @@
-import { runScriptInCurrentTab } from "./helpers/utils.js";
+import { runScriptInCurrentTab, showLoading } from "./helpers/utils.js";
 
 export default {
   icon: "https://www.douyin.com/favicon.ico",
@@ -13,18 +13,40 @@ export default {
   whiteList: ["https://www.douyin.com/*"],
 
   onClickExtension: async function () {
-    const { downloadURL, downloadBlobUrl } =
-      UsefulScriptGlobalPageContext.Utils;
+    const {
+      downloadURL,
+      downloadBlob,
+      getBlobFromUrlWithProgress,
+      formatSize,
+    } = UsefulScriptGlobalPageContext.Utils;
+
+    const { closeLoading, setLoadingText } = showLoading(
+      "Đang tìm video url..."
+    );
 
     const src = await runScriptInCurrentTab(async () => {
       return await UsefulScriptGlobalPageContext.DOM.getWatchingVideoSrc();
     });
 
     if (!src) {
       alert("Không tìm thấy video nào.");
-      return;
+    } else {
+      setLoadingText("Đang tải video...");
+      downloadURL(src, "douyin_video.mp4");
+      // const blob = await getBlobFromUrlWithProgress(
+      //   src,
+      //   ({ loaded, total, speed }) => {
+      //     const percent = ((loaded / total) * 100) | 0;
+      //     setLoadingText(
+      //       `Đang tải video...<br/>` +
+      //         `Vui lòng không tắt popup <br/>` +
+      //         `${formatSize(loaded)}/${formatSize(total)} (${percent}%)` +
+      //         ` - ${formatSize(speed)}/s`
+      //     );
+      //   }
+      // );
+      // await downloadBlob(blob, "douyin_video.mp4");
     }
-
-    downloadBlobUrl(src, "douyin_video.mp4");
+    closeLoading();
   },
 };

scripts/helpers/utils.js

@@ -156,8 +156,8 @@ export function checkBlackWhiteList(script, url) {
     b = script.blackList || [],
     hasWhiteList = w.length > 0,
     hasBlackList = b.length > 0,
-    inWhiteList = matchPatterns(url, w) ?? true,
-    inBlackList = matchPatterns(url, b) ?? false;
+    inWhiteList = matchOneOfPatterns(url, w) ?? true,
+    inBlackList = matchOneOfPatterns(url, b) ?? false;
 
   let willRun =
     (!hasWhiteList && !hasBlackList) ||
@@ -167,16 +167,19 @@ export function checkBlackWhiteList(script, url) {
   return willRun;
 }
 
-function matchPatterns(url, patterns) {
+function matchOneOfPatterns(url, patterns) {
   for (let pattern of patterns) {
-    // Replace wildcard characters * with regex wildcard .*
-    const regexRule = pattern.replace(/\*/g, ".*");
-    // Create a regex pattern from the rule
-    const reg = new RegExp("^" + regexRule + "$");
-    // Check if the URL matches the pattern
-    if (!reg.test(url)) return false;
+    const regex = new RegExp(
+      "^" +
+        pattern
+          .split("*")
+          .map((part) => part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
+          .join(".*") +
+        "$"
+    );
+    if (regex.test(url)) return true;
   }
-  return true;
+  return false;
 }
 
 // https://stackoverflow.com/a/68634884/11898496

scripts/tiktok_downloadWatchingVideo.js

@@ -11,6 +11,8 @@ export default {
     vi: "Tải video tiktok bạn đang xem (không watermark)",
   },
 
+  whiteList: ["https://www.tiktok.com/*"],
+
   onClickExtension: async function () {
     const { closeLoading, setLoadingText } = showLoading("Đang lấy video id..");
 

scripts/youtube_toggleLight.js

@@ -8,7 +8,7 @@ export default {
     en: "Toggle light on/off to focus to youtube video",
     vi: "Tắt/Mở đèn để tập trung xem video youtube",
   },
-    whiteList: ["*://www.youtube.com/*"],
+  whiteList: ["*://www.youtube.com/*"],
 
   onClick: function () {
     ["#below", "#secondary", "#masthead-container"].forEach((_) => {
@@ -21,8 +21,9 @@ export default {
       });
     });
 
-    document.querySelector("#player-theater-container")?.scrollIntoView?.({
+    document.querySelector("ytd-player")?.scrollIntoView?.({
       behavior: "smooth",
+      block: "center",
     });
   },
 };