fix: 收紧误判规则并补充检测兜底

setube · setube · commit 388a2f49cf53 · 2026-05-11T11:50:50.000+08:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "stackprism",
   "private": true,
-  "version": "1.2.64",
+  "version": "1.2.65",
   "type": "module",
   "description": "StackPrism 用于检测网页前端、后端、CDN、SaaS、广告营销、统计、登录、支付、网站程序和主题模板线索。",
   "scripts": {
diff --git a/public/rules/page/analytics-providers.json b/public/rules/page/analytics-providers.json
@@ -96,8 +96,15 @@
           },
           {
             "name": "Alibaba Aplus / 阿里统计",
-            "patterns": ["g\\.alicdn\\.com/alilog", "aplus\\.js", "log\\.mmstat\\.com", "arms-retcode", "__bl"],
-            "globals": ["goldlog", "__bl"]
+            "patterns": ["g\\.alicdn\\.com/alilog", "aplus\\.js", "log\\.mmstat\\.com"],
+            "globals": ["goldlog"]
+          },
+          {
+            "category": "探针 / 监控",
+            "name": "Alibaba ARMS / 前端 APM",
+            "kind": "前端性能监控 / APM",
+            "patterns": ["retcode\\.alicdn\\.com/retcode", "arms-retcode", "__bl"],
+            "globals": ["__bl"]
           }
         ]
       },
diff --git a/public/rules/page/backend-hints-page.json b/public/rules/page/backend-hints-page.json
@@ -62,6 +62,15 @@
           "confidence": "中",
           "patterns": ["yii(?:\\.activeForm|\\.gridView)|yii\\.js"]
         },
+        {
+          "name": "ThinkPHP",
+          "confidence": "中",
+          "patterns": [
+            "thinkphp",
+            "index\\.php\\?s=",
+            "(?:^|/)index/(?:index|home|pay|user|api)/[a-z0-9_-]+(?:[?#\\s\"'<>]|$)"
+          ]
+        },
         {
           "name": "CakePHP",
           "confidence": "低",
diff --git a/public/rules/page/dynamic-technologies.json b/public/rules/page/dynamic-technologies.json
@@ -92,7 +92,7 @@
               },
               {
                 "name": "Element UI / Element Plus",
-                "patterns": ["element-plus", "element-ui", "\\.el-"]
+                "patterns": ["element-plus", "element-ui", "\\.el-", "(?:^|/)element/(?:index|element-ui|element-plus)(?:\\.min)?\\.(?:js|css)(?:[?#]|$)"]
               }
             ]
           },
diff --git a/public/rules/page/frontend-local-libraries.json b/public/rules/page/frontend-local-libraries.json
@@ -54,6 +54,21 @@
             "name": "LazyLoad",
             "patterns": ["(?:^|/)(?:lazyload|lazy-load|vanilla-lazyload)(?:\\.min)?\\.js(?:[?#][^\\s\"'<>]*)?(?:[\"'<>\\s]|$)"]
           },
+          {
+            "name": "Layer.js",
+            "patterns": ["(?:^|/)layer(?:\\.min)?\\.js(?:[?#][^\\s\"'<>]*)?(?:[\"'<>\\s]|$)"]
+          },
+          {
+            "name": "jQuery UI",
+            "patterns": [
+              "(?:^|/)jquery-ui(?:\\.min)?\\.js(?:[?#][^\\s\"'<>]*)?(?:[\"'<>\\s]|$)",
+              "(?:^|/)jquery\\.ui(?:\\.min)?\\.js(?:[?#][^\\s\"'<>]*)?(?:[\"'<>\\s]|$)"
+            ]
+          },
+          {
+            "name": "jQuery cxCalendar",
+            "patterns": ["(?:^|/)jquery\\.cxcalendar(?:\\.min)?\\.js(?:[?#][^\\s\"'<>]*)?(?:[\"'<>\\s]|$)"]
+          },
           {
             "name": "Zooming",
             "patterns": ["(?:^|/)zooming(?:\\.min)?\\.js(?:[?#].*)?$"]
diff --git a/public/rules/page/languages.json b/public/rules/page/languages.json
@@ -58,6 +58,12 @@
         "confidence": "中",
         "patterns": ["\\.jsp(?:\\?|#|$)", "\\.jspx(?:\\?|#|$)", "JSESSIONID", "javax\\.servlet\\.jsp", "org\\.apache\\.jsp"]
       },
