Merge pull request #4 from arielszmerla/feat/add-shortcut

arielszmerla · web-flow · commit 5b08ee9b3155 · 2025-06-23T23:26:47.000+03:00
Feat/add shortcut
diff --git a/code/background.js b/code/background.js
@@ -1,7 +1,37 @@
+import { cleanAwsUrl } from './utils.js';
+
 chrome.runtime.onInstalled.addListener(() => {
   console.log("AWS Console URL Cleaner extension installed.");
 });
 
 chrome.runtime.onStartup.addListener(() => {
   console.log("AWS Console URL Cleaner extension started.");
-});
+});
+
+chrome.commands.onCommand.addListener(async (command) => {
+  if (command === "clean-url") {
+    const [tab] = await chrome.tabs.query({ active: true, currentWindow: true });
+    if (!tab || !tab.url) return;
+
+    const cleaned = cleanAwsUrl(tab.url);
+    if (!cleaned) return;
+
+    await copyToClipboard(tab.id, cleaned);
+  }
+});
+
+async function copyToClipboard(tabId, text) {
+  // Try to send the message first
+  try {
+    await chrome.tabs.sendMessage(tabId, { action: "copyToClipboard", text });
+  } catch (e) {
+    // If the content script is not present, inject it and try again
+    await chrome.scripting.executeScript({
+      target: { tabId },
+      files: ["code/content.js"]
+    });
+    // Wait a moment for the script to load, then resend the message
+    await new Promise(resolve => setTimeout(resolve, 100));
+    await chrome.tabs.sendMessage(tabId, { action: "copyToClipboard", text });
+  }
+}
diff --git a/code/content.js b/code/content.js
@@ -0,0 +1,13 @@
+chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
+  if (msg.action === "copyToClipboard" && msg.text) {
+    // Fallback for clipboard write
+    const textarea = document.createElement('textarea');
+    textarea.value = msg.text;
+    document.body.appendChild(textarea);
+    textarea.select();
+    document.execCommand('copy');
+    document.body.removeChild(textarea);
+    sendResponse({ success: true });
+  }
+  return true;
+});
diff --git a/code/popup.html b/code/popup.html
@@ -5,9 +5,9 @@
   <link rel="stylesheet" href="popup.css">
 </head>
 <body>
-  <h3>Clean AWS Console URL</h3>
+  <h3>Clean/Copy AWS Console URL</h3>
   <button id="cleanBtn">Clean & Copy URL</button>
   <div id="status"></div>
-  <script src="popup.js"></script>
+<script type="module" src="popup.js"></script>
 </body>
 </html>
diff --git a/code/popup.js b/code/popup.js
@@ -1,14 +1,20 @@
+// code/popup.js
+import { cleanAwsUrl } from './utils.js';
+
 document.getElementById("cleanBtn").onclick = () => {
   chrome.tabs.query({active: true, currentWindow: true}, (tabs) => {
-    const url = new URL(tabs[0].url);
-    const cleanedHost = url.host.replace(/^\d{12}-[a-z0-9]+\./, '');
-    const cleanedUrl = `${url.protocol}//${cleanedHost}${url.pathname}${url.search}${url.hash}`;
+    const originalUrl = tabs[0].url;
+    const cleanedUrl = cleanAwsUrl(originalUrl);
+
+    if (!cleanedUrl) {
+      document.getElementById("status").textContent = "⚠️ Invalid or unsupported URL.";
+      return;
+    }
 
-    // Copy to clipboard
     navigator.clipboard.writeText(cleanedUrl).then(() => {
       document.getElementById("status").textContent = "✅ Cleaned URL copied!";
     }).catch(() => {
       document.getElementById("status").textContent = "❌ Failed to copy.";
     });
   });
-};
+};
diff --git a/code/utils.js b/code/utils.js
@@ -0,0 +1,10 @@
+// code/utils.js
+export function cleanAwsUrl(rawUrl) {
+  try {
+    const url = new URL(rawUrl);
+    const cleanedHost = url.host.replace(/^\d{12}-[a-z0-9]+\./, '');
+    return `${url.protocol}//${cleanedHost}${url.pathname}${url.search}${url.hash}`;
+  } catch (e) {
+    return null;
+  }
+}
diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,12 @@
   "name": "AWS Console URL Cleaner",
   "version": "0.1",
   "description": "Cleans AWS console URLs by removing account-specific prefixes.",
-  "permissions": ["tabs", "clipboardWrite", "activeTab", "scripting"],
+  "permissions": [
+    "tabs",
+    "clipboardWrite",
+    "activeTab",
+    "scripting"
+  ],
   "action": {
     "default_popup": "code/popup.html",
     "default_icon": {
@@ -16,6 +21,36 @@
     "128": "assets/imgs/icon.png"
   },
   "background": {
-    "service_worker": "code/background.js"
+    "service_worker": "code/background.js",
+    "type": "module"
+  },
+  "web_accessible_resources": [
+    {
+      "resources": [
+        "code/utils.js"
+      ],
+      "matches": [
+        "<all_urls>"
+      ]
+    }
+  ],
+  "content_scripts": [
+    {
+      "matches": [
+        "<all_urls>"
+      ],
+      "js": [
+        "code/content.js"
+      ]
+    }
+  ],
+  "commands": {
+    "clean-url": {
+      "suggested_key": {
+        "default": "Ctrl+Shift+U",
+        "mac": "Command+Shift+U"
+      },
+      "description": "Clean and copy AWS URL"
+    }
   }
 }
