gruber 0.6.1 → 0.7.0

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 This file documents notable changes to the project
 
+## 0.7.0
+
+**new**
+
+- Add Server-sent events utilities
+- Add experimental `log` option to `FetchRouter`
+- Add experimental `expressMiddleware` and `koaMiddleware`
+
+**fixes**
+
+- Fix malformed node HTTP headers when they contain a comma
+- Ignore invalid cookies rather than throw an error
+- `getRequestBody` also checks for `multipart/form-data`
+- node: `request.signal` is now triggered if the request is cancelled
+
+## 0.6.2
+
+**fixes**
+
+- Use `unknown` type when expecting a dependency, its now on the consumer to make sure they pass the correct thing. TypeScript-ing this is too hard.
+- Experimental stores use dependency types too
+
 ## 0.6.1
 
 **new**

package/README.md

@@ -726,7 +726,7 @@ TODO: I'm not happy with this, will need to come back to it.
 
 ## Core library
 
-### http
+### HTTP
 
 #### defineRoute
 
@@ -1144,7 +1144,7 @@ The idea is you might check for `user:books:write` inside a request handler agai
 
 ### Authentication
 
-> UNSTABLE
+> VERY UNSTABLE
 
 Authentication provides a service to help users get authorization to use the application.
 
@@ -1183,6 +1183,56 @@ const { token, headers, redirect } = await authn.finish(login);
 These would obviously be spread accross multiple endpoints and you transfer
 the token / code combination to the user in a way that proves they are who they claim to be.
 
+### Server Sent Events
+
+Gruber includes utilities for sending [Server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events) from regular route definitions.
+
+```ts
+import { defineRoute, ServerSentEventStream, sseHeaders } from "gruber";
+
+const stream = defineRoute({
+	method: "GET",
+	pathname: "/stream",
+	async handler({ request }) {
+		let counter = 0;
+		let timerId = null;
+
+		// Create a stream to pipe data to the response,
+		// it sends an incrementing counter every second
+		const stream = new ReadableStream({
+			start(controller) {
+				timerId = setInterval(() => {
+					counter++;
+					controller.enqueue({ data: JSON.stringify({ counter }) });
+				}, 1_000);
+			},
+			cancel() {
+				if (timerId) clearInterval(timerId);
+			},
+		});
+
+		// Create a response that transforms the stream into an SSE body
+		return new Response(stream.pipeThrough(new ServerSentEventStream()), {
+			headers: {
+				"content-type": "text/event-stream",
+				"cache-control": "no-cache",
+				connection: "keep-alive",
+			},
+		});
+	},
+});
+```
+
+> You might want to use [ReadableStream.from](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/from_static) to create the stream
+
+#### ServerSentEventMessage
+
+`ServerSentEventMessage` is an interface for the payload to be delivered to the client.
+
+#### ServerSentEventStream
+
+`ServerSentEventStream` is a [TransformStream]() that converts `ServerSentEventMessage` into the raw bytes to send to a client.
+
 ### Utilities
 
 #### loader

