[pull] main from GUI-for-Cores:main

frontend/src/lang/locale/en.ts

@@ -398,12 +398,10 @@ export default {
     proxyPrefix: 'Proxy Prefix',
     updating: 'Updating',
     useragent: 'User-Agent',
-    resetUserAgent: 'Reset User-Agent',
     inSecure: 'Skip TLS Verification',
-    healthCheck: {
-      name: 'Health Check',
-      interval: 'interval(s)',
-      url: 'url',
+    header: {
+      request: 'Request Header',
+      response: 'Response Header',
     },
   },
   subscribes: {

frontend/src/lang/locale/fa.ts

@@ -398,12 +398,10 @@ export default {
     proxyPrefix: 'پیشوند پروکسی',
     updating: 'در حال به‌روزرسانی',
     useragent: 'User-Agent',
-    resetUserAgent: 'بازنشانی User-Agent',
     inSecure: 'رد کردن تأیید هویت TLS',
-    healthCheck: {
-      name: 'بررسی سلامت',
-      interval: 'فاصله (ثانیه)',
-      url: 'URL',
+    header: {
+      request: 'هدر درخواست',
+      response: 'هدر پاسخ',
     },
   },
   subscribes: {

frontend/src/lang/locale/ru.ts

@@ -398,12 +398,10 @@ export default {
     proxyPrefix: 'Префикс прокси-сервера',
     updating: 'Загрузка',
     useragent: 'Пользовательский User-Agent',
-    resetUserAgent: 'Сбросить User-Agent',
     inSecure: 'Пропустить проверку TLS',
-    healthCheck: {
-      name: 'Проверка работоспособности',
-      interval: 'Интервал (сек.)',
-      url: 'URL-ссылка',
+    header: {
+      request: 'Заголовок запроса',
+      response: 'Заголовок ответа',
     },
   },
   subscribes: {

frontend/src/lang/locale/zh.ts

@@ -397,12 +397,10 @@ export default {
     proxyPrefix: '代理前缀',
     updating: '更新中',
     useragent: '用户代理',
-    resetUserAgent: '重置用户代理',
     inSecure: '跳过证书验证',
-    healthCheck: {
-      name: '健康检查',
-      interval: '时间间隔(秒)',
-      url: '测试链接',
+    header: {
+      request: '请求头',
+      response: '响应头',
     },
   },
   subscribes: {

frontend/src/stores/subscribes.ts

@@ -11,7 +11,6 @@ import {
   debounce,
   sampleID,
   isValidSubJson,
-  getUserAgent,
   isValidSubYAML,
   isValidBase64,
   ignoredError,
@@ -34,6 +33,20 @@ export const useSubscribesStore = defineStore('subscribes', () => {
         sub.script = DefaultSubscribeScript
         needSync = true
       }
+      if (!sub.header) {
+        sub.header = {
+          request: {},
+          response: {},
+        }
+        // @ts-expect-error(Deprecated `userAgent`)
+        if (sub.userAgent) {
+          // @ts-expect-error(Deprecated `userAgent`)
+          sub.header.request['User-Agent'] = sub.userAgent
+          // @ts-expect-error(Deprecated `userAgent`)
+          delete sub.userAgent
+        }
+        needSync = true
+      }
     })
 
     if (needSync) {
@@ -77,7 +90,10 @@ export const useSubscribesStore = defineStore('subscribes', () => {
       proxyPrefix: '',
       disabled: false,
       inSecure: false,
-      userAgent: '',
+      header: {
+        request: {},
+        response: {},
+      },
       proxies: [],
       script: DefaultSubscribeScript,
     })
@@ -123,14 +139,10 @@ export const useSubscribesStore = defineStore('subscribes', () => {
     }
 
     if (s.type === 'Http') {
-      const { headers: h, body: b } = await HttpGet(
-        s.url,
-        {
-          'User-Agent': s.userAgent || getUserAgent(),
-        },
-        { Insecure: s.inSecure },
-      )
-
+      const { headers: h, body: b } = await HttpGet(s.url, s.header.request, {
+        Insecure: s.inSecure,
+      })
+      Object.assign(h, s.header.response)
       h['Subscription-Userinfo'] && (userInfo = h['Subscription-Userinfo'])
       if (typeof b !== 'string') {
         body = JSON.stringify(b)

frontend/src/types/app.d.ts

@@ -1,4 +1,4 @@
-import { h, onActivated, onMounted, onUnmounted, ref, type VNode } from 'vue'
+import { h, ref, type VNode } from 'vue'
 
 import type {
   Lang,
@@ -163,7 +163,10 @@ export interface Subscription {
   disabled: boolean
   inSecure: boolean
   proxies: { id: string; tag: string; type: string }[]
-  userAgent: string
+  header: {
+    request: Recordable
+    response: Recordable
+  }
   script: string
   // Not Config
   updating?: boolean

frontend/src/views/HomeView/components/QuickStart.vue

@@ -44,7 +44,10 @@ const handleSubmit = async () => {
     proxyPrefix: '',
     disabled: false,
     inSecure: false,
-    userAgent: '',
+    header: {
+      request: {},
+      response: {},
+    },
     proxies: [],
     script: DefaultSubscribeScript,
   }

frontend/src/views/SubscribesView/components/SubscribeForm.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import { ref, inject } from 'vue'
+import { ref, inject, computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import { DefaultSubscribeScript } from '@/constant/app'
 import { DefaultExcludeProtocols } from '@/constant/kernel'
 import { useBool } from '@/hooks'
 import { useSubscribesStore } from '@/stores'
-import { deepClone, sampleID, getUserAgent, message } from '@/utils'
+import { deepClone, sampleID, message } from '@/utils'
 
 import type { Subscription } from '@/types/app'
 
@@ -41,11 +41,17 @@ const sub = ref<Subscription>({
   proxyPrefix: '',
   disabled: false,
   inSecure: false,
-  userAgent: '',
+  header: {
+    request: {},
+    response: {},
+  },
   proxies: [],
   script: DefaultSubscribeScript,
 })
 
+const isManual = computed(() => sub.value.type === 'Manual')
+const isRemote = computed(() => sub.value.type === 'Http')
+
 const { t } = useI18n()
 const [showMore, toggleShowMore] = useBool(false)
 const subscribeStore = useSubscribesStore()
@@ -70,9 +76,6 @@ const handleSubmit = async () => {
   loading.value = false
 }
 
-const resetUserAgent = () => (sub.value.userAgent = '')
-const isManual = () => sub.value.type === 'Manual'
-
 if (props.isUpdate) {
   const s = subscribeStore.getSubscribeById(props.id)
   if (s) {
@@ -100,7 +103,7 @@ if (props.isUpdate) {
       <div class="name">{{ t('subscribe.name') }} *</div>
       <Input v-model="sub.name" auto-size autofocus class="input" />
     </div>
-    <div v-show="!isManual()" class="form-item">
+    <div v-if="!isManual" class="form-item">
       <div class="name">
         {{ t(sub.type === 'Http' ? 'subscribe.url' : 'subscribe.localPath') }} *
       </div>
@@ -120,12 +123,12 @@ if (props.isUpdate) {
         class="input"
       />
     </div>
-    <Divider v-show="!isManual()">
+    <Divider v-if="!isManual">
       <Button @click="toggleShowMore" type="text" size="small">
         {{ t('common.more') }}
       </Button>
     </Divider>
-    <div v-show="showMore && !isManual()">
+    <div v-if="showMore && !isManual">
       <div class="form-item">
         <div class="name">{{ t('subscribe.include') }}</div>
         <Input v-model="sub.include" placeholder="keyword1|keyword2" auto-size class="input" />
@@ -156,37 +159,40 @@ if (props.isUpdate) {
         <div class="name">{{ t('subscribe.proxyPrefix') }}</div>
         <Input v-model="sub.proxyPrefix" auto-size class="input" />
       </div>
-      <div v-if="sub.type === 'Http'" class="form-item">
-        <div class="name">
-          {{ t('subscribe.website') }}
+      <template v-if="isRemote">
+        <div class="form-item">
+          <div class="name">
+            {{ t('subscribe.website') }}
+          </div>
+          <Input v-model="sub.website" placeholder="http(s)://" auto-size class="input" />
         </div>
-        <Input v-model="sub.website" placeholder="http(s)://" auto-size class="input" />
-      </div>
-      <div class="form-item">
-        <div class="name">{{ t('subscribe.useragent') }}</div>
-        <Input v-model="sub.userAgent" :placeholder="getUserAgent()" auto-size>
-          <template #extra>
-            <Button
-              @click="resetUserAgent"
-              type="text"
-              icon="reset"
-              v-tips="t('subscribe.resetUserAgent')"
-            />
-          </template>
-        </Input>
-      </div>
-      <div class="form-item">
-        <div class="name">{{ t('subscribe.inSecure') }}</div>
-        <Switch v-model="sub.inSecure" />
-      </div>
+        <div class="form-item">
+          <div class="name">{{ t('subscribe.inSecure') }}</div>
+          <Switch v-model="sub.inSecure" />
+        </div>
+        <div
+          :class="{ 'flex-start': Object.keys(sub.header.request).length !== 0 }"
+          class="form-item"
+        >
+          <div class="name">{{ t('subscribe.header.request') }}</div>
+          <KeyValueEditor v-model="sub.header.request" />
+        </div>
+        <div
+          :class="{ 'flex-start': Object.keys(sub.header.response).length !== 0 }"
+          class="form-item"
+        >
+          <div class="name">{{ t('subscribe.header.response') }}</div>
+          <KeyValueEditor v-model="sub.header.response" />
+        </div>
+      </template>
     </div>
   </div>
   <div class="form-action">
     <Button @click="handleCancel">{{ t('common.cancel') }}</Button>
     <Button
       @click="handleSubmit"
       :loading="loading"
-      :disabled="!sub.name || !sub.path || (!sub.url && sub.type !== 'Manual')"
+      :disabled="!sub.name || !sub.path || (!sub.url && !isManual)"
       type="primary"
     >
       {{ t('common.save') }}