after chaning the proxy config, refresh the proxy setting

bytevet · Oct 20, 2024 · 513aa39 · 513aa39
1 parent ba0b3b3
commit 513aa39
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/src/components/ProfileConfig.vue b/src/components/ProfileConfig.vue
@@ -27,6 +27,7 @@ import {
 import { FieldRule, Notification } from "@arco-design/web-vue";
 import { useRouter } from "vue-router";
 import { Host, PacScript } from "@/adapters";
+import { refreshProxy } from "@/services/proxy";
 
 const router = useRouter();
 const props = defineProps<{
@@ -131,7 +132,6 @@ const proxyServerFieldRule = (
     type: "object",
     required: required,
     validator(value, callback) {
-      console.log(value);
       if (value == undefined || value.scheme == "direct") {
         return;
       }
@@ -182,13 +182,17 @@ const saveProfileEvent = async () => {
       content: Host.getMessage("config_feedback_saved"),
     });
 
+    // need to overwrite the current proxy settings
+    await refreshProxy();
+
     if (newProfileMode) {
       router.replace({
         name: "profile.custom",
         params: { id: profileConfig.profileID },
       });
       return;
     }
+
     editing.value = false;
   } catch (e: any) {
     Notification.error({

diff --git a/src/services/proxy/index.ts b/src/services/proxy/index.ts
@@ -67,6 +67,27 @@ export async function setProxy(val: ProxyProfile) {
   await Host.set<ProxyProfile>(keyActiveProfile, val);
 }
 
+/**
+ * Refresh the current proxy setting. This is useful when the proxy setting is changed by user.
+ * @returns
+ */
+export async function refreshProxy() {
+  const current = await getCurrentProxySetting();
+
+  // if it's not controlled by this extension, then do nothing
+  if (!current.activeProfile) {
+    return;
+  }
+
+  // if it's preset profiles, then do nothing
+  if (current.activeProfile.proxyType in ["system", "direct"]) {
+    return;
+  }
+
+  const profile = new ProfileConverter(current.activeProfile, getProfile);
+  await Host.setProxy(await profile.toProxyConfig());
+}
+
 export async function previewAutoSwitchPac(val: ProfileAuthSwitch) {
   const profile = new ProfileConverter(val, getProfile);
   return await profile.toPAC();

diff --git a/src/services/proxy/profile2config.ts b/src/services/proxy/profile2config.ts
@@ -63,7 +63,6 @@ export class ProfileConverter {
    * @returns
    */
   async toClosure() {
-    console.log("toClosure", this.profile.profileID);
     const stmts = await this.genStatements();
     stmts.push(
       PACScriptHelper.newReturnStatement(