package/core/authorization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authorization.d.ts","sourceRoot":"","sources":["authorization.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvD;;;GAGG;AACH,wBAAgB,WAAW,CAC1B,OAAO,EAAE,OAAO,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAapC;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,iBAIjD;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAErE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,YAQ1C;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,WAM7D;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAE7D;AAED,MAAM,WAAW,iBAAiB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,gBAAgB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,4BAA4B;IAC5C,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC;IAClD,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAC9C,UAAU,CACT,OAAO,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE,iBAAiB,GACzB,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,2BAA2B;IAC3C,UAAU,EAAE,MAAM,CAAC;CACnB;AAED,gBAAgB;AAChB,qBAAa,oBAAqB,YAAW,4BAA4B;IAEhE,OAAO,EAAE,2BAA2B;IACpC,MAAM,EAAE,YAAY;gBADpB,OAAO,EAAE,2BAA2B,EACpC,MAAM,EAAE,YAAY;IAG5B,gBAAgB,CAAC,OAAO,EAAE,OAAO;IAO3B,MAAM,CAAC,OAAO,EAAE,OAAO;IAUvB,UAAU,CACf,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,iBAAsB,GAC7B,OAAO,CAAC,gBAAgB,CAAC;CAY5B"}
+{"version":3,"file":"authorization.d.ts","sourceRoot":"","sources":["authorization.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvD;;;GAGG;AACH,wBAAgB,WAAW,CAC1B,OAAO,EAAE,OAAO,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAapC;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,iBAIjD;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAMrE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,YAQ1C;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,WAM7D;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAE7D;AAED,MAAM,WAAW,iBAAiB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,gBAAgB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,4BAA4B;IAC5C,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC;IAClD,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAC9C,UAAU,CACT,OAAO,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE,iBAAiB,GACzB,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,2BAA2B;IAC3C,UAAU,EAAE,MAAM,CAAC;CACnB;AAED,gBAAgB;AAChB,qBAAa,oBAAqB,YAAW,4BAA4B;IAEhE,OAAO,EAAE,2BAA2B;IACpC,MAAM,EAAE,YAAY;gBADpB,OAAO,EAAE,2BAA2B,EACpC,MAAM,EAAE,YAAY;IAG5B,gBAAgB,CAAC,OAAO,EAAE,OAAO;IAO3B,MAAM,CAAC,OAAO,EAAE,OAAO;IAUvB,UAAU,CACf,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,iBAAsB,GAC7B,OAAO,CAAC,gBAAgB,CAAC;CAY5B"}

package/core/authorization.js

@@ -24,7 +24,12 @@ export function _getRequestBearer(request) {
     return /^bearer (.+)$/i.exec(authz)?.[1] ?? null;
 }
 export function _getRequestCookie(request, cookieName) {
-    return _getCookies(request.headers)[cookieName] ?? null;
+    try {
+        return _getCookies(request.headers)[cookieName] ?? null;
+    }
+    catch {
+        return null;
+    }
 }
 /**
  * a:b:c -> [a, a:b, a:b:c]

package/core/authorization.test.js

@@ -72,6 +72,17 @@ describe("_getRequestCookie", () => {
 			"abcdef",
 		);
 	});
+	it("does not throw", () => {
+		assertEquals(
+			_getRequestCookie(
+				new Request("https://example.com", {
+					headers: { Cookie: "not_;a-cookie" },
+				}),
+				"my_cookie",
+			),
+			null,
+		);
+	});
 });
 
 describe("_expandScopes", () => {
@@ -124,13 +135,32 @@ describe("AuthorizationService", () => {
 	}
 
 	describe("getAuthorization", () => {
+		it("parses bearer", () => {
+			const { authz } = setup();
+
+			const request = new Request("https://example.com", {
+				headers: { Authorization: "Bearer test_bearer_token" },
+			});
+			assertEquals(authz.getAuthorization(request), "test_bearer_token");
+		});
+		it("parses cookies", () => {
+			const { authz } = setup();
+
+			const request = new Request("https://example.com", {
+				headers: { Cookie: "testing_session=test_cookie_value" },
+			});
+			assertEquals(authz.getAuthorization(request), "test_cookie_value");
+		});
+	});
+
+	describe("assert", () => {
 		it("parses bearer", async () => {
 			const { authz } = setup();
 
 			const request = new Request("https://example.com", {
 				headers: { Authorization: 'Bearer {"scope":"user","userId":1}' },
 			});
-			assertEquals(await authz.getAuthorization(request), {
+			assertEquals(await authz.assert(request), {
 				scope: "user",
 				userId: 1,
 			});
@@ -141,7 +171,7 @@ describe("AuthorizationService", () => {
 			const request = new Request("https://example.com", {
 				headers: { Cookie: 'testing_session={"scope":"user","userId":1}' },
 			});
-			assertEquals(await authz.getAuthorization(request), {
+			assertEquals(await authz.assert(request), {
 				scope: "user",
 				userId: 1,
 			});

package/core/authorization.ts

@@ -29,7 +29,11 @@ export function _getRequestBearer(request: Request) {
 }
 
 export function _getRequestCookie(request: Request, cookieName: string) {
-	return _getCookies(request.headers)[cookieName] ?? null;
+	try {
+		return _getCookies(request.headers)[cookieName] ?? null;
+	} catch {
+		return null;
+	}
 }
 
 /**

package/core/fetch-router.d.ts

@@ -8,11 +8,18 @@ export interface MatchedRoute {
 export interface FetchRouterOptions {
     routes?: RouteDefinition[];
     errorHandler?: RouteErrorHandler;
+    /** @unstable */
+    log?: boolean | _RouteMiddleware;
+}
+/** @unstable */
+export interface _RouteMiddleware {
+    (request: Request, response: Response): void;
 }
 /** A rudimentary HTTP router using fetch Request & Responses with RouteDefinitions based on URLPattern */
 export declare class FetchRouter {
     routes: RouteDefinition[];
     errorHandler: RouteErrorHandler | undefined;
+    _middleware: _RouteMiddleware[];
     constructor(options?: FetchRouterOptions);
     /**
      * Finds routes that match the request method and URLPattern

package/core/fetch-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-router.d.ts","sourceRoot":"","sources":["fetch-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,eAAe,EAAE,MAAM,WAAW,CAAC;AAEvD,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC;AAE9E,MAAM,WAAW,YAAY;IAC5B,KAAK,EAAE,eAAe,CAAC;IACvB,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,gBAAgB,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IAClC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;IAC3B,YAAY,CAAC,EAAE,iBAAiB,CAAC;CACjC;AAED,0GAA0G;AAC1G,qBAAa,WAAW;IACvB,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,YAAY,EAAE,iBAAiB,GAAG,SAAS,CAAC;gBAEhC,OAAO,GAAE,kBAAuB;IAK5C;;;OAGG;IACF,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC;IAa7D;;OAEG;IACG,cAAc,CACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,GAC7B,OAAO,CAAC,QAAQ,CAAC;IAepB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,QAAQ;IAUjD,WAAW,CAAC,OAAO,EAAE,OAAO;CAUlC"}
+{"version":3,"file":"fetch-router.d.ts","sourceRoot":"","sources":["fetch-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,eAAe,EAAE,MAAM,WAAW,CAAC;AAEvD,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC;AAE9E,MAAM,WAAW,YAAY;IAC5B,KAAK,EAAE,eAAe,CAAC;IACvB,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,gBAAgB,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IAClC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;IAC3B,YAAY,CAAC,EAAE,iBAAiB,CAAC;IAEjC,gBAAgB;IAChB,GAAG,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC;CACjC;AAED,gBAAgB;AAChB,MAAM,WAAW,gBAAgB;IAChC,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC7C;AAMD,0GAA0G;AAC1G,qBAAa,WAAW;IACvB,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,YAAY,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC5C,WAAW,EAAE,gBAAgB,EAAE,CAAM;gBAEzB,OAAO,GAAE,kBAAuB;IAO5C;;;OAGG;IACF,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC;IAa7D;;OAEG;IACG,cAAc,CACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,GAC7B,OAAO,CAAC,QAAQ,CAAC;IAepB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,QAAQ;IAUjD,WAAW,CAAC,OAAO,EAAE,OAAO;CAYlC"}

package/core/fetch-router.js

@@ -1,11 +1,19 @@
 import { HTTPError } from "./http.js";
+function _defaultLogger(request, response) {
+    console.debug(response.status, request.method.padEnd(5), request.url);
+}
 /** A rudimentary HTTP router using fetch Request & Responses with RouteDefinitions based on URLPattern */
 export class FetchRouter {
     routes;
     errorHandler;
+    _middleware = [];
     constructor(options = {}) {
         this.routes = options.routes ?? [];
         this.errorHandler = options.errorHandler ?? undefined;
+        if (options.log === true)
+            this._middleware.push(_defaultLogger);
+        if (typeof options.log === "function")
+            this._middleware.push(options.log);
     }
     /**
      * Finds routes that match the request method and URLPattern
@@ -49,7 +57,9 @@ export class FetchRouter {
     }
     async getResponse(request) {
         try {
-            return await this.processMatches(request, this.findMatchingRoutes(request));
+            const response = await this.processMatches(request, this.findMatchingRoutes(request));
+            this._middleware.forEach((fn) => fn(request, response));
+            return response;
         }
         catch (error) {
             return this.handleError(request, error);

package/core/fetch-router.ts

@@ -11,16 +11,31 @@ export interface MatchedRoute {
 export interface FetchRouterOptions {
 	routes?: RouteDefinition[];
 	errorHandler?: RouteErrorHandler;
+
+	/** @unstable */
+	log?: boolean | _RouteMiddleware;
+}
+
+/** @unstable */
+export interface _RouteMiddleware {
+	(request: Request, response: Response): void;
+}
+
+function _defaultLogger(request: Request, response: Response) {
+	console.debug(response.status, request.method.padEnd(5), request.url);
 }
 
 /** A rudimentary HTTP router using fetch Request & Responses with RouteDefinitions based on URLPattern */
 export class FetchRouter {
 	routes: RouteDefinition[];
 	errorHandler: RouteErrorHandler | undefined;
+	_middleware: _RouteMiddleware[] = [];
 
 	constructor(options: FetchRouterOptions = {}) {
 		this.routes = options.routes ?? [];
 		this.errorHandler = options.errorHandler ?? undefined;
+		if (options.log === true) this._middleware.push(_defaultLogger);
+		if (typeof options.log === "function") this._middleware.push(options.log);
 	}
 
 	/**
@@ -73,10 +88,12 @@ export class FetchRouter {
 
 	async getResponse(request: Request) {
 		try {
-			return await this.processMatches(
+			const response = await this.processMatches(
 				request,
 				this.findMatchingRoutes(request),
 			);
+			this._middleware.forEach((fn) => fn(request, response));
+			return response;
 		} catch (error) {
 			return this.handleError(request, error);
 		}

package/core/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,MAAM,UAAU,GACnB,KAAK,GACL,MAAM,GACN,MAAM,GACN,KAAK,GACL,OAAO,GACP,QAAQ,GACR,SAAS,GACT,SAAS,CAAC;AAEb,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE/E,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,MAAM,IAC9C,CAAC,SAAS,GAAG,MAAM,IAAI,MAAM,KAAK,IAAI,MAAM,IAAI,EAAE,GAC/C,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAChC,CAAC,SAAS,GAAG,MAAM,IAAI,MAAM,KAAK,EAAE,GACnC,KAAK,GACL,KAAK,CAAC;AAEX,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,MAAM,CACjD,kBAAkB,CAAC,CAAC,CAAC,EACrB,MAAM,CACN,CAAC;AAEF,MAAM,WAAW,YAAY,CAAC,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,CAAC,CAAC;IACV,GAAG,EAAE,GAAG,CAAC;CACT;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC9B,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC;CACxC;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,MAAM;IAC7C,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,CAAC,CAAC;IACZ,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,GAAG;IACvC,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,UAAU,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;CACzB;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC3C,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACtB,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAMjC;AAGD,qBAAa,SAAU,SAAQ,KAAK;IACnC;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,IAAI,GAAE,QAAQ,GAAG,SAAqB;IAIxD;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,IAAI,GAAE,QAAQ,GAAG,SAAqB;IAI1D;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAE,QAAQ,GAAG,SAAqB;IAItD;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,IAAI,GAAE,QAAQ,GAAG,SAAqB;IAIjE;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,IAAI,GAAE,QAAQ,GAAG,SAAqB;IAI5D,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;gBAG5B,MAAM,GAAE,MAAY,EACpB,UAAU,GAAE,MAAa,EACzB,IAAI,GAAE,QAAQ,GAAG,SAAqB,EACtC,OAAO,GAAE,WAAW,GAAG,SAAqB;IAW7C,UAAU;CAOV;AAED,gBAAgB;AAChB,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,gBAI9C;AAED,gBAAgB;AAChB,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,CAAC,CAU5E"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,MAAM,UAAU,GACnB,KAAK,GACL,MAAM,GACN,MAAM,GACN,KAAK,GACL,OAAO,GACP,QAAQ,GACR,SAAS,GACT,SAAS,CAAC;AAEb,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE/E,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,MAAM,IAC9C,CAAC,SAAS,GAAG,MAAM,IAAI,MAAM,KAAK,IAAI,MAAM,IAAI,EAAE,GAC/C,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAChC,CAAC,SAAS,GAAG,MAAM,IAAI,MAAM,KAAK,EAAE,GACnC,KAAK,GACL,KAAK,CAAC;AAEX,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,MAAM,CACjD,kBAAkB,CAAC,CAAC,CAAC,EACrB,MAAM,CACN,CAAC;AAEF,MAAM,WAAW,YAAY,CAAC,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,CAAC,CAAC;IACV,GAAG,EAAE,GAAG,CAAC;CACT;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC9B,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC;CACxC;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,MAAM;IAC7C,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,CAAC,CAAC;IACZ,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,GAAG;IACvC,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,UAAU,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;CACzB;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC3C,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACtB,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAMjC;AAGD,qBAAa,SAAU,SAAQ,KAAK;IACnC;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,IAAI,GAAE,QAAQ,GAAG,SAAqB;IAIxD;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,IAAI,GAAE,QAAQ,GAAG,SAAqB;IAI1D;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAE,QAAQ,GAAG,SAAqB;IAItD;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,IAAI,GAAE,QAAQ,GAAG,SAAqB;IAIjE;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,IAAI,GAAE,QAAQ,GAAG,SAAqB;IAI5D,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;gBAG5B,MAAM,GAAE,MAAY,EACpB,UAAU,GAAE,MAAa,EACzB,IAAI,GAAE,QAAQ,GAAG,SAAqB,EACtC,OAAO,GAAE,WAAW,GAAG,SAAqB;IAW7C,UAAU;CAOV;AAED,gBAAgB;AAChB,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,gBAU9C;AAED,gBAAgB;AAChB,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,CAAC,CAU5E"}

package/core/http.js

@@ -62,8 +62,10 @@ export class HTTPError extends Error {
 /** @unstable */
 export function getRequestBody(request) {
     const ct = request.headers.get("Content-Type");
-    if (ct === "application/x-www-form-urlencoded")
+    if (ct?.startsWith("application/x-www-form-urlencoded") ||
+        ct?.startsWith("multipart/form-data")) {
         return request.formData();
+    }
     return request.json();
 }
 /** @unstable */

package/core/http.ts

@@ -125,7 +125,13 @@ export class HTTPError extends Error {
 /** @unstable */
 export function getRequestBody(request: Request) {
 	const ct = request.headers.get("Content-Type");
-	if (ct === "application/x-www-form-urlencoded") return request.formData();
+	if (
+		ct?.startsWith("application/x-www-form-urlencoded") ||
+		ct?.startsWith("multipart/form-data")
+	) {
+		return request.formData();
+	}
+
 	return request.json();
 }
 

package/core/mod.d.ts

@@ -7,6 +7,7 @@ export * from "./tokens.ts";
 export * from "./migrator.ts";
 export * from "./postgres.ts";
 export * from "./random.ts";
+export * from "./server-sent-events.ts";
 export * from "./store.ts";
 export * from "./structures.ts";
 export * from "./terminator.ts";

package/core/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["mod.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["mod.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC"}

package/core/mod.js

@@ -7,6 +7,7 @@ export * from "./tokens.js";
 export * from "./migrator.js";
 export * from "./postgres.js";
 export * from "./random.js";
+export * from "./server-sent-events.js";
 export * from "./store.js";
 export * from "./structures.js";
 export * from "./terminator.js";

package/core/mod.ts

@@ -7,6 +7,7 @@ export * from "./tokens.ts";
 export * from "./migrator.ts";
 export * from "./postgres.ts";
 export * from "./random.ts";
+export * from "./server-sent-events.ts";
 export * from "./store.ts";
 export * from "./structures.ts";
 export * from "./terminator.ts";

package/core/server-sent-events.d.ts

@@ -0,0 +1,50 @@
+/**
+ * Represents a message in the Server-Sent Event (SSE) protocol.
+ *
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#fields}
+ */
+export interface ServerSentEventMessage {
+    /** Ignored by the client. */
+    comment?: string;
+    /** A string identifying the type of event described. */
+    event?: string;
+    /** The data field for the message. Split by new lines. */
+    data?: string;
+    /** The event ID to set the {@linkcode EventSource} object's last event ID value. */
+    id?: string | number;
+    /** The reconnection time. */
+    retry?: number;
+}
+/**
+ * Transforms server-sent message objects into strings for the client.
+ *
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events}
+ *
+ * @example Usage
+ * ```ts no-assert
+ * import {
+ *   type ServerSentEventMessage,
+ *   ServerSentEventStream,
+ * } from "@std/http/server-sent-event-stream";
+ *
+ * const stream = ReadableStream.from<ServerSentEventMessage>([
+ *   { data: "hello there" }
+ * ]).pipeThrough(new ServerSentEventStream());
+ * new Response(stream, {
+ *   headers: {
+ *     "content-type": "text/event-stream",
+ *     "cache-control": "no-cache",
+ *   },
+ * });
+ * ```
+ */
+export declare class ServerSentEventStream extends TransformStream<ServerSentEventMessage, Uint8Array> {
+    constructor();
+}
+/** @unstable */
+export declare const sseHeaders: {
+    "content-type": string;
+    "cache-control": string;
+    connection: string;
+};
+//# sourceMappingURL=server-sent-events.d.ts.map

package/core/server-sent-events.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server-sent-events.d.ts","sourceRoot":"","sources":["server-sent-events.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACtC,6BAA6B;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wDAAwD;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oFAAoF;IACpF,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,6BAA6B;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAgDD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,qBAAa,qBAAsB,SAAQ,eAAe,CACzD,sBAAsB,EACtB,UAAU,CACV;;CAQA;AAED,gBAAgB;AAChB,eAAO,MAAM,UAAU;;;;CAItB,CAAC"}

package/core/server-sent-events.js

@@ -0,0 +1,75 @@
+// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
+// This module is browser compatible.
+const NEWLINE_REGEXP = /\r\n|\r|\n/;
+const encoder = new TextEncoder();
+function assertHasNoNewline(value, varName, errPrefix) {
+    if (value.match(NEWLINE_REGEXP) !== null) {
+        throw new SyntaxError(`${errPrefix}: ${varName} cannot contain a newline`);
+    }
+}
+/**
+ * Converts a server-sent message object into a string for the client.
+ *
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#event_stream_format}
+ */
+function stringify(message) {
+    const lines = [];
+    if (message.comment) {
+        assertHasNoNewline(message.comment, "`message.comment`", "Cannot serialize message");
+        lines.push(`:${message.comment}`);
+    }
+    if (message.event) {
+        assertHasNoNewline(message.event, "`message.event`", "Cannot serialize message");
+        lines.push(`event:${message.event}`);
+    }
+    if (message.data) {
+        message.data
+            .split(NEWLINE_REGEXP)
+            .forEach((line) => lines.push(`data:${line}`));
+    }
+    if (message.id) {
+        assertHasNoNewline(message.id.toString(), "`message.id`", "Cannot serialize message");
+        lines.push(`id:${message.id}`);
+    }
+    if (message.retry)
+        lines.push(`retry:${message.retry}`);
+    return encoder.encode(lines.join("\n") + "\n\n");
+}
+/**
+ * Transforms server-sent message objects into strings for the client.
+ *
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events}
+ *
+ * @example Usage
+ * ```ts no-assert
+ * import {
+ *   type ServerSentEventMessage,
+ *   ServerSentEventStream,
+ * } from "@std/http/server-sent-event-stream";
+ *
+ * const stream = ReadableStream.from<ServerSentEventMessage>([
+ *   { data: "hello there" }
+ * ]).pipeThrough(new ServerSentEventStream());
+ * new Response(stream, {
+ *   headers: {
+ *     "content-type": "text/event-stream",
+ *     "cache-control": "no-cache",
+ *   },
+ * });
+ * ```
+ */
+export class ServerSentEventStream extends TransformStream {
+    constructor() {
+        super({
+            transform: (message, controller) => {
+                controller.enqueue(stringify(message));
+            },
+        });
+    }
+}
+/** @unstable */
+export const sseHeaders = {
+    "content-type": "text/event-stream",
+    "cache-control": "no-cache",
+    connection: "keep-alive",
+};

package/core/server-sent-events.ts

@@ -0,0 +1,112 @@
+// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
+// This module is browser compatible.
+
+const NEWLINE_REGEXP = /\r\n|\r|\n/;
+const encoder = new TextEncoder();
+
+/**
+ * Represents a message in the Server-Sent Event (SSE) protocol.
+ *
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#fields}
+ */
+export interface ServerSentEventMessage {
+	/** Ignored by the client. */
+	comment?: string;
+	/** A string identifying the type of event described. */
+	event?: string;
+	/** The data field for the message. Split by new lines. */
+	data?: string;
+	/** The event ID to set the {@linkcode EventSource} object's last event ID value. */
+	id?: string | number;
+	/** The reconnection time. */
+	retry?: number;
+}
+
+function assertHasNoNewline(value: string, varName: string, errPrefix: string) {
+	if (value.match(NEWLINE_REGEXP) !== null) {
+		throw new SyntaxError(`${errPrefix}: ${varName} cannot contain a newline`);
+	}
+}
+
+/**
+ * Converts a server-sent message object into a string for the client.
+ *
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#event_stream_format}
+ */
+function stringify(message: ServerSentEventMessage): Uint8Array {
+	const lines = [];
+	if (message.comment) {
+		assertHasNoNewline(
+			message.comment,
+			"`message.comment`",
+			"Cannot serialize message",
+		);
+		lines.push(`:${message.comment}`);
+	}
+	if (message.event) {
+		assertHasNoNewline(
+			message.event,
+			"`message.event`",
+			"Cannot serialize message",
+		);
+		lines.push(`event:${message.event}`);
+	}
+	if (message.data) {
+		message.data
+			.split(NEWLINE_REGEXP)
+			.forEach((line) => lines.push(`data:${line}`));
+	}
+	if (message.id) {
+		assertHasNoNewline(
+			message.id.toString(),
+			"`message.id`",
+			"Cannot serialize message",
+		);
+		lines.push(`id:${message.id}`);
+	}
+	if (message.retry) lines.push(`retry:${message.retry}`);
+	return encoder.encode(lines.join("\n") + "\n\n");
+}
+
+/**
+ * Transforms server-sent message objects into strings for the client.
+ *
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events}
+ *
+ * @example Usage
+ * ```ts no-assert
+ * import {
+ *   type ServerSentEventMessage,
+ *   ServerSentEventStream,
+ * } from "@std/http/server-sent-event-stream";
+ *
+ * const stream = ReadableStream.from<ServerSentEventMessage>([
+ *   { data: "hello there" }
+ * ]).pipeThrough(new ServerSentEventStream());
+ * new Response(stream, {
+ *   headers: {
+ *     "content-type": "text/event-stream",
+ *     "cache-control": "no-cache",
+ *   },
+ * });
+ * ```
+ */
+export class ServerSentEventStream extends TransformStream<
+	ServerSentEventMessage,
+	Uint8Array
+> {
+	constructor() {
+		super({
+			transform: (message, controller) => {
+				controller.enqueue(stringify(message));
+			},
+		});
+	}
+}
+
+/** @unstable */
+export const sseHeaders = {
+	"content-type": "text/event-stream",
+	"cache-control": "no-cache",
+	connection: "keep-alive",
+};

package/core/store.d.ts

@@ -1,7 +1,6 @@
-import type { Sql } from "postgres";
-import type { RedisClientType } from "redis";
 import { MigrationDefinition } from "./migrator.ts";
 import { TimerService } from "./timers.ts";
+import { RedisDependency, SqlDependency } from "./types.ts";
 /** @unstable */
 export interface StoreSetOptions {
     /** milliseconds */
@@ -38,10 +37,10 @@ export interface PostgresStoreOptions {
 /** @unstable */
 export declare class PostgresStore implements Store {
     get tableName(): string;
-    static getMigration(tableName: string): MigrationDefinition<Sql>;
-    sql: Sql;
+    static getMigration(tableName: string): MigrationDefinition<any>;
+    sql: SqlDependency;
     options: Required<PostgresStoreOptions>;
-    constructor(sql: Sql, options?: PostgresStoreOptions);
+    constructor(sql: unknown, options?: PostgresStoreOptions);
     get<T>(key: string): Promise<T | undefined>;
     set<T>(key: string, value: T, options?: StoreSetOptions): Promise<void>;
     delete(key: string): Promise<void>;
@@ -53,9 +52,9 @@ export interface RedisStoreOptions {
 }
 /** @unstable */
 export declare class RedisStore implements Store {
-    redis: RedisClientType;
+    redis: RedisDependency;
     prefix: string;
-    constructor(redis: RedisClientType, options?: RedisStoreOptions);
+    constructor(redis: unknown, options?: RedisStoreOptions);
     get<T>(key: string): Promise<T | undefined>;
     set<T>(key: string, value: T, options?: StoreSetOptions): Promise<void>;
     delete<T>(key: string): Promise<void>;

package/core/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["store.ts"],"names":[],"mappings":"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"}

package/core/store.ts

@@ -1,8 +1,6 @@
-import type { Sql } from "postgres";
-import type { RedisClientType, SetOptions } from "redis";
-
 import { MigrationDefinition } from "./migrator.ts";
 import { TimerService } from "./timers.ts";
+import { RedisDependency, SqlDependency } from "./types.ts";
 
 /** @unstable */
 export interface StoreSetOptions {
@@ -79,7 +77,7 @@ export class PostgresStore implements Store {
 		return this.options.tableName;
 	}
 
-	static getMigration(tableName: string): MigrationDefinition<Sql> {
+	static getMigration(tableName: string): MigrationDefinition<any> {
 		return {
 			name: "00-postgres-store",
 			up: async (sql) => {
@@ -99,10 +97,10 @@ export class PostgresStore implements Store {
 		};
 	}
 
-	sql: Sql;
+	sql: SqlDependency;
 	options: Required<PostgresStoreOptions>;
-	constructor(sql: Sql, options: PostgresStoreOptions = {}) {
-		this.sql = sql;
+	constructor(sql: unknown, options: PostgresStoreOptions = {}) {
+		this.sql = sql as SqlDependency;
 		this.options = {
 			tableName: options.tableName ?? "cache",
 		};
@@ -154,10 +152,10 @@ export interface RedisStoreOptions {
 
 /** @unstable */
 export class RedisStore implements Store {
-	redis: RedisClientType;
+	redis: RedisDependency;
 	prefix: string;
-	constructor(redis: RedisClientType, options: RedisStoreOptions = {}) {
-		this.redis = redis;
+	constructor(redis: unknown, options: RedisStoreOptions = {}) {
+		this.redis = redis as RedisDependency;
 		this.prefix = options.prefix ?? "";
 	}
 
@@ -171,7 +169,7 @@ export class RedisStore implements Store {
 		value: T,
 		options: StoreSetOptions = {},
 	): Promise<void> {
-		const opts: SetOptions = {};
+		const opts: Record<string, any> = {};
 		if (options.maxAge) opts.PX = options.maxAge;
 		await this.redis.set(this.prefix + key, JSON.stringify(value), opts);
 	}

package/core/types.d.ts

@@ -31,4 +31,11 @@ export interface JoseDependency {
     }>;
     SignJWT: _SignJWT;
 }
+export interface RedisDependency {
+    get(key: string): Promise<string | undefined>;
+    set(key: string, value: string, options?: {
+        PX?: number;
+    }): Promise<unknown>;
+    del(key: string): Promise<unknown>;
+}
 //# sourceMappingURL=types.d.ts.map

package/core/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE7C,MAAM,MAAM,cAAc,CAAC,CAAC,IAC3B,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEpD,MAAM,WAAW,aAAa;IAC7B,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvE,0EAA0E;IAC1E,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAE7E,6CAA6C;IAC7C,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC;IAEtB,+BAA+B;IAC/B,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC;CAC1B;AAED,MAAM,WAAW,QAAQ;IACxB,KAAK,OAAO,EAAE,GAAG,GAAG,QAAQ,CAAC;IAE7B,kBAAkB,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,QAAQ,CAAC;IACnE,WAAW,IAAI,QAAQ,CAAC;IACxB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;IACpC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;IACxC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,CAAC;IACtC,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,QAAQ,CAAC;IAEvD,IAAI,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,cAAc;IAC9B,SAAS,CACR,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,UAAU,EACf,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAC9C,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,CAAA;KAAE,CAAC,CAAC;IAE7B,OAAO,EAAE,QAAQ,CAAC;CAClB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE7C,MAAM,MAAM,cAAc,CAAC,CAAC,IAC3B,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEpD,MAAM,WAAW,aAAa;IAC7B,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvE,0EAA0E;IAC1E,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAE7E,6CAA6C;IAC7C,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC;IAEtB,+BAA+B;IAC/B,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC;CAC1B;AAED,MAAM,WAAW,QAAQ;IACxB,KAAK,OAAO,EAAE,GAAG,GAAG,QAAQ,CAAC;IAE7B,kBAAkB,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,QAAQ,CAAC;IACnE,WAAW,IAAI,QAAQ,CAAC;IACxB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;IACpC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;IACxC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,CAAC;IACtC,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,QAAQ,CAAC;IAEvD,IAAI,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,cAAc;IAC9B,SAAS,CACR,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,UAAU,EACf,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAC9C,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,CAAA;KAAE,CAAC,CAAC;IAE7B,OAAO,EAAE,QAAQ,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC/B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7E,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACnC"}

package/core/types.js

@@ -1,2 +1 @@
-/// <reference types="urlpattern-polyfill" />
 export {};

package/core/types.ts

@@ -1,7 +1,3 @@
-/// <reference types="urlpattern-polyfill" />
-
-// import { SignJWT } from "jose";
-
 export type MaybePromise<T> = T | Promise<T>;
 
 export type ResolvePromise<T> =
@@ -42,3 +38,9 @@ export interface JoseDependency {
 
 	SignJWT: _SignJWT;
 }
+
+export interface RedisDependency {
+	get(key: string): Promise<string | undefined>;
+	set(key: string, value: string, options?: { PX?: number }): Promise<unknown>;
+	del(key: string): Promise<unknown>;
+}

package/package.json

@@ -23,5 +23,5 @@
       "import": "./source/*.js"
     }
   },
-  "version": "0.6.1"
+  "version": "0.7.0"
 }

package/source/express-router.d.ts

@@ -21,4 +21,6 @@ export declare class ExpressRouter {
     onRouteError(error: unknown, request: Request): void;
     respond(res: ExpressResponse, response: Response): void;
 }
+/** @unstable */
+export declare function expressMiddleware(router: FetchRouter): ExpressRequestHandler;
 //# sourceMappingURL=express-router.d.ts.map

package/source/express-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"express-router.d.ts","sourceRoot":"","sources":["express-router.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,cAAc,IAAI,qBAAqB,EACvC,QAAQ,IAAI,eAAe,EAC3B,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAGN,iBAAiB,EACjB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;;;EAWE;AACF,qBAAa,aAAa;IACzB,MAAM,EAAE,WAAW,CAAC;gBACR,OAAO,GAAE,iBAAsB;IAO3C,UAAU,IAAI,qBAAqB;IASnC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAIhD,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAIpD,OAAO,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAGvD"}
+{"version":3,"file":"express-router.d.ts","sourceRoot":"","sources":["express-router.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,cAAc,IAAI,qBAAqB,EACvC,QAAQ,IAAI,eAAe,EAC3B,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAGN,iBAAiB,EACjB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;;;EAWE;AACF,qBAAa,aAAa;IACzB,MAAM,EAAE,WAAW,CAAC;gBACR,OAAO,GAAE,iBAAsB;IAO3C,UAAU,IAAI,qBAAqB;IASnC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAIhD,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAIpD,OAAO,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAGvD;AAED,gBAAgB;AAChB,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,qBAAqB,CAI5E"}

package/source/express-router.js

@@ -38,3 +38,9 @@ export class ExpressRouter {
         applyResponse(response, res);
     }
 }
+/** @unstable */
+export function expressMiddleware(router) {
+    const express = new ExpressRouter();
+    express.router = router;
+    return express.middleware();
+}

package/source/express-router.ts

@@ -52,3 +52,10 @@ export class ExpressRouter {
 		applyResponse(response, res);
 	}
 }
+
+/** @unstable */
+export function expressMiddleware(router: FetchRouter): ExpressRequestHandler {
+	const express = new ExpressRouter();
+	express.router = router;
+	return express.middleware();
+}

package/source/koa-router.d.ts

@@ -22,4 +22,6 @@ export declare class KoaRouter {
     onRouteError(error: unknown, request: Request): void;
     respond(ctx: Context, response: Response): void;
 }
+/** @unstable */
+export declare function koaMiddleware(router: FetchRouter): Middleware;
 //# sourceMappingURL=koa-router.d.ts.map

package/source/koa-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"koa-router.d.ts","sourceRoot":"","sources":["koa-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAGN,iBAAiB,EACjB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;;;;EAYE;AACF,qBAAa,SAAS;IACrB,MAAM,EAAE,WAAW,CAAC;gBACR,OAAO,GAAE,iBAAsB;IAO3C,UAAU,IAAI,UAAU;IASxB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAIhD,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAIpD,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAa/C"}
+{"version":3,"file":"koa-router.d.ts","sourceRoot":"","sources":["koa-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAGN,iBAAiB,EACjB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;;;;EAYE;AACF,qBAAa,SAAS;IACrB,MAAM,EAAE,WAAW,CAAC;gBACR,OAAO,GAAE,iBAAsB;IAO3C,UAAU,IAAI,UAAU;IASxB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAIhD,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAIpD,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAa/C;AAED,gBAAgB;AAChB,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAI7D"}

package/source/koa-router.js

@@ -47,3 +47,9 @@ export class KoaRouter {
         }
     }
 }
+/** @unstable */
+export function koaMiddleware(router) {
+    const koa = new KoaRouter();
+    koa.router = router;
+    return koa.middleware();
+}

package/source/koa-router.ts

@@ -60,3 +60,10 @@ export class KoaRouter {
 		}
 	}
 }
+
+/** @unstable */
+export function koaMiddleware(router: FetchRouter): Middleware {
+	const koa = new KoaRouter();
+	koa.router = router;
+	return koa.middleware();
+}

package/source/node-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-router.d.ts","sourceRoot":"","sources":["node-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAEN,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,cAAc,EACd,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,WAAW,iBAAiB;IACjC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;CAC3B;AAED;;;;;;;;;;EAUE;AACF,qBAAa,UAAU;IACtB,MAAM,EAAE,WAAW,CAAC;gBACR,OAAO,GAAE,iBAAsB;IAO3C,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAIhD,aAAa,IAAI,eAAe;IAQhC,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAIpD,OAAO,CAAC,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAGtD;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,cAAc,GAAG,IAAI,CAU3E;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,eAAe,WASnD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,mBAAmB,WAOzD;AAID,wBAAgB,sBAAsB,CACrC,GAAG,EAAE,eAAe,GAClB,QAAQ,GAAG,SAAS,CAItB;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,YAGrD;AAED,gBAAgB;AAChB,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,gBAAgB;AAChB,MAAM,WAAW,gBAAgB;IAChC,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;CAC3C;AAED,gFAAgF;AAChF,wBAAgB,SAAS,CACxB,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,gBAAgB,wEAuBzB"}
+{"version":3,"file":"node-router.d.ts","sourceRoot":"","sources":["node-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAEN,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,cAAc,EACd,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,WAAW,iBAAiB;IACjC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;CAC3B;AAED;;;;;;;;;;EAUE;AACF,qBAAa,UAAU;IACtB,MAAM,EAAE,WAAW,CAAC;gBACR,OAAO,GAAE,iBAAsB;IAO3C,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAIhD,aAAa,IAAI,eAAe;IAQhC,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAIpD,OAAO,CAAC,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAGtD;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,cAAc,GAAG,IAAI,CAS3E;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,eAAe,WAYnD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,mBAAmB,WAOzD;AAID,wBAAgB,sBAAsB,CACrC,GAAG,EAAE,eAAe,GAClB,QAAQ,GAAG,SAAS,CAItB;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,YAGrD;AAED,gBAAgB;AAChB,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,gBAAgB;AAChB,MAAM,WAAW,gBAAgB;IAChC,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;CAC3C;AAED,gFAAgF;AAChF,wBAAgB,SAAS,CACxB,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,gBAAgB,wEAuBzB"}

package/source/node-router.js

@@ -39,8 +39,7 @@ export class NodeRouter {
 }
 export function applyResponse(response, res) {
     for (const [key, value] of response.headers) {
-        const values = value.split(",");
-        res.setHeader(key, values.length === 1 ? value : values);
+        res.appendHeader(key, value);
     }
     res.writeHead(response.status, response.statusText);
     if (response.body)
@@ -50,12 +49,15 @@ export function applyResponse(response, res) {
 }
 export function getFetchRequest(req) {
     const url = "http://" + (req.headers.host ?? "localhost") + req.url;
+    const ac = new AbortController();
+    req.once("error", (e) => ac.abort(e));
     return new Request(url, {
         method: req.method,
         headers: getFetchHeaders(req.headers),
         body: getIncomingMessageBody(req),
         // @ts-ignore
         duplex: "half",
+        signal: ac.signal,
     });
 }
 export function getFetchHeaders(input) {

package/source/node-router.ts

@@ -58,8 +58,7 @@ export class NodeRouter {
 
 export function applyResponse(response: Response, res: ServerResponse): void {
 	for (const [key, value] of response.headers) {
-		const values = value.split(",");
-		res.setHeader(key, values.length === 1 ? value : values);
+		res.appendHeader(key, value);
 	}
 
 	res.writeHead(response.status, response.statusText);
@@ -70,12 +69,15 @@ export function applyResponse(response: Response, res: ServerResponse): void {
 
 export function getFetchRequest(req: IncomingMessage) {
 	const url = "http://" + (req.headers.host ?? "localhost") + req.url;
+	const ac = new AbortController();
+	req.once("error", (e) => ac.abort(e));
 	return new Request(url, {
 		method: req.method,
 		headers: getFetchHeaders(req.headers),
 		body: getIncomingMessageBody(req),
 		// @ts-ignore
 		duplex: "half",
+		signal: ac.signal,
 	});
 }
 

package/source/postgres.d.ts

@@ -1,7 +1,7 @@
 import type { SqlDependency } from "../core/types.ts";
 import { Migrator, MigratorOptions } from "../core/migrator.ts";
 export interface PostgresMigratorOptions {
-    sql: SqlDependency;
+    sql: unknown;
     directory: URL;
 }
 export declare function getPostgresMigratorOptions(options: PostgresMigratorOptions): MigratorOptions<SqlDependency>;

package/source/postgres.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["postgres.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAiB,MAAM,qBAAqB,CAAC;AAS/E,MAAM,WAAW,uBAAuB;IACvC,GAAG,EAAE,aAAa,CAAC;IACnB,SAAS,EAAE,GAAG,CAAC;CACf;AAED,wBAAgB,0BAA0B,CACzC,OAAO,EAAE,uBAAuB,GAC9B,eAAe,CAAC,aAAa,CAAC,CA6BhC;AAED,mDAAmD;AACnD,eAAO,MAAM,8BAA8B,mCAA6B,CAAC;AAEzE;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,uBAAuB,2BAKnE;AAED,4CAA4C;AAC5C,eAAO,MAAM,uBAAuB,4BAAsB,CAAC"}
+{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["postgres.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAiB,QAAQ,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAS/E,MAAM,WAAW,uBAAuB;IACvC,GAAG,EAAE,OAAO,CAAC;IACb,SAAS,EAAE,GAAG,CAAC;CACf;AAED,wBAAgB,0BAA0B,CACzC,OAAO,EAAE,uBAAuB,GAC9B,eAAe,CAAC,aAAa,CAAC,CA8BhC;AAED,mDAAmD;AACnD,eAAO,MAAM,8BAA8B,mCAA6B,CAAC;AAEzE;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,uBAAuB,2BAKnE;AAED,4CAA4C;AAC5C,eAAO,MAAM,uBAAuB,4BAAsB,CAAC"}

package/source/postgres.js

@@ -1,15 +1,16 @@
 import fs from "node:fs/promises";
 import path from "node:path";
-import { Migrator, loadMigration } from "../core/migrator.js";
+import { loadMigration, Migrator } from "../core/migrator.js";
 import { executePostgresMigration, getPostgresMigrations, postgresBootstrapMigration, } from "../core/postgres.js";
 const migrationExtensions = new Set([".ts", ".js"]);
 export function getPostgresMigratorOptions(options) {
+    const sql = options.sql;
     return {
         getRecords() {
-            return getPostgresMigrations(options.sql);
+            return getPostgresMigrations(sql);
         },
         execute(def, direction) {
-            return executePostgresMigration(def, direction, options.sql);
+            return executePostgresMigration(def, direction, sql);
         },
         async getDefinitions() {
             const migrations = [

package/source/postgres.ts

@@ -2,7 +2,7 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import type { SqlDependency } from "../core/types.ts";
 
-import { Migrator, MigratorOptions, loadMigration } from "../core/migrator.ts";
+import { loadMigration, Migrator, MigratorOptions } from "../core/migrator.ts";
 import {
 	executePostgresMigration,
 	getPostgresMigrations,
@@ -12,20 +12,21 @@ import {
 const migrationExtensions = new Set([".ts", ".js"]);
 
 export interface PostgresMigratorOptions {
-	sql: SqlDependency;
+	sql: unknown;
 	directory: URL;
 }
 
 export function getPostgresMigratorOptions(
 	options: PostgresMigratorOptions,
 ): MigratorOptions<SqlDependency> {
+	const sql = options.sql as SqlDependency;
 	return {
 		getRecords() {
-			return getPostgresMigrations(options.sql);
+			return getPostgresMigrations(sql);
 		},
 
 		execute(def, direction) {
-			return executePostgresMigration(def, direction, options.sql);
+			return executePostgresMigration(def, direction, sql);
 		},
 
 		async getDefinitions() {