fix: concurrent fetch await in cloudflare

fixes #355
panva · Feb 7, 2022 · e44cd18 · e44cd18
1 parent 3d2a2b8
commit e44cd18
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/jwks/remote.ts b/src/jwks/remote.ts
@@ -1,4 +1,5 @@
 import fetchJwks from '../runtime/fetch_jwks.js'
+import { isCloudflareWorkers } from '../runtime/env.js'
 
 import type { KeyLike, JWSHeaderParameters, FlattenedJWSInput, GetKeyFunction } from '../types.d'
 import { JWKSInvalid, JWKSNoMatchingKey } from '../util/errors.js'
@@ -89,6 +90,20 @@ class RemoteJWKSet extends LocalJWKSet {
  }
 
  async reload() {
+ // see https://github.com/panva/jose/issues/355
+ if (this._pendingFetch && isCloudflareWorkers()) {
+ return new Promise<void>((resolve) => {
+ const isDone = () => {
+ if (this._pendingFetch === undefined) {
+ resolve()
+ } else {
+ setTimeout(isDone, 5)
+ }
+ }
+ isDone()
+ })
+ }
+
  if (!this._pendingFetch) {
  this._pendingFetch = fetchJwks(this._url, this._timeoutDuration, this._options)
  .then((json) => {