From 6c2185562e1ad7abde1326bde0a751553046658f Mon Sep 17 00:00:00 2001
From: Max Ingraham-Rakatansky <maxmir@berkeley.edu>
Date: Mon, 24 Apr 2023 15:11:04 +0100
Subject: [PATCH] WIP

---
 .idea/workspace.xml                           |  4 +-
 fURL/Chrome Extension/manifest.json           |  9 +--
 fURL/Chrome Extension/modules/copyURL.js      | 59 +++++++++++++++++
 .../scripts/copy_address_bar.js               | 66 +++----------------
 fURL/Chrome Extension/service-worker.js       |  6 --
 5 files changed, 77 insertions(+), 67 deletions(-)
 create mode 100644 fURL/Chrome Extension/modules/copyURL.js
 delete mode 100644 fURL/Chrome Extension/service-worker.js

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e89f571..f019f86 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="367d3137-cacb-4186-8222-26f530c0016a" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/fURL/Chrome Extension/modules/copyURL.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fURL/Chrome Extension/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/fURL/Chrome Extension/manifest.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/fURL/Chrome Extension/scripts/copy_address_bar.js" beforeDir="false" afterPath="$PROJECT_DIR$/fURL/Chrome Extension/scripts/copy_address_bar.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fURL/Chrome Extension/scripts/furl.js" beforeDir="false" afterPath="$PROJECT_DIR$/fURL/Chrome Extension/scripts/furl.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fURL/Chrome Extension/service-worker.js" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/fURL/Chrome Extension/manifest.json b/fURL/Chrome Extension/manifest.json
index ded0e80..74424da 100644
--- a/fURL/Chrome Extension/manifest.json	
+++ b/fURL/Chrome Extension/manifest.json	
@@ -9,9 +9,6 @@
       "32": "icons/icon-32.png",
       "128": "icons/icon-128.png"
     },
-    "background": {
-      "service_worker": "service-worker.js"
-    },
     "permissions": [
         "tabs",
         "activeTab",
@@ -27,5 +24,9 @@
       "default_icon": "icons/icon-38.png",
       "default_title": "fURL",
       "default_popup": "popup/popup.html"
-    }
+    },
+    "web_accessible_resources": [{
+      "matches": ["<all_urls>"],
+      "resources": ["modules/copyURL.js"]
+    }]
 }
\ No newline at end of file
diff --git a/fURL/Chrome Extension/modules/copyURL.js b/fURL/Chrome Extension/modules/copyURL.js
new file mode 100644
index 0000000..4ad052b
--- /dev/null
+++ b/fURL/Chrome Extension/modules/copyURL.js	
@@ -0,0 +1,59 @@
+export function copy(url){
+    console.log("starting copyurl")
+    console.log(url);
+//    add URL element and confirming that we have a valid URL
+    let copyFrom = document.createElement('input');
+    copyFrom.type = 'url';
+    copyFrom.value = url;
+    if (!copyFrom.checkValidity()) {
+        console.log("copied value isn't a url: " + copyFrom.value);
+        return;
+    } else {
+        console.log("copied value is a url: " + copyFrom.value)
+    }
+//  trim the url of any utm elements
+    copyFrom.value = trimURL(url);
+    console.log("trimmed_url is " + copyFrom.value);
+
+// Stage 2 Using Clipboard API, copy to clipboard
+
+    document.body.appendChild(copyFrom);
+    copyFrom.select()
+    document.execCommand('copy');
+    copyFrom.blur();
+    document.body.removeChild(copyFrom);
+
+}
+
+export function trimURL(url){
+    // search for query parameters
+    const utm_params = new Set(["utm_source", "utm_medium", "utm_campaign", "utm_term", "utm_content", "fbclid"]);
+
+    let path_split = url.split('?')
+    console.log("path split is: " + path_split);
+    let updated_params = "";
+    if  (path_split.length > 1) {
+        let query_params = path_split[1].split('&');
+        console.log("query params are: " + query_params);
+
+        for (let i=0; i < query_params.length; i++) {
+            let [key, value] = query_params[i].split('=');
+            console.log("key: " + key + "| value: " + value);
+            if (key && !(utm_params.has(key))) {
+//              re-adding the parameter if it's not in our utm list
+                updated_params += key + '=' + value;
+            }
+        }
+    } else {
+        console.log("no query parameters found")
+    }
+    console.log("updated params: " + updated_params);
+
+    if (updated_params){
+        updated_params = "?" + updated_params
+    }
+    return path_split[0] + updated_params;
+
+}
+
+console.log("copying address bar");
diff --git a/fURL/Chrome Extension/scripts/copy_address_bar.js b/fURL/Chrome Extension/scripts/copy_address_bar.js
index 24369c3..091046d 100644
--- a/fURL/Chrome Extension/scripts/copy_address_bar.js	
+++ b/fURL/Chrome Extension/scripts/copy_address_bar.js	
@@ -1,62 +1,16 @@
-function copyURL2(){
+function copy_address(){
 
     let url = window.location.href;
-
-//    add URL element and confirming that we have a valid URL
-    let copyFrom = document.createElement('input');
-    copyFrom.type = 'url';
-    copyFrom.value = url;
-    if (!copyFrom.checkValidity()) {
-        console.log("copied value isn't a url: " + copyFrom.value);
-        return;
-    } else {
-        console.log("copied value is a url: " + copyFrom.value)
-    }
-//  trim the url of any utm elements
-    copyFrom.value = trimURL(url);
-    console.log("trimmed_url is " + copyFrom.value);
-
-// Stage 2 Using Clipboard API, copy to clipboard
-
-    document.body.appendChild(copyFrom);
-    copyFrom.select()
-    document.execCommand('copy');
-    copyFrom.blur();
-    document.body.removeChild(copyFrom);
-
-}
-
-function trimURL(url){
-    // search for query parameters
-    const utm_params = new Set(["utm_source", "utm_medium", "utm_campaign", "utm_term", "utm_content", "fbclid"]);
-
-
-    let path_split = url.split('?')
-    console.log("path split is: " + path_split);
-    let updated_params = "";
-    if  (path_split.length > 1) {
-        let query_params = path_split[1].split('&');
-        console.log("query params are: " + query_params);
-
-        for (let i=0; i < query_params.length; i++) {
-            let [key, value] = query_params[i].split('=');
-            console.log("key: " + key + "| value: " + value);
-            if (key && !(utm_params.has(key))) {
-//              re-adding the parameter if it's not in our utm list
-                updated_params += key + '=' + value;
-            }
-        }
-    } else {
-        console.log("no query parameters found")
-    }
-    console.log("updated params: " + updated_params);
-
-    if (updated_params){
-        updated_params = "?" + updated_params
-    }
-    return path_split[0] + updated_params;
+    console.log(url);
+//    import copyURL and run
+    (async () => {
+        const src = chrome.runtime.getURL("modules/copyURL.js");
+        const copyURL = await import(src);
+        console.log(copyURL);
+        copyURL.copy(url);
+    })();
 
 }
 
 console.log("copying address bar");
-copyURL2();
\ No newline at end of file
+copy_address();
\ No newline at end of file
diff --git a/fURL/Chrome Extension/service-worker.js b/fURL/Chrome Extension/service-worker.js
deleted file mode 100644
index 923ed1f..0000000
--- a/fURL/Chrome Extension/service-worker.js	
+++ /dev/null
@@ -1,6 +0,0 @@
-//chrome.tabs.query({activate:true, currentWindow:true}, function(tabs){
-//    chrome.tabs.sendMessage(tabs[0].id,
-//        {
-//            message:
-//        })
-//})
\ No newline at end of file