Refactor VPN proxy components and update related behavior

src/server/features/routing/routeRulesService.ts

@@ -1,6 +1,11 @@
 import { isDeepStrictEqual } from 'node:util';
 
-import type { RouteRule, StoredState } from '../../../shared/contracts/state.js';
+import {
+  appliedProfile,
+  desiredProfile,
+  type RouteRule,
+  type StoredState,
+} from '../../../shared/contracts/state.js';
 import { HarborError } from '../../../shared/errors.js';
 import { normalizeRouteRules } from '../../../shared/routingRules.js';
 import type { RuntimeCommandResult } from '../connection/index.js';
@@ -11,7 +16,7 @@ interface RouteRulesDependencies {
     read(): StoredState;
     update(mutator: (state: StoredState) => Record<string, unknown>): StoredState;
   };
-  subscription: { readConfig(): unknown | null };
+  subscription: { readConfig(profileId: string): unknown | null };
   config: {
     build(subscriptionConfig: unknown, selectedServerId: string, routeRules: RouteRule[]): unknown;
     read(): string | null;
@@ -30,8 +35,17 @@ interface RouteRulesDependencies {
 
 export function createRouteRulesService(dependencies: RouteRulesDependencies) {
   const applyRules = async (previousState: StoredState, routeRules: RouteRule[]) => {
-    const subscriptionConfig = dependencies.subscription.readConfig();
-    if (!previousState.selectedServerId || !subscriptionConfig) {
+    const wasRunning = await dependencies.runtime.isRunning();
+    const targetProfile = wasRunning
+      ? appliedProfile(previousState)
+      : desiredProfile(previousState);
+    const targetServerId = wasRunning
+      ? previousState.appliedServerId
+      : targetProfile?.desiredServerId || '';
+    const subscriptionConfig = targetProfile
+      ? dependencies.subscription.readConfig(targetProfile.id)
+      : null;
+    if (!targetServerId || !subscriptionConfig) {
       let stateCommitStarted = false;
       try {
         stateCommitStarted = true;
@@ -50,11 +64,10 @@ export function createRouteRulesService(dependencies: RouteRulesDependencies) {
 
     const candidateConfig = dependencies.config.build(
       subscriptionConfig,
-      previousState.selectedServerId,
+      targetServerId,
       routeRules,
     );
     const previousConfig = dependencies.config.read();
-    const wasRunning = await dependencies.runtime.isRunning();
     let configMutationStarted = false;
     let runtimeMutationStarted = false;
     let stateCommitStarted = false;