Introduce stable server IDs for subscription state

2026-07-12 11:59:22 +03:00
parent 005c7a101b
commit 267afc5c7e
16 changed files with 323 additions and 145 deletions
@@ -13,7 +13,7 @@ import { createOperationRegistry } from './state/operations.js';

 function App() {
  const previewReady = new URLSearchParams(window.location.search).has('preview-ready');
-  const [{ snapshot: state, pendingServerId: pendingTag, transport }, dispatch] = useReducer(
+  const [{ snapshot: state, pendingServerId, transport }, dispatch] = useReducer(
    harborReducer,
    initialHarborState,
  );
@@ -27,7 +27,7 @@ function App() {
    operationRegistry.current = createOperationRegistry(setOperations);
  }

-  function setPendingTag(serverId) {
+  function setPendingServerId(serverId) {
    dispatch({ type: 'select-server', serverId });
  }

@@ -144,19 +144,32 @@ function App() {
      <div className="app-body client-mode">
        <main className="app-main">
          <ClientOverviewPage
-            state={previewReady ? { ...state, mode: 'client', hasSubscription: true, subscriptionHost: 'harbor.example', selectedTag: 'Amsterdam', proxyPort: 8082 } : state}
+            state={previewReady ? {
+              ...state,
+              mode: 'client',
+              hasSubscription: true,
+              subscriptionHost: 'harbor.example',
+              selection: { desiredServerId: 'preview-amsterdam', appliedServerId: 'preview-amsterdam' },
+              proxyPort: 8082,
+            } : state}
            versionInfo={versionInfo}
            operations={operations}
            error={error}
            subscriptionUrl={subscriptionUrl}
            setSubscriptionUrl={setSubscriptionUrl}
-            servers={previewReady ? [{ tag: 'Amsterdam', server: '127.0.0.1', server_port: 443 }] : state.servers || []}
-            pendingTag={previewReady ? 'Amsterdam' : pendingTag}
-            setPendingTag={setPendingTag}
+            servers={previewReady ? [{
+              id: 'preview-amsterdam',
+              label: 'Amsterdam',
+              host: '127.0.0.1',
+              port: 443,
+              protocol: 'vless',
+            }] : state.servers || []}
+            pendingServerId={previewReady ? 'preview-amsterdam' : pendingServerId}
+            setPendingServerId={setPendingServerId}
            onFetchSubscription={fetchSubscription}
            onRefreshSubscription={refreshSubscription}
            onForgetSubscription={forgetSubscription}
-            onApply={(tag) => run('serverApply', () => api.apply(tag), 'connection')}
+            onApply={(serverId) => run('serverApply', () => api.apply(serverId), 'connection')}
            onRestart={() => run('connection', api.singbox.restart, 'connection')}
            onStop={() => run('connection', api.singbox.stop, 'connection')}
            onSetGatewayAuto={(enabled) => run('gatewayAuto', () => api.gatewayAuto.setEnabled(enabled), 'connection')}