v1.2.3: Support Auto Switch Authentication

package.json

@@ -17,33 +17,33 @@
   },
   "dependencies": {
     "@highlightjs/vue-plugin": "^2.1.0",
-    "@sentry/vue": "^8.51.0",
-    "@vueuse/core": "^12.4.0",
-    "acorn": "^8.14.0",
+    "@sentry/vue": "^8.55.0",
+    "@vueuse/core": "^12.8.2",
+    "acorn": "^8.14.1",
     "escodegen": "^2.1.0",
     "espree": "^10.3.0",
     "io-ts": "^2.2.22",
     "ipaddr.js": "^2.2.0",
-    "vue": "^3.5.13",
-    "vue-router": "^4.5.0"
+    "vue": "^3.5.16",
+    "vue-router": "^4.5.1"
   },
   "devDependencies": {
-    "@arco-design/web-vue": "^2.56.3",
-    "@sentry/vite-plugin": "^3.0.0",
+    "@arco-design/web-vue": "^2.57.0",
+    "@sentry/vite-plugin": "^3.5.0",
     "@types/chrome": "^0.0.266",
     "@types/escodegen": "^0.0.10",
     "@types/espree": "^10.1.0",
     "@types/firefox-webext-browser": "^120.0.4",
     "@types/node": "^22.10.6",
-    "@vitejs/plugin-vue": "^5.2.1",
-    "@vitest/coverage-v8": "^3.0.6",
+    "@vitejs/plugin-vue": "^5.2.4",
+    "@vitest/coverage-v8": "^3.2.2",
     "rollup-plugin-visualizer": "^5.14.0",
     "sass-embedded": "^1.83.3",
-    "typescript": "^5.7.3",
+    "typescript": "^5.8.3",
     "unplugin-auto-import": "^19.0.0",
     "unplugin-vue-components": "^28.0.0",
-    "vite": "^6.1.0",
-    "vitest": "^3.0.6",
-    "vue-tsc": "^2.2.2"
+    "vite": "^6.3.5",
+    "vitest": "^3.2.2",
+    "vue-tsc": "^2.2.10"
   }
 }

src/components/ProfileConfig.vue

