jose 5.6.1 → 5.6.2

package/dist/browser/jwks/remote.js

@@ -10,7 +10,7 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v5.6.1';
+    const VERSION = 'v5.6.2';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
 export const experimental_jwksCache = Symbol();

package/dist/browser/lib/decrypt_key_management.js

@@ -11,8 +11,8 @@ import checkKeyType from './check_key_type.js';
 import isObject from './is_object.js';
 import { unwrap as aesGcmKw } from './aesgcmkw.js';
 async function decryptKeyManagement(alg, key, encryptedKey, joseHeader, options) {
-    key = (await normalize.normalizePrivateKey?.(key, alg)) || key;
     checkKeyType(alg, key, 'decrypt');
+    key = (await normalize.normalizePrivateKey?.(key, alg)) || key;
     switch (alg) {
         case 'dir': {
             if (encryptedKey !== undefined)

package/dist/browser/lib/encrypt_key_management.js

@@ -13,8 +13,8 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
     let encryptedKey;
     let parameters;
     let cek;
-    key = (await normalize.normalizePublicKey?.(key, alg)) || key;
     checkKeyType(alg, key, 'encrypt');
+    key = (await normalize.normalizePublicKey?.(key, alg)) || key;
     switch (alg) {
         case 'dir': {
             cek = key;

package/dist/browser/runtime/normalize_key.js

@@ -1,8 +1,27 @@
 import { decode } from './base64url.js';
 import importJWK from './jwk_to_key.js';
 const normalizeSecretKey = (k) => decode(k);
-const normalizePublicKey = async (key, alg) => {
-    if (key?.[Symbol.toStringTag] === 'KeyObject') {
+let privCache;
+let pubCache;
+const isKeyObject = (key) => {
+    return key?.[Symbol.toStringTag] === 'KeyObject';
+};
+const importAndCache = async (cache, key, jwk, alg) => {
+    let cached = cache.get(key);
+    if (cached?.[alg]) {
+        return cached[alg];
+    }
+    const cryptoKey = await importJWK({ ...jwk, alg });
+    if (!cached) {
+        cache.set(key, { [alg]: cryptoKey });
+    }
+    else {
+        cached[alg] = cryptoKey;
+    }
+    return cryptoKey;
+};
+const normalizePublicKey = (key, alg) => {
+    if (isKeyObject(key)) {
         let jwk = key.export({ format: 'jwk' });
         delete jwk.d;
         delete jwk.dp;
@@ -13,17 +32,19 @@ const normalizePublicKey = async (key, alg) => {
         if (jwk.k) {
             return normalizeSecretKey(jwk.k);
         }
-        return importJWK({ ...jwk, alg });
+        pubCache || (pubCache = new WeakMap());
+        return importAndCache(pubCache, key, jwk, alg);
     }
     return key;
 };
-const normalizePrivateKey = async (key, alg) => {
-    if (key?.[Symbol.toStringTag] === 'KeyObject') {
+const normalizePrivateKey = (key, alg) => {
+    if (isKeyObject(key)) {
         let jwk = key.export({ format: 'jwk' });
         if (jwk.k) {
             return normalizeSecretKey(jwk.k);
         }
-        return importJWK({ ...jwk, alg });
+        privCache || (privCache = new WeakMap());
+        return importAndCache(privCache, key, jwk, alg);
     }
     return key;
 };

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

@@ -13,7 +13,7 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v5.6.1';
+    const VERSION = 'v5.6.2';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
 exports.experimental_jwksCache = Symbol();

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

@@ -13,8 +13,8 @@ const check_key_type_js_1 = require("./check_key_type.js");
 const is_object_js_1 = require("./is_object.js");
 const aesgcmkw_js_1 = require("./aesgcmkw.js");
 async function decryptKeyManagement(alg, key, encryptedKey, joseHeader, options) {
-    key = (await normalize_key_js_1.default.normalizePrivateKey?.(key, alg)) || key;
     (0, check_key_type_js_1.default)(alg, key, 'decrypt');
+    key = (await normalize_key_js_1.default.normalizePrivateKey?.(key, alg)) || key;
     switch (alg) {
         case 'dir': {
             if (encryptedKey !== undefined)

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

@@ -15,8 +15,8 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
     let encryptedKey;
     let parameters;
     let cek;
-    key = (await normalize_key_js_1.default.normalizePublicKey?.(key, alg)) || key;
     (0, check_key_type_js_1.default)(alg, key, 'encrypt');
+    key = (await normalize_key_js_1.default.normalizePublicKey?.(key, alg)) || key;
     switch (alg) {
         case 'dir': {
             cek = key;

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

@@ -10,7 +10,7 @@ function isCloudflareWorkers() {
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
     const NAME = 'jose';
-    const VERSION = 'v5.6.1';
+    const VERSION = 'v5.6.2';
     USER_AGENT = `${NAME}/${VERSION}`;
 }
 export const experimental_jwksCache = Symbol();

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

@@ -11,8 +11,8 @@ import checkKeyType from './check_key_type.js';
 import isObject from './is_object.js';
 import { unwrap as aesGcmKw } from './aesgcmkw.js';
 async function decryptKeyManagement(alg, key, encryptedKey, joseHeader, options) {
-    key = (await normalize.normalizePrivateKey?.(key, alg)) || key;
     checkKeyType(alg, key, 'decrypt');
+    key = (await normalize.normalizePrivateKey?.(key, alg)) || key;
     switch (alg) {
         case 'dir': {
             if (encryptedKey !== undefined)

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

@@ -13,8 +13,8 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
     let encryptedKey;
     let parameters;
     let cek;
-    key = (await normalize.normalizePublicKey?.(key, alg)) || key;
     checkKeyType(alg, key, 'encrypt');
+    key = (await normalize.normalizePublicKey?.(key, alg)) || key;
     switch (alg) {
         case 'dir': {
             cek = key;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jose",
-  "version": "5.6.1",
+  "version": "5.6.2",
   "description": "JWA, JWS, JWE, JWT, JWK, JWKS for Node.js, Browser, Cloudflare Workers, Deno, Bun, and other Web-interoperable runtimes",
   "keywords": [
     "browser",