+      {
+        "name": "FreeMarker",
+        "kind": "后端模板语言",
+        "confidence": "中",
+        "patterns": ["\\.ftl(?:\\?|#|$)", "freemarker", "FreeMarker template error", "org\\.apache\\.freemarker"]
+      },
       {
         "name": "Java Servlet",
         "kind": "后端 Java Web 技术",
diff --git a/public/rules/page/payment-systems.json b/public/rules/page/payment-systems.json
@@ -47,7 +47,8 @@
       {
         "name": "京东支付",
         "kind": "国内支付",
-        "patterns": ["jdpay", "pay\\.jd\\.com", "京东支付"]
+        "matchIn": ["url", "resources"],
+        "patterns": ["(?:^|[/?#&_.=-])jdpay(?:[/?#&_.=-]|sdk|$)", "pay\\.jd\\.com"]
       },
       {
         "name": "百度收银台",
@@ -167,7 +168,12 @@
       {
         "name": "码支付 / CodePay",
         "kind": "第四方支付 / 免签聚合支付",
-        "patterns": ["codepay\\.fateqq\\.com", "codepay", "码支付", "codepay_id", "codepay_key", "pay\\.codepay"]
+        "patterns": [
+          "codepay\\.fateqq\\.com",
+          "pay\\.codepay",
+          "(?:^|[?&#\\s\"'<>])codepay_(?:id|key)(?:[\\s\"'<>:=&]|$)",
+          "name=[\"']codepay_(?:id|key)[\"']"
+        ]
       },
       {
         "name": "易支付 / EPay 聚合支付",
@@ -210,7 +216,11 @@
       {
         "name": "YPay / 源支付",
         "kind": "第四方支付 / 聚合支付",
-        "patterns": ["YPay", "源支付", "ypay", "ypay_order", "YPay聚合支付"]
+        "patterns": [
+          "(?:^|/)ypay(?:/|[?#\\s\"'<>]|$)",
+          "(?:^|[?&#\\s\"'<>])ypay_(?:order|api|notify|return|config)(?:[\\s\"'<>:=&]|$)",
+          "name=[\"']ypay_(?:order|api|notify|return|config)[\"']"
+        ]
       },
       {
         "defaults": {
diff --git a/public/rules/page/ui-frameworks.json b/public/rules/page/ui-frameworks.json
@@ -70,7 +70,11 @@
               },
               {
                 "name": "Element UI / Element Plus",
-                "patterns": ["element-plus", "element-ui"],
+                "patterns": [
+                  "element-plus",
+                  "element-ui",
+                  "(?=[\\s\\S]*(?:^|/)element/index(?:\\.min)?\\.js(?:[?#]|[\"'<>\\s]|$))(?=[\\s\\S]*(?:(?:^|/)element/index(?:\\.min)?\\.css(?:[?#]|[\"'<>\\s]|$)|el-(?:button|form|input|table|dialog|select)))"
+                ],
                 "classPrefixes": ["el-"]
               }
             ]
diff --git a/public/rules/page/website-programs-extra.json b/public/rules/page/website-programs-extra.json
@@ -275,7 +275,7 @@
               "matchType": "regex",
               "patterns": [
                 "<meta[^>]+name=['\"]?generator['\"]?[^>]+(?:Open edX|openedx)",
-                "(?:^|/)static/(?:edx|openedx|common|studio)/",
+                "(?:^|/)static/(?:edx|openedx|studio)/",
                 "(?:^|/)courses/course-v1:",
                 "openedx[^\\s\"'<>]*\\.(?:js|css|svg|png)(?:\\?|$)"
               ],
diff --git a/public/tech-links.json b/public/tech-links.json
@@ -152,6 +152,7 @@
     "Unpoly": "https://unpoly.com",
     "Bootstrap": "https://getbootstrap.com",
     "Tailwind CSS": "https://tailwindcss.com",
+    "jQuery UI": "https://jqueryui.com",
     "shadcn/ui": "https://ui.shadcn.com",
     "Material UI": "https://mui.com",
     "Ant Design": "https://ant.design",
@@ -396,6 +397,7 @@
     "JMS Serializer Bundle": "https://jmsyst.com/bundles/JMSSerializerBundle",
     "Twig Components": "https://symfony.com/bundles/ux-twig-component/current/index.html",
     "Yii": "https://www.yiiframework.com",
+    "ThinkPHP": "https://www.thinkphp.cn",
     "CodeIgniter": "https://codeigniter.com",
     "CakePHP": "https://cakephp.org",
     "Laminas / Zend Framework": "https://getlaminas.org",
@@ -444,6 +446,7 @@
     "Rust Ntex": "https://ntex.rs",
     "Rust Hyper": "https://hyper.rs",
     "Java Servlet": "https://jakarta.ee/specifications/servlet",
+    "FreeMarker": "https://freemarker.apache.org",
     "JavaServer Faces": "https://jakarta.ee/specifications/faces",
     "Apache Wicket": "https://wicket.apache.org",
     "Vaadin Flow": "https://vaadin.com/flow",
@@ -2777,6 +2780,7 @@
     "TalkingData": "https://www.talkingdata.com",
     "Youmeng+ / 友盟+": "https://www.umeng.com",
     "Alibaba Aplus / 阿里统计": "https://www.alibabacloud.com/help/doc-detail/28763.htm",
+    "Alibaba ARMS / 前端 APM": "https://www.alibabacloud.com/product/arms",
     "Yandex Metrica": "https://metrica.yandex.com",
     "Adobe Analytics": "https://business.adobe.com/products/analytics/adobe-analytics.html",
     "Adobe Launch": "https://business.adobe.com/products/experience-platform/launch.html",
@@ -3192,6 +3196,7 @@
     "single-spa": "https://single-spa.js.org",
     "pyodide": "https://github.com/pyodide/pyodide",
     "dplayer": "https://dplayer.js.org/#",
+    "Layer.js": "https://layer.layui.com",
     "hack-font": "https://sourcefoundry.org/hack",
     "vivus": "https://github.com/maxwellito/vivus",
     "ajv": "https://github.com/epoberezkin/ajv",
@@ -5071,6 +5076,7 @@
     "load-awesome": "http://github.danielcardoso.net/load-awesome",
     "image-picker": "http://rvera.github.com/image-picker",
     "sticky-table-headers": "https://github.com/jmosbech/StickyTableHeaders",
+    "jQuery cxCalendar": "https://github.com/ciaoca/cxCalendar",
     "juicer": "http://juicer.name",
     "dom4": "https://github.com/WebReflection/dom4",
     "documentup": "http://documentup.com",
diff --git a/src/background/detection.ts b/src/background/detection.ts
@@ -4,10 +4,35 @@ import { fetchMainHeadersFallback } from './headers'
 import { clearBadge, clearTabSession, getTabData, getTabSnapshot, updateBadgeForTab, writeTabData } from './tab-store'
 import { buildEffectivePageRules, loadDetectorSettings, loadTechRules } from './detector-settings'
 import { scheduleBundleLicenseDetection } from './bundle-license'
+import { injectContentObserver } from './content-injector'
 import { isDetectablePageUrl } from '@/utils/page-support'
 
 const activeDetectionTimers = new Map<number, ReturnType<typeof setTimeout>>()
 
+const normalizePageUrl = (value: unknown): string => {
+  try {
+    const url = new URL(String(value || ''))
+    url.hash = ''
+    return url.href
+  } catch {
+    return ''
+  }
+}
+
+const needsMainHeadersFallback = (record: any, currentUrl: string): boolean => {
+  if (!record) return true
+  const recordUrl = normalizePageUrl(record.url)
+  const tabUrl = normalizePageUrl(currentUrl)
+  if (recordUrl && tabUrl && recordUrl !== tabUrl) return true
+  return !Number(record.headerCount || 0) && !(record.technologies || []).length
+}
+
+const headerRecordMatchesUrl = (record: any, currentUrl: string): boolean => {
+  const recordUrl = normalizePageUrl(record?.url)
+  const tabUrl = normalizePageUrl(currentUrl)
+  return Boolean(recordUrl && tabUrl && recordUrl === tabUrl)
+}
+
 export const saveTabDataAndBadge = async (tabId: number, data: any, settings: any) => {
   const tab = await getTabSnapshot(tabId)
   if (!isDetectablePageUrl(tab.url)) {
@@ -53,6 +78,7 @@ export const runActivePageDetection = async (tabId: number) => {
       clearBadge(tabId)
       return
     }
+    await injectContentObserver(tabId)
     const [data, rules, settings] = await Promise.all([getTabData(tabId), loadTechRules(), loadDetectorSettings()])
     const pageRules = buildEffectivePageRules(rules.page || {}, settings)
     await chrome.scripting.executeScript({
@@ -74,9 +100,10 @@ export const runActivePageDetection = async (tabId: number) => {
     const augmentedPage = await augmentPageWithWordPressThemeStyles(page)
     data.page = cleanPageDetectionRecord(augmentedPage)
 
-    if (!data.main) {
+    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
     }
 
     data.updatedAt = Date.now()
diff --git a/src/background/headers.ts b/src/background/headers.ts
@@ -115,18 +115,22 @@ const detectFromHeaders = (headers: Record<string, string>, url: string, headerR
 export const fetchMainHeadersFallback = async (url: string, headerRules: any, settings: any) => {
   if (!url || !/^https?:/i.test(url)) return null
   try {
-    let response = await fetch(url, { method: 'HEAD', credentials: 'omit', cache: 'no-store', redirect: 'follow' })
-    if (!response.ok && response.status !== 405 && response.status !== 0) {
+    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) {
+      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 }))
     }
-    const responseHeaders: Array<{ name: string; value: string }> = []
-    response.headers.forEach((value, name) => responseHeaders.push({ name, value }))
     if (!responseHeaders.length) return null
     return buildHeaderRecord(
       {
         url: response.url || url,
         type: 'main_frame',
-        method: 'HEAD',
+        method,
         statusCode: response.status,
         responseHeaders
       },
@@ -142,6 +146,7 @@ export const buildHeaderRecord = (details: any, headerRules: any, settings: any)
   const normalizedHeaders = normalizeHeaders(details.responseHeaders)
   const headers = pickHeaders(normalizedHeaders, headerRules.interestingHeaders || [])
   return {
+    requestId: details.requestId || '',
     url: details.url,
     type: details.type,
     method: details.method,
@@ -153,6 +158,39 @@ export const buildHeaderRecord = (details: any, headerRules: any, settings: any)
   }
 }
 
+const normalizeRecordUrl = (value: unknown): string => {
+  try {
+    const url = new URL(String(value || ''))
+    url.hash = ''
+    return url.href
+  } catch {
+    return ''
+  }
+}
+
+export const shouldMergeHeaderRecords = (previous: any, next: any): boolean => {
+  if (!previous || !next) return false
+  if (previous.requestId && next.requestId && previous.requestId === next.requestId) return true
+  const previousUrl = normalizeRecordUrl(previous.url)
+  const nextUrl = normalizeRecordUrl(next.url)
+  return Boolean(previousUrl && nextUrl && previousUrl === nextUrl)
+}
+
+export const mergeHeaderRecords = (previous: any, next: any) => {
+  if (!previous) return next
+  if (!next) return previous
+  return {
+    ...previous,
+    ...next,
+    headers: {
+      ...(previous.headers || {}),
+      ...(next.headers || {})
+    },
+    headerCount: Math.max(Number(previous.headerCount || 0), Number(next.headerCount || 0)),
+    technologies: mergeTechnologyRecords([...(previous.technologies || []), ...(next.technologies || [])])
+  }
+}
+
 const detectCustomHeaderRules = (record: any, customRules: any[]) => {
   const technologies: any[] = []
   const add = createCollector(technologies, '响应头')
diff --git a/src/background/index.ts b/src/background/index.ts
@@ -1,7 +1,7 @@
 import { injectContentObserverIntoOpenTabs } from './content-injector'
 import { clearBadge, clearTabSession } from './tab-store'
 import { clearDynamicSnapshotTimer, clearPendingDynamicSnapshot } from './dynamic-snapshot'
-import { buildHeaderRecord, dedupeApiRecords } from './headers'
+import { buildHeaderRecord, dedupeApiRecords, mergeHeaderRecords, shouldMergeHeaderRecords } from './headers'
 import { clearActiveDetectionTimer, refreshAllBadges, saveTabDataAndBadge, scheduleActivePageDetection } from './detection'
 import { getTabData, getTabSnapshot } from './tab-store'
 import { SETTINGS_STORAGE_KEY, applyDetectorSettingsUpdate, loadDetectorSettings, loadTechRules } from './detector-settings'
@@ -85,7 +85,7 @@ chrome.webRequest.onHeadersReceived.addListener(
         }
         const record = buildHeaderRecord(details, rules.headers || {}, settings)
         if (details.type === 'main_frame') {
-          data.main = record
+          data.main = shouldMergeHeaderRecords(data.main, record) ? mergeHeaderRecords(data.main, record) : record
           data.apis = []
           data.frames = []
           delete data.page
diff --git a/src/injected/page-detector.ts b/src/injected/page-detector.ts
@@ -442,7 +442,7 @@ const detectPageTechnologies = (ruleConfig: Record<string, unknown> = {}) => {
   }
 
   function detectBackendFrameworkHints(add, resources, html, externalRules) {
-    const text = [resources.text, html].join('\n')
+    const text = [location.href, resources.text, html].join('\n')
     detectJsonRuleList(add, externalRules, {
       defaultCategory: '后端 / 服务器框架',
       resources,

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "stackprism",`
`3`	`3`	`"private": true,`
`4`		`- "version": "1.2.64",`
	`4`	`+ "version": "1.2.65",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"description": "StackPrism 用于检测网页前端、后端、CDN、SaaS、广告营销、统计、登录、支付、网站程序和主题模板线索。",`
`7`	`7`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,15 @@`
`96`	`96`	`},`
`97`	`97`	`{`
`98`	`98`	`"name": "Alibaba Aplus / 阿里统计",`
`99`		`- "patterns": ["g\\.alicdn\\.com/alilog", "aplus\\.js", "log\\.mmstat\\.com", "arms-retcode", "__bl"],`
`100`		`- "globals": ["goldlog", "__bl"]`
	`99`	`+ "patterns": ["g\\.alicdn\\.com/alilog", "aplus\\.js", "log\\.mmstat\\.com"],`
	`100`	`+ "globals": ["goldlog"]`
	`101`	`+ },`
	`102`	`+ {`
	`103`	`+ "category": "探针 / 监控",`
	`104`	`+ "name": "Alibaba ARMS / 前端 APM",`
	`105`	`+ "kind": "前端性能监控 / APM",`
	`106`	`+ "patterns": ["retcode\\.alicdn\\.com/retcode", "arms-retcode", "__bl"],`
	`107`	`+ "globals": ["__bl"]`
`101`	`108`	`}`
`102`	`109`	`]`
`103`	`110`	`},`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@`
`92`	`92`	`},`
`93`	`93`	`{`
`94`	`94`	`"name": "Element UI / Element Plus",`
`95`		`- "patterns": ["element-plus", "element-ui", "\\.el-"]`
	`95`	`+ "patterns": ["element-plus", "element-ui", "\\.el-", "(?:^\|/)element/(?:index\|element-ui\|element-plus)(?:\\.min)?\\.(?:js\|css)(?:[?#]\|$)"]`
`96`	`96`	`}`
`97`	`97`	`]`
`98`	`98`	`},`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,11 @@`
`70`	`70`	`},`
`71`	`71`	`{`
`72`	`72`	`"name": "Element UI / Element Plus",`
`73`		`- "patterns": ["element-plus", "element-ui"],`
	`73`	`+ "patterns": [`
	`74`	`+ "element-plus",`
	`75`	`+ "element-ui",`
	`76`	`+ "(?=[\\s\\S](?:^\|/)element/index(?:\\.min)?\\.js(?:[?#]\|[\"'<>\\s]\|$))(?=[\\s\\S](?:(?:^\|/)element/index(?:\\.min)?\\.css(?:[?#]\|[\"'<>\\s]\|$)\|el-(?:button\|form\|input\|table\|dialog\|select)))"`
	`77`	`+ ],`
`74`	`78`	`"classPrefixes": ["el-"]`
`75`	`79`	`}`
`76`	`80`	`]`