@@ -17,7 +17,7 @@ import AutoSwitchInput from "./configs/AutoSwitchInput.vue";
 import AutoSwitchPacPreview from "./configs/AutoSwitchPacPreview.vue";
 import ScriptInput from "./configs/ScriptInput.vue";
 import {
-  ProfileAuthSwitch,
+  ProfileAutoSwitch,
   ProfileSimple,
   ProxyServer,
   SystemProfile,
@@ -38,7 +38,7 @@ const chooseRandomColor = () => {
   return colors[idx];
 };
 
-type ConfigState = (ProfileSimple | ProfileAuthSwitch) & {
+type ConfigState = (ProfileSimple | ProfileAutoSwitch) & {
   [key: string]: any;
 };
 
@@ -132,7 +132,10 @@ const proxyServerFieldRule = (
   return {
     type: "object",
     required: required,
-    validator(value, callback) {
+    validator(
+      value: ProxyServer | undefined,
+      callback: (message?: string) => void
+    ) {
       if (value == undefined || value.scheme == "direct") {
         return;
       }
@@ -151,7 +154,10 @@ const pacScriptFieldRule = (
   return {
     type: "object",
     required: required,
-    validator(value, callback) {
+    validator(
+      value: PacScript | undefined,
+      callback: (message?: string) => void
+    ) {
       if (value == undefined) {
         return;
       }
@@ -421,7 +427,7 @@ watchEffect(async () => {
 
           <AutoSwitchPacPreview
             v-if="profileConfig.proxyType == 'auto'"
-            :profile="(profileConfig as ProfileAuthSwitch)"
+            :profile="(profileConfig as ProfileAutoSwitch)"
           />
         </a-space>
       </template>

src/components/configs/AutoSwitchInput.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { IconCopy, IconPlus, IconDelete } from "@arco-design/web-vue/es/icon";
-import { FieldRule } from "@arco-design/web-vue/es/form";
+import type { FieldRule } from "@arco-design/web-vue";
 
 import { Host } from "@/adapters";
 import {
@@ -101,7 +101,7 @@ const getConditionInputRule = (type: AutoSwitchType): FieldRule<string> => {
 
     case "url":
       return {
-        validator: async (value, cb) => {
+        validator: async (value: string, cb: (message?: string) => void) => {
           console.log("test");
           let u;
           try {
@@ -134,7 +134,7 @@ const getConditionInputRule = (type: AutoSwitchType): FieldRule<string> => {
     case "cidr":
       return {
         required: true,
-        validator: (value, cb) => {
+        validator: (value: string, cb: (message?: string) => void) => {
           if (!value || !isValidCIDR(value)) {
             cb(
               Host.getMessage("config_section_auto_switch_type_cidr_malformed")

src/components/configs/AutoSwitchPacPreview.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { IconCopy } from "@arco-design/web-vue/es/icon";
-import { ProfileAuthSwitch } from "@/services/profile";
+import { ProfileAutoSwitch } from "@/services/profile";
 import { useClipboard, watchDebounced } from "@vueuse/core";
 import { ref } from "vue";
 import { previewAutoSwitchPac } from "@/services/proxy";
@@ -9,7 +9,7 @@ import hljsVuePlugin from "@highlightjs/vue-plugin";
 const highlightjs = hljsVuePlugin.component;
 
 const { profile } = defineProps<{
-  profile: ProfileAuthSwitch;
+  profile: ProfileAutoSwitch;
 }>();
 
 const pacScript = ref<string>("");

src/services/profile.ts

@@ -68,11 +68,11 @@ export type ProfilePreset = ProxyConfigMeta & {
   proxyType: "system" | "direct";
 };
 
-export type ProfileAuthSwitch = ProxyConfigMeta & {
+export type ProfileAutoSwitch = ProxyConfigMeta & {
   proxyType: "auto";
 } & ProxyConfigAutoSwitch;
 
-export type ProxyProfile = ProfileSimple | ProfilePreset | ProfileAuthSwitch;
+export type ProxyProfile = ProfileSimple | ProfilePreset | ProfileAutoSwitch;
 
 export const SystemProfile: Record<string, ProxyProfile> = {
   DIRECT: {

src/services/proxy/auth.ts

@@ -0,0 +1,112 @@
+import type { ProxyAuthInfo, ProxyProfile } from "../profile";
+import type { ProfileLoader } from "./profile2config";
+
+export class ProfileAuthProvider {
+  private searchedProfiles: Set<string> = new Set();
+
+  constructor(
+    private profile: ProxyProfile,
+    private profileLoader?: ProfileLoader
+  ) {}
+
+  async getAuthInfos(host: string, port: number): Promise<ProxyAuthInfo[]> {
+    this.searchedProfiles.clear();
+    return this.getAuthInfosForProfile(host, port, this.profile);
+  }
+
+  private async getAuthInfosForProfile(
+    host: string,
+    port: number,
+    profile: ProxyProfile
+  ): Promise<ProxyAuthInfo[]> {
+    // avoid infinite loop
+    if (this.searchedProfiles.has(profile.profileID)) {
+      return [];
+    }
+    this.searchedProfiles.add(profile.profileID);
+
+    switch (profile.proxyType) {
+      case "proxy":
+        return this.getAuthInfosForProxyProfile(host, port, profile);
+      case "auto":
+        return this.getAuthInfosForAutoProfile(host, port, profile);
+
+      default:
+        return [];
+    }
+  }
+
+  private async getAuthInfosForProxyProfile(
+    host: string,
+    port: number,
+    profile: ProxyProfile & { proxyType: "proxy" }
+  ): Promise<ProxyAuthInfo[]> {
+    const ret: ProxyAuthInfo[] = [];
+    const auths = [
+      profile.proxyRules.default,
+      profile.proxyRules.ftp,
+      profile.proxyRules.http,
+      profile.proxyRules.https,
+    ];
+
+    // check if there's any matching host and port
+    auths.map((item) => {
+      if (!item) return;
+
+      if (
+        item.host == host &&
+        (item.port === undefined || item.port == port) &&
+        item.auth
+      ) {
+        ret.push(item.auth);
+      }
+    });
+
+    return ret;
+  }
+
+  private async getAuthInfosForAutoProfile(
+    host: string,
+    port: number,
+    profile: ProxyProfile & { proxyType: "auto" }
+  ): Promise<ProxyAuthInfo[]> {
+    const ret: ProxyAuthInfo[] = [];
+
+    for (const rule of profile.rules) {
+      if (rule.type == "disabled") {
+        continue;
+      }
+
+      const profile = await this.loadProfile(rule.profileID);
+      if (!profile) {
+        continue;
+      }
+
+      const authInfos = await this.getAuthInfosForProfile(host, port, profile);
+      authInfos && ret.push(...authInfos);
+    }
+
+    // don't forget the default profile
+    const defaultProfile = await this.loadProfile(profile.defaultProfileID);
+    if (defaultProfile) {
+      const authInfos = await this.getAuthInfosForProfile(
+        host,
+        port,
+        defaultProfile
+      );
+      authInfos && ret.push(...authInfos);
+    }
+
+    return ret;
+  }
+
+  private async loadProfile(
+    profileID: string
+  ): Promise<ProxyProfile | undefined> {
+    if (!this.profileLoader) {
+      return;
+    }
+
+    return await this.profileLoader(profileID);
+  }
+}

src/services/proxy/index.ts

@@ -4,10 +4,11 @@ import {
   ProxyAuthInfo,
   SystemProfile,
   getProfile,
-  ProfileAuthSwitch,
+  ProfileAutoSwitch,
 } from "../profile";
 import { ProxySettingResultDetails } from "@/adapters";
 import { ProfileConverter } from "./profile2config";
+import { ProfileAuthProvider } from "./auth";
 
 export type ProxySetting = {
   activeProfile?: ProxyProfile;
@@ -80,7 +81,7 @@ export async function refreshProxy() {
   await Host.setProxy(await profile.toProxyConfig());
 }
 
-export async function previewAutoSwitchPac(val: ProfileAuthSwitch) {
+export async function previewAutoSwitchPac(val: ProfileAutoSwitch) {
   const profile = new ProfileConverter(val, getProfile);
   return await profile.toPAC();
 }
@@ -90,30 +91,10 @@ export async function getAuthInfos(
   port: number
 ): Promise<ProxyAuthInfo[]> {
   const profile = await Host.get<ProxyProfile>(keyActiveProfile);
-  if (!profile || profile.proxyType !== "proxy") {
+  if (!profile) {
     return [];
   }
 
-  const ret: ProxyAuthInfo[] = [];
-  const auths = [
-    profile.proxyRules.default,
-    profile.proxyRules.ftp,
-    profile.proxyRules.http,
-    profile.proxyRules.https,
-  ];
-
-  // check if there's any matching host and port
-  auths.map((item) => {
-    if (!item) return;
-
-    if (
-      item.host == host &&
-      (item.port === undefined || item.port == port) &&
-      item.auth
-    ) {
-      ret.push(item.auth);
-    }
-  });
-
-  return ret;
+  const authProvider = new ProfileAuthProvider(profile, getProfile);
+  return await authProvider.getAuthInfos(host, port);
 }

src/services/proxy/profile2config.ts

@@ -2,7 +2,7 @@ import { generate as generateJS } from "escodegen";
 import type { Program, Statement } from "acorn";
 import {
   AutoSwitchRule,
-  ProfileAuthSwitch,
+  ProfileAutoSwitch,
   ProxyProfile,
   ProxyServer,
 } from "../profile";
@@ -14,7 +14,9 @@ import {
 } from "./scriptHelper";
 import { ProxyConfig } from "@/adapters";
 
-type ProfileLoader = (profileID: string) => Promise<ProxyProfile | undefined>;
+export type ProfileLoader = (
+  profileID: string
+) => Promise<ProxyProfile | undefined>;
 
 export class ProfileConverter {
   constructor(
@@ -44,6 +46,10 @@ export class ProfileConverter {
     }
   }
 
+  /**
+   * Convert the `auto` profile to a PAC script
+   * @returns the PAC script
+   */
   async toPAC() {
     const astProgram: Program = {
       type: "Program",
@@ -299,7 +305,7 @@ export class ProfileConverter {
     );
   }
 
-  private async prepareAutoProfilePrecedence(profile: ProfileAuthSwitch) {
+  private async prepareAutoProfilePrecedence(profile: ProfileAutoSwitch) {
     const loadedProfiles = new Set<string>();
     const stmt: Statement[] = [
       // var profiles = profiles || {};