@forklaunch/core 0.14.13 → 0.14.15

package/lib/http/index.mjs

@@ -118,7 +118,7 @@ function isBasicAuthMethod(maybeBasicAuthMethod) {
 
 // src/http/guards/isHmacMethod.ts
 function isHmacMethod(maybeHmacMethod) {
-  return typeof maybeHmacMethod === "object" && maybeHmacMethod !== null && "secretKey" in maybeHmacMethod && maybeHmacMethod.secretKey != null;
+  return typeof maybeHmacMethod === "object" && maybeHmacMethod !== null && "hmac" in maybeHmacMethod && maybeHmacMethod.hmac != null;
 }
 
 // src/http/guards/isJwtAuthMethod.ts
@@ -127,12 +127,26 @@ function isJwtAuthMethod(maybeJwtAuthMethod) {
 }
 
 // src/http/discriminateAuthMethod.ts
-var DEFAULT_TTL = 60 * 1e3 * 5;
-var memoizedJwks = {
+var DEFAULT_TTL = process.env.JWKS_TTL ? parseInt(process.env.JWKS_TTL) : 60 * 1e3 * 5;
+var cachedJwks = {
   value: null,
   lastUpdated: null,
   ttl: DEFAULT_TTL
 };
+async function getCachedJwks(jwksPublicKeyUrl) {
+  if (cachedJwks.value && cachedJwks.lastUpdated && Date.now() - cachedJwks.lastUpdated.getTime() < cachedJwks.ttl) {
+    return cachedJwks.value;
+  } else {
+    const jwksResponse = await fetch(jwksPublicKeyUrl);
+    const jwks = (await jwksResponse.json()).keys;
+    cachedJwks.value = jwks;
+    cachedJwks.lastUpdated = /* @__PURE__ */ new Date();
+    cachedJwks.ttl = parseInt(
+      jwksResponse.headers.get("cache-control")?.split("=")[1] ?? `${DEFAULT_TTL / 1e3}`
+    ) * 1e3;
+    return jwks;
+  }
+}
 async function discriminateAuthMethod(auth) {
   let authMethod;
   if (isBasicAuthMethod(auth)) {
@@ -157,17 +171,7 @@ async function discriminateAuthMethod(auth) {
     } else {
       let jwks;
       if ("jwksPublicKeyUrl" in jwt) {
-        if (memoizedJwks.value && memoizedJwks.lastUpdated && Date.now() - memoizedJwks.lastUpdated.getTime() < memoizedJwks.ttl) {
-          jwks = memoizedJwks.value;
-        } else {
-          const jwksResponse = await fetch(jwt.jwksPublicKeyUrl);
-          jwks = (await jwksResponse.json()).keys;
-          memoizedJwks.value = jwks;
-          memoizedJwks.lastUpdated = /* @__PURE__ */ new Date();
-          memoizedJwks.ttl = parseInt(
-            jwksResponse.headers.get("cache-control")?.split("=")[1] ?? `${DEFAULT_TTL / 1e3}`
-          ) * 1e3;
-        }
+        jwks = await getCachedJwks(jwt.jwksPublicKeyUrl);
       } else if ("jwksPublicKey" in jwt) {
         jwks = [jwt.jwksPublicKey];
       }
@@ -177,9 +181,9 @@ async function discriminateAuthMethod(auth) {
             const { payload } = await jwtVerify(token, key);
             return payload;
           } catch {
-            memoizedJwks.value = null;
-            memoizedJwks.lastUpdated = null;
-            memoizedJwks.ttl = DEFAULT_TTL;
+            cachedJwks.value = null;
+            cachedJwks.lastUpdated = null;
+            cachedJwks.ttl = DEFAULT_TTL;
             continue;
           }
         }
@@ -464,6 +468,7 @@ async function parseRequestAuth(req, res, next) {
     req._globalOptions?.()?.auth
   ) ?? [];
   if (error != null) {
+    req.openTelemetryCollector.error(error, message);
     res.type("text/plain");
     res.status(error).send(message);
     return;