fix a lot

Author: HoangTran0410

empty_script.js

@@ -44,4 +44,5 @@ export default {
 };
 
 // functions/attributes that other scripts can import and use
+// can only use in popup context (onClickExtension)
 export const shared = {};

popup/index.js

@@ -294,6 +294,16 @@ function createScriptButton(script, isFavorite = false) {
   if (script.description?.img) {
     tooltip.innerHTML += `<img src="${script.description.img}" style="width:95%" />`;
   }
+  if (script.changeLogs) {
+    let tx = "";
+    for (let ver in script.changeLogs) {
+      let dates = Object.keys(script.changeLogs[ver]).sort().reverse();
+      for (let date of dates) {
+        tx += `<li>${date} - ${script.changeLogs[ver][date]}</li>`;
+      }
+    }
+    tooltip.innerHTML += `<ul class="change-logs">${tx}</ul>`;
+  }
   button.appendChild(tooltip);
 
   buttonContainer.appendChild(button);

popup/styles/style.css

@@ -159,7 +159,7 @@ a:hover {
 .tabcontent {
     padding: 6px;
     border-top: none;
-    padding-bottom: 50px;
+    padding-bottom: 300px;
 }
 
 .tabcontent {
@@ -315,7 +315,7 @@ a:hover {
     min-width: 120px;
     background-color: rgb(133, 133, 133);
     color: rgb(255, 255, 255);
-    text-align: center;
+    text-align: left;
     border-radius: 6px;
     padding: 5px;
     pointer-events: none;
@@ -349,6 +349,14 @@ a:hover {
     border-color: transparent transparent rgb(133, 133, 133) transparent;
 }
 
+.tooltip .tooltiptext .change-logs {
+    border-top: 1px white solid;
+    color: white;
+    font-style: italic;
+    padding: 5px;
+    margin-top: 5px;
+}
+
 /* --------- Modal ---------- */
 .modal {
     display: none;

popup/tabs.js

@@ -202,7 +202,6 @@ const tabs = [
       s.fb_getAllAlbumIdFromCurrentWebsite,
       s.fb_getUidFromUrl,
       s.fb_getAllUidFromFbSearch,
-      s.fb_getAllUidFromFriendsPage,
       s.fb_getAllUidOfGroupMembers,
       createTitle("--- Shortcut ---", "--- Phím tắt ---"),
       {
@@ -259,8 +258,6 @@ const tabs = [
       s.insta_anonymousStoryViewer,
       createTitle("--- Bulk Download ---", "--- Tải hàng loạt ---"),
       s.insta_getAllUserMedia,
-      s.insta_getAllImagesInUserProfile,
-      s.insta_getAllImagesInNewFeed,
     ],
   },
   {
@@ -305,10 +302,6 @@ const tabs = [
       s.douyin_downloadWachingVideo,
       s.douyin_downloadAllVideoUser,
       // s.douyin_batchDownload,
-      s.saveAllVideo,
-      createTitle("--- Doutu.be ---", "--- Doutu.be ---"),
-      s.doutube_downloadWatchingVideo,
-      s.doutube_getAllVideoInUserProfile,
     ],
   },
   {

scripts/auto_redirectLargestImageSrc.js

@@ -10,6 +10,12 @@ export default {
     img: "/scripts/auto_redirectLargestImageSrc.png",
   },
 
+  changeLogs: {
+    1.66: {
+      "2024-04-16": "init",
+    },
+  },
+
   onDocumentStart: async () => {
     let oldHref = location.href;
     check(oldHref);

scripts/background-scripts/background-script.js

@@ -40,6 +40,18 @@ function runScripts(tabId, event, world) {
 
 async function customFetch(url, options) {
   try {
+    if (
+      typeof options?.body === "string" &&
+      options.body.startsWith("ufs-formData:")
+    ) {
+      let body = options.body.replace("ufs-formData:", "");
+      body = JSON.parse(body);
+      options.body = new FormData();
+      for (const [key, value] of Object.entries(body)) {
+        options.body.append(key, value);
+      }
+    }
+
     const res = await fetch(url, options);
     let body;
 

scripts/consoleLog_withTime.js

@@ -9,6 +9,12 @@ export default {
     vi: "Hiển thị thêm thời gian chạy lệnh vào trước console.log",
   },
 
+  changeLogs: {
+    1.66: {
+      "2024-04-11": "init",
+    },
+  },
+
   onDocumentStart: () => {
     const origLog = console.log;
     console.log = function () {

scripts/content-scripts/content_script.js

@@ -5,8 +5,8 @@ let utils;
 function sendToPageScript(event, uuid, data) {
   console.log("sendToPageScript", event, uuid, data);
   window.dispatchEvent(
-    new CustomEvent("ufs-contentscript-sendto-pagescript", {
-      detail: { event, uuid, data },
+    new CustomEvent("ufs-contentscript-sendto-pagescript" + uuid, {
+      detail: { event, data },
     })
   );
 }

scripts/content-scripts/page_scripts.js

@@ -16,7 +16,7 @@
     CACHED.path = path;
 
     for (let id of scriptIds.filter((_) => _)) {
-      let scriptPath = `${path}/${id}.js`;
+      let scriptPath = `${path}${id}.js`;
       import(scriptPath)
         .then(({ default: script }) => {
           try {

scripts/content-scripts/ufs_global.js

@@ -4,13 +4,11 @@ UfsGlobal.Extension = {
   // use basic customEvent technique - only communicate within the same document or window context
   sendToContentScript(event, data) {
     return new Promise((resolve, reject) => {
-      let listenerKey = "ufs-contentscript-sendto-pagescript";
       let uuid = Math.random().toString(36);
+      let listenerKey = "ufs-contentscript-sendto-pagescript" + uuid;
       let listener = (evt) => {
-        if (evt.detail.event === event && evt.detail.uuid === uuid) {
-          resolve(evt.detail.data);
-          window.removeEventListener(listenerKey, listener);
-        }
+        resolve(evt.detail.data);
+        window.removeEventListener(listenerKey, listener);
       };
       window.addEventListener(listenerKey, listener);
       window.dispatchEvent(
@@ -33,22 +31,21 @@ UfsGlobal.Extension = {
       params,
     });
   },
-  fetchByPassOrigin(url, options = {}) {
-    return new Promise((resolve, reject) => {
+  async fetchByPassOrigin(url, options = {}) {
+    try {
+      let _url = url;
       let urlObject = new URL(url);
       // https://stackoverflow.com/a/9375786/23648002
       if (location.hostname == urlObject?.hostname) {
-        url = urlObject.pathname;
+        _url = urlObject.pathname;
       }
-      fetch(url, options)
-        .then(resolve)
-        .catch((e) => {
-          console.log("NORMAL FETCH FAIL: ", e);
-          UfsGlobal.Extension.runInBackground("fetch", [url, options])
-            .then(resolve)
-            .catch(reject);
-        });
-    });
+      let res = await fetch(_url, options);
+      return res;
+    } catch (e) {
+      console.log("NORMAL FETCH FAIL: ", e);
+    }
+    let res = await UfsGlobal.Extension.runInBackground("fetch", [url]);
+    return res;
   },
   getURL(filePath) {
     return UfsGlobal.Extension.runInContentScript("chrome.runtime.getURL", [
@@ -70,6 +67,18 @@ UfsGlobal.Extension = {
   },
 };
 UfsGlobal.DOM = {
+  closest(element, selector) {
+    let el = element;
+    while (el !== null) {
+      if (el.matches(selector)) return el;
+
+      let found = el.querySelector(selector);
+      if (found) return found;
+
+      el = el.parentElement;
+    }
+    return el;
+  },
   addLoadingAnimationAtPos(
     x,
     y,
@@ -554,6 +563,39 @@ UfsGlobal.DOM = {
   },
 };
 UfsGlobal.Utils = {
+  async json2xml(json) {
+    if (!window.json2xml) {
+      let url = await UfsGlobal.Extension.getURL(
+        "/scripts/libs/xml-json/json2xml.js"
+      );
+      await UfsGlobal.DOM.injectScriptSrcAsync(url);
+    }
+    return window.json2xml(json);
+  },
+  async xml2json(xml) {
+    if (!window.xml2json) {
+      let url = await UfsGlobal.Extension.getURL(
+        "/scripts/libs/xml-json/xml2json.js"
+      );
+      await UfsGlobal.DOM.injectScriptSrcAsync(url);
+    }
+    return window.xml2json(xml);
+  },
+  getLargestSrcset(srcset) {
+    var srcs = srcset.split(/[xw],/i),
+      largeSize = -1,
+      largeSrc = null;
+    if (!srcs.length) return null;
+    srcs.forEach((srci) => {
+      let srcInfo = srci.trim().split(/(\s+|%20)/),
+        curSize = parseInt(srcInfo[2] || 0);
+      if (srcInfo[0] && curSize > largeSize) {
+        largeSize = curSize;
+        largeSrc = srcInfo[0];
+      }
+    });
+    return largeSrc;
+  },
   svgBase64ToUrl(sgvBase64) {
     try {
       if (!/^data:image\/svg/.test(sgvBase64)) throw new Error("Invalid SVG");
@@ -1903,8 +1945,11 @@ UfsGlobal.Tiktok = {
         const params = Object.keys(parameters)
           .map((key) => `&${key}=${parameters[key]}`)
           .join("");
-        let data = await fetch(api + videoId + "&" + params);
-        let json = await data.json();
+        let data = await UfsGlobal.Extension.runInBackground("fetch", [
+          api + videoId + "&" + params,
+        ]);
+        console.log(data);
+        let json = JSON.parse(data.body);
         console.log(json);
         let item = json.aweme_list.find((a) => a.aweme_id == videoId);
         if (!item) throw Error("Không tìm thấy video");
@@ -1921,35 +1966,60 @@ UfsGlobal.Tiktok = {
   CACHE: {
     snapTikToken: null,
   },
-  downloadTiktokVideoFromUrl: async function (url) {
+  downloadTiktokVideoFromUrl: async function (url, background = false) {
     try {
       let token = UfsGlobal.Tiktok.CACHE.snapTikToken;
       if (!token) {
-        let token = await UfsGlobal.SnapTik.getToken();
+        let token = await UfsGlobal.SnapTik.getToken(background);
         if (!token) throw Error("Không tìm thấy token snaptik");
         UfsGlobal.Tiktok.CACHE.snapTikToken = token;
       }
 
-      let data = new FormData();
-      data.append("url", url);
-      data.append("token", token);
-
-      let res = await fetch("https://snaptik.app/abc2.php", {
-        method: "POST",
-        body: data,
-      });
-      let text = await res.text();
+      let form = new FormData();
+      form.append("url", url);
+      form.append("token", token);
+
+      let text;
+      if (background) {
+        let res = await UfsGlobal.Extension.runInBackground("fetch", [
+          "https://snaptik.app/abc2.php",
+          {
+            method: "POST",
+            body:
+              "ufs-formData:" +
+              JSON.stringify({
+                url: url,
+                token: token,
+              }),
+          },
+        ]);
+        text = res.body;
+      } else {
+        let res = await fetch("https://snaptik.app/abc2.php", {
+          method: "POST",
+          body: form,
+        });
+        text = await res.text();
+      }
       let result = UfsGlobal.SnapTik.decode(text);
       return result;
     } catch (e) {
-      console.log("ERROR: " + e);
+      console.log("ERROR: ", e);
     }
   },
 };
 UfsGlobal.SnapTik = {
-  getToken: async () => {
-    let res = await fetch("https://snaptik.app/");
-    let text = await res.text();
+  getToken: async (background = false) => {
+    let text;
+    if (background) {
+      let res = await UfsGlobal.Extension.runInBackground("fetch", [
+        "https://snaptik.app/",
+      ]);
+      text = res.body;
+    } else {
+      let res = await fetch("https://snaptik.app/");
+      text = await res.text();
+    }
     let token = text.match(/name="token" value="(.+?)"/)?.[1];
     return token;
   },
@@ -1998,6 +2068,7 @@ UfsGlobal.SnapTik = {
 
     let result = c(...params);
     let jwt = result.match(/d\?token=(.*?)\&dl=1/)?.[1];
+    if (!jwt) return null;
     let payload = UfsGlobal.Utils.parseJwt(jwt);
     return payload?.url;
   },
@@ -2731,11 +2802,27 @@ UfsGlobal.largeImgSiteRules = [
   },
 ];
 
-if (window) window.UfsGlobal = UfsGlobal;
-
 // export if posible
-if (typeof module !== "undefined" && typeof module.exports !== "undefined") {
-  module.exports = UfsGlobal;
-}
+(function (f) {
+  if (typeof exports === "object" && typeof module !== "undefined") {
+    module.exports = f();
+  } else if (typeof define === "function" && define.amd) {
+    define([], f);
+  } else {
+    var g;
+    if (typeof window !== "undefined") {
+      g = window;
+    } else if (typeof global !== "undefined") {
+      g = global;
+    } else if (typeof self !== "undefined") {
+      g = self;
+    } else {
+      g = this;
+    }
+    g.UfsGlobal = f();
+  }
+})(function () {
+  return UfsGlobal;
+});
 
 console.log("UfsGlobal loaded");