fix: isClashMetaForAndroid

surgioproject · Feb 17, 2024 · 9cd1b5d · 9cd1b5d
1 parent 1eee9b9
commit 9cd1b5d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/utils/__tests__/useragent.test.ts b/src/utils/__tests__/useragent.test.ts
@@ -69,10 +69,13 @@ test('isClashMetaForAndroid', (t) => {
  isClashMetaForAndroid('ClashMetaForAndroid/2.8.8.Meta-Alpha', '>=3.0.0'),
  false,
  )
- t.is(isClashMetaForAndroid('ClashMetaForAndroid/2.8.8.Meta'), true)
- t.is(isClashMetaForAndroid('ClashMetaForAndroid/2.8.8.Meta', '>=2.8.0'), true)
+ t.is(isClashMetaForAndroid('ClashMetaForAndroid/2.18.8.Meta'), true)
  t.is(
- isClashMetaForAndroid('ClashMetaForAndroid/2.8.8.Meta', '>=3.0.0'),
+ isClashMetaForAndroid('ClashMetaForAndroid/2.18.8.Meta', '>=2.8.0'),
+ true,
+ )
+ t.is(
+ isClashMetaForAndroid('ClashMetaForAndroid/2.18.8.Meta', '>=3.0.0'),
  false,
  )
  t.is(isClashMetaForAndroid('clash'), false)

diff --git a/src/utils/useragent.ts b/src/utils/useragent.ts
@@ -129,7 +129,7 @@ export const isClashMetaForAndroid = (
  return false
  }
 
- const matcher = /\bClashMetaForAndroid\/([0-9.]{5})\b/i
+ const matcher = /\bClashMetaForAndroid\/(.+)\b/i
  const isClient = matcher.exec(ua)
 
  if (!isClient) {
@@ -140,7 +140,7 @@ export const isClashMetaForAndroid = (
  return true
  }
 
- const clientVersion = isClient ? isClient[1] : ''
+ const clientVersion = isClient ? isClient[1].replace(/\.Meta.*/gi, '') : ''
 
  try {
  return satisfies(clientVersion, version)