almost there

assets/react.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

components/Error.tsx

@@ -1,12 +1,12 @@
 export default function Error({ error }: { error: string }) {
   return (
     <div className="min-w-[300px] bg-gray-900 shadow-2xl p-6 text-white font-sans">
-    <div className="flex items-center justify-between mb-6">
-      <h2 className="text-2xl font-bold bg-gradient-to-r from-blue-400 to-purple-500 bg-clip-text text-transparent">
-        Error
-      </h2>
-    </div>
-    <div className="flex items-center space-x-3">
+      <div className="flex items-center justify-between mb-6">
+        <h2 className="text-2xl font-bold bg-gradient-to-r from-blue-400 to-purple-500 bg-clip-text text-transparent">
+          Error
+        </h2>
+      </div>
+      <div className="flex items-center space-x-3">
         <div>
           <p className="text-sm text-gray-300">{error}</p>
         </div>

components/ServerInfo.tsx

@@ -5,12 +5,12 @@ export default function ServerInfo({ data }: { data: ServerData }) {
   if (data.isBrowserResource) {
     return (
       <div className="min-w-[300px] bg-gray-900 shadow-2xl p-6 text-white font-sans">
-      <div className="flex items-center justify-between mb-6">
-        <h2 className="text-2xl font-bold bg-gradient-to-r from-blue-400 to-purple-500 bg-clip-text text-transparent">
-          Browser Resource
-        </h2>
-      </div>
-      <div className="flex items-center space-x-3">
+        <div className="flex items-center justify-between mb-6">
+          <h2 className="text-2xl font-bold bg-gradient-to-r from-blue-400 to-purple-500 bg-clip-text text-transparent">
+            Browser Resource
+          </h2>
+        </div>
+        <div className="flex items-center space-x-3">
           <div>
             <p className="text-sm text-gray-300">The requested document was obtained from the local computer</p>
           </div>
@@ -22,12 +22,12 @@ export default function ServerInfo({ data }: { data: ServerData }) {
   if (data.isLocal) {
     return (
       <div className="min-w-[300px] bg-gray-900 shadow-2xl p-6 text-white font-sans">
-      <div className="flex items-center justify-between mb-6">
-        <h2 className="text-2xl font-bold bg-gradient-to-r from-blue-400 to-purple-500 bg-clip-text text-transparent">
-          Internal Network
-        </h2>
-      </div>
-      <div className="flex items-center space-x-3">
+        <div className="flex items-center justify-between mb-6">
+          <h2 className="text-2xl font-bold bg-gradient-to-r from-blue-400 to-purple-500 bg-clip-text text-transparent">
+            Internal Network
+          </h2>
+        </div>
+        <div className="flex items-center space-x-3">
           <ServerIcon className="w-6 h-6 text-yellow-400 flex-shrink-0" />
           <div>
             <p className="text-sm text-gray-400">IP Address</p>

components/Spinner.tsx

@@ -1,24 +0,0 @@
-export function Spinner({ className }: { className?: string }) {
-    return (
-      <svg
-        className={`animate-spin ${className}`}
-        xmlns="http://www.w3.org/2000/svg"
-        fill="none"
-        viewBox="0 0 24 24"
-      >
-        <circle
-          className="opacity-25"
-          cx="12"
-          cy="12"
-          r="10"
-          stroke="currentColor"
-          strokeWidth="4"
-        />
-        <path
-          className="opacity-75"
-          fill="currentColor"
-          d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-        />
-      </svg>
-    );
-  }

entrypoints/background.ts

@@ -1,90 +1,104 @@
-import psl from 'psl';
+import psl from 'psl'
+
+let currentTabUrl: string | null = null
+
+async function resolveARecord(hostname: string): Promise<string | null> {
+  try {
+    const dnsResponse = await fetch(
+      `https://cloudflare-dns.com/dns-query?name=${hostname}&type=A`,
+      {
+        headers: { Accept: 'application/dns-json' },
+      }
+    )
+
+    if (!dnsResponse.ok) {
+      console.error(`DNS query failed: ${dnsResponse.status}`)
+      return null
+    }
+
+    const dnsData = await dnsResponse.json()
+    return (
+      dnsData.Answer?.find((entry: DNSEntry) => entry.type === 1)?.data || null
+    )
+  } catch (error) {
+    console.error('Failed to fetch DNS data:', error)
+    return null
+  }
+}
+
+async function handleTabUpdate(url: string) {
+  if (url === currentTabUrl) return
+  currentTabUrl = url
+
+  try {
+    const hostname = new URL(url).hostname
+    const ip = await resolveARecord(hostname)
+
+    if (!ip) {
+      await updateIcon(null)
+      return
+    }
+
+    const apiResponse = await fetch(`https://ip.albert.lol/${ip}`)
+    const apiData = await apiResponse.json()
+
+    await updateIcon(apiData.country || null)
+  } catch (error) {
+    console.error('Failed to handle tab update:', error)
+    await updateIcon(null)
+  }
+}
+
+chrome.tabs.onActivated.addListener(async activeInfo => {
+  const tab = await chrome.tabs.get(activeInfo.tabId)
+  if (tab.url) await handleTabUpdate(tab.url)
+})
+
+chrome.tabs.onUpdated.addListener(async (_tabId, changeInfo) => {
+  if (changeInfo.url) await handleTabUpdate(changeInfo.url)
+})
 
 export default defineBackground({
   main() {
     chrome.runtime.onMessage.addListener((request, _sender, sendResponse) => {
       if (request.type === 'FETCH_SERVER_INFO') {
-        (async () => {
+        ;(async () => {
           try {
-            const dnsResponse = await fetch(`https://dns.google/resolve?name=${request.hostname}&type=A`);
-            const dnsData = await dnsResponse.json();
-            const ip = dnsData.Answer?.[0]?.data;
-
+            const ip = await resolveARecord(request.hostname)
             if (!ip) {
-              sendResponse({ error: 'DNS resolution failed', data: null });
-              return;
+              sendResponse({ error: 'DNS resolution failed', data: null })
+              return
             }
 
-            const apiResponse = await fetch(`https://ip.albert.lol/${ip}`);
-            const apiData = await apiResponse.json();
+            const apiResponse = await fetch(`https://ip.albert.lol/${ip}`)
+            const apiData = await apiResponse.json()
 
-            const parsed = psl.parse(request.hostname);
-            const origin = 'domain' in parsed ? parsed.domain : null;
+            const parsed = psl.parse(request.hostname)
+            const origin = 'domain' in parsed ? parsed.domain : null
 
-            await updateIcon(apiData.country);
+            await updateIcon(apiData.country)
 
             sendResponse({
               error: null,
               data: {
-                origin: origin,
+                origin,
                 ip: apiData.ip,
-                hostname: apiData.hostname ? apiData.hostname : "N/A",
-                country: apiData.country ? apiData.country : null,
-                city: apiData.city ? apiData.city : null,
-                org: apiData.org
-              }
-            });
+                hostname: apiData.hostname || 'N/A',
+                country: apiData.country || null,
+                city: apiData.city || null,
+                org: apiData.org,
+              },
+            })
           } catch (error) {
-            await updateIcon(null);
+            await updateIcon(null)
             sendResponse({
               error: error instanceof Error ? error.message : 'Unknown error',
-              data: null
-            });
+              data: null,
+            })
           }
-        })();
-        return true;
+        })()
+        return true
       }
-    });
+    })
   },
-});
-
-chrome.tabs.onActivated.addListener(async (activeInfo) => {
-  const tab = await chrome.tabs.get(activeInfo.tabId);
-  if (!tab.url) return;
-
-  try {
-    const url = new URL(tab.url);
-    const dnsResponse = await fetch(`https://dns.google/resolve?name=${url.hostname}&type=A`);
-    const dnsData = await dnsResponse.json();
-    const ip = dnsData.Answer?.[0]?.data;
-
-    if (!ip) return;
-
-    const apiResponse = await fetch(`https://ip.albert.lol/${ip}`);
-    const apiData = await apiResponse.json();
-
-    await updateIcon(apiData.country);
-  } catch {
-    await updateIcon(null);
-  }
-});
-
-chrome.tabs.onUpdated.addListener(async (_tabId, changeInfo) => {
-  if (!changeInfo.url) return;
-
-  try {
-    const url = new URL(changeInfo.url);
-    const dnsResponse = await fetch(`https://dns.google/resolve?name=${url.hostname}&type=A`);
-    const dnsData = await dnsResponse.json();
-    const ip = dnsData.Answer?.[0]?.data;
-
-    if (!ip) return;
-
-    const apiResponse = await fetch(`https://ip.albert.lol/${ip}`);
-    const apiData = await apiResponse.json();
-
-    await updateIcon(apiData.country);
-  } catch {
-    await updateIcon(null);
-  }
-});
+})

