Add enabled local routing rules and gateway version reporting

src/server/index.js

@@ -32,7 +32,7 @@ import {
 import { HarborError, normalizeHarborError } from '../shared/errors.js';
 import { normalizeRouteRules } from '../shared/routingRules.js';
 import { createJsonStore, createStateStore } from './services/stateStore.js';
-import { buildVersionInfo } from './version.js';
+import { buildGatewayVersionInfo, buildVersionInfo } from './version.js';
 
 const MAX_BODY_BYTES = 1_000_000;
 const SUBSCRIPTION_REFRESH_INTERVAL_MS = 15 * 60 * 1000;
@@ -90,7 +90,7 @@ let revision = normalizeStoredState(initialStoredState).revision;
 function updateStoredState(update) {
   return stateStore.update((stored) => {
     const current = normalizeStoredState(stored);
-    const next = normalizeStoredState(update(current));
+    const next = normalizeStoredState({ schemaVersion: current.schemaVersion, ...update(current) });
     revision = Math.max(revision, current.revision) + 1;
     next.revision = revision;
     return next;
@@ -505,11 +505,7 @@ async function handleApi(req, res) {
   if (req.method === 'GET' && req.url === '/api/version') {
     if (!remoteDataplane) return sendJson(res, 200, versionInfo);
     const runtime = await singboxRuntime.refresh();
-    return sendJson(res, 200, {
-      ...versionInfo,
-      components: { gatewayBackend: runtime.gatewayBackendVersion || null },
-      runtime: { singBox: runtime.singBoxVersion || null },
-    });
+    return sendJson(res, 200, buildGatewayVersionInfo(versionInfo, runtime));
   }
 
   if (req.method === 'GET' && req.url === '/api/shared-proxy') {

src/server/services/stateStore.js

@@ -2,8 +2,9 @@ import crypto from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
 import { normalizeStoredState } from '../../shared/contracts/state.js';
+import { INITIAL_ROUTE_RULES } from '../../shared/routingRules.js';
 
-export const STATE_SCHEMA_VERSION = 2;
+export const STATE_SCHEMA_VERSION = 3;
 
 const clone = (value) => structuredClone(value);
 const stamp = (value) => value.toISOString().replace(/[:.]/g, '-');
@@ -55,8 +56,11 @@ export function migrateStoredState(value) {
   if (version < 0 || version > STATE_SCHEMA_VERSION) {
     throw new Error(`Unsupported Harbor state schemaVersion: ${version}`);
   }
+  const routeRules = version < 3
+    ? [...INITIAL_ROUTE_RULES, ...(Array.isArray(stored.routeRules) ? stored.routeRules : [])]
+    : stored.routeRules;
   return {
-    ...normalizeStoredState(stored),
+    ...normalizeStoredState({ ...stored, routeRules }),
     schemaVersion: STATE_SCHEMA_VERSION,
   };
 }

src/server/singbox.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import { settings } from './config.js';
 import { HarborError } from '../shared/errors.js';
-import { BUILT_IN_DIRECT_RULES, normalizeRouteRules } from '../shared/routingRules.js';
+import { normalizeRouteRules } from '../shared/routingRules.js';
 import { atomicWriteFile, atomicWriteJson } from './services/stateStore.js';
 
 const PROXY_TYPES = new Set(['vless', 'vmess', 'trojan', 'shadowsocks', 'hysteria2']);
@@ -52,10 +52,9 @@ export function buildGatewayConfig(subscriptionConfig, selectedTag, {
       set_system_proxy: false,
     },
   ];
-  const directRules = [...BUILT_IN_DIRECT_RULES, ...normalizeRouteRules(routeRules)].map((rule) => ({
-    [rule.type]: [rule.value],
-    outbound: 'direct',
-  }));
+  const directRules = normalizeRouteRules(routeRules)
+    .filter((rule) => rule.enabled)
+    .map((rule) => ({ [rule.type]: [rule.value], outbound: 'direct' }));
   const rules = clientMode
     ? [...directRules, { inbound: [MIXED_INBOUND], outbound: outboundTag }]
     : [

src/server/version.js

@@ -18,3 +18,13 @@ export function buildVersionInfo(appMode, run = spawnSync) {
     runtime: { singBox: detectSingBoxVersion(run) },
   };
 }
+
+export function buildGatewayVersionInfo(controlInfo, dataplaneState) {
+  return {
+    ...controlInfo,
+    runtime: {
+      dataplaneVersion: dataplaneState?.gatewayBackendVersion || null,
+      singBox: dataplaneState?.singBoxVersion || null,
+    },
+  };
+}