@japikey/cloudflare 0.3.0 → 0.3.2

package/README.md

@@ -134,16 +134,15 @@ database_name = "japikey-db"
 database_id = "your-database-id"
 ```
 
-The D1Driver will automatically create the required table when you call `ensureTable()`. The table structure is:
-
-```sql
-CREATE TABLE IF NOT EXISTS japikeys (
-  kid TEXT PRIMARY KEY,
-  user_id TEXT NOT NULL,
-  revoked INTEGER NOT NULL,
-  jwk TEXT NOT NULL,
-  metadata TEXT NOT NULL
-)
+## Manual Table Creation
+
+Cloudflare already supports table migrations. If you want, you can manually create the table
+(see the sql in [d1.ts](./src/d1.ts)). The ensureTable will not make any changes in this case.
+However, you must still call ensureTable() in your code
+
+```ts
+const db = new D1Driver(env.DB);
+await db.ensureTable(); // This call is still necessary, for initializing the prepared statements
 ```
 
 # Validating an API key

package/dist/d1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"d1.d.ts","sourceRoot":"","sources":["../src/d1.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAIL,sCAAsC,EACvC,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,UAAU,EAGX,MAAM,2BAA2B,CAAC;AAyCnC,MAAM,CAAC,OAAO,OAAO,QAAS,YAAW,cAAc;IAKnD,OAAO,CAAC,EAAE;IAJZ,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,SAAS,CAAS;gBAGhB,EAAE,EAAE,UAAU,EACtB,SAAS,GAAE,MAAmB;IAQhC,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,iBAAiB;IAqBnB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB5B,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB9C,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAgBjD,WAAW,CACf,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,SAAS,EAAE,CAAC;IAajB,YAAY,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWrE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAEtB,CAAC,sCAAsC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAGhE"}
+{"version":3,"file":"d1.d.ts","sourceRoot":"","sources":["../src/d1.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAIL,sCAAsC,EACvC,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,UAAU,EAGX,MAAM,2BAA2B,CAAC;AAyCnC,MAAM,CAAC,OAAO,OAAO,QAAS,YAAW,cAAc;IAKnD,OAAO,CAAC,EAAE;IAJZ,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,SAAS,CAAS;gBAGhB,EAAE,EAAE,UAAU,EACtB,SAAS,GAAE,MAAmB;IAQhC,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,iBAAiB;IAqBnB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB5B,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB9C,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAgBjD,WAAW,CACf,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,SAAS,EAAE,CAAC;IAajB,YAAY,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWrE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAEtB,CAAC,sCAAsC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAGhE"}

package/dist/d1.js

@@ -51,10 +51,10 @@ export default class D1Driver {
     prepareStatements() {
         try {
             this._queries = {
-                insert: this.db.prepare(`INSERT INTO ${this.tableName} (kid, user_id, revoked, jwk, metadata) VALUES (?1, ?2, ?3, ?4, ?5)`),
-                get: this.db.prepare(`SELECT * FROM ${this.tableName} WHERE kid = ?1`),
-                find: this.db.prepare(`SELECT * FROM ${this.tableName} WHERE user_id = ?1 LIMIT ?2 OFFSET ?3`),
-                revoke: this.db.prepare(`UPDATE ${this.tableName} SET revoked = 1 WHERE user_id = ?1 AND kid = ?2`),
+                insert: this.db.prepare(`INSERT INTO ${this.tableName} (kid, user_id, revoked, jwk, metadata) VALUES (?1, ?2, ?3, ?4, ?5);`),
+                get: this.db.prepare(`SELECT * FROM ${this.tableName} WHERE kid = ?1;`),
+                find: this.db.prepare(`SELECT * FROM ${this.tableName} WHERE user_id = ?1 LIMIT ?2 OFFSET ?3;`),
+                revoke: this.db.prepare(`UPDATE ${this.tableName} SET revoked = 1 WHERE user_id = ?1 AND kid = ?2;`),
             };
         }
         catch (err) {
@@ -72,8 +72,9 @@ export default class D1Driver {
         revoked INTEGER NOT NULL,
         jwk TEXT NOT NULL,
         metadata TEXT NOT NULL
-      )
-    `);
+      );
+    `.replaceAll('\n', ' ') // Workaround for https://github.com/cloudflare/workers-sdk/issues/9133
+            );
         }
         catch (err) {
             throw new DatabaseError('Failed to create the table', {

package/dist/router.d.ts

@@ -1,13 +1,13 @@
 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 ApiKeyRouterOptions<Env> = {
-    getUserId: (request: Request, env: Env) => Promise<string>;
-    parseCreateApiKeyRequest: (request: Request, env: Env) => Promise<CreateApiKeyData>;
+    getUserId: (request: WorkerRequest<unknown, IncomingRequestCfProperties>, env: Env) => Promise<string>;
+    parseCreateApiKeyRequest: (request: WorkerRequest<unknown, IncomingRequestCfProperties>, env: Env) => Promise<CreateApiKeyData>;
     issuer: URL;
     aud: string;
     db: DatabaseDriver;
@@ -18,7 +18,10 @@ export type JwksRouterOptions = {
     db: DatabaseDriver;
     maxAgeSeconds?: number;
 };
-export declare function createJWKSRouter<Env>(options: JwksRouterOptions): ExportedHandler<Env>;
-export declare function isJWKSPath(request: Request, baseIssuer: URL): boolean;
-export declare function createApiKeyRouter<Env>(options: ApiKeyRouterOptions<Env>): ExportedHandler<Env>;
+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,mBAAmB,CAAC,GAAG,IAAI;IACrC,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;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,GAAG,CAAC;IAChB,EAAE,EAAE,cAAc,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AA2EF,wBAAgB,gBAAgB,CAAC,GAAG,EAClC,OAAO,EAAE,iBAAiB,GACzB,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,mBAAmB,CAAC,GAAG,CAAC,GAChC,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

@@ -65,7 +65,7 @@ function getWellKnownKid(request, baseIssuer) {
 }
 export function createJWKSRouter(options) {
     return {
-        fetch: wrapError(async function fetch(request, env) {
+        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.3.0",
+  "version": "0.3.2",
   "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.3.0",
+    "@japikey/japikey": "0.3.2",
     "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"
   }
 }