jose 5.2.3 → 5.3.0

package/dist/browser/jwe/flattened/encrypt.js

@@ -99,13 +99,11 @@ export class FlattenedEncrypt {
                         this._unprotectedHeader = { ...this._unprotectedHeader, ...parameters };
                     }
                 }
+                else if (!this._protectedHeader) {
+                    this.setProtectedHeader(parameters);
+                }
                 else {
-                    if (!this._protectedHeader) {
-                        this.setProtectedHeader(parameters);
-                    }
-                    else {
-                        this._protectedHeader = { ...this._protectedHeader, ...parameters };
-                    }
+                    this._protectedHeader = { ...this._protectedHeader, ...parameters };
                 }
             }
         }

package/dist/browser/jwks/local.js

@@ -14,7 +14,7 @@ function getKtyFromAlg(alg) {
             throw new JOSENotSupported('Unsupported "alg" value for a JSON Web Key Set');
     }
 }
-export function isJWKSLike(jwks) {
+function isJWKSLike(jwks) {
     return (jwks &&
         typeof jwks === 'object' &&
         Array.isArray(jwks.keys) &&
@@ -108,5 +108,14 @@ async function importWithAlgCache(cache, jwk, alg) {
 }
 export function createLocalJWKSet(jwks) {
     const set = new LocalJWKSet(jwks);
-    return async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    const localJWKSet = async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    Object.defineProperties(localJWKSet, {
+        jwks: {
+            value: () => clone(set._jwks),
+            enumerable: true,
+            configurable: false,
+            writable: false,
+        },
+    });
+    return localJWKSet;
 }

package/dist/browser/jwks/remote.js

@@ -1,6 +1,6 @@
 import fetchJwks from '../runtime/fetch_jwks.js';
-import { JWKSInvalid, JWKSNoMatchingKey } from '../util/errors.js';
-import { isJWKSLike, LocalJWKSet } from './local.js';
+import { JWKSNoMatchingKey } from '../util/errors.js';
+import { createLocalJWKSet } from './local.js';
 function isCloudflareWorkers() {
     return (typeof WebSocketPair !== 'undefined' ||
         (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers') ||
@@ -9,13 +9,11 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v5.2.3';
+    const VERSION = 'v5.3.0';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
-class RemoteJWKSet extends LocalJWKSet {
+class RemoteJWKSet {
     constructor(url, options) {
-        super({ keys: [] });
-        this._jwks = undefined;
         if (!(url instanceof URL)) {
             throw new TypeError('url must be an instance of URL');
         }
@@ -38,17 +36,17 @@ class RemoteJWKSet extends LocalJWKSet {
             : false;
     }
     async getKey(protectedHeader, token) {
-        if (!this._jwks || !this.fresh()) {
+        if (!this._local || !this.fresh()) {
             await this.reload();
         }
         try {
-            return await super.getKey(protectedHeader, token);
+            return await this._local(protectedHeader, token);
         }
         catch (err) {
             if (err instanceof JWKSNoMatchingKey) {
                 if (this.coolingDown() === false) {
                     await this.reload();
-                    return super.getKey(protectedHeader, token);
+                    return this._local(protectedHeader, token);
                 }
             }
             throw err;
@@ -65,10 +63,7 @@ class RemoteJWKSet extends LocalJWKSet {
         }
         this._pendingFetch || (this._pendingFetch = fetchJwks(this._url, this._timeoutDuration, this._options)
             .then((json) => {
-            if (!isJWKSLike(json)) {
-                throw new JWKSInvalid('JSON Web Key Set malformed');
-            }
-            this._jwks = { keys: json.keys };
+            this._local = createLocalJWKSet(json);
             this._jwksTimestamp = Date.now();
             this._pendingFetch = undefined;
         })
@@ -81,5 +76,35 @@ class RemoteJWKSet extends LocalJWKSet {
 }
 export function createRemoteJWKSet(url, options) {
     const set = new RemoteJWKSet(url, options);
-    return async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    const remoteJWKSet = async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    Object.defineProperties(remoteJWKSet, {
+        coolingDown: {
+            get: () => set.coolingDown(),
+            enumerable: true,
+            configurable: false,
+        },
+        fresh: {
+            get: () => set.fresh(),
+            enumerable: true,
+            configurable: false,
+        },
+        reload: {
+            value: () => set.reload(),
+            enumerable: true,
+            configurable: false,
+            writable: false,
+        },
+        reloading: {
+            get: () => !!set._pendingFetch,
+            enumerable: true,
+            configurable: false,
+        },
+        jwks: {
+            value: () => set._local?.jwks(),
+            enumerable: true,
+            configurable: false,
+            writable: false,
+        },
+    });
+    return remoteJWKSet;
 }

package/dist/node/cjs/jwe/flattened/encrypt.js

@@ -110,13 +110,11 @@ class FlattenedEncrypt {
                         this._unprotectedHeader = { ...this._unprotectedHeader, ...parameters };
                     }
                 }
+                else if (!this._protectedHeader) {
+                    this.setProtectedHeader(parameters);
+                }
                 else {
-                    if (!this._protectedHeader) {
-                        this.setProtectedHeader(parameters);
-                    }
-                    else {
-                        this._protectedHeader = { ...this._protectedHeader, ...parameters };
-                    }
+                    this._protectedHeader = { ...this._protectedHeader, ...parameters };
                 }
             }
         }

package/dist/node/cjs/jwks/local.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLocalJWKSet = exports.LocalJWKSet = exports.isJWKSLike = void 0;
+exports.createLocalJWKSet = exports.LocalJWKSet = void 0;
 const import_js_1 = require("../key/import.js");
 const errors_js_1 = require("../util/errors.js");
 const is_object_js_1 = require("../lib/is_object.js");
@@ -23,7 +23,6 @@ function isJWKSLike(jwks) {
         Array.isArray(jwks.keys) &&
         jwks.keys.every(isJWKLike));
 }
-exports.isJWKSLike = isJWKSLike;
 function isJWKLike(key) {
     return (0, is_object_js_1.default)(key);
 }
@@ -114,6 +113,15 @@ async function importWithAlgCache(cache, jwk, alg) {
 }
 function createLocalJWKSet(jwks) {
     const set = new LocalJWKSet(jwks);
-    return async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    const localJWKSet = async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    Object.defineProperties(localJWKSet, {
+        jwks: {
+            value: () => clone(set._jwks),
+            enumerable: true,
+            configurable: false,
+            writable: false,
+        },
+    });
+    return localJWKSet;
 }
 exports.createLocalJWKSet = createLocalJWKSet;

package/dist/node/cjs/jwks/remote.js

@@ -12,10 +12,10 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v5.2.3';
+    const VERSION = 'v5.3.0';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
-class RemoteJWKSet extends local_js_1.LocalJWKSet {
+class RemoteJWKSet {
     _url;
     _timeoutDuration;
     _cooldownDuration;
@@ -23,9 +23,8 @@ class RemoteJWKSet extends local_js_1.LocalJWKSet {
     _jwksTimestamp;
     _pendingFetch;
     _options;
+    _local;
     constructor(url, options) {
-        super({ keys: [] });
-        this._jwks = undefined;
         if (!(url instanceof URL)) {
             throw new TypeError('url must be an instance of URL');
         }
@@ -48,17 +47,17 @@ class RemoteJWKSet extends local_js_1.LocalJWKSet {
             : false;
     }
     async getKey(protectedHeader, token) {
-        if (!this._jwks || !this.fresh()) {
+        if (!this._local || !this.fresh()) {
             await this.reload();
         }
         try {
-            return await super.getKey(protectedHeader, token);
+            return await this._local(protectedHeader, token);
         }
         catch (err) {
             if (err instanceof errors_js_1.JWKSNoMatchingKey) {
                 if (this.coolingDown() === false) {
                     await this.reload();
-                    return super.getKey(protectedHeader, token);
+                    return this._local(protectedHeader, token);
                 }
             }
             throw err;
@@ -75,10 +74,7 @@ class RemoteJWKSet extends local_js_1.LocalJWKSet {
         }
         this._pendingFetch ||= (0, fetch_jwks_js_1.default)(this._url, this._timeoutDuration, this._options)
             .then((json) => {
-            if (!(0, local_js_1.isJWKSLike)(json)) {
-                throw new errors_js_1.JWKSInvalid('JSON Web Key Set malformed');
-            }
-            this._jwks = { keys: json.keys };
+            this._local = (0, local_js_1.createLocalJWKSet)(json);
             this._jwksTimestamp = Date.now();
             this._pendingFetch = undefined;
         })
@@ -91,6 +87,36 @@ class RemoteJWKSet extends local_js_1.LocalJWKSet {
 }
 function createRemoteJWKSet(url, options) {
     const set = new RemoteJWKSet(url, options);
-    return async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    const remoteJWKSet = async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    Object.defineProperties(remoteJWKSet, {
+        coolingDown: {
+            get: () => set.coolingDown(),
+            enumerable: true,
+            configurable: false,
+        },
+        fresh: {
+            get: () => set.fresh(),
+            enumerable: true,
+            configurable: false,
+        },
+        reload: {
+            value: () => set.reload(),
+            enumerable: true,
+            configurable: false,
+            writable: false,
+        },
+        reloading: {
+            get: () => !!set._pendingFetch,
+            enumerable: true,
+            configurable: false,
+        },
+        jwks: {
+            value: () => set._local?.jwks(),
+            enumerable: true,
+            configurable: false,
+            writable: false,
+        },
+    });
+    return remoteJWKSet;
 }
 exports.createRemoteJWKSet = createRemoteJWKSet;

package/dist/node/cjs/lib/decrypt_key_management.js

@@ -75,7 +75,7 @@ async function decryptKeyManagement(alg, key, encryptedKey, joseHeader, options)
                 throw new errors_js_1.JWEInvalid('JWE Encrypted Key missing');
             if (typeof joseHeader.p2c !== 'number')
                 throw new errors_js_1.JWEInvalid(`JOSE Header "p2c" (PBES2 Count) missing or invalid`);
-            const p2cLimit = options?.maxPBES2Count || 10000;
+            const p2cLimit = options?.maxPBES2Count || 10_000;
             if (joseHeader.p2c > p2cLimit)
                 throw new errors_js_1.JWEInvalid(`JOSE Header "p2c" (PBES2 Count) out is of acceptable bounds`);
             if (typeof joseHeader.p2s !== 'string')

package/dist/node/esm/jwe/flattened/encrypt.js

@@ -107,13 +107,11 @@ export class FlattenedEncrypt {
                         this._unprotectedHeader = { ...this._unprotectedHeader, ...parameters };
                     }
                 }
+                else if (!this._protectedHeader) {
+                    this.setProtectedHeader(parameters);
+                }
                 else {
-                    if (!this._protectedHeader) {
-                        this.setProtectedHeader(parameters);
-                    }
-                    else {
-                        this._protectedHeader = { ...this._protectedHeader, ...parameters };
-                    }
+                    this._protectedHeader = { ...this._protectedHeader, ...parameters };
                 }
             }
         }

package/dist/node/esm/jwks/local.js

@@ -14,7 +14,7 @@ function getKtyFromAlg(alg) {
             throw new JOSENotSupported('Unsupported "alg" value for a JSON Web Key Set');
     }
 }
-export function isJWKSLike(jwks) {
+function isJWKSLike(jwks) {
     return (jwks &&
         typeof jwks === 'object' &&
         Array.isArray(jwks.keys) &&
@@ -109,5 +109,14 @@ async function importWithAlgCache(cache, jwk, alg) {
 }
 export function createLocalJWKSet(jwks) {
     const set = new LocalJWKSet(jwks);
-    return async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    const localJWKSet = async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    Object.defineProperties(localJWKSet, {
+        jwks: {
+            value: () => clone(set._jwks),
+            enumerable: true,
+            configurable: false,
+            writable: false,
+        },
+    });
+    return localJWKSet;
 }

package/dist/node/esm/jwks/remote.js

@@ -1,6 +1,6 @@
 import fetchJwks from '../runtime/fetch_jwks.js';
-import { JWKSInvalid, JWKSNoMatchingKey } from '../util/errors.js';
-import { isJWKSLike, LocalJWKSet } from './local.js';
+import { JWKSNoMatchingKey } from '../util/errors.js';
+import { createLocalJWKSet } from './local.js';
 function isCloudflareWorkers() {
     return (typeof WebSocketPair !== 'undefined' ||
         (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers') ||
@@ -9,10 +9,10 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v5.2.3';
+    const VERSION = 'v5.3.0';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
-class RemoteJWKSet extends LocalJWKSet {
+class RemoteJWKSet {
     _url;
     _timeoutDuration;
     _cooldownDuration;
@@ -20,9 +20,8 @@ class RemoteJWKSet extends LocalJWKSet {
     _jwksTimestamp;
     _pendingFetch;
     _options;
+    _local;
     constructor(url, options) {
-        super({ keys: [] });
-        this._jwks = undefined;
         if (!(url instanceof URL)) {
             throw new TypeError('url must be an instance of URL');
         }
@@ -45,17 +44,17 @@ class RemoteJWKSet extends LocalJWKSet {
             : false;
     }
     async getKey(protectedHeader, token) {
-        if (!this._jwks || !this.fresh()) {
+        if (!this._local || !this.fresh()) {
             await this.reload();
         }
         try {
-            return await super.getKey(protectedHeader, token);
+            return await this._local(protectedHeader, token);
         }
         catch (err) {
             if (err instanceof JWKSNoMatchingKey) {
                 if (this.coolingDown() === false) {
                     await this.reload();
-                    return super.getKey(protectedHeader, token);
+                    return this._local(protectedHeader, token);
                 }
             }
             throw err;
@@ -72,10 +71,7 @@ class RemoteJWKSet extends LocalJWKSet {
         }
         this._pendingFetch ||= fetchJwks(this._url, this._timeoutDuration, this._options)
             .then((json) => {
-            if (!isJWKSLike(json)) {
-                throw new JWKSInvalid('JSON Web Key Set malformed');
-            }
-            this._jwks = { keys: json.keys };
+            this._local = createLocalJWKSet(json);
             this._jwksTimestamp = Date.now();
             this._pendingFetch = undefined;
         })
@@ -88,5 +84,35 @@ class RemoteJWKSet extends LocalJWKSet {
 }
 export function createRemoteJWKSet(url, options) {
     const set = new RemoteJWKSet(url, options);
-    return async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    const remoteJWKSet = async (protectedHeader, token) => set.getKey(protectedHeader, token);
+    Object.defineProperties(remoteJWKSet, {
+        coolingDown: {
+            get: () => set.coolingDown(),
+            enumerable: true,
+            configurable: false,
+        },
+        fresh: {
+            get: () => set.fresh(),
+            enumerable: true,
+            configurable: false,
+        },
+        reload: {
+            value: () => set.reload(),
+            enumerable: true,
+            configurable: false,
+            writable: false,
+        },
+        reloading: {
+            get: () => !!set._pendingFetch,
+            enumerable: true,
+            configurable: false,
+        },
+        jwks: {
+            value: () => set._local?.jwks(),
+            enumerable: true,
+            configurable: false,
+            writable: false,
+        },
+    });
+    return remoteJWKSet;
 }

package/dist/node/esm/lib/decrypt_key_management.js

@@ -73,7 +73,7 @@ async function decryptKeyManagement(alg, key, encryptedKey, joseHeader, options)
                 throw new JWEInvalid('JWE Encrypted Key missing');
             if (typeof joseHeader.p2c !== 'number')
                 throw new JWEInvalid(`JOSE Header "p2c" (PBES2 Count) missing or invalid`);
-            const p2cLimit = options?.maxPBES2Count || 10000;
+            const p2cLimit = options?.maxPBES2Count || 10_000;
             if (joseHeader.p2c > p2cLimit)
                 throw new JWEInvalid(`JOSE Header "p2c" (PBES2 Count) out is of acceptable bounds`);
             if (typeof joseHeader.p2s !== 'string')

package/dist/types/jwks/local.d.ts

@@ -1,9 +1,7 @@
 import type { KeyLike, JWSHeaderParameters, JSONWebKeySet, FlattenedJWSInput } from '../types';
 /** @private */
-export declare function isJWKSLike(jwks: unknown): jwks is JSONWebKeySet;
-/** @private */
 export declare class LocalJWKSet<KeyLikeType extends KeyLike = KeyLike> {
-    protected _jwks?: JSONWebKeySet;
+    private _jwks?;
     private _cached;
     constructor(jwks: unknown);
     getKey(protectedHeader?: JWSHeaderParameters, token?: FlattenedJWSInput): Promise<KeyLikeType>;

package/dist/types/jwks/remote.d.ts

@@ -1,4 +1,4 @@
-import type { KeyLike, JWSHeaderParameters, FlattenedJWSInput } from '../types';
+import type { KeyLike, JWSHeaderParameters, FlattenedJWSInput, JSONWebKeySet } from '../types';
 /** Options for the remote JSON Web Key Set. */
 export interface RemoteJWKSetOptions {
     /**
@@ -53,4 +53,16 @@ export interface RemoteJWKSetOptions {
  * @param url URL to fetch the JSON Web Key Set from.
  * @param options Options for the remote JSON Web Key Set.
  */
-export declare function createRemoteJWKSet<KeyLikeType extends KeyLike = KeyLike>(url: URL, options?: RemoteJWKSetOptions): (protectedHeader?: JWSHeaderParameters, token?: FlattenedJWSInput) => Promise<KeyLikeType>;
+export declare function createRemoteJWKSet<KeyLikeType extends KeyLike = KeyLike>(url: URL, options?: RemoteJWKSetOptions): {
+    (protectedHeader?: JWSHeaderParameters, token?: FlattenedJWSInput): Promise<KeyLikeType>;
+    /** @ignore */
+    coolingDown: boolean;
+    /** @ignore */
+    fresh: boolean;
+    /** @ignore */
+    reloading: boolean;
+    /** @ignore */
+    reload: () => Promise<void>;
+    /** @ignore */
+    jwks: () => JSONWebKeySet | undefined;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jose",
-  "version": "5.2.3",
+  "version": "5.3.0",
   "description": "JWA, JWS, JWE, JWT, JWK, JWKS for Node.js, Browser, Cloudflare Workers, Deno, Bun, and other Web-interoperable runtimes",
   "keywords": [
     "browser",
@@ -65,6 +65,7 @@
       "deno": "./dist/browser/index.js",
       "browser": "./dist/browser/index.js",
       "worker": "./dist/browser/index.js",
+      "workerd": "./dist/browser/index.js",
       "import": "./dist/node/esm/index.js",
       "require": "./dist/node/cjs/index.js"
     },
@@ -74,6 +75,7 @@
       "deno": "./dist/browser/util/errors.js",
       "browser": "./dist/browser/util/errors.js",
       "worker": "./dist/browser/util/errors.js",
+      "workerd": "./dist/browser/util/errors.js",
       "import": "./dist/node/esm/util/errors.js",
       "require": "./dist/node/cjs/util/errors.js"
     },
@@ -83,6 +85,7 @@
       "deno": "./dist/browser/util/base64url.js",
       "browser": "./dist/browser/util/base64url.js",
       "worker": "./dist/browser/util/base64url.js",
+      "workerd": "./dist/browser/util/base64url.js",
       "import": "./dist/node/esm/util/base64url.js",
       "require": "./dist/node/cjs/util/base64url.js"
     },