Simplify client proxy port handling

test/server/client-config.test.js

@@ -0,0 +1,45 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+async function withEnv(patch, fn) {
+  const previous = {};
+  for (const key of Object.keys(patch)) {
+    previous[key] = process.env[key];
+    if (patch[key] === undefined) {
+      delete process.env[key];
+    } else {
+      process.env[key] = patch[key];
+    }
+  }
+
+  try {
+    return await fn();
+  } finally {
+    for (const [key, value] of Object.entries(previous)) {
+      if (value === undefined) {
+        delete process.env[key];
+      } else {
+        process.env[key] = value;
+      }
+    }
+  }
+}
+
+test("client proxy range defaults to the single configured proxy port", async () => {
+  await withEnv(
+    {
+      PROXY_PORT: "8082",
+      CLIENT_PROXY_PORT_START: "8082",
+      CLIENT_PROXY_PORT_END: undefined,
+    },
+    async () => {
+      const { settings } = await import(
+        `../../src/server/config.js?single-proxy-port=${Date.now()}`
+      );
+
+      assert.equal(settings.proxyPort, 8082);
+      assert.equal(settings.clientProxyPortStart, 8082);
+      assert.equal(settings.clientProxyPortEnd, 8082);
+    },
+  );
+});

test/server/singbox-client-mode.test.js

@@ -44,6 +44,7 @@ test("client mode routes mixed proxy fallback to the selected VPN", () => {
   const config = buildGatewayConfig(subscriptionConfig, "test-vpn");
 
   assert.deepEqual(config.route.rule_set, []);
+  assert.equal(config.route.auto_detect_interface, undefined);
   assert.deepEqual(config.route.rules, [
     { inbound: ["mixed-in"], outbound: "test-vpn" },
   ]);
@@ -82,7 +83,7 @@ test("client home bypass can build direct proxy without local VPN", () => {
   ]);
 });
 
-test("client mode uses selected proxy port from client settings", () => {
+test("client mode ignores saved proxy port outside the published single port", () => {
   fs.rmSync(clientSettingsPath, { force: true });
   fs.writeFileSync(
     clientSettingsPath,
@@ -91,7 +92,7 @@ test("client mode uses selected proxy port from client settings", () => {
 
   const config = buildGatewayConfig(subscriptionConfig, "test-vpn");
 
-  assert.equal(config.inbounds[0].listen_port, 8085);
+  assert.equal(config.inbounds[0].listen_port, 8080);
   assert.deepEqual(config.route.rules, [
     { inbound: ["mixed-in"], outbound: "test-vpn" },
   ]);