optimize + tracking

Author: HoangTran0410

manifest.json

@@ -48,8 +48,8 @@
     {
       "matches": ["<all_urls>"],
       "js": [
-        "scripts/content-scripts/ufs_global_webpage_context.js",
-        "scripts/content-scripts/run_scripts.js"
+        "scripts/content-scripts/ufs_global.js",
+        "scripts/content-scripts/page_scripts.js"
       ],
       "run_at": "document_start",
       "world": "MAIN",

popup/index.js

@@ -8,6 +8,7 @@ import {
   runScriptInCurrentTab,
   sendEventToTab,
   toggleActiveScript,
+  trackingUseScript,
 } from "../scripts/helpers/utils.js";
 import { checkForUpdate } from "./helpers/checkForUpdate.js";
 import { getFlag, t, toggleLang } from "./helpers/lang.js";
@@ -156,7 +157,7 @@ function createScriptButton(script, isFavorite = false) {
     checkmark.className = "checkmark tooltip";
     checkmark.onclick = async (e) => {
       let newValue = await toggleActiveScript(script.id);
-      newValue && UfsGlobal.Extension.updateScriptClickCount(script.id);
+      newValue && trackingUseScript(script.id);
       newValue ? script.onEnable?.() : script.onDisable?.();
       updateButtonChecker(script, buttonContainer, newValue);
     };
@@ -320,7 +321,7 @@ async function runScript(script) {
   if (willRun) {
     try {
       recentScriptsSaver.add(script);
-      UfsGlobal.Extension.updateScriptClickCount(script.id);
+      trackingUseScript(script.id);
       if (isFunction(script.onClickExtension)) await script.onClickExtension();
       if (isFunction(script.onClick))
         await runScriptInCurrentTab(script.onClick);

popup/main.js

@@ -1,8 +1,3 @@
 import("./index.js").then(() => {
   document.querySelector("#loading-fullscreen")?.remove();
 });
-
-import("../scripts/content-scripts/ufs_global_webpage_context.js").then(() => {
-  console.log("loaded ufs_global_webpage_context");
-  UfsGlobal.Extension.updateScriptClickCount("ufs_open_extension_popup");
-});

scripts/background-scripts/background-script.js

@@ -3,6 +3,7 @@ import {
   convertBlobToBase64,
   runScriptInTab,
   getAllActiveScriptIds,
+  trackingUseScript,
 } from "../helpers/utils.js";
 
 const { ISOLATED, MAIN } = chrome.scripting.ExecutionWorld;
@@ -22,7 +23,7 @@ function runScripts(tabId, event, world) {
   runScriptInTab({
     tabId: tabId,
     func: (scriptIds, event, path) => {
-      window.ufs_runScritps?.(scriptIds, event, path);
+      window.runScripts?.(scriptIds, event, path);
     },
     args: [CACHED.activeScriptIds, event, CACHED.path],
     world,
@@ -31,6 +32,7 @@ function runScripts(tabId, event, world) {
 
 const global = {
   log: console.log,
+  trackingUseScript,
   async fetch(url, options) {
     const res = await fetch(url, options);
     let body;
@@ -65,25 +67,6 @@ const global = {
     console.log("Response from background script:", data);
     return data;
   },
-  async updateScriptClickCount(scriptId) {
-    console.log("updateScriptClickCount", scriptId);
-    // return;
-    try {
-      let res = await fetch(
-        "https://useful-script-statistic.glitch.me/count",
-        // "https://useful-script-statistic.onrender.com/count",
-        {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ script: scriptId }),
-        }
-      );
-      return await res.text();
-    } catch (e) {
-      console.log("ERROR update script click count: ", e);
-      return null;
-    }
-  },
 };
 
 function main() {
@@ -197,8 +180,9 @@ function main() {
   });
 
   chrome.runtime.onInstalled.addListener(function () {
-    global.updateScriptClickCount("ufs-installed");
-    console.log("install");
+    global.trackingUseScript("ufs-installed");
+    console.log("installed", version);
+
     chrome.contextMenus.create({
       title: "Magnify this image",
       contexts: ["image"],

scripts/content-scripts/content_script.js

@@ -1,4 +1,4 @@
-import("./ufs_global_webpage_context.js");
+import("./ufs_global.js");
 
 // communication between page-script and content-script
 function sendToPageScript(event, uuid, data) {
@@ -10,7 +10,7 @@ function sendToPageScript(event, uuid, data) {
   );
 }
 
-window.ufs_runScritps = runScripts;
+window.runScripts = runScripts;
 function runScripts(scriptIds, event, path) {
   for (let scriptId of scriptIds) {
     runScript(scriptId, event);

scripts/content-scripts/run_scripts.js scripts/content-scripts/page_scripts.jsscripts/content-scripts/run_scripts.js renamed to scripts/content-scripts/page_scripts.js

@@ -10,7 +10,7 @@
     runScripts(CACHED.activeScriptIds, detail.event, CACHED.path);
   });
 
-  window.ufs_runScritps = runScripts;
+  window.runScripts = runScripts;
   function runScripts(scriptIds, event, path) {
     CACHED.activeScriptIds = scriptIds;
     CACHED.path = path;

…nt-scripts/ufs_global_webpage_context.js scripts/content-scripts/ufs_global.jsscripts/content-scripts/ufs_global_webpage_context.js renamed to scripts/content-scripts/ufs_global.js scripts/content-scripts/ufs_global_webpage_context.js renamed to scripts/content-scripts/ufs_global.js

@@ -34,11 +34,21 @@ UfsGlobal.Extension = {
     });
   },
   fetchByPassOrigin(url, options = {}) {
-    // same origin case
-    if (location.hostname == new URL(url)?.hostname) {
-      return fetch(url, options);
-    }
-    return UfsGlobal.Extension.runInBackground("fetch", [url, options]);
+    return new Promise((resolve, reject) => {
+      let urlObject = new URL(url);
+      // https://stackoverflow.com/a/9375786/23648002
+      if (location.hostname == urlObject?.hostname) {
+        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);
+        });
+    });
   },
   getURL(filePath) {
     return UfsGlobal.Extension.runInContentScript("chrome.runtime.getURL", [
@@ -50,10 +60,8 @@ UfsGlobal.Extension = {
       options,
     ]);
   },
-  updateScriptClickCount(scriptId) {
-    return UfsGlobal.Extension.runInBackground("updateScriptClickCount", [
-      scriptId,
-    ]);
+  trackingUseScript(scriptId) {
+    return UfsGlobal.Extension.runInBackground("trackingUseScript", [scriptId]);
   },
 };
 UfsGlobal.DOM = {

scripts/fb_messengerHistory.html

@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Useful script - Facebook messenger history</title>
 
-  <script src="./content-scripts/ufs_global_webpage_context.js"></script>
+  <script src="./content-scripts/ufs_global.js"></script>
   <link rel="stylesheet" href="./fb_messengerHistory.css">
 </head>
 

scripts/helpers/utils.js

@@ -1,3 +1,29 @@
+//  Utils used by popup and background-script
+
+const { version } = chrome.runtime.getManifest();
+
+export async function trackingUseScript(scriptId) {
+  console.log("trackingUseScript", scriptId);
+  try {
+    let res = await fetch(
+      "https://useful-script-statistic.glitch.me/count",
+      // "https://useful-script-statistic.onrender.com/count",
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          script: scriptId,
+          version: version,
+        }),
+      }
+    );
+    return await res.text();
+  } catch (e) {
+    console.log("ERROR update script click count: ", e);
+    return null;
+  }
+}
+
 export async function sendEventToTab(tabId, data) {
   console.log("... Sending ", data, " to tab...");
   const response = await chrome.tabs.sendMessage(tabId, data);

scripts/youtube_localDownloader.html

@@ -7,7 +7,7 @@
   <title>Useful Script - YouTube Local Downloader</title>
 
   <script src="./libs/file-saver/index.js"></script>
-  <script src="./content-scripts/ufs_global_webpage_context.js"></script>
+  <script src="./content-scripts/ufs_global.js"></script>
 </head>
 
 <body>