From cc951e634229b23918df356027078a21166aeaea Mon Sep 17 00:00:00 2001 From: animesha3 <42974910+animesha3@users.noreply.github.com> Date: Sun, 8 Nov 2026 17:03:03 +0200 Subject: [PATCH] feat(sub): optionally replace configs rejected by HWID limits --- docs/content/docs/en/config/subscription.mdx | 16 ++ docs/content/docs/ru/config/subscription.mdx | 18 ++ .../images/subscription-hwid-rejection.png | Bin 0 -> 41079 bytes docs/public/openapi.json | 8 + frontend/public/openapi.json | 8 + frontend/src/generated/examples.ts | 2 + frontend/src/generated/schemas.ts | 8 + frontend/src/generated/types.ts | 2 + frontend/src/generated/zod.ts | 2 + frontend/src/models/setting.ts | 1 + .../pages/settings/SubscriptionGeneralTab.tsx | 11 ++ frontend/src/schemas/setting.ts | 1 + internal/sub/controller.go | 24 ++- internal/sub/hwid_controller_test.go | 161 +++++++++++++++++- internal/sub/hwid_rejection.go | 68 ++++++++ internal/web/entity/entity.go | 1 + internal/web/service/setting.go | 5 + internal/web/translation/ar-EG.json | 2 + internal/web/translation/en-US.json | 2 + internal/web/translation/es-ES.json | 2 + internal/web/translation/fa-IR.json | 2 + internal/web/translation/id-ID.json | 2 + internal/web/translation/ja-JP.json | 2 + internal/web/translation/pt-BR.json | 2 + internal/web/translation/ru-RU.json | 2 + internal/web/translation/sk-SK.json | 2 + internal/web/translation/tr-TR.json | 2 + internal/web/translation/uk-UA.json | 2 + internal/web/translation/vi-VN.json | 2 + internal/web/translation/zh-CN.json | 2 + internal/web/translation/zh-TW.json | 2 + 31 files changed, 351 insertions(+), 13 deletions(-) create mode 100644 docs/public/images/subscription-hwid-rejection.png create mode 100644 internal/sub/hwid_rejection.go diff --git a/docs/content/docs/en/config/subscription.mdx b/docs/content/docs/en/config/subscription.mdx index f22d74653..306d9e8c5 100644 --- a/docs/content/docs/en/config/subscription.mdx +++ b/docs/content/docs/en/config/subscription.mdx @@ -38,6 +38,22 @@ URLs and preview both bodies here: +## Replacing nodes after an HWID rejection + +In **Panel settings → Subscription**, enable **Replace configs when HWID is +rejected** (`subHwidRejectWithConfig`, off by default). When HWID is missing or +the device limit is reached, the server returns HTTP 200 with a non-working +node instead of 404. This supports raw/base64 links, Xray JSON, Clash/Mihomo, +legacy Clash, and automatic format detection. Compatible apps can accept the +update and replace previously downloaded nodes. With this option off, the +existing 404 response and HWID error headers are preserved. + +Replacement requires the app to refresh and accept the subscription. It does +not revoke copied credentials or immediately terminate existing connections. +Deleting a device only frees its slot: it can register again if a slot is +available. To reject it after deletion, the remaining devices must fill the +configured limit. + ## Output formats The **format is chosen by path**, each with its own enable toggle: diff --git a/docs/content/docs/ru/config/subscription.mdx b/docs/content/docs/ru/config/subscription.mdx index e0c2fbb36..6fdb71c74 100644 --- a/docs/content/docs/ru/config/subscription.mdx +++ b/docs/content/docs/ru/config/subscription.mdx @@ -9,6 +9,24 @@ icon: Rss входящего соединения клиенты подхватывают изменения автоматически. Сервер подписок работает как **отдельный** сервер от панели. +## Замена узлов при отказе по HWID + +В разделе **Настройки панели → Подписка** включите **Заменять конфиги при +отказе по HWID** (`subHwidRejectWithConfig`, по умолчанию выключено). +При отсутствии HWID или достижении лимита устройств сервер вернёт HTTP 200 +с нерабочим узлом вместо 404. Поддерживаются обычные и base64-ссылки, Xray JSON, +Clash/Mihomo, старый Clash и автоматическое определение формата. Совместимое +приложение сможет принять обновление и заменить ранее загруженные узлы. +При выключенной настройке сохраняются ответ 404 и заголовки ошибки HWID. + +![Настройка замены конфигов при отказе по HWID](/images/subscription-hwid-rejection.png) + +Замена происходит только после обновления подписки приложением. Она не +отзывает скопированные ключи и не разрывает существующие соединения. +Удаление устройства освобождает место: если лимит позволяет, устройство +сможет зарегистрироваться снова. Чтобы оно получило отказ после удаления, +оставшиеся устройства должны заполнять установленный лимит. + ## Включение и настройка Сервер подписок **включён по умолчанию** (`subEnable`). Настройте его в diff --git a/docs/public/images/subscription-hwid-rejection.png b/docs/public/images/subscription-hwid-rejection.png new file mode 100644 index 0000000000000000000000000000000000000000..6007b971ea0b7aaaa009a9b424bc6f0912d510c8 GIT binary patch literal 41079 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 = { "subHappTunType": "", "subHideSettings": false, "subHostSortMode": "inbound-first", + "subHwidRejectWithConfig": false, "subIncyAnnounceUrl": "", "subIncyAppAutoDetect": false, "subIncyBannerBgColor": "", @@ -291,6 +292,7 @@ export const EXAMPLES: Record = { "subHappTunType": "", "subHideSettings": false, "subHostSortMode": "inbound-first", + "subHwidRejectWithConfig": false, "subIncyAnnounceUrl": "", "subIncyAppAutoDetect": false, "subIncyBannerBgColor": "", diff --git a/frontend/src/generated/schemas.ts b/frontend/src/generated/schemas.ts index 479ec9fdb..e659059a5 100644 --- a/frontend/src/generated/schemas.ts +++ b/frontend/src/generated/schemas.ts @@ -328,6 +328,9 @@ export const SCHEMAS: Record = { "example": "inbound-first", "type": "string" }, + "subHwidRejectWithConfig": { + "type": "boolean" + }, "subIncyAnnounceUrl": { "type": "string" }, @@ -684,6 +687,7 @@ export const SCHEMAS: Record = { "subHappTunType", "subHideSettings", "subHostSortMode", + "subHwidRejectWithConfig", "subIncyAnnounceUrl", "subIncyAppAutoDetect", "subIncyBannerBgColor", @@ -1119,6 +1123,9 @@ export const SCHEMAS: Record = { "example": "inbound-first", "type": "string" }, + "subHwidRejectWithConfig": { + "type": "boolean" + }, "subIncyAnnounceUrl": { "type": "string" }, @@ -1483,6 +1490,7 @@ export const SCHEMAS: Record = { "subHappTunType", "subHideSettings", "subHostSortMode", + "subHwidRejectWithConfig", "subIncyAnnounceUrl", "subIncyAppAutoDetect", "subIncyBannerBgColor", diff --git a/frontend/src/generated/types.ts b/frontend/src/generated/types.ts index c9d50cfc6..f010d9865 100644 --- a/frontend/src/generated/types.ts +++ b/frontend/src/generated/types.ts @@ -110,6 +110,7 @@ export interface AllSetting { subHappTunType: string; subHideSettings: boolean; subHostSortMode: string; + subHwidRejectWithConfig: boolean; subIncyAnnounceUrl: string; subIncyAppAutoDetect: boolean; subIncyBannerBgColor: string; @@ -301,6 +302,7 @@ export interface AllSettingView { subHappTunType: string; subHideSettings: boolean; subHostSortMode: string; + subHwidRejectWithConfig: boolean; subIncyAnnounceUrl: string; subIncyAppAutoDetect: boolean; subIncyBannerBgColor: string; diff --git a/frontend/src/generated/zod.ts b/frontend/src/generated/zod.ts index d86fa6391..ccb84c6fa 100644 --- a/frontend/src/generated/zod.ts +++ b/frontend/src/generated/zod.ts @@ -128,6 +128,7 @@ export const AllSettingSchema = z.object({ subHappTunType: z.string(), subHideSettings: z.boolean(), subHostSortMode: z.string(), + subHwidRejectWithConfig: z.boolean(), subIncyAnnounceUrl: z.string(), subIncyAppAutoDetect: z.boolean(), subIncyBannerBgColor: z.string(), @@ -320,6 +321,7 @@ export const AllSettingViewSchema = z.object({ subHappTunType: z.string(), subHideSettings: z.boolean(), subHostSortMode: z.string(), + subHwidRejectWithConfig: z.boolean(), subIncyAnnounceUrl: z.string(), subIncyAppAutoDetect: z.boolean(), subIncyBannerBgColor: z.string(), diff --git a/frontend/src/models/setting.ts b/frontend/src/models/setting.ts index 1dcf9abaf..2b356f75a 100644 --- a/frontend/src/models/setting.ts +++ b/frontend/src/models/setting.ts @@ -20,6 +20,7 @@ export class AllSetting { remarkTemplate = '{{INBOUND}}-{{EMAIL}}|📊{{TRAFFIC_LEFT}}|⏳{{DAYS_LEFT}}D'; subShowIdentityOnAllLinks = false; subInfoNodeEnable = false; + subHwidRejectWithConfig = false; subHostSortMode: SubHostSortMode = 'inbound-first'; subCalendarExpireInclusive = false; subExpiredTemplate = '⛔ {{EMAIL}} | Expired: {{EXPIRE_DATE}}'; diff --git a/frontend/src/pages/settings/SubscriptionGeneralTab.tsx b/frontend/src/pages/settings/SubscriptionGeneralTab.tsx index 94a1fd12b..9b85e95fd 100644 --- a/frontend/src/pages/settings/SubscriptionGeneralTab.tsx +++ b/frontend/src/pages/settings/SubscriptionGeneralTab.tsx @@ -95,6 +95,17 @@ export default function SubscriptionGeneralTab({ } /> )} + + updateSetting({ subHwidRejectWithConfig: v })} + /> +