Show country code in random proxy mode

Author: ruihildt

src/helpers/proxyBadge.ts

@@ -1,7 +1,8 @@
-import { ProxyDetails } from '@/helpers/socksProxy/socksProxy.types';
 import { checkDomain } from '@/helpers/domain';
-import { getActiveProxyDetails, getActiveTab } from '@/helpers/tabs';
+import { domainProxyDetailsMap } from '@/helpers/socksProxy/getRandomSessionProxy';
 import { isLocalOrReservedIP } from '@/helpers/socksProxy/socksProxy';
+import { ProxyDetails } from '@/helpers/socksProxy/socksProxy.types';
+import { getActiveProxyDetails, getActiveTab } from '@/helpers/tabs';
 
 export const updateCurrentTabProxyBadge = async () => {
   const activeTab = await getActiveTab();
@@ -19,10 +20,12 @@ export const updateTabProxyBadge = async (
   const { excludedHosts } = await browser.storage.local.get('excludedHosts');
   const { hostProxiesDetails } = await browser.storage.local.get('hostProxiesDetails');
   const { globalProxyDetails } = await browser.storage.local.get('globalProxyDetails');
+  const { randomProxyMode } = await browser.storage.local.get('randomProxyMode');
 
   const hostProxiesDetailsParsed = JSON.parse(hostProxiesDetails);
   const excludedHostsParsed = JSON.parse(excludedHosts);
   const globalProxyDetailsParsed = JSON.parse(globalProxyDetails);
+  const randomProxyModeParsed = JSON.parse(randomProxyMode);
 
   const tabHost = new URL(url!).hostname;
   const { domain, subDomain, hasSubdomain } = checkDomain(tabHost);
@@ -34,6 +37,18 @@ export const updateTabProxyBadge = async (
     return;
   }
 
+  // 0. Check for random proxy mode
+  if (randomProxyModeParsed) {
+    const proxyDetails = domainProxyDetailsMap[domain];
+    if (proxyDetails) {
+      const proxyDNSMessage = proxyDetails.proxyDNS ? 'DNS proxied' : 'DNS not proxied';
+      const title = `${proxyDetails.city}, ${proxyDetails.country}\nServer: ${proxyDetails.server}\n${proxyDNSMessage}`;
+      browser.browserAction.setTitle({ tabId, title });
+      await setTabExtBadge(tab, true, false, proxyDetails.countryCode);
+      return;
+    }
+  }
+
   // 1. Check subdomain level
   if (hasSubdomain) {
     if (excludedHostsParsed.includes(subDomain)) {

src/helpers/socksProxy/addCountryCode.ts

@@ -1,17 +1,18 @@
 import { SocksProxy } from '@/helpers/socksProxy/socksProxies.types';
 
-export const addCountryCode = (data: SocksProxy[]) => {
-  return data.map((proxy) => {
-    const { location } = proxy;
+export const addCountryCodeToProxy = (proxy: SocksProxy) => {
+  const { location } = proxy;
+  const countryCode = location.code.substring(0, 2);
 
-    const countryCode = location.code.substring(0, 2);
+  return {
+    ...proxy,
+    location: {
+      ...location,
+      countryCode,
+    },
+  };
+};
 
-    return {
-      ...proxy,
-      location: {
-        ...location,
-        countryCode,
-      },
-    };
-  });
+export const addCountryCode = (data: SocksProxy[]) => {
+  return data.map(addCountryCodeToProxy);
 };

src/helpers/socksProxy/getRandomSessionProxy.ts

@@ -1,3 +1,5 @@
+import { addCountryCodeToProxy } from '@/helpers/socksProxy/addCountryCode';
+import { baseConfig, socksIp } from '@/helpers/socksProxy/constants';
 import { SocksProxy } from '@/helpers/socksProxy/socksProxies.types';
 import {
   ProxyInfo,
@@ -6,10 +8,9 @@ import {
   ProxyDetailsMap,
   ProxyInfoType,
 } from '@/helpers/socksProxy/socksProxy.types';
-import { baseConfig, socksIp } from './constants';
 
 const domainProxyInfoMap: ProxyInfoMap = {};
-const domainProxyDetailsMap: ProxyDetailsMap = {};
+export const domainProxyDetailsMap: ProxyDetailsMap = {};
 
 export async function getRandomSessionProxy(domain: string) {
   try {
@@ -36,11 +37,12 @@ export async function getRandomSessionProxy(domain: string) {
       domainProxyInfoMap[domain] = proxyInfo;
 
       // Optionally store user-facing details in ProxyDetailsMap
+      console.log({ randomProxy });
       const proxyDetails: ProxyDetails = {
         socksEnabled: true,
         server: randomProxy.hostname!.replace('socks5-', '')!.replace('.relays.mullvad.net', ''),
         country: randomProxy.location.country,
-        countryCode: randomProxy.location.countryCode,
+        countryCode: addCountryCodeToProxy(randomProxy).location.countryCode,
         city: randomProxy.location.city,
         proxyDNS: baseConfig.proxyDNS,
       };