@zuplo/cli 6.74.2 → 6.74.6

package/node_modules/@modelcontextprotocol/sdk/node_modules/jose/dist/webapi/lib/jwe_encrypt.js

@@ -9,7 +9,7 @@ import { prepareKey } from './key.js';
 import { jweAlgorithm, jweEncryption } from './jwe_algorithms.js';
 import { compress } from './deflate.js';
 export function checkEncryptHeaders(input) {
-    const { protectedHeader, unprotectedHeader, sharedUnprotectedHeader } = input;
+    const [, protectedHeader, unprotectedHeader, sharedUnprotectedHeader, , , , , crit] = input;
     if (!isDisjoint(protectedHeader, unprotectedHeader, sharedUnprotectedHeader)) {
         throw new JWEInvalid('JWE Protected, JWE Shared Unprotected and JWE Per-Recipient Header Parameter names must be disjoint');
     }
@@ -18,7 +18,7 @@ export function checkEncryptHeaders(input) {
         ...unprotectedHeader,
         ...sharedUnprotectedHeader,
     };
-    validateCrit(JWEInvalid, JWE_RECOGNIZED, input.crit, protectedHeader, joseHeader);
+    validateCrit(JWEInvalid, JWE_RECOGNIZED, crit, protectedHeader, joseHeader);
     if (joseHeader.zip !== undefined && joseHeader.zip !== 'DEF') {
         throw new JOSENotSupported('Unsupported JWE "zip" (Compression Algorithm) Header Parameter value.');
     }
@@ -32,20 +32,21 @@ export function checkEncryptHeaders(input) {
     if (typeof enc !== 'string' || !enc) {
         throw new JWEInvalid('JWE "enc" (Encryption Algorithm) Header Parameter missing or invalid');
     }
-    return { joseHeader, alg, enc, encEntry: jweEncryption(enc) };
+    return [joseHeader, alg, enc, jweEncryption(enc)];
 }
 export async function encryptJWE(input, checked, key) {
-    const { joseHeader, alg, encEntry } = checked;
-    let { protectedHeader, unprotectedHeader } = input;
-    const { sharedUnprotectedHeader } = input;
-    if (input.cek && (alg === 'dir' || alg === 'ECDH-ES')) {
+    const [joseHeader, alg, , encEntry] = checked;
+    const [inputPlaintext, inputProtectedHeader, inputUnprotectedHeader, sharedUnprotectedHeader, aad, providedCek, inputIv, keyManagementParameters, , unprotectedParameters,] = input;
+    let protectedHeader = inputProtectedHeader;
+    let unprotectedHeader = inputUnprotectedHeader;
+    if (providedCek && (alg === 'dir' || alg === 'ECDH-ES')) {
         throw new TypeError(`setContentEncryptionKey cannot be called with JWE "alg" (Algorithm) Header ${alg}`);
     }
     const algEntry = jweAlgorithm(alg);
     const k = await prepareKey(alg === 'dir' ? encEntry : algEntry, key, 'encrypt');
-    const { cek, encryptedKey, parameters } = await encryptKeyManagement(alg, encEntry, k, input.cek, input.keyManagementParameters);
+    const [cek, encryptedKey, parameters] = await encryptKeyManagement(alg, encEntry, k, providedCek, keyManagementParameters);
     if (parameters) {
-        if (input.unprotectedParameters) {
+        if (unprotectedParameters) {
             unprotectedHeader = unprotectedHeader ? { ...unprotectedHeader, ...parameters } : parameters;
         }
         else {
@@ -64,20 +65,20 @@ export async function encryptJWE(input, checked, key) {
     }
     let additionalData;
     let aadMember;
-    if (input.aad?.byteLength) {
-        aadMember = b64u(input.aad);
+    if (aad?.byteLength) {
+        aadMember = b64u(aad);
         additionalData = concat(protectedHeaderB, encode('.'), encode(aadMember));
     }
     else {
         additionalData = protectedHeaderB;
     }
-    let plaintext = input.plaintext;
+    let plaintext = inputPlaintext;
     if (joseHeader.zip === 'DEF') {
         plaintext = await compress(plaintext).catch((cause) => {
             throw new JWEInvalid('Failed to compress plaintext', { cause });
         });
     }
-    const { ciphertext, tag, iv } = await encrypt(encEntry, plaintext, cek, input.iv, additionalData);
+    const { ciphertext, tag, iv } = await encrypt(encEntry, plaintext, cek, inputIv, additionalData);
     const jwe = {
         ciphertext: b64u(ciphertext),
     };

package/node_modules/@modelcontextprotocol/sdk/node_modules/jose/dist/webapi/lib/jwk_to_key.js

@@ -1,22 +1,17 @@
 import { JOSENotSupported } from '../util/errors.js';
-const unsupportedAlg = 'Invalid or unsupported JWK "alg" (Algorithm) Parameter value';
-function subtleParams(entry, jwk) {
-    if (!entry.kty.includes(jwk.kty)) {
-        throw new JOSENotSupported(unsupportedAlg);
-    }
-    return entry.subtleFor?.({ kty: jwk.kty, crv: jwk.crv }) ?? entry.subtle;
-}
 export async function jwkToKey(entry, jwk) {
     if (jwk.kty === 'RSA' && 'oth' in jwk && jwk.oth !== undefined) {
         throw new JOSENotSupported('RSA JWK "oth" (Other Primes Info) Parameter value is not supported');
     }
-    const algorithm = subtleParams(entry, jwk);
+    if (!entry.kty.includes(jwk.kty)) {
+        throw new JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
+    }
+    const algorithm = entry.resolve?.({ kty: jwk.kty, crv: jwk.crv }) ?? entry.subtle;
     const isPrivate = !!(jwk.d || jwk.priv);
-    const keyUsages = isPrivate ? entry.usages.private : entry.usages.public;
     const keyData = { ...jwk };
     if (keyData.kty !== 'AKP') {
         delete keyData.alg;
     }
     delete keyData.use;
-    return crypto.subtle.importKey('jwk', keyData, algorithm, jwk.ext ?? (isPrivate ? false : true), jwk.key_ops ?? keyUsages);
+    return crypto.subtle.importKey('jwk', keyData, algorithm, jwk.ext ?? !isPrivate, jwk.key_ops ?? entry.usages[isPrivate ? 1 : 0]);
 }

package/node_modules/@modelcontextprotocol/sdk/node_modules/jose/dist/webapi/lib/jws_algorithms.js

@@ -1,18 +1,19 @@
 import { JOSENotSupported } from '../util/errors.js';
 import { table } from './key_descriptor.js';
-const sig = { public: ['verify'], private: ['sign'] };
+const sig = [['verify'], ['sign']];
 function hmac(bits) {
     const subtle = { name: 'HMAC', hash: `SHA-${bits}` };
-    return { kty: ['oct'], symmetric: true, subtle, operation: subtle, usages: sig };
+    return { kty: ['oct'], secret: true, subtle, signing: subtle, usages: sig };
 }
-function rsa(name, bits, saltLength) {
+function rsa(bits, saltLength) {
+    const name = saltLength ? 'RSA-PSS' : 'RSASSA-PKCS1-v1_5';
     const subtle = { name, hash: `SHA-${bits}` };
     return {
         kty: ['RSA'],
         subtle,
-        operation: saltLength ? { ...subtle, saltLength } : subtle,
+        signing: saltLength ? { ...subtle, saltLength } : subtle,
         usages: sig,
-        minModulusLength: 2048,
+        minRsaBits: 2048,
     };
 }
 function ecdsa(crv, bits) {
@@ -20,7 +21,7 @@ function ecdsa(crv, bits) {
         kty: ['EC'],
         crv,
         subtle: { name: 'ECDSA', namedCurve: crv },
-        operation: { name: 'ECDSA', hash: `SHA-${bits}` },
+        signing: { name: 'ECDSA', hash: `SHA-${bits}` },
         usages: sig,
     };
 }
@@ -30,16 +31,17 @@ function eddsa() {
         kty: ['OKP'],
         crv: 'Ed25519',
         subtle,
-        operation: subtle,
+        signing: subtle,
         usages: sig,
     };
 }
-function mldsa(name) {
+function mldsa(bits) {
+    const name = `ML-DSA-${bits}`;
     const subtle = { name };
     return {
         kty: ['AKP'],
         subtle,
-        operation: subtle,
+        signing: subtle,
         usages: sig,
     };
 }
@@ -47,20 +49,20 @@ const JWS = table({
     HS256: hmac(256),
     HS384: hmac(384),
     HS512: hmac(512),
-    RS256: rsa('RSASSA-PKCS1-v1_5', 256),
-    RS384: rsa('RSASSA-PKCS1-v1_5', 384),
-    RS512: rsa('RSASSA-PKCS1-v1_5', 512),
-    PS256: rsa('RSA-PSS', 256, 32),
-    PS384: rsa('RSA-PSS', 384, 48),
-    PS512: rsa('RSA-PSS', 512, 64),
+    RS256: rsa(256),
+    RS384: rsa(384),
+    RS512: rsa(512),
+    PS256: rsa(256, 32),
+    PS384: rsa(384, 48),
+    PS512: rsa(512, 64),
     ES256: ecdsa('P-256', 256),
     ES384: ecdsa('P-384', 384),
     ES512: ecdsa('P-521', 512),
     EdDSA: eddsa(),
     Ed25519: eddsa(),
-    'ML-DSA-44': mldsa('ML-DSA-44'),
-    'ML-DSA-65': mldsa('ML-DSA-65'),
-    'ML-DSA-87': mldsa('ML-DSA-87'),
+    'ML-DSA-44': mldsa(44),
+    'ML-DSA-65': mldsa(65),
+    'ML-DSA-87': mldsa(87),
 });
 export function jwsAlgorithm(alg) {
     const entry = JWS[alg];

package/node_modules/@modelcontextprotocol/sdk/node_modules/jose/dist/webapi/lib/jws_sign.js

@@ -13,6 +13,9 @@ export function unencodedPayload(protectedHeader) {
 }
 export async function createSignature(input, key) {
     const { protectedHeader, unprotectedHeader } = input;
+    if (!protectedHeader && !unprotectedHeader) {
+        throw new JWSInvalid('either setProtectedHeader or setUnprotectedHeader must be called before #sign()');
+    }
     if (!isDisjoint(protectedHeader, unprotectedHeader)) {
         throw new JWSInvalid('JWS Protected and JWS Unprotected Header Parameter names must be disjoint');
     }
@@ -20,7 +23,7 @@ export async function createSignature(input, key) {
     validateCritDuplicates(JWSInvalid, protectedHeader);
     const extensions = validateCrit(JWSInvalid, JWS_RECOGNIZED, input.crit, protectedHeader, joseHeader);
     let b64 = true;
-    if (extensions.has('b64')) {
+    if (extensions.includes('b64')) {
         b64 = protectedHeader.b64;
         if (typeof b64 !== 'boolean') {
             throw new JWSInvalid('The "b64" (base64url-encode payload) Header Parameter must be a boolean');
@@ -34,11 +37,11 @@ export async function createSignature(input, key) {
     let payloadS;
     let payloadB;
     if (b64) {
-        const encoded = (input.encoded ??= {});
-        encoded.b64 ??= b64u(input.payload);
-        encoded.raw ??= encode(encoded.b64);
-        payloadS = encoded.b64;
-        payloadB = encoded.raw;
+        const encoded = (input.encoded ??= []);
+        encoded[0] ??= b64u(input.payload);
+        encoded[1] ??= encode(encoded[0]);
+        payloadS = encoded[0];
+        payloadB = encoded[1];
     }
     else {
         payloadB = input.payload;
@@ -64,5 +67,8 @@ export async function createSignature(input, key) {
     if (protectedHeader) {
         jws.protected = protectedHeaderString;
     }
+    if (unprotectedHeader) {
+        jws.header = unprotectedHeader;
+    }
     return jws;
 }

package/node_modules/@modelcontextprotocol/sdk/node_modules/jose/dist/webapi/lib/jws_verify.js

@@ -7,42 +7,41 @@ import { isDisjoint } from './type_checks.js';
 import { validateCrit, validateAlgorithms, JWS_RECOGNIZED } from './options.js';
 import { prepareKey } from './key.js';
 export function verifyResult(jws, verified) {
-    const result = { payload: verified.payload };
+    const [payload, parsedProt, , key, resolvedKey] = verified;
+    const result = { payload };
     if (jws.protected !== undefined) {
-        result.protectedHeader = verified.parsedProt;
+        result.protectedHeader = parsedProt;
     }
     if (jws.header !== undefined) {
         result.unprotectedHeader = jws.header;
     }
-    if (verified.resolvedKey) {
-        return { ...result, key: verified.key };
+    if (resolvedKey) {
+        return { ...result, key };
     }
     return result;
 }
 export function prepareVerify(options) {
-    return {
-        algorithms: options && validateAlgorithms('algorithms', options.algorithms),
-        crit: options?.crit,
-    };
+    return [options && validateAlgorithms('algorithms', options.algorithms), options?.crit];
 }
 export async function verifySignature(jws, shared, key) {
+    const { protected: encodedProtected, header, payload: inputPayload } = jws;
     let parsedProt = {};
-    if (jws.protected) {
-        parsedProt = parseJoseHeader(jws.protected, JWSInvalid, 'JWS Protected Header is invalid');
+    if (encodedProtected) {
+        parsedProt = parseJoseHeader(encodedProtected, JWSInvalid, 'JWS Protected Header is invalid');
     }
     let joseHeader;
-    if (jws.header !== undefined) {
-        if (!isDisjoint(parsedProt, jws.header)) {
+    if (header !== undefined) {
+        if (!isDisjoint(parsedProt, header)) {
             throw new JWSInvalid('JWS Protected and JWS Unprotected Header Parameter names must be disjoint');
         }
-        joseHeader = { ...parsedProt, ...jws.header };
+        joseHeader = { ...parsedProt, ...header };
     }
     else {
         joseHeader = parsedProt;
     }
-    const extensions = validateCrit(JWSInvalid, JWS_RECOGNIZED, shared.crit, parsedProt, joseHeader);
+    const extensions = validateCrit(JWSInvalid, JWS_RECOGNIZED, shared[1], parsedProt, joseHeader);
     let b64 = true;
-    if (extensions.has('b64')) {
+    if (extensions.includes('b64')) {
         b64 = parsedProt.b64;
         if (typeof b64 !== 'boolean') {
             throw new JWSInvalid('The "b64" (base64url-encode payload) Header Parameter must be a boolean');
@@ -52,15 +51,15 @@ export async function verifySignature(jws, shared, key) {
     if (typeof alg !== 'string' || !alg) {
         throw new JWSInvalid('JWS "alg" (Algorithm) Header Parameter missing or invalid');
     }
-    if (shared.algorithms && !shared.algorithms.has(alg)) {
+    if (shared[0] && !shared[0].has(alg)) {
         throw new JOSEAlgNotAllowed('"alg" (Algorithm) Header Parameter value not allowed');
     }
     if (b64) {
-        if (typeof jws.payload !== 'string') {
+        if (typeof inputPayload !== 'string') {
             throw new JWSInvalid('JWS Payload must be a string');
         }
     }
-    else if (typeof jws.payload !== 'string' && !(jws.payload instanceof Uint8Array)) {
+    else if (typeof inputPayload !== 'string' && !(inputPayload instanceof Uint8Array)) {
         throw new JWSInvalid('JWS Payload must be a string or an Uint8Array instance');
     }
     let resolvedKey = false;
@@ -69,12 +68,12 @@ export async function verifySignature(jws, shared, key) {
         resolvedKey = true;
     }
     const entry = jwsAlgorithm(alg);
-    const data = concat(jws.protected !== undefined ? encode(jws.protected) : new Uint8Array(), encode('.'), typeof jws.payload === 'string'
+    const data = concat(encodedProtected !== undefined ? encode(encodedProtected) : new Uint8Array(), encode('.'), typeof inputPayload === 'string'
         ? b64
             ?
-                (shared.b64p ??= encodeBase64url(jws.payload, 'payload', JWSInvalid))
-            : encoder.encode(jws.payload)
-        : jws.payload);
+                (shared[2] ??= encodeBase64url(inputPayload, 'payload', JWSInvalid))
+            : encoder.encode(inputPayload)
+        : inputPayload);
     const signature = decodeBase64url(jws.signature, 'signature', JWSInvalid);
     const k = await prepareKey(entry, key, 'verify');
     const verified = await verify(entry, k, signature, data);
@@ -83,15 +82,15 @@ export async function verifySignature(jws, shared, key) {
     }
     let payload;
     if (b64) {
-        payload = decodeBase64url(jws.payload, 'payload', JWSInvalid);
+        payload = decodeBase64url(inputPayload, 'payload', JWSInvalid);
     }
-    else if (typeof jws.payload === 'string') {
-        payload = encoder.encode(jws.payload);
+    else if (typeof inputPayload === 'string') {
+        payload = encoder.encode(inputPayload);
     }
     else {
-        payload = jws.payload;
+        payload = inputPayload;
     }
-    return { payload, parsedProt, b64, key: k, resolvedKey };
+    return [payload, parsedProt, b64, k, resolvedKey];
 }
 export async function verifyCompact(jws, shared, key) {
     if (jws instanceof Uint8Array) {

package/node_modules/@modelcontextprotocol/sdk/node_modules/jose/dist/webapi/lib/jwt_claims_set.js

@@ -2,56 +2,23 @@ import { JWTClaimValidationFailed, JWTExpired, JWTInvalid } from '../util/errors
 import { encoder, strictDecoder } from './buffer_utils.js';
 import { isObject } from './type_checks.js';
 const epoch = (date) => Math.floor(date.getTime() / 1000);
-const minute = 60;
-const hour = minute * 60;
-const day = hour * 24;
-const week = day * 7;
-const year = day * 365.25;
+const multipliers = {
+    s: 1,
+    m: 60,
+    h: 3600,
+    d: 86400,
+    w: 604800,
+    y: 31557600,
+};
 const REGEX = /^(\+|\-)? ?(\d+|\d+\.\d+) ?(seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)(?: (ago|from now))?$/i;
+const checkFailed = 'check_failed';
 export function secs(str) {
     const matched = REGEX.exec(str);
     if (!matched || (matched[4] && matched[1])) {
         throw new TypeError('Invalid time period format');
     }
     const value = parseFloat(matched[2]);
-    const unit = matched[3].toLowerCase();
-    let numericDate;
-    switch (unit) {
-        case 'sec':
-        case 'secs':
-        case 'second':
-        case 'seconds':
-        case 's':
-            numericDate = Math.round(value);
-            break;
-        case 'minute':
-        case 'minutes':
-        case 'min':
-        case 'mins':
-        case 'm':
-            numericDate = Math.round(value * minute);
-            break;
-        case 'hour':
-        case 'hours':
-        case 'hr':
-        case 'hrs':
-        case 'h':
-            numericDate = Math.round(value * hour);
-            break;
-        case 'day':
-        case 'days':
-        case 'd':
-            numericDate = Math.round(value * day);
-            break;
-        case 'week':
-        case 'weeks':
-        case 'w':
-            numericDate = Math.round(value * week);
-            break;
-        default:
-            numericDate = Math.round(value * year);
-            break;
-    }
+    const numericDate = Math.round(value * multipliers[matched[3][0].toLowerCase()]);
     if (matched[1] === '-' || matched[4] === 'ago') {
         return -numericDate;
     }
@@ -63,6 +30,13 @@ function validateInput(label, input) {
     }
     return input;
 }
+function numericDate(value, label) {
+    if (typeof value === 'number')
+        return validateInput(label, value);
+    if (value instanceof Date)
+        return validateInput(label, epoch(value));
+    return epoch(new Date()) + secs(value);
+}
 const normalizeTyp = (value) => {
     if (value.includes('/')) {
         return value.toLowerCase();
@@ -74,10 +48,22 @@ const checkAudiencePresence = (audPayload, audOption) => {
         return audOption.includes(audPayload);
     }
     if (Array.isArray(audPayload)) {
-        return audOption.some(Set.prototype.has.bind(new Set(audPayload)));
+        return audOption.some((aud) => audPayload.includes(aud));
     }
     return false;
 };
+function validateNumericDate(payload, claim, required = false) {
+    const value = payload[claim];
+    if (value === undefined && !required)
+        return undefined;
+    if (typeof value !== 'number') {
+        throw new JWTClaimValidationFailed(`"${claim}" claim must be a number`, payload, claim, 'invalid');
+    }
+    return value;
+}
+function unexpectedClaim(payload, claim) {
+    throw new JWTClaimValidationFailed(`unexpected "${claim}" claim value`, payload, claim, checkFailed);
+}
 export function validateClaimsSet(protectedHeader, encodedPayload, options = {}) {
     let payload;
     try {
@@ -92,7 +78,7 @@ export function validateClaimsSet(protectedHeader, encodedPayload, options = {})
     if (typ &&
         (typeof protectedHeader.typ !== 'string' ||
             normalizeTyp(protectedHeader.typ) !== normalizeTyp(typ))) {
-        throw new JWTClaimValidationFailed('unexpected "typ" JWT header value', payload, 'typ', 'check_failed');
+        throw new JWTClaimValidationFailed('unexpected "typ" JWT header value', payload, 'typ', checkFailed);
     }
     const { requiredClaims = [], issuer, subject, audience, maxTokenAge } = options;
     const presenceCheck = [...requiredClaims];
@@ -105,65 +91,56 @@ export function validateClaimsSet(protectedHeader, encodedPayload, options = {})
     if (issuer !== undefined)
         presenceCheck.push('iss');
     for (const claim of new Set(presenceCheck.reverse())) {
-        if (!(claim in payload)) {
+        if (!Object.hasOwn(payload, claim)) {
             throw new JWTClaimValidationFailed(`missing required "${claim}" claim`, payload, claim, 'missing');
         }
     }
     if (issuer !== undefined &&
         !(Array.isArray(issuer) ? issuer : [issuer]).includes(payload.iss)) {
-        throw new JWTClaimValidationFailed('unexpected "iss" claim value', payload, 'iss', 'check_failed');
+        unexpectedClaim(payload, 'iss');
     }
     if (subject !== undefined && payload.sub !== subject) {
-        throw new JWTClaimValidationFailed('unexpected "sub" claim value', payload, 'sub', 'check_failed');
+        unexpectedClaim(payload, 'sub');
     }
     if (audience !== undefined &&
         !checkAudiencePresence(payload.aud, typeof audience === 'string' ? [audience] : audience)) {
-        throw new JWTClaimValidationFailed('unexpected "aud" claim value', payload, 'aud', 'check_failed');
-    }
-    let tolerance;
-    switch (typeof options.clockTolerance) {
-        case 'string':
-            tolerance = secs(options.clockTolerance);
-            break;
-        case 'number':
-            tolerance = options.clockTolerance;
-            break;
-        case 'undefined':
-            tolerance = 0;
-            break;
-        default:
+        unexpectedClaim(payload, 'aud');
+    }
+    const { clockTolerance } = options;
+    let tolerance = 0;
+    if (typeof clockTolerance === 'string') {
+        tolerance = secs(clockTolerance);
+    }
+    else if (clockTolerance !== undefined) {
+        if (typeof clockTolerance !== 'number') {
             throw new TypeError('Invalid clockTolerance option type');
+        }
+        tolerance = clockTolerance;
     }
     validateInput('clockTolerance option', tolerance);
     const { currentDate } = options;
     const now = validateInput('currentDate option', epoch(currentDate || new Date()));
-    if ((payload.iat !== undefined || maxTokenAge !== undefined) && typeof payload.iat !== 'number') {
-        throw new JWTClaimValidationFailed('"iat" claim must be a number', payload, 'iat', 'invalid');
-    }
-    if (payload.nbf !== undefined) {
-        if (typeof payload.nbf !== 'number') {
-            throw new JWTClaimValidationFailed('"nbf" claim must be a number', payload, 'nbf', 'invalid');
-        }
-        if (payload.nbf > now + tolerance) {
-            throw new JWTClaimValidationFailed('"nbf" claim timestamp check failed', payload, 'nbf', 'check_failed');
+    const iat = validateNumericDate(payload, 'iat', maxTokenAge !== undefined);
+    const nbf = validateNumericDate(payload, 'nbf');
+    if (nbf !== undefined) {
+        if (nbf > now + tolerance) {
+            throw new JWTClaimValidationFailed('"nbf" claim timestamp check failed', payload, 'nbf', checkFailed);
         }
     }
-    if (payload.exp !== undefined) {
-        if (typeof payload.exp !== 'number') {
-            throw new JWTClaimValidationFailed('"exp" claim must be a number', payload, 'exp', 'invalid');
-        }
-        if (payload.exp <= now - tolerance) {
-            throw new JWTExpired('"exp" claim timestamp check failed', payload, 'exp', 'check_failed');
+    const exp = validateNumericDate(payload, 'exp');
+    if (exp !== undefined) {
+        if (exp <= now - tolerance) {
+            throw new JWTExpired('"exp" claim timestamp check failed', payload, 'exp', checkFailed);
         }
     }
     if (maxTokenAge !== undefined) {
-        const age = now - payload.iat;
+        const age = now - iat;
         const max = typeof maxTokenAge === 'number' ? maxTokenAge : secs(maxTokenAge);
         if (age - tolerance > max) {
-            throw new JWTExpired('"iat" claim timestamp check failed (too far in the past)', payload, 'iat', 'check_failed');
+            throw new JWTExpired('"iat" claim timestamp check failed (too far in the past)', payload, 'iat', checkFailed);
         }
         if (age < 0 - tolerance) {
-            throw new JWTClaimValidationFailed('"iat" claim timestamp check failed (it should be in the past)', payload, 'iat', 'check_failed');
+            throw new JWTClaimValidationFailed('"iat" claim timestamp check failed (it should be in the past)', payload, 'iat', checkFailed);
         }
     }
     return payload;
@@ -201,39 +178,20 @@ export class JWTClaimsBuilder {
         this.#payload.jti = value;
     }
     set nbf(value) {
-        if (typeof value === 'number') {
-            this.#payload.nbf = validateInput('setNotBefore', value);
-        }
-        else if (value instanceof Date) {
-            this.#payload.nbf = validateInput('setNotBefore', epoch(value));
-        }
-        else {
-            this.#payload.nbf = epoch(new Date()) + secs(value);
-        }
+        this.#payload.nbf = numericDate(value, 'setNotBefore');
     }
     set exp(value) {
-        if (typeof value === 'number') {
-            this.#payload.exp = validateInput('setExpirationTime', value);
-        }
-        else if (value instanceof Date) {
-            this.#payload.exp = validateInput('setExpirationTime', epoch(value));
-        }
-        else {
-            this.#payload.exp = epoch(new Date()) + secs(value);
-        }
+        this.#payload.exp = numericDate(value, 'setExpirationTime');
     }
     set iat(value) {
         if (value === undefined) {
             this.#payload.iat = epoch(new Date());
         }
-        else if (value instanceof Date) {
-            this.#payload.iat = validateInput('setIssuedAt', epoch(value));
-        }
         else if (typeof value === 'string') {
             this.#payload.iat = validateInput('setIssuedAt', epoch(new Date()) + secs(value));
         }
         else {
-            this.#payload.iat = validateInput('setIssuedAt', value);
+            this.#payload.iat = numericDate(value, 'setIssuedAt');
         }
     }
 }