wip

MatthewWid · Oct 1, 2024 · a7dcb3e · a7dcb3e
1 parent 61adebd
commit a7dcb3e
Show file tree

Hide file tree

Showing 24 changed files with 422 additions and 152 deletions.
diff --git a/examples/getting-started/server.ts b/examples/getting-started/server.ts
@@ -1,6 +1,8 @@
 import path from "path";
 import express from "express";
-import {createSession, Session} from "better-sse";
+import * as SSE from "better-sse/http2";
+
+console.log(SSE);
 
 const app = express();
 
@@ -11,7 +13,7 @@ app.use(express.static(path.resolve(__dirname, "./public")));
  */
 declare module "express-serve-static-core" {
 	interface Response {
-		sse: Session;
+		// sse: Session;
 	}
 }
 
@@ -21,17 +23,17 @@ app.get(
 	 * Attach the session instance to the response.
 	 */
 	async (req, res, next) => {
-		const session = await createSession(req, res);
+		// const session = await createSession(req, res);
 
-		res.sse = session;
+		// res.sse = session;
 
 		next();
 	},
 	/**
 	 * Push a message with the event name "ping".
 	 */
 	(_, res) => {
-		res.sse.push("Hello world!", "ping");
+		// res.sse.push("Hello world!", "ping");
 	}
 );
 

diff --git a/examples/http2-compat/index.ts b/examples/http2-compat/index.ts
@@ -0,0 +1 @@
+import "./server";
diff --git a/examples/http2-compat/public/index.html b/examples/http2-compat/public/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<title>HTTP/2 - Better SSE</title>
+	</head>
+	<body>
+		<script src="/index.js"></script>
+	</body>
+</html>
diff --git a/examples/http2-compat/public/index.js b/examples/http2-compat/public/index.js
@@ -0,0 +1,11 @@
+const eventSource = new EventSource("/sse");
+
+eventSource.addEventListener("ping", (event) => {
+	const {type, data} = event;
+
+	const element = document.createElement("pre");
+
+	element.innerText = `Got '${type}' event: ${data}.`;
+
+	document.body.appendChild(element);
+});
diff --git a/examples/http2-compat/server.ts b/examples/http2-compat/server.ts
@@ -0,0 +1,69 @@
+import {resolve} from "path";
+import {promisify} from "util";
+import {createSecureServer} from "http2";
+import {
+	CertificateCreationOptions,
+	CertificateCreationResult,
+	createCertificate as createCertificateCallback,
+} from "pem";
+import {Http2CompatSession} from "better-sse";
+
+(async () => {
+	const createCertificate = promisify<
+		CertificateCreationOptions,
+		CertificateCreationResult
+	>(createCertificateCallback);
+
+	const indexHtmlPath = resolve(__dirname, "./public/index.html");
+	const indexJsPath = resolve(__dirname, "./public/index.js");
+
+	const {serviceKey: key, certificate: cert} = await createCertificate({
+		selfSigned: true,
+		days: 1,
+	});
+
+	const server = createSecureServer({key, cert}, async (req, res) => {
+		const {":path": path, ":method": method} = req.headers;
+		const {stream} = res;
+
+		if (method !== "GET") {
+			stream.respond({":status": 405});
+			stream.end();
+			return;
+		}
+
+		switch (path) {
+			case "/": {
+				stream.respondWithFile(indexHtmlPath);
+				break;
+			}
+			case "/index.js": {
+				stream.respondWithFile(indexJsPath);
+				break;
+			}
+			case "/sse": {
+				const session = new Http2CompatSession(req, res);
+
+				session.once("connected", () => {
+					session.push("Hello world", "ping");
+				});
+
+				break;
+			}
+			default: {
+				stream.respond({":status": 404});
+				stream.end();
+			}
+		}
+	});
+
+	server.on("error", console.error);
+
+	const PORT = process.env.PORT ?? 8443;
+
+	server.listen(PORT, () => {
+		console.log(
+			`Server listening. Open https://localhost:${PORT} in your browser.`
+		);
+	});
+})();
diff --git a/examples/http2/server.ts b/examples/http2/server.ts
@@ -6,7 +6,7 @@ import {
 	CertificateCreationResult,
 	createCertificate as createCertificateCallback,
 } from "pem";
-import {createSession} from "better-sse";
+import {Http2Session} from "better-sse";
 
 (async () => {
 	const createCertificate = promisify<
@@ -22,9 +22,10 @@ import {createSession} from "better-sse";
 		days: 1,
 	});
 
-	const server = createSecureServer({key, cert}, async (req, res) => {
-		const {":path": path, ":method": method} = req.headers;
-		const {stream} = res;
+	const server = createSecureServer({key, cert});
+
+	server.on("stream", (stream, headers) => {
+		const {":path": path, ":method": method} = headers;
 
 		if (method !== "GET") {
 			stream.respond({":status": 405});
@@ -42,14 +43,17 @@ import {createSession} from "better-sse";
 				break;
 			}
 			case "/sse": {
-				const session = await createSession(req, res);
+				const session = new Http2Session(stream, headers);
 
-				session.push("Hello world", "ping");
+				session.once("connected", () => {
+					session.push("Hello world", "ping");
+				});
 
 				break;
 			}
 			default: {
 				stream.respond({":status": 404});
+				stream.end();
 			}
 		}
 	});

diff --git a/examples/package-lock.json b/examples/package-lock.json
diff --git a/examples/package.json b/examples/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"benchmark": "^2.1.4",
-		"better-sse": "^0.12.1",
+		"better-sse": "file:..",
 		"easy-server-sent-events": "^1.0.14",
 		"eventsource": "^2.0.2",
 		"express": "^4.19.2",

diff --git a/examples/tsconfig.json b/examples/tsconfig.json
@@ -3,7 +3,7 @@
 		"target": "ES2019",
 		"strict": true,
 		"outDir": "./build",
-		"moduleResolution": "node",
+		"moduleResolution": "nodenext",
 		"esModuleInterop": true
 	}
 }
diff --git a/package.json b/package.json
@@ -2,8 +2,6 @@
 	"name": "better-sse",
 	"description": "Dead simple, dependency-less, spec-compliant server-sent events implementation for Node, written in TypeScript.",
 	"version": "0.13.0",
-	"main": "./build/index.js",
-	"types": "./build/index.d.ts",
 	"license": "MIT",
 	"author": "Matthew W. <[email protected]>",
 	"repository": "github:MatthewWid/better-sse",
@@ -17,6 +15,10 @@
 		"tcp",
 		"events"
 	],
+	"engines": {
+		"node": ">=12",
+		"pnpm": ">=9"
+	},
 	"scripts": {
 		"build": "webpack --env production",
 		"test": "vitest",
@@ -25,14 +27,16 @@
 		"lint": "eslint \"./src/**/*.ts\"",
 		"prepublishOnly": "npm-run-all clean format test build"
 	},
+	"main": "./build/http1.js",
+	"types": "./build/adapters/http1/index.d.ts",
+	"exports": {
+		".": "./build/http1.js",
+		"./http2": "./build/http2.js"
+	},
 	"files": [
 		"build",
 		"!build/**/*.map"
 	],
-	"engines": {
-		"node": ">=12",
-		"pnpm": ">=9"
-	},
 	"devDependencies": {
 		"@types/eventsource": "^1.1.11",
 		"@types/express": "^4.17.16",