@japikey/cloudflare 0.2.2 → 0.3.1

package/README.md

@@ -24,7 +24,7 @@ import {
   createApiKeyRouter,
   createJWKSRouter,
   isJWKSPath,
-  type CreateApiKeyRouterOptions,
+  type ApiKeyRouterOptions,
   type CreateApiKeyData,
 } from '@japikey/cloudflare';
 
@@ -75,7 +75,7 @@ export default {
       const db = new D1Driver(env.DB);
       await db.ensureTable();
 
-      const options: CreateApiKeyRouterOptions<Env> = {
+      const options: ApiKeyRouterOptions<Env> = {
         getUserId,
         parseCreateApiKeyRequest,
         issuer: new URL('https://example.com/'),
@@ -91,7 +91,11 @@ export default {
     // Handle JWKS routes
     const baseIssuer = new URL('https://example.com/');
     if (isJWKSPath(request, baseIssuer)) {
-      const jwksRouter = createJWKSRouter(baseIssuer, db);
+      const jwksRouter = createJWKSRouter({
+        baseIssuer,
+        db,
+        maxAgeSeconds: 300,
+      });
       return jwksRouter.fetch(request, env);
     }
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import type { CreateApiKeyRouterOptions, CreateApiKeyData } from './router.ts';
+import type { ApiKeyRouterOptions, CreateApiKeyData, JwksRouterOptions } from './router.ts';
 import { createApiKeyRouter, createJWKSRouter, isJWKSPath } from './router.ts';
 import D1Driver from './d1.ts';
-export { createApiKeyRouter, createJWKSRouter, isJWKSPath, D1Driver, type CreateApiKeyRouterOptions, type CreateApiKeyData, };
+export { createApiKeyRouter, createJWKSRouter, isJWKSPath, D1Driver, type ApiKeyRouterOptions, type CreateApiKeyData, type JwksRouterOptions, };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,QAAQ,MAAM,SAAS,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,UAAU,EACV,QAAQ,EACR,KAAK,yBAAyB,EAC9B,KAAK,gBAAgB,GACtB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,QAAQ,MAAM,SAAS,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,UAAU,EACV,QAAQ,EACR,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,GACvB,CAAC"}

package/dist/router.d.ts

@@ -1,19 +1,27 @@
 import type { DatabaseDriver } from '@japikey/japikey';
-import type { ExportedHandler } from '@cloudflare/workers-types';
+import type { Request as WorkerRequest, ExportedHandlerFetchHandler, IncomingRequestCfProperties } from '@cloudflare/workers-types';
 export type CreateApiKeyData = {
     expiresAt: Date;
     claims: Record<string, unknown>;
     databaseMetadata: Record<string, unknown>;
 };
-export type CreateApiKeyRouterOptions<Env> = {
-    getUserId: (request: Request, env: Env) => Promise<string>;
-    parseCreateApiKeyRequest: (request: Request, env: Env) => Promise<CreateApiKeyData>;
+export type ApiKeyRouterOptions<Env> = {
+    getUserId: (request: WorkerRequest<unknown, IncomingRequestCfProperties>, env: Env) => Promise<string>;
+    parseCreateApiKeyRequest: (request: WorkerRequest<unknown, IncomingRequestCfProperties>, env: Env) => Promise<CreateApiKeyData>;
     issuer: URL;
     aud: string;
     db: DatabaseDriver;
     routePrefix: string;
 };
-export declare function createJWKSRouter<Env>(baseIssuer: URL, db: DatabaseDriver): ExportedHandler<Env>;
-export declare function isJWKSPath(request: Request, baseIssuer: URL): boolean;
-export declare function createApiKeyRouter<Env>(options: CreateApiKeyRouterOptions<Env>): ExportedHandler<Env>;
+export type JwksRouterOptions = {
+    baseIssuer: URL;
+    db: DatabaseDriver;
+    maxAgeSeconds?: number;
+};
+export type SimpleHandler<Env> = {
+    fetch: ExportedHandlerFetchHandler<Env>;
+};
+export declare function createJWKSRouter<Env>(options: JwksRouterOptions): SimpleHandler<Env>;
+export declare function isJWKSPath<C>(request: WorkerRequest<unknown, IncomingRequestCfProperties>, baseIssuer: URL): boolean;
+export declare function createApiKeyRouter<Env>(options: ApiKeyRouterOptions<Env>): SimpleHandler<Env>;
 //# sourceMappingURL=router.d.ts.map

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,kBAAkB,CAAC;AAGtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAGjE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,IAAI,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,yBAAyB,CAAC,GAAG,IAAI;IAC3C,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3D,wBAAwB,EAAE,CACxB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,KACL,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/B,MAAM,EAAE,GAAG,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,cAAc,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAwEF,wBAAgB,gBAAgB,CAAC,GAAG,EAClC,UAAU,EAAE,GAAG,EACf,EAAE,EAAE,cAAc,GACjB,eAAe,CAAC,GAAG,CAAC,CAUtB;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,GAAG,OAAO,CAOrE;AA6HD,wBAAgB,kBAAkB,CAAC,GAAG,EACpC,OAAO,EAAE,yBAAyB,CAAC,GAAG,CAAC,GACtC,eAAe,CAAC,GAAG,CAAC,CAmCtB"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,kBAAkB,CAAC;AAGtE,OAAO,KAAK,EACV,OAAO,IAAI,aAAa,EAExB,2BAA2B,EAC3B,2BAA2B,EAC5B,MAAM,2BAA2B,CAAC;AAGnC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,IAAI,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,mBAAmB,CAAC,GAAG,IAAI;IACrC,SAAS,EAAE,CACT,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,2BAA2B,CAAC,EAC5D,GAAG,EAAE,GAAG,KACL,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,wBAAwB,EAAE,CACxB,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,2BAA2B,CAAC,EAC5D,GAAG,EAAE,GAAG,KACL,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/B,MAAM,EAAE,GAAG,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,cAAc,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,GAAG,CAAC;IAChB,EAAE,EAAE,cAAc,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,aAAa,CAAC,GAAG,IAAI;IAC/B,KAAK,EAAE,2BAA2B,CAAC,GAAG,CAAC,CAAC;CACzC,CAAC;AA2EF,wBAAgB,gBAAgB,CAAC,GAAG,EAClC,OAAO,EAAE,iBAAiB,GACzB,aAAa,CAAC,GAAG,CAAC,CASpB;AAED,wBAAgB,UAAU,CAAC,CAAC,EAC1B,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,2BAA2B,CAAC,EAC5D,UAAU,EAAE,GAAG,GACd,OAAO,CAOT;AA6HD,wBAAgB,kBAAkB,CAAC,GAAG,EACpC,OAAO,EAAE,mBAAmB,CAAC,GAAG,CAAC,GAChC,aAAa,CAAC,GAAG,CAAC,CAqCpB"}

package/dist/router.js

@@ -25,18 +25,21 @@ function wrapError(fn) {
         }
     };
 }
-async function handleJWKSRequest(kid, db) {
-    const row = await db.getApiKey(kid);
+async function handleJWKSRequest(kid, options) {
+    const row = await options.db.getApiKey(kid);
     if (!row || row.revoked) {
         throw new NotFoundError('API key not found');
     }
     const jwks = {
         keys: [row.jwk],
     };
+    const headers = {
+        'Content-Type': 'application/json',
+    };
+    const maxAge = Math.max(options.maxAgeSeconds ?? 0, 0); // Negative values are undefined per mdn - clamp to 0
+    headers['Cache-Control'] = `max-age=${maxAge}`;
     return new Response(JSON.stringify(jwks), {
-        headers: {
-            'Content-Type': 'application/json',
-        },
+        headers,
     });
 }
 function getWellKnownKid(request, baseIssuer) {
@@ -60,11 +63,11 @@ function getWellKnownKid(request, baseIssuer) {
     }
     return kid;
 }
-export function createJWKSRouter(baseIssuer, db) {
+export function createJWKSRouter(options) {
     return {
-        fetch: wrapError(async function fetch(request, env) {
-            const kid = getWellKnownKid(request, baseIssuer);
-            return handleJWKSRequest(kid, db);
+        fetch: wrapError(async function fetch(request) {
+            const kid = getWellKnownKid(request, options.baseIssuer);
+            return handleJWKSRequest(kid, options);
         }),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@japikey/cloudflare",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "description": "Cloudflare worker-based endpoints for japikey",
   "engines": {
     "node": ">=22.5.0"
@@ -44,11 +44,10 @@
     "format:check": "prettier --check src/**/*.ts"
   },
   "dependencies": {
-    "@japikey/japikey": "0.2.2",
+    "@japikey/japikey": "0.3.1",
     "path-to-regexp": "^8.2.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250806.0",
     "@types/node": "^24.1.0",
     "@typescript-eslint/eslint-plugin": "^8.38.0",
     "@typescript-eslint/parser": "^8.38.0",
@@ -60,5 +59,8 @@
     "prettier": "^3.6.2",
     "rimraf": "^6.0.1",
     "vitest": "^3.2.4"
+  },
+  "peerDependencies": {
+    "@cloudflare/workers-types": "^4.20250810.0"
   }
 }