feat: improve macos client proxy setup

src/server/clientSettings.js

@@ -6,6 +6,24 @@ const DEFAULT_CLIENT_SETTINGS = {
   homeBypassEnabled: false,
 };
 
+function normalizeProxyPort(value, fallback = settings.proxyPort) {
+  const parsed = Number.parseInt(value, 10);
+  const min = Number.isInteger(settings.clientProxyPortStart)
+    ? settings.clientProxyPortStart
+    : settings.proxyPort;
+  const max = Number.isInteger(settings.clientProxyPortEnd)
+    ? settings.clientProxyPortEnd
+    : min;
+  const fallbackPort =
+    Number.isInteger(fallback) && fallback >= min && fallback <= max
+      ? fallback
+      : min;
+  if (!Number.isInteger(parsed) || parsed < min || parsed > max) {
+    return fallbackPort;
+  }
+  return parsed;
+}
+
 function readJson(filePath, fallback) {
   try {
     if (!fs.existsSync(filePath)) return fallback;
@@ -23,12 +41,14 @@ function writeJson(filePath, value) {
 export function normalizeClientSettings(input = {}) {
   return {
     homeBypassEnabled: Boolean(input.homeBypassEnabled),
+    proxyPort: normalizeProxyPort(input.proxyPort),
   };
 }
 
 export function readClientSettings() {
   return normalizeClientSettings({
     ...DEFAULT_CLIENT_SETTINGS,
+    proxyPort: settings.proxyPort,
     ...readJson(settings.clientSettingsPath, {}),
   });
 }