entrypoints/content.ts

@@ -1,6 +0,0 @@
-export default defineContentScript({
-  matches: ['*://*.google.com/*'],
-  main() {
-    console.log('Hello content.');
-  },
-});

entrypoints/popup/Popup.tsx

@@ -1,17 +1,8 @@
-import { Spinner } from '@/components/Spinner';
 import ServerInfo from '@/components/ServerInfo';
 import Error from '@/components/Error';
 
 export default function Popup() {
-  const { data, loading, error } = useTabData();
-
-  if (loading) {
-    return (
-      <div className="flex items-center justify-center h-48 bg-gray-900">
-        <Spinner className="w-12 h-12 text-purple-500" />
-      </div>
-    );
-  }
+  const { data, error } = useTabData();
 
   if (error) {
     return (

entrypoints/popup/index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

hooks/useTabData.ts

@@ -1,7 +1,7 @@
 export function useTabData() {
-  const [data, setData] = useState<ServerData | null>(null);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
+  const [data, setData] = useState<ServerData | null>(null)
+  const [loading, setLoading] = useState(true)
+  const [error, setError] = useState<string | null>(null)
 
   useEffect(() => {
     const fetchData = async () => {
@@ -9,14 +9,13 @@ export function useTabData() {
         const [tab] = await chrome.tabs.query({
           active: true,
           currentWindow: true,
-        });
+        })
 
-        if (!tab?.url) throw new Error('No active tab found');
+        if (!tab?.url) throw new Error('No active tab found')
 
-        const url = new URL(tab.url);
-        const hostname = url.hostname;
+        const url = new URL(tab.url)
+        const hostname = url.hostname
 
-        // Check for browser resources
         if (['chrome:', 'about:', 'file:'].includes(url.protocol)) {
           return setData({
             origin: '',
@@ -26,12 +25,11 @@ export function useTabData() {
             city: '',
             org: '',
             isLocal: false,
-            isBrowserResource: true
-          });
+            isBrowserResource: true,
+          })
         }
 
-        // Check for internal IPs
-        const isInternal = isPrivateIP(hostname);
+        const isInternal = isPrivateIP(hostname)
         if (isInternal) {
           return setData({
             origin: '',
@@ -41,41 +39,39 @@ export function useTabData() {
             city: '',
             org: '',
             isLocal: true,
-            isBrowserResource: false
-          });
+            isBrowserResource: false,
+          })
         }
 
         const response = await chrome.runtime.sendMessage({
           type: 'FETCH_SERVER_INFO',
-          hostname: hostname
-        });
+          hostname: hostname,
+        })
 
         if (!response) {
-          throw new Error('No response from background script');
+          throw new Error('No response from background script')
         }
 
-        // Handle API errors
         if (response.error) {
-          throw new Error(response.error);
+          throw new Error(response.error)
         }
 
-        // Validate response data
         if (!response.data?.ip) {
-          throw new Error('Invalid server data received');
+          throw new Error('Invalid server data received')
         }
 
-        setData(response.data);
-        setError(null);
+        setData(response.data)
+        setError(null)
       } catch (err) {
-        setError(err instanceof Error ? err.message : 'Failed to fetch data');
-        setData(null);
+        setError(err instanceof Error ? err.message : 'Failed to fetch data')
+        setData(null)
       } finally {
-        setLoading(false);
+        setLoading(false)
       }
-    };
+    }
 
-    fetchData();
-  }, []);
+    fetchData()
+  }, [])
 
-  return { data, loading, error };
+  return { data, loading, error }
 }