test: Safari 17 now supports Ed25519

panva · Oct 2, 2023 · 7c5c926 · 7c5c926
1 parent 9516195
commit 7c5c926
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/tap/env.ts b/tap/env.ts
@@ -24,14 +24,27 @@ export const isBrowser =
 
 const BOWSER = 'https://cdn.jsdelivr.net/npm/bowser@2.11.0/src/bowser.js'
 
-async function isEngine(engine: string) {
+let parsedUserAgent
+async function parseUserAgent() {
   const { default: Bowser } = await import(BOWSER)
-  return Bowser.parse(window.navigator.userAgent).engine.name === engine
+  parsedUserAgent ||= Bowser.parse(window.navigator.userAgent)
+  return parsedUserAgent
+}
+
+async function isEngine(engine: string) {
+  const userAgentData = await parseUserAgent()
+  return userAgentData.engine.name === engine
+}
+
+async function isVersionAtLeast(version: number) {
+  const userAgentData = await parseUserAgent()
+  return parseInt(userAgentData.browser.version.split('.')[0], 10) >= version
 }
 
 export const isBlink = isBrowser && (await isEngine('Blink'))
 
 export const isWebKit = isBrowser && (await isEngine('WebKit'))
+export const isWebKitAbove17 = isBrowser && isWebKit && (await isVersionAtLeast(17))
 
 export const isGecko = isBrowser && (await isEngine('Gecko'))
 

diff --git a/tap/keys.ts b/tap/keys.ts
@@ -13,7 +13,7 @@ export const algs = <lib.JWSAlgorithm[]>[
 ]
 export const fails = <lib.JWSAlgorithm[]>[]
 ;(env.isDeno ? fails : algs).push('ES512')
-;(env.isBrowser ? fails : algs).push('EdDSA')
+;(env.isBrowser && !(env.isWebKit && env.isWebKitAbove17) ? fails : algs).push('EdDSA')
 
 export const keys = algs.reduce(
   (acc, alg) => {