fix(edge-functions): don't use globalThis

src/lib/crypto_key.ts

@@ -1,4 +1,4 @@
-import { isCloudflareWorkers, isNodeJs } from '../runtime/global.js'
+import { isCloudflareWorkers, isNodeJs } from '../runtime/env.js'
 
 function unusable(name: string | number, prop = 'algorithm.name') {
  return new TypeError(`CryptoKey does not support this operation, its ${prop} must be ${name}`)

src/runtime/browser/asn1.ts

@@ -1,4 +1,4 @@
-import globalThis, { isCloudflareWorkers, isNodeJs } from './global.js'
+import { isCloudflareWorkers, isNodeJs } from './env.js'
 import crypto, { isCryptoKey } from './webcrypto.js'
 import type { PEMExportFunction, PEMImportFunction } from '../interfaces.d'
 import invalidKeyInput from '../../lib/invalid_key_input.js'
@@ -85,8 +85,7 @@ const genericImport = async (
  let keyUsages: KeyUsage[]
 
  const keyData = new Uint8Array(
- globalThis
- .atob(pem.replace(replace, ''))
+ atob(pem.replace(replace, ''))
  .split('')
  .map((c) => c.charCodeAt(0)),
  )

src/runtime/browser/base64url.ts

@@ -1,5 +1,4 @@
 import { encoder, decoder } from '../../lib/buffer_utils.js'
-import globalThis from './global.js'
 
 export const encodeBase64 = (input: Uint8Array | string) => {
  let unencoded = input
@@ -12,7 +11,7 @@ export const encodeBase64 = (input: Uint8Array | string) => {
  // @ts-expect-error
  arr.push(String.fromCharCode.apply(null, unencoded.subarray(i, i + CHUNK_SIZE)))
  }
- return globalThis.btoa(arr.join(''))
+ return btoa(arr.join(''))
 }
 
 export const encode = (input: Uint8Array | string) => {
@@ -21,8 +20,7 @@ export const encode = (input: Uint8Array | string) => {
 
 export const decodeBase64 = (encoded: string): Uint8Array => {
  return new Uint8Array(
- globalThis
- .atob(encoded)
+ atob(encoded)
  .split('')
  .map((c) => c.charCodeAt(0)),
  )

src/runtime/browser/env.ts

@@ -0,0 +1,13 @@
+export function isCloudflareWorkers(): boolean {
+ // @ts-expect-error
+ return typeof WebSocketPair === 'function'
+}
+
+export function isNodeJs(): boolean {
+ try {
+ // @deno-expect-error
+ return process.versions.node !== undefined
+ } catch {
+ return false
+ }
+}

src/runtime/browser/fetch_jwks.ts

@@ -1,6 +1,6 @@
 import type { FetchFunction } from '../interfaces.d'
 import { JOSEError, JWKSTimeout } from '../../util/errors.js'
-import globalThis, { isCloudflareWorkers } from './global.js'
+import { isCloudflareWorkers } from './env.js'
 
 const fetchJwks: FetchFunction = async (url: URL, timeout: number) => {
  let controller!: AbortController
@@ -14,23 +14,21 @@ const fetchJwks: FetchFunction = async (url: URL, timeout: number) => {
  }, timeout)
  }
 
- const response = await globalThis
- .fetch(url.href, {
- signal: controller ? controller.signal : undefined,
- redirect: 'manual',
- method: 'GET',
- ...(!isCloudflareWorkers()
- ? {
- referrerPolicy: 'no-referrer',
- credentials: 'omit',
- mode: 'cors',
- }
- : undefined),
- })
- .catch((err) => {
- if (timedOut) throw new JWKSTimeout()
- throw err
- })
+ const response = await fetch(url.href, {
+ signal: controller ? controller.signal : undefined,
+ redirect: 'manual',
+ method: 'GET',
+ ...(!isCloudflareWorkers()
+ ? {
+ referrerPolicy: 'no-referrer',
+ credentials: 'omit',
+ mode: 'cors',
+ }
+ : undefined),
+ }).catch((err) => {
+ if (timedOut) throw new JWKSTimeout()
+ throw err
+ })
 
  if (id !== undefined) clearTimeout(id)
 

src/runtime/browser/generate.ts

@@ -1,4 +1,4 @@
-import { isCloudflareWorkers, isNodeJs } from './global.js'
+import { isCloudflareWorkers, isNodeJs } from './env.js'
 import crypto from './webcrypto.js'
 import { JOSENotSupported } from '../../util/errors.js'
 import random from './random.js'

src/runtime/browser/jwk_to_key.ts

@@ -1,4 +1,4 @@
-import { isCloudflareWorkers, isNodeJs } from './global.js'
+import { isCloudflareWorkers, isNodeJs } from './env.js'
 import crypto from './webcrypto.js'
 import type { JWKImportFunction } from '../interfaces.d'
 import { JOSENotSupported } from '../../util/errors.js'

src/runtime/browser/subtle_dsa.ts

@@ -1,4 +1,4 @@
-import { isCloudflareWorkers, isNodeJs } from './global.js'
+import { isCloudflareWorkers, isNodeJs } from './env.js'
 import { JOSENotSupported } from '../../util/errors.js'
 
 export default function subtleDsa(alg: string, namedCurve?: string) {

src/runtime/browser/webcrypto.ts

@@ -1,10 +1,14 @@
-import globalThis from './global.js'
-
-export default globalThis.crypto
+export default crypto
 
 export function isCryptoKey(key: unknown): key is CryptoKey {
- if (typeof globalThis.CryptoKey === 'undefined') {
+ try {
+ return (
+ key != null &&
+ typeof (<CryptoKey>key).extractable === 'boolean' &&
+ typeof (<CryptoKey>key).algorithm.name === 'string' &&
+ typeof (<CryptoKey>key).type === 'string'
+ )
+ } catch {
  return false
  }
- return key != null && key instanceof globalThis.CryptoKey
 }