some fix

hoang.tran12 · hoang.tran12 · commit 616ecc8148e1 · 2024-05-27T14:34:40.000+07:00
diff --git a/index.html b/index.html
@@ -2,121 +2,13 @@
 <html lang="en">
 
 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Document</title>
 </head>
 
 <body>
-
-    <script type="module">
-
-        const PADDING_START = "\u200c";
-const PADDING_END = "\u{e0061}";
-const CHARS = [
-  // "\u200d",
-  // "\u{e0061}",
-  "\u{e0062}",
-  "\u{e0063}",
-  "\u{e0064}",
-  "\u{e0065}",
-  "\u{e0066}",
-  "\u{e0067}",
-  "\u{e0068}",
-  "\u{e0069}",
-  "\u{e006a}",
-  "\u{e006b}",
-  "\u{e006c}",
-  "\u{e006d}",
-  "\u{e006e}",
-  "\u{e006f}",
-  "\u{e0070}",
-  "\u{e0071}",
-  "\u{e0072}",
-  "\u{e0073}",
-  "\u{e0074}",
-  "\u{e0075}",
-  "\u{e0076}",
-  "\u{e0077}",
-  "\u{e0078}",
-  "\u{e0079}",
-  "\u{e007a}",
-  "\u{e007f}",
-];
-export const shouldEncodePattern = / *>(.+?)< */;
-const encodedPattern = new RegExp(
-  `${PADDING_START}([${CHARS.join("")}]+?)${PADDING_END}`
-);
-const CHARS_MAP = CHARS.reduce((curr, val, i) => {
-  curr[val] = i;
-  return curr;
-}, {});
-const lenCalc = (base, chars) => {
-  var len = 0;
-  var curr = 1;
-  while (curr < chars) {
-    curr *= base;
-    len++;
-  }
-  return len;
-};
-const UNICODE_CHARS = 1114112;
-const BASE = CHARS.length;
-const LEN = lenCalc(BASE, UNICODE_CHARS);
-const charConvert = (char) => {
-  let charCode = char.codePointAt(0);
-  let arr = [];
-  while (charCode > 0) {
-    arr.push(charCode % BASE);
-    charCode = ~~(charCode / BASE);
-  }
-  while (arr.length < LEN) {
-    arr.push(0);
-  }
-  return arr.reverse();
-};
-const charEncode = (convertedChar) => {
-  return convertedChar.reduce((curr, digit) => curr + CHARS[digit], "");
-};
-export const encode = (s) => {
-  let converted = [];
-  for (let c of s) {
-    converted.push(charConvert(c));
-  }
-  let res = converted.map(charEncode);
-  return PADDING_START + res.join("") + PADDING_END;
-};
-const decodeChar = (encodedChar) => {
-  encodedChar = encodedChar.reverse();
-  let curr = 1;
-  let charCode = 0;
-  for (let digit of encodedChar) {
-    charCode += digit * curr;
-    curr *= BASE;
-  }
-  return String.fromCodePoint(charCode);
-};
-export const decode = (s) => {
-  s = encodedPattern.exec(s)[1];
-  let curr = [];
-  let res = "";
-  for (let c of s) {
-    curr.push(CHARS_MAP[c]);
-    if (curr.length >= LEN) {
-      res += decodeChar(curr);
-      curr = [];
-    }
-  }
-  return res;
-};
-export const checkEncode = (s) => {
-  //console.log(s);
-  return encodedPattern.exec(s);
-};
-
-console.log(encode("abc"))
-
-    </script>
+  <h1>ABC def</h1>
 </body>
 
 </html>
diff --git a/manifest.json b/manifest.json
@@ -41,7 +41,7 @@
     "declarativeNetRequestFeedback",
     "declarativeNetRequestWithHostAccess"
   ],
