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, {}),
   });
 }

src/server/config.js

@@ -6,6 +6,8 @@ export const settings = {
   appMode: process.env.APP_MODE === "client" ? "client" : "gateway",
   port: Number(process.env.PORT || 3456),
   proxyPort: Number(process.env.PROXY_PORT || 8080),
+  clientProxyPortStart: Number(process.env.CLIENT_PROXY_PORT_START || 8080),
+  clientProxyPortEnd: Number(process.env.CLIENT_PROXY_PORT_END || 8090),
   tproxyPort: Number(process.env.TPROXY_PORT || 7895),
   bindIp: process.env.PROXY_BIND_IP || "0.0.0.0",
   dataDir,

src/server/index.js

@@ -598,15 +598,21 @@ function publicState() {
   const state = readJson(settings.statePath, {});
   const customRules = readJson(settings.customRulesPath, []);
   const deviceProfiles = readDeviceProfiles();
+  const clientSettings = readClientSettings();
   const { subscriptionUrl, ...rest } = state;
   return {
     mode: settings.appMode,
     port: settings.port,
-    proxyPort: settings.proxyPort,
+    proxyPort:
+      settings.appMode === "client" ? clientSettings.proxyPort : settings.proxyPort,
+    clientProxyPortRange: {
+      start: settings.clientProxyPortStart,
+      end: settings.clientProxyPortEnd,
+    },
     proxyBindIp: settings.bindIp,
     tproxyPort: settings.appMode === "gateway" ? settings.tproxyPort : null,
     routingRuDirect: settings.routingRuDirect,
-    clientSettings: readClientSettings(),
+    clientSettings,
     configExists: fs.existsSync(settings.configPath),
     singboxRunning: Boolean(singboxProcess),
     singboxStartedAt,

src/server/singbox.js

@@ -264,6 +264,7 @@ export function buildGatewayConfig(
   const clientOutbound = clientSettings?.homeBypassEnabled
     ? "direct"
     : vpnOutbound.tag;
+  const mixedProxyPort = clientSettings?.proxyPort || settings.proxyPort;
   const proxyOnlyRules = [{ inbound: [MIXED_INBOUND], outbound: clientOutbound }];
   const inbounds = [
     ...(clientMode
@@ -282,7 +283,7 @@ export function buildGatewayConfig(
       type: "mixed",
       tag: "mixed-in",
       listen: settings.bindIp,
-      listen_port: settings.proxyPort,
+      listen_port: mixedProxyPort,
       sniff: true,
       set_system_proxy: false,
     },