fix: 优化响应头回退与重复识别

Author: setube

package.json

@@ -1,7 +1,7 @@
 {
   "name": "stackprism",
   "private": true,
-  "version": "1.2.70",
+  "version": "1.2.71",
   "type": "module",
   "description": "StackPrism 用于检测网页前端、后端、CDN、SaaS、广告营销、统计、登录、支付、网站程序和主题模板线索。",
   "scripts": {

public/rules/page/languages.json

@@ -62,7 +62,13 @@
         "name": "FreeMarker",
         "kind": "后端模板语言",
         "confidence": "中",
-        "patterns": ["\\.ftl(?:\\?|#|$)", "freemarker", "FreeMarker template error", "org\\.apache\\.freemarker"]
+        "patterns": [
+          "\\.ftl(?:\\?|#|$)",
+          "(?:^|/)pay/ftl(?:/|[?#\\s\"'<>]|$)",
+          "freemarker",
+          "FreeMarker template error",
+          "org\\.apache\\.freemarker"
+        ]
       },
       {
         "name": "Java Servlet",

src/background/detection.ts

@@ -1,6 +1,6 @@
 import { augmentPageWithWordPressThemeStyles } from './wordpress'
 import { buildPopupCacheRecord, cleanPageDetectionRecord } from './popup-cache'
-import { fetchMainHeadersFallback } from './headers'
+import { fetchMainHeadersFallback, mergeHeaderRecords } from './headers'
 import { clearBadge, clearTabSession, getTabData, getTabSnapshot, updateBadgeForTab, writeTabData } from './tab-store'
 import { buildEffectivePageRules, loadDetectorSettings, loadTechRules } from './detector-settings'
 import { scheduleBundleLicenseDetection } from './bundle-license'
@@ -24,7 +24,7 @@ const needsMainHeadersFallback = (record: any, currentUrl: string): boolean => {
   const recordUrl = normalizePageUrl(record.url)
   const tabUrl = normalizePageUrl(currentUrl)
   if (recordUrl && tabUrl && recordUrl !== tabUrl) return true
-  return !Number(record.headerCount || 0) && !(record.technologies || []).length
+  return Number(record.headerCount || 0) <= 1 && !Object.keys(record.headers || {}).length && !(record.technologies || []).length
 }
 
 const headerRecordMatchesUrl = (record: any, currentUrl: string): boolean => {
@@ -33,6 +33,22 @@ const headerRecordMatchesUrl = (record: any, currentUrl: string): boolean => {
   return Boolean(recordUrl && tabUrl && recordUrl === tabUrl)
 }
 
+const headerRecordSharesPagePath = (record: any, currentUrl: string): boolean => {
+  try {
+    const recordUrl = new URL(String(record?.url || ''))
+    const tabUrl = new URL(String(currentUrl || ''))
+    return recordUrl.origin === tabUrl.origin && recordUrl.pathname === tabUrl.pathname
+  } catch {
+    return false
+  }
+}
+
+const hasUsefulHeaderRecord = (record: any): boolean =>
+  Boolean(record && (Number(record.headerCount || 0) > 1 || Object.keys(record.headers || {}).length || (record.technologies || []).length))
+
+const shouldPreserveMainHeaderRecord = (record: any, currentUrl: string): boolean =>
+  headerRecordMatchesUrl(record, currentUrl) || (headerRecordSharesPagePath(record, currentUrl) && hasUsefulHeaderRecord(record))
+
 export const saveTabDataAndBadge = async (tabId: number, data: any, settings: any) => {
   const tab = await getTabSnapshot(tabId)
   if (!isDetectablePageUrl(tab.url)) {
@@ -102,8 +118,13 @@ export const runActivePageDetection = async (tabId: number) => {
 
     if (needsMainHeadersFallback(data.main, (page as any).url || tab.url)) {
       const fallback = await fetchMainHeadersFallback((page as any).url || '', rules.headers || {}, settings)
-      if (fallback) data.main = fallback
-      else if (data.main && !headerRecordMatchesUrl(data.main, (page as any).url || tab.url)) delete data.main
+      if (fallback) {
+        data.main = shouldPreserveMainHeaderRecord(data.main, (page as any).url || tab.url)
+          ? mergeHeaderRecords(data.main, fallback)
+          : fallback
+      } else if (data.main && !shouldPreserveMainHeaderRecord(data.main, (page as any).url || tab.url)) {
+        delete data.main
+      }
     }
 
     data.updatedAt = Date.now()

src/background/headers.ts

@@ -38,6 +38,12 @@ const normalizeHeaders = (responseHeaders: any[]) => {
   return map
 }
 
+const collectFetchResponseHeaders = (response: Response) => {
+  const responseHeaders: Array<{ name: string; value: string }> = []
+  response.headers.forEach((value, name) => responseHeaders.push({ name, value }))
+  return responseHeaders
+}
+
 const pickHeaders = (headers: Record<string, string>, interestingNames: string[]) => {
   const picked: Record<string, string> = {}
   for (const name of interestingNames) {
@@ -129,14 +135,12 @@ export const fetchMainHeadersFallback = async (url: string, headerRules: any, se
   if (!url || !/^https?:/i.test(url)) return null
   try {
     let method = 'HEAD'
-    let response = await fetch(url, { method, credentials: 'omit', cache: 'no-store', redirect: 'follow' })
-    let responseHeaders: Array<{ name: string; value: string }> = []
-    response.headers.forEach((value, name) => responseHeaders.push({ name, value }))
-    if ((!response.ok && response.status !== 405 && response.status !== 0) || !responseHeaders.length) {
+    let response = await fetch(url, { method, credentials: 'include', cache: 'no-store', redirect: 'follow' })
+    let responseHeaders = collectFetchResponseHeaders(response)
+    if ((!response.ok && response.status !== 0) || responseHeaders.length <= 1) {
       method = 'GET'
-      response = await fetch(url, { method: 'GET', credentials: 'omit', cache: 'no-store', redirect: 'follow' })
-      responseHeaders = []
-      response.headers.forEach((value, name) => responseHeaders.push({ name, value }))
+      response = await fetch(url, { method: 'GET', credentials: 'include', cache: 'no-store', redirect: 'follow' })
+      responseHeaders = collectFetchResponseHeaders(response)
     }
     if (!responseHeaders.length) return null
     return buildHeaderRecord(

src/background/merge.ts

@@ -53,8 +53,13 @@ export const isFrontendFallback = (item: any) => item?.category === '前端库'
 const frontendTechnologyCategories = new Set(['前端库', '前端框架', 'UI / CSS 框架'])
 
 const frontendAliasTechnologies: Record<string, { category: string; name: string }> = {
+  angular: { category: '前端框架', name: 'Angular' },
   jquerycompat: { category: '前端库', name: 'jQuery' },
-  twitterbootstrap: { category: 'UI / CSS 框架', name: 'Bootstrap' }
+  preact: { category: '前端框架', name: 'Preact' },
+  react: { category: '前端框架', name: 'React' },
+  svelte: { category: '前端框架', name: 'Svelte' },
+  twitterbootstrap: { category: 'UI / CSS 框架', name: 'Bootstrap' },
+  vue: { category: '前端框架', name: 'Vue' }
 }
 
 export const canonicalizeFrontendAliasTechnologies = (items: any[]) => {

src/injected/page-detector.ts

@@ -367,8 +367,13 @@ const detectPageTechnologies = (ruleConfig: Record<string, unknown> = {}) => {
       return []
     }
     const aliases = {
+      angular: { category: '前端框架', name: 'Angular' },
       jquerycompat: { category: '前端库', name: 'jQuery' },
-      twitterbootstrap: { category: 'UI / CSS 框架', name: 'Bootstrap' }
+      preact: { category: '前端框架', name: 'Preact' },
+      react: { category: '前端框架', name: 'React' },
+      svelte: { category: '前端框架', name: 'Svelte' },
+      twitterbootstrap: { category: 'UI / CSS 框架', name: 'Bootstrap' },
+      vue: { category: '前端框架', name: 'Vue' }
     }
     const frontendCategories = new Set(['前端库', '前端框架', 'UI / CSS 框架'])
     return items.map(item => {