-  "host_permissions": ["<all_urls>"],
+  "host_permissions": ["*://*/*", "<all_urls>"],
   "options_page": "./pages/options/options.html",
   "background": {
     "service_worker": "scripts/background-scripts/background_script.js",
diff --git a/popup/index.js b/popup/index.js
@@ -411,7 +411,7 @@ async function updateButtonChecker(script, checkmarkContainer, val) {
   if (val ?? (await isActiveScript(script.id))) {
     checkmark.classList.add("active");
     tooltip = t({
-      vi: "Tắt tự động chạy",
+      vi: "Tắt tự chạy",
       en: "Turn off Autorun",
     });
   } else {
@@ -424,38 +424,48 @@ async function updateButtonChecker(script, checkmarkContainer, val) {
   checkmarkContainer.setAttribute("data-tooltip", tooltip);
 }
 
+function showError(e) {
+  Swal.fire({
+    icon: "error",
+    title: t({ vi: "Lỗi", en: "Error" }),
+    text: e?.message || "",
+    input: "textarea",
+    inputValue: JSON.stringify(e, null, 4),
+  });
+}
+
 async function runScript(script) {
   let tab = await getCurrentTab();
   let willRun = checkBlackWhiteList(script, tab.url);
   if (willRun) {
-    try {
-      recentScriptsSaver.add(script);
-      trackEvent(script.id);
+    recentScriptsSaver.add(script);
+    trackEvent(script.id);
 
+    try {
       if (isFunction(script.popupScript?.onClick))
         await script.popupScript.onClick();
-
-      [
-        ["MAIN", "pageScript", "onClick", false],
-        ["MAIN", "pageScript", "onClick_", true],
-        ["ISOLATED", "contentScript", "onClick", false],
-        ["ISOLATED", "contentScript", "onClick_", true],
-      ].forEach(([world, context, func, allFrames]) => {
-        if (isFunction(script?.[context]?.[func])) {
-          runScriptInTabWithEventChain({
-            target: {
-              tabId: tab.id,
-              ...(allFrames ? { allFrames: true } : {}),
-            },
-            scriptIds: [script.id],
-            eventChain: context + "." + func,
-            world: world,
-          });
-        }
-      });
     } catch (e) {
-      alert("ERROR: run script " + e);
+      showError(e);
     }
+
+    [
+      ["MAIN", "pageScript", "onClick", false],
+      ["MAIN", "pageScript", "onClick_", true],
+      ["ISOLATED", "contentScript", "onClick", false],
+      ["ISOLATED", "contentScript", "onClick_", true],
+    ].forEach(([world, context, func, allFrames]) => {
+      if (isFunction(script?.[context]?.[func])) {
+        runScriptInTabWithEventChain({
+          target: {
+            tabId: tab.id,
+            ...(allFrames ? { allFrames: true } : {}),
+          },
+          scriptIds: [script.id],
+          eventChain: context + "." + func,
+          world: world,
+        }).catch(showError);
+      }
+    });
   } else {
     let w = script?.whiteList?.join("<br/>");
     let b = script?.blackList?.join("<br/>");
@@ -596,10 +606,18 @@ function initSettings() {
     // smooth scroll row
     const smoothScrollRow = document.createElement("div");
     smoothScrollRow.classList.add("row");
+    smoothScrollRow.setAttribute(
+      "data-tooltip",
+      t({
+        vi: "Tắt nếu bạn đã cài app SmoothScroll",
+        en: "Turn off if installed SmoothScroll app",
+      })
+    );
+    smoothScrollRow.setAttribute("data-flow", "bottom");
     smoothScrollRow.innerHTML = `
       <div class="label">${t({
-        vi: "Cuộn chuột mượt",
-        en: "Smooth scroll",
+        vi: "Cuôn chuột siêu mượt",
+        en: "Super smooth scroll",
       })}</div>
       <div class="right-container">
         <button class="checkmark"></button>
diff --git a/popup/styles/default.less b/popup/styles/default.less
@@ -54,7 +54,7 @@
 
 * {
     font-family: @font_family_1;
-    // font-weight: @font-weight;
+    font-weight: @font-weight;
     margin: 0;
     box-sizing: border-box;
     color: @color_body;
@@ -523,7 +523,7 @@ option {
         .body {
             font-size: 16px;
             max-height: 70%;
-            overflow: auto;
+            // overflow: auto;
         }
     }
 
diff --git a/popup/styles/xtri98.less b/popup/styles/xtri98.less
@@ -34,10 +34,6 @@
         }
     }
 
-    button.tablinks {
-        margin: 5 10 10 5;
-    }
-
     button.active {
         background-color: #2C7873;
     }
@@ -81,11 +77,6 @@
     }
 }
 
-.tabcontent {
-    border-top: none;
-    animation: fadeEffect 0.3s;
-}
-
 .section-title {
     padding: 10px 0 5px;
     position: sticky;
diff --git a/scripts/_test.js b/scripts/_test.js
@@ -1,4 +1,5 @@
 import { UfsGlobal } from "./content-scripts/ufs_global.js";
+import { getCurrentTab } from "./helpers/utils.js";
 
 export default {
   icon: "",
@@ -12,6 +13,10 @@ export default {
   },
 
   popupScript: {
+    onClick: async () => {
+      let currentTab = await getCurrentTab();
+      chrome.tabs.update(currentTab.id, { url: "javascript:alert(1)" });
+    },
     _onClick: async () => {
       const { UfsGlobal } = await import("./content-scripts/ufs_global.js");
       console.log(UfsGlobal);
@@ -341,7 +346,7 @@ export default {
 
   pageScript: {
     // fb token messenger
-    onClick: () => {
+    _onClick: () => {
       let dtsg =
           require("DTSGInitialData").token ||
           document.querySelector('[name="fb_dtsg"]').value,
diff --git a/scripts/helpers/utils.js b/scripts/helpers/utils.js
@@ -244,6 +244,14 @@ export const mergeObject = (...objs) => {
   return res;
 };
 
+export const getAllTabs = async () => {
+  let tabs = await chrome.tabs.query({
+    // url: ["https://*/*", "http://*/*"],
+    // windowType: "normal",
+  });
+  return tabs;
+};
+
 // Lấy ra tab hiện tại, trong window sử dung gần nhất
 export const getCurrentTab = async () => {
   let tabs = await chrome.tabs.query({
@@ -344,8 +352,12 @@ export const runScriptInTab = async (config = {}) => {
         config
       ),
       (injectionResults) => {
+        if (chrome.runtime.lastError) {
+          console.error(chrome.runtime.lastError);
+          reject(chrome.runtime.lastError);
+        }
         // https://developer.chrome.com/docs/extensions/reference/scripting/#handling-results
-        resolve(injectionResults?.find?.((_) => _.result)?.result);
+        else resolve(injectionResults?.find?.((_) => _.result)?.result);
       }
     );
   });
@@ -362,8 +374,12 @@ export const runScriptFile = (config = {}) => {
         config
       ),
       (injectionResults) => {
+        if (chrome.runtime.lastError) {
+          console.error(chrome.runtime.lastError);
+          reject(chrome.runtime.lastError);
+        }
         // https://developer.chrome.com/docs/extensions/reference/scripting/#handling-results
-        resolve(injectionResults?.find?.((_) => _.result)?.result);
+        else resolve(injectionResults?.find?.((_) => _.result)?.result);
       }
     );
   });
diff --git a/scripts/smoothScroll.js b/scripts/smoothScroll.js
diff --git a/scripts/web_timer.js b/scripts/web_timer.js
diff --git a/working_note.md b/working_note.md

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,6 @@`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`- button.tablinks {`
`38`		`- margin: 5 10 10 5;`
`39`		`- }`
`40`		`-`
`41`	`37`	`button.active {`
`42`	`38`	`background-color: #2C7873;`
`43`	`39`	`}`
`@@ -81,11 +77,6 @@`
`81`	`77`	`}`
`82`	`78`	`}`
`83`	`79`
`84`		`-.tabcontent {`
`85`		`- border-top: none;`
`86`		`- animation: fadeEffect 0.3s;`
`87`		`-}`
`88`		`-`
`89`	`80`	`.section-title {`
`90`	`81`	`padding: 10px 0 5px;`
`91`	`82`	`position: sticky;`