Remove initial server health check and bump Harbor versions

src/server/index.js

@@ -43,6 +43,11 @@ import { buildGatewayVersionInfo, buildVersionInfo } from './version.js';
 const MAX_BODY_BYTES = 1_000_000;
 const SUBSCRIPTION_REFRESH_INTERVAL_MS = 15 * 60 * 1000;
 const GATEWAY_DISCOVERY_INTERVAL_MS = 5_000;
+const TERMINAL_SUBSCRIPTION_CODES = new Set([
+  'SUBSCRIPTION_EXPIRED',
+  'SUBSCRIPTION_DISABLED',
+  'SUBSCRIPTION_REJECTED',
+]);
 
 fs.mkdirSync(settings.dataDir, { recursive: true });
 
@@ -215,6 +220,16 @@ function buildActiveConfig(
 const stopSingbox = () => singboxRuntime.stop();
 const startSingbox = () => singboxRuntime.apply();
 
+function resetSavedSubscription({ stopRuntime = true } = {}) {
+  return serializeControl(async () => {
+    if (stopRuntime) await stopSingbox();
+    removeSingboxConfig();
+    subscriptionCacheStore.remove();
+    updateStoredState((state) => ({ routeRules: state.routeRules }));
+    gatewayAutoState = createGatewayAutoState();
+  });
+}
+
 async function publicState() {
   const runtime = await singboxRuntime.refresh();
   const state = normalizeStoredState(stateStore.read());
@@ -529,10 +544,17 @@ function refreshSavedSubscription() {
   if (subscriptionRefreshPromise) return subscriptionRefreshPromise;
 
   subscriptionRefreshPromise = (async () => {
-    const subscriptionUrl = stateStore.read().subscriptionUrl;
-    if (!subscriptionUrl) throw new HarborError('SUBSCRIPTION_INVALID');
-    const parsed = await fetchSubscription(subscriptionUrl);
-    return commitSubscription(subscriptionUrl, parsed);
+    try {
+      const subscriptionUrl = stateStore.read().subscriptionUrl;
+      if (!subscriptionUrl) throw new HarborError('SUBSCRIPTION_INVALID');
+      const parsed = await fetchSubscription(subscriptionUrl);
+      return await commitSubscription(subscriptionUrl, parsed);
+    } catch (error) {
+      if (TERMINAL_SUBSCRIPTION_CODES.has(error?.code)) {
+        await resetSavedSubscription();
+      }
+      throw error;
+    }
   })().finally(() => {
     subscriptionRefreshPromise = null;
   });
@@ -654,13 +676,7 @@ async function handleApi(req, res) {
   }
 
   if (req.method === 'DELETE' && req.url === '/api/subscription') {
-    await withOperation('subscription-forget', () => serializeControl(async () => {
-      await stopSingbox();
-      removeSingboxConfig();
-      subscriptionCacheStore.remove();
-      updateStoredState((state) => ({ routeRules: state.routeRules }));
-      gatewayAutoState = createGatewayAutoState();
-    }));
+    await withOperation('subscription-forget', () => resetSavedSubscription());
     return sendState(res);
   }
 
@@ -755,7 +771,13 @@ process.on('SIGINT', shutdown);
 await refreshGatewayAutoMode({ reconfigure: false })
   .catch((error) => console.warn(`[control] Gateway не определён: ${error.message}`));
 if (settings.appMode === 'client' || !fs.existsSync(settings.configPath)) {
-  writeCurrentConfig();
+  try {
+    writeCurrentConfig();
+  } catch (error) {
+    if (!String(error?.code || '').startsWith('SUBSCRIPTION_')) throw error;
+    console.warn(`[storage] сохранённая подписка отклонена: ${error.message}; возврат к первичной настройке`);
+    await resetSavedSubscription({ stopRuntime: false });
+  }
 }
 await startSingbox()
   .then(() => {