From 3e104ded8d570697dc65712b7cd1143dff2b26d4 Mon Sep 17 00:00:00 2001 From: Hellings Date: Sat, 12 Sep 2026 08:20:46 -0400 Subject: [PATCH] branch(main): Initial commit. --- .forgejo/workflows/publish.yml | 32 +++ .gitattributes | 12 + .gitignore | 8 + activitypub/build.gradle.kts | 25 ++ .../nestj/activitypub/ActivityPubService.kt | 132 ++++++++++ build.gradle.kts | 22 ++ bun.lock | 14 + client/typescript/.gitignore | 34 +++ client/typescript/README.md | 14 + client/typescript/browser.ts | 1 + client/typescript/bun.lock | 26 ++ client/typescript/index.ts | 111 ++++++++ client/typescript/node.ts | 13 + client/typescript/package.json | 15 ++ client/typescript/tsconfig.json | 30 +++ client/typescript/ws.d.ts | 4 + gradle.properties | 8 + gradle/libs.versions.toml | 25 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 47505 bytes gradle/wrapper/gradle-wrapper.properties | 9 + gradlew | 248 ++++++++++++++++++ gradlew.bat | 82 ++++++ justfile | 10 + lib/build.gradle.kts | 59 +++++ .../main/kotlin/rip/crit/nestj/Application.kt | 97 +++++++ lib/src/main/kotlin/rip/crit/nestj/Library.kt | 17 ++ .../rip/crit/nestj/config/ConfigModule.kt | 5 + .../rip/crit/nestj/config/ConfigService.kt | 14 + .../rip/crit/nestj/controller/Controller.kt | 57 ++++ .../rip/crit/nestj/extractions/Extractions.kt | 35 +++ .../main/kotlin/rip/crit/nestj/gate/Gates.kt | 17 ++ .../rip/crit/nestj/http/method/Method.kt | 12 + .../crit/nestj/http/pathfinder/Pathfinder.kt | 144 ++++++++++ .../rip/crit/nestj/http/request/Request.kt | 81 ++++++ .../rip/crit/nestj/http/response/Response.kt | 60 +++++ .../rip/crit/nestj/http/server/Server.kt | 62 +++++ .../rip/crit/nestj/inject/Injectable.kt | 47 ++++ .../kotlin/rip/crit/nestj/module/Module.kt | 12 + .../main/kotlin/rip/crit/nestj/pipe/Pipes.kt | 43 +++ .../rip/crit/nestj/pipe/header/Header.kt | 21 ++ .../kotlin/rip/crit/nestj/plugin/Plugin.kt | 8 + .../rip/crit/nestj/serve/ServeDirModule.kt | 5 + .../rip/crit/nestj/serve/ServeDirService.kt | 29 ++ .../rip/crit/nestj/websocket/WebSocket.kt | 121 +++++++++ .../test/kotlin/rip/crit/nestj/LibraryTest.kt | 111 ++++++++ .../test/kotlin/rip/crit/nestj/TestServer.kt | 22 ++ orm-core/build.gradle.kts | 22 ++ .../kotlin/rip/crit/nestj/orm/Database.kt | 62 +++++ .../kotlin/rip/crit/nestj/orm/Repository.kt | 104 ++++++++ orm-postgres/build.gradle.kts | 25 ++ .../nestj/orm/postgres/PostgresDatabase.kt | 13 + orm-sqlite/build.gradle.kts | 25 ++ .../crit/nestj/orm/sqlite/SqliteDatabase.kt | 7 + package.json | 5 + pom.xml | 25 ++ servlet-compat/build.gradle.kts | 25 ++ .../rip/crit/nestj/servlet/ServletBridge.kt | 198 ++++++++++++++ settings.gradle.kts | 22 ++ socketio/build.gradle.kts | 25 ++ .../crit/nestj/socketio/SocketIoGateway.kt | 52 ++++ vaadin/build.gradle.kts | 25 ++ .../rip/crit/nestj/vaadin/VaadinService.kt | 23 ++ 62 files changed, 2612 insertions(+) create mode 100644 .forgejo/workflows/publish.yml create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 activitypub/build.gradle.kts create mode 100644 activitypub/src/main/kotlin/rip/crit/nestj/activitypub/ActivityPubService.kt create mode 100644 build.gradle.kts create mode 100644 bun.lock create mode 100644 client/typescript/.gitignore create mode 100644 client/typescript/README.md create mode 100644 client/typescript/browser.ts create mode 100644 client/typescript/bun.lock create mode 100644 client/typescript/index.ts create mode 100644 client/typescript/node.ts create mode 100644 client/typescript/package.json create mode 100644 client/typescript/tsconfig.json create mode 100644 client/typescript/ws.d.ts create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 justfile create mode 100644 lib/build.gradle.kts create mode 100644 lib/src/main/kotlin/rip/crit/nestj/Application.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/Library.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/config/ConfigModule.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/config/ConfigService.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/controller/Controller.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/extractions/Extractions.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/gate/Gates.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/http/method/Method.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/http/pathfinder/Pathfinder.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/http/request/Request.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/http/response/Response.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/http/server/Server.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/inject/Injectable.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/module/Module.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/pipe/Pipes.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/pipe/header/Header.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/plugin/Plugin.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/serve/ServeDirModule.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/serve/ServeDirService.kt create mode 100644 lib/src/main/kotlin/rip/crit/nestj/websocket/WebSocket.kt create mode 100644 lib/src/test/kotlin/rip/crit/nestj/LibraryTest.kt create mode 100644 lib/src/test/kotlin/rip/crit/nestj/TestServer.kt create mode 100644 orm-core/build.gradle.kts create mode 100644 orm-core/src/main/kotlin/rip/crit/nestj/orm/Database.kt create mode 100644 orm-core/src/main/kotlin/rip/crit/nestj/orm/Repository.kt create mode 100644 orm-postgres/build.gradle.kts create mode 100644 orm-postgres/src/main/kotlin/rip/crit/nestj/orm/postgres/PostgresDatabase.kt create mode 100644 orm-sqlite/build.gradle.kts create mode 100644 orm-sqlite/src/main/kotlin/rip/crit/nestj/orm/sqlite/SqliteDatabase.kt create mode 100644 package.json create mode 100644 pom.xml create mode 100644 servlet-compat/build.gradle.kts create mode 100644 servlet-compat/src/main/kotlin/rip/crit/nestj/servlet/ServletBridge.kt create mode 100644 settings.gradle.kts create mode 100644 socketio/build.gradle.kts create mode 100644 socketio/src/main/kotlin/rip/crit/nestj/socketio/SocketIoGateway.kt create mode 100644 vaadin/build.gradle.kts create mode 100644 vaadin/src/main/kotlin/rip/crit/nestj/vaadin/VaadinService.kt diff --git a/.forgejo/workflows/publish.yml b/.forgejo/workflows/publish.yml new file mode 100644 index 0000000..a47512d --- /dev/null +++ b/.forgejo/workflows/publish.yml @@ -0,0 +1,32 @@ +name: Build and publish + +on: + push: + branches: [main] + tags: ["v*"] + pull_request: + +jobs: + verify: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: "25" + - run: ./gradlew test + publish: + if: startsWith(gitea.ref, 'refs/tags/v') + needs: verify + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: "25" + - run: ./gradlew publish + env: + ORG_GRADLE_PROJECT_forgejoUsername: ${{ secrets.FORGEJO_USERNAME }} + ORG_GRADLE_PROJECT_forgejoPassword: ${{ secrets.FORGEJO_TOKEN }} diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f91f646 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,12 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + +# Binary files should be left untouched +*.jar binary + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5c4ac6d --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build + +# Ignore Kotlin plugin data +.kotlin diff --git a/activitypub/build.gradle.kts b/activitypub/build.gradle.kts new file mode 100644 index 0000000..e52631f --- /dev/null +++ b/activitypub/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + alias(libs.plugins.kotlin.jvm) + `java-library` + `maven-publish` + id("com.ncorti.ktfmt.gradle") version "0.27.0" +} + +dependencies { + api(project(":lib")) + implementation(libs.jackson.databind) +} + +java { + toolchain { languageVersion = JavaLanguageVersion.of(25) } + withSourcesJar() +} + +publishing { + publications { + create("maven") { + from(components["java"]) + artifactId = "nestj-activitypub" + } + } +} diff --git a/activitypub/src/main/kotlin/rip/crit/nestj/activitypub/ActivityPubService.kt b/activitypub/src/main/kotlin/rip/crit/nestj/activitypub/ActivityPubService.kt new file mode 100644 index 0000000..771f4fa --- /dev/null +++ b/activitypub/src/main/kotlin/rip/crit/nestj/activitypub/ActivityPubService.kt @@ -0,0 +1,132 @@ +package rip.crit.nestj.activitypub + +import com.fasterxml.jackson.databind.JsonNode +import com.fasterxml.jackson.databind.ObjectMapper +import java.time.Instant +import java.util.concurrent.ConcurrentHashMap +import rip.crit.nestj.http.request.Request +import rip.crit.nestj.http.response.HTTPResponse +import rip.crit.nestj.http.response.Response +import rip.crit.nestj.http.server.Server + +const val ACTIVITYPUB_CONTENT_TYPE = "application/activity+json" + +data class ActivityPubActor(val handle: String, val name: String, val summary: String = "") + +fun interface ActivityDelivery { + fun deliver(inbox: String, activity: JsonNode) +} + +/** + * A small ActivityPub HTTP surface. It serves actor documents and ordered collections, accepts JSON + * activities at local inboxes, and keeps remote delivery behind an explicit adapter. + */ +class ActivityPubService( + private val baseUrl: String, + private val delivery: ActivityDelivery = ActivityDelivery { _, _ -> }, + private val mapper: ObjectMapper = ObjectMapper(), +) { + private val actors = ConcurrentHashMap() + private val inboxes = ConcurrentHashMap>() + private val outboxes = ConcurrentHashMap>() + + fun register(actor: ActivityPubActor): ActivityPubService = apply { + require(actor.handle.matches(Regex("[A-Za-z0-9_.-]+"))) { "Invalid ActivityPub handle" } + actors[actor.handle] = actor + } + + fun install(server: Server): ActivityPubService = apply { + server.get("/ap/actors/:handle") { request -> actorResponse(request) } + server.get("/ap/actors/:handle/outbox") { request -> collectionResponse(request, outboxes) } + server.get("/ap/actors/:handle/inbox") { request -> collectionResponse(request, inboxes) } + server.post("/ap/actors/:handle/inbox") { request -> receive(request) } + } + + fun publish( + handle: String, + type: String, + obj: Any, + recipients: Iterable = emptyList(), + ): JsonNode { + require(actors.containsKey(handle)) { "Unknown actor: $handle" } + val activity = + mapper.createObjectNode().apply { + put("@context", "https://www.w3.org/ns/activitystreams") + put("id", "$baseUrl/ap/activities/${java.util.UUID.randomUUID()}") + put("type", type) + put("actor", actorUrl(handle)) + set("object", mapper.valueToTree(obj)) + put("published", Instant.now().toString()) + } + outboxes.computeIfAbsent(handle) { mutableListOf() }.add(0, activity) + recipients.forEach { delivery.deliver(it, activity) } + return activity + } + + private fun actorResponse(request: Request): Response { + val handle = request.getPathParams()["handle"] ?: return notFound(request) + val actor = actors[handle] ?: return notFound(request) + val body = + mapper.createObjectNode().apply { + put("@context", "https://www.w3.org/ns/activitystreams") + put("id", actorUrl(handle)) + put("type", "Person") + put("preferredUsername", actor.handle) + put("name", actor.name) + put("summary", actor.summary) + put("inbox", "${actorUrl(handle)}/inbox") + put("outbox", "${actorUrl(handle)}/outbox") + } + return json(request, body, 200) + } + + private fun collectionResponse(request: Request, source: Map>): Response { + val handle = request.getPathParams()["handle"] ?: return notFound(request) + if (!actors.containsKey(handle)) return notFound(request) + val entries = source[handle].orEmpty() + return json( + request, + mapper.createObjectNode().apply { + put("@context", "https://www.w3.org/ns/activitystreams") + put("type", "OrderedCollection") + put("totalItems", entries.size) + set("orderedItems", mapper.valueToTree(entries)) + }, + 200, + ) + } + + private fun receive(request: Request): Response { + val handle = request.getPathParams()["handle"] ?: return notFound(request) + if (!actors.containsKey(handle)) return notFound(request) + if ( + !request.getHeaders().entries.any { + it.key.equals("content-type", true) && it.value.contains("json") + } + ) + return HTTPResponse("Expected ActivityPub JSON", 415, request) + val activity = + try { + mapper.readTree(request.getBody()) + } catch (_: Exception) { + return HTTPResponse("Invalid JSON", 400, request) + } + if (activity.path("type").asText().isBlank()) + return HTTPResponse("Activity type is required", 400, request) + inboxes.computeIfAbsent(handle) { mutableListOf() }.add(0, activity) + return HTTPResponse(ByteArray(0), 202, request) + } + + private fun actorUrl(handle: String) = "$baseUrl/ap/actors/$handle" + + private fun json(request: Request, value: JsonNode, status: Int) = + HTTPResponse( + mapper.writeValueAsBytes(value), + hashMapOf("Content-Type" to ACTIVITYPUB_CONTENT_TYPE), + status, + ACTIVITYPUB_CONTENT_TYPE, + request, + ) + + private fun notFound(request: Request) = HTTPResponse("Actor not found", 404, request) +} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..faaf4c1 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,22 @@ +import org.gradle.api.artifacts.repositories.PasswordCredentials +import org.gradle.api.publish.PublishingExtension + +allprojects { + group = providers.gradleProperty("group").orElse("rip.crit.nestj").get() + version = providers.gradleProperty("version").orElse("0.1.0-SNAPSHOT").get() + repositories { mavenCentral() } +} + +subprojects { + plugins.withId("maven-publish") { + extensions.configure { + repositories { + maven { + name = "Forgejo" + url = uri("https://ai.crit.rip/api/packages/jprims/maven") + credentials(PasswordCredentials::class) + } + } + } + } +} diff --git a/bun.lock b/bun.lock new file mode 100644 index 0000000..267f38e --- /dev/null +++ b/bun.lock @@ -0,0 +1,14 @@ +{ + "lockfileVersion": 1, + "configVersion": 1, + "workspaces": { + "": { + "dependencies": { + "ws": "^8.21.3", + }, + }, + }, + "packages": { + "ws": ["ws@8.21.3", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw=="], + } +} diff --git a/client/typescript/.gitignore b/client/typescript/.gitignore new file mode 100644 index 0000000..a14702c --- /dev/null +++ b/client/typescript/.gitignore @@ -0,0 +1,34 @@ +# dependencies (bun install) +node_modules + +# output +out +dist +*.tgz + +# code coverage +coverage +*.lcov + +# logs +logs +_.log +report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json + +# dotenv environment variable files +.env +.env.development.local +.env.test.local +.env.production.local +.env.local + +# caches +.eslintcache +.cache +*.tsbuildinfo + +# IntelliJ based IDEs +.idea + +# Finder (MacOS) folder config +.DS_Store diff --git a/client/typescript/README.md b/client/typescript/README.md new file mode 100644 index 0000000..697f748 --- /dev/null +++ b/client/typescript/README.md @@ -0,0 +1,14 @@ +# NestJ TypeScript WebSocket client + +The connector uses the plain WebSocket protocol, not Socket.IO. + +```ts +import { createWebSocketClient } from "./index.js"; +const socket = createWebSocketClient("ws://localhost:8080/chat"); +socket.onMessage(console.log); +await socket.connect(); +socket.send("hello"); +``` + +Browser builds use the platform `WebSocket`. Node.js projects can import +`createNodeWebSocketClient` from `node.ts`, which uses `ws`. diff --git a/client/typescript/browser.ts b/client/typescript/browser.ts new file mode 100644 index 0000000..283345e --- /dev/null +++ b/client/typescript/browser.ts @@ -0,0 +1 @@ +export { createWebSocketClient, NestjWebSocketClient } from "./index.js"; diff --git a/client/typescript/bun.lock b/client/typescript/bun.lock new file mode 100644 index 0000000..977c082 --- /dev/null +++ b/client/typescript/bun.lock @@ -0,0 +1,26 @@ +{ + "lockfileVersion": 1, + "configVersion": 1, + "workspaces": { + "": { + "name": "typescript", + "devDependencies": { + "@types/bun": "latest", + }, + "peerDependencies": { + "typescript": "^5", + }, + }, + }, + "packages": { + "@types/bun": ["@types/bun@1.4.2", "", { "dependencies": { "bun-types": "1.4.2" } }, "sha512-GimotNn7+ZV0uVArItBbriZsR1oNf0+WTzPkdcFrzShI7k2norL0uzEaJT8T33dWr7O/c9ZDuAFQrctKCi72oQ=="], + + "@types/node": ["@types/node@22.20.2", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-xlvWf4Vs9n1PEVYwP1n4vvG07M6y8WgvJ2t0vbrWTmijsIHp1cS+uJ2kMIRdY3nHZK0nCYKrPeD171+SzF4/zw=="], + + "bun-types": ["bun-types@1.4.2", "", { "dependencies": { "@types/node": "*" } }, "sha512-bxV1FgK7yBIzjRe5zBozIM4Bem11ZJcCXSrjWRG3YWLt8yFDePu4cLjpebO8OvPeIE9trbyPF4fuj3Cia4Fj3w=="], + + "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], + + "undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="], + } +} diff --git a/client/typescript/index.ts b/client/typescript/index.ts new file mode 100644 index 0000000..26f2e9d --- /dev/null +++ b/client/typescript/index.ts @@ -0,0 +1,111 @@ +export type SocketState = "connecting" | "open" | "closing" | "closed"; + +export interface WebSocketClient { + readonly state: SocketState; + connect(): Promise; + send(message: string): void; + close(code?: number, reason?: string): void; + onOpen(listener: () => void): () => void; + onMessage(listener: (message: string) => void): () => void; + onClose(listener: (code: number, reason: string) => void): () => void; + onError(listener: (error: Event | Error) => void): () => void; +} + +type ListenerMap = { + open: Set<() => void>; + message: Set<(message: string) => void>; + close: Set<(code: number, reason: string) => void>; + error: Set<(error: Event | Error) => void>; +}; +export type WebSocketConstructor = new ( + url: string, + protocols?: string | string[], +) => WebSocket; + +export class NestjWebSocketClient implements WebSocketClient { + private socket?: WebSocket; + private listeners: ListenerMap = { + open: new Set(), + message: new Set(), + close: new Set(), + error: new Set(), + }; + private currentState: SocketState = "closed"; + get state(): SocketState { + return this.currentState; + } + + constructor( + private readonly url: string, + private readonly protocols?: string | string[], + private readonly socketConstructor: WebSocketConstructor = WebSocket, + ) {} + + async connect(): Promise { + if ( + this.socket && + (this.currentState === "open" || this.currentState === "connecting") + ) return; + this.currentState = "connecting"; + await new Promise((resolve, reject) => { + const socket = new this.socketConstructor(this.url, this.protocols); + this.socket = socket; + socket.addEventListener("open", () => { + this.currentState = "open"; + this.listeners.open.forEach((f) => f()); + resolve(); + }, { once: true }); + socket.addEventListener( + "message", + (event) => + this.listeners.message.forEach((f) => + f(String(event.data)) + ), + ); + socket.addEventListener("close", (event) => { + this.currentState = "closed"; + this.listeners.close.forEach((f) => + f(event.code, event.reason) + ); + }); + socket.addEventListener("error", (event) => { + this.listeners.error.forEach((f) => f(event)); + reject(new Error("WebSocket connection failed")); + }, { once: true }); + }); + } + + send(message: string): void { + if (this.currentState !== "open") { + throw new Error("WebSocket is not open"); + } + this.socket!.send(message); + } + close(code = 1000, reason = ""): void { + this.currentState = "closing"; + this.socket?.close(code, reason); + } + onOpen(listener: () => void) { + return this.subscribe(this.listeners.open, listener); + } + onMessage(listener: (message: string) => void) { + return this.subscribe(this.listeners.message, listener); + } + onClose(listener: (code: number, reason: string) => void) { + return this.subscribe(this.listeners.close, listener); + } + onError(listener: (error: Event | Error) => void) { + return this.subscribe(this.listeners.error, listener); + } + private subscribe(listeners: Set, listener: T): () => void { + listeners.add(listener); + return () => listeners.delete(listener); + } +} + +export function createWebSocketClient( + url: string, + protocols?: string | string[], +): WebSocketClient { + return new NestjWebSocketClient(url, protocols); +} diff --git a/client/typescript/node.ts b/client/typescript/node.ts new file mode 100644 index 0000000..bf6e603 --- /dev/null +++ b/client/typescript/node.ts @@ -0,0 +1,13 @@ +import WebSocket from "ws"; +import { NestjWebSocketClient, type WebSocketClient } from "./index.js"; + +export function createNodeWebSocketClient( + url: string, + protocols?: string | string[], +): WebSocketClient { + return new NestjWebSocketClient( + url, + protocols, + WebSocket as unknown as import("./index.js").WebSocketConstructor, + ); +} diff --git a/client/typescript/package.json b/client/typescript/package.json new file mode 100644 index 0000000..2f910ff --- /dev/null +++ b/client/typescript/package.json @@ -0,0 +1,15 @@ +{ + "name": "typescript", + "module": "index.ts", + "type": "module", + "private": true, + "devDependencies": { + "@types/bun": "latest" + }, + "peerDependencies": { + "typescript": "^5" + }, + "dependencies": { + "ws": "^8.21.3" + } +} diff --git a/client/typescript/tsconfig.json b/client/typescript/tsconfig.json new file mode 100644 index 0000000..8676333 --- /dev/null +++ b/client/typescript/tsconfig.json @@ -0,0 +1,30 @@ +{ + "compilerOptions": { + // Environment setup & latest features + "lib": ["ESNext", "DOM"], + "target": "ESNext", + "module": "Preserve", + "moduleDetection": "force", + "jsx": "react-jsx", + "allowJs": true, + "types": ["bun"], + + // Bundler mode + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "verbatimModuleSyntax": true, + "noEmit": true, + + // Best practices + "strict": true, + "skipLibCheck": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedIndexedAccess": true, + "noImplicitOverride": true, + + // Some stricter flags (disabled by default) + "noUnusedLocals": false, + "noUnusedParameters": false, + "noPropertyAccessFromIndexSignature": false + } +} diff --git a/client/typescript/ws.d.ts b/client/typescript/ws.d.ts new file mode 100644 index 0000000..b792b69 --- /dev/null +++ b/client/typescript/ws.d.ts @@ -0,0 +1,4 @@ +declare module "ws" { + const WebSocket: new (url: string, protocols?: string | string[]) => globalThis.WebSocket; + export default WebSocket; +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..ea43ef5 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,8 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.configuration-cache=true +org.gradle.parallel=true +org.gradle.caching=true +group=rip.crit +version=0.1.0-SNAPSHOT diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..cecbbf8 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,25 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/version_catalogs.html#sec::toml-dependencies-format + +[versions] +commons-math3 = "3.6.1" +guava = "33.5.0-jre" +netty-socketio = "2.0.14" +sqlite = "3.53.4.0" +postgres = "42.7.8" +servlet = "6.1.0" +vaadin = "25.2.6" +jackson = "2.20.1" + +[libraries] +commons-math3 = { module = "org.apache.commons:commons-math3", version.ref = "commons-math3" } +guava = { module = "com.google.guava:guava", version.ref = "guava" } +netty-socketio = { module = "com.corundumstudio.socketio:netty-socketio", version.ref = "netty-socketio" } +sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" } +postgres-jdbc = { module = "org.postgresql:postgresql", version.ref = "postgres" } +jakarta-servlet = { module = "jakarta.servlet:jakarta.servlet-api", version.ref = "servlet" } +vaadin-core = { module = "com.vaadin:vaadin-core", version.ref = "vaadin" } +jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } + +[plugins] +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "2.4.0" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..eddabd2eef8d94a5437d6168ff9c87a78ff725b3 GIT binary patch literal 47505 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..a51ec4f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,82 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem gradlew startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/justfile b/justfile new file mode 100644 index 0000000..2838666 --- /dev/null +++ b/justfile @@ -0,0 +1,10 @@ +format: + find . -name "build.gradle*" -exec dirname {} \; | sort -u | xargs -I {} ./gradlew -p {} ktfmtFormat + +build: + ./gradlew build + +publish version="0.1.0-SNAPSHOT": + git add . + git commit -m "Update version to ${version}" + git push -f origin main \ No newline at end of file diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts new file mode 100644 index 0000000..96ad225 --- /dev/null +++ b/lib/build.gradle.kts @@ -0,0 +1,59 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Kotlin library project to get you started. + * For more details on building Java & JVM projects, please refer to https://docs.gradle.org/9.7.1/userguide/building_java_projects.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin. + alias(libs.plugins.kotlin.jvm) + + // Apply the java-library plugin for API and implementation separation. + `java-library` + `maven-publish` + + id("com.ncorti.ktfmt.gradle") version "0.27.0" +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +dependencies { + // This dependency is exported to consumers, that is to say found on their compile classpath. + api(libs.commons.math3) + + // This dependency is used internally, and not exposed to consumers on their own compile + // classpath. + implementation(libs.guava) + implementation(kotlin("reflect")) +} + +testing { + suites { + // Configure the built-in test suite + val test = + named("test") { + // Use Kotlin Test test framework + useKotlinTest("2.4.0") + } + } +} + +// Apply a specific Java toolchain to ease working on different environments. +java { + toolchain { languageVersion = JavaLanguageVersion.of(25) } + withSourcesJar() +} + +publishing { + publications { + create("maven") { + from(components["java"]) + artifactId = "nestj-core" + } + } +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/Application.kt b/lib/src/main/kotlin/rip/crit/nestj/Application.kt new file mode 100644 index 0000000..83c1987 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/Application.kt @@ -0,0 +1,97 @@ +package rip.crit.nestj + +import java.util.ServiceLoader +import kotlin.reflect.KClass +import kotlin.reflect.KFunction +import kotlin.reflect.KParameter +import kotlin.reflect.full.findAnnotation +import kotlin.reflect.full.memberFunctions +import rip.crit.nestj.controller.* +import rip.crit.nestj.extractions.Extractions +import rip.crit.nestj.http.method.Method +import rip.crit.nestj.http.request.Request +import rip.crit.nestj.http.response.HTTPResponse +import rip.crit.nestj.http.response.Response +import rip.crit.nestj.http.server.Server +import rip.crit.nestj.inject.DepResolver +import rip.crit.nestj.module.Module +import rip.crit.nestj.plugin.NestjPlugin + +class Application private constructor(val server: Server, val resolver: DepResolver) { + companion object { + fun create(root: KClass<*>): Application { + val app = Application(Server(), DepResolver()) + app.installModule(root, mutableSetOf()) + ServiceLoader.load(NestjPlugin::class.java).forEach { it.configure(app) } + return app + } + } + + fun use(plugin: NestjPlugin): Application = apply { plugin.configure(this) } + + private fun installModule(type: KClass<*>, seen: MutableSet>) { + if (!seen.add(type)) return + val module = + requireNotNull(type.findAnnotation()) { "${type.qualifiedName} is not a @Module" } + module.imports.forEach { installModule(it, seen) } + module.providers.forEach { resolver.resolve(it) } + module.controllers.forEach(::installController) + } + + private fun installController(type: KClass<*>) { + val controller = resolver.resolve(type) + val basePath = type.findAnnotation()?.path ?: "" + type.memberFunctions.forEach { function -> + route(function)?.let { (method, path) -> + server.route(join(basePath, path), method) { request -> + invoke(controller, function, request) + } + } + } + } + + private fun route(function: KFunction<*>): Pair? = + when { + function.findAnnotation() != null -> + Method.GET to function.findAnnotation()!!.path + function.findAnnotation() != null -> + Method.POST to function.findAnnotation()!!.path + function.findAnnotation() != null -> + Method.PUT to function.findAnnotation()!!.path + function.findAnnotation() != null -> + Method.DELETE to function.findAnnotation()!!.path + function.findAnnotation() != null -> + Method.PATCH to function.findAnnotation()!!.path + function.findAnnotation() != null -> + Method.OPTIONS to function.findAnnotation()!!.path + function.findAnnotation() != null -> + Method.HEAD to function.findAnnotation()!!.path + function.findAnnotation() != null -> + Method.ALL to function.findAnnotation()!!.path + else -> null + } + + private fun invoke(controller: Any, function: KFunction<*>, request: Request): Response { + val values = + mutableMapOf( + function.parameters.first { it.kind == KParameter.Kind.INSTANCE } to controller + ) + function.parameters + .filter { it.kind == KParameter.Kind.VALUE } + .forEach { parameter -> + val value = Extractions.value(parameter, request) + if (value != null) values[parameter] = value + else if (!parameter.isOptional && !parameter.type.isMarkedNullable) + error("Missing route argument ${parameter.name}") + } + return when (val result = function.callBy(values)) { + is Response -> result + is ByteArray -> HTTPResponse(result, 200, request) + null -> HTTPResponse(ByteArray(0), 204, request) + else -> HTTPResponse(result.toString(), 200, request) + } + } + + private fun join(first: String, second: String): String = + "/" + listOf(first, second).joinToString("/") { it.trim('/') }.trim('/') +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/Library.kt b/lib/src/main/kotlin/rip/crit/nestj/Library.kt new file mode 100644 index 0000000..e3c1c6b --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/Library.kt @@ -0,0 +1,17 @@ +package rip.crit.nestj + +import rip.crit.nestj.http.server.Server +import rip.crit.nestj.websocket.WebSocketServer + +class Library { + fun createServer(): Server = Server() + + fun createWebSocketServer(): WebSocketServer = WebSocketServer() + + fun createApplication(module: kotlin.reflect.KClass<*>): Application = Application.create(module) + + @Deprecated("Use createServer() to begin building an application") + fun someLibraryMethod(): Boolean { + return true + } +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/config/ConfigModule.kt b/lib/src/main/kotlin/rip/crit/nestj/config/ConfigModule.kt new file mode 100644 index 0000000..a7168de --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/config/ConfigModule.kt @@ -0,0 +1,5 @@ +package rip.crit.nestj.config + +import rip.crit.nestj.module.Module + +@Module(providers = [ConfigService::class]) class ConfigModule diff --git a/lib/src/main/kotlin/rip/crit/nestj/config/ConfigService.kt b/lib/src/main/kotlin/rip/crit/nestj/config/ConfigService.kt new file mode 100644 index 0000000..4574722 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/config/ConfigService.kt @@ -0,0 +1,14 @@ +package rip.crit.nestj.config + +import rip.crit.nestj.inject.Injectable + +@Injectable +class ConfigService(private val values: Map = emptyMap()) { + fun get(name: String, default: String? = null): String? = + values[name] ?: System.getenv(name) ?: System.getProperty(name) ?: default + + fun require(name: String): String = + requireNotNull(get(name)) { "Missing configuration value: $name" } + + fun getInt(name: String, default: Int): Int = get(name)?.toIntOrNull() ?: default +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/controller/Controller.kt b/lib/src/main/kotlin/rip/crit/nestj/controller/Controller.kt new file mode 100644 index 0000000..775acf5 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/controller/Controller.kt @@ -0,0 +1,57 @@ +package rip.crit.nestj.controller + +@Retention(AnnotationRetention.RUNTIME) +@Target(AnnotationTarget.CLASS) +annotation class Controller(val path: String = "") + +@Retention(AnnotationRetention.RUNTIME) +@Target(AnnotationTarget.FUNCTION) +annotation class Get(val path: String = "") + +@Retention(AnnotationRetention.RUNTIME) +@Target(AnnotationTarget.FUNCTION) +annotation class Post(val path: String = "") + +@Retention(AnnotationRetention.RUNTIME) +@Target(AnnotationTarget.FUNCTION) +annotation class Put(val path: String = "") + +@Retention(AnnotationRetention.RUNTIME) +@Target(AnnotationTarget.FUNCTION) +annotation class Delete(val path: String = "") + +@Retention(AnnotationRetention.RUNTIME) +@Target(AnnotationTarget.FUNCTION) +annotation class Patch(val path: String = "") + +@Retention(AnnotationRetention.RUNTIME) +@Target(AnnotationTarget.FUNCTION) +annotation class Options(val path: String = "") + +@Retention(AnnotationRetention.RUNTIME) +@Target(AnnotationTarget.FUNCTION) +annotation class Head(val path: String = "") + +@Retention(AnnotationRetention.RUNTIME) +@Target(AnnotationTarget.FUNCTION) +annotation class All(val path: String = "") + +@Target(AnnotationTarget.VALUE_PARAMETER) +@Retention(AnnotationRetention.RUNTIME) +annotation class Param(val name: String) + +@Target(AnnotationTarget.VALUE_PARAMETER) +@Retention(AnnotationRetention.RUNTIME) +annotation class Query(val name: String) + +@Target(AnnotationTarget.VALUE_PARAMETER) +@Retention(AnnotationRetention.RUNTIME) +annotation class Header(val name: String) + +@Target(AnnotationTarget.VALUE_PARAMETER) +@Retention(AnnotationRetention.RUNTIME) +annotation class Body + +@Target(AnnotationTarget.VALUE_PARAMETER) +@Retention(AnnotationRetention.RUNTIME) +annotation class RequestObject diff --git a/lib/src/main/kotlin/rip/crit/nestj/extractions/Extractions.kt b/lib/src/main/kotlin/rip/crit/nestj/extractions/Extractions.kt new file mode 100644 index 0000000..d0eb298 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/extractions/Extractions.kt @@ -0,0 +1,35 @@ +package rip.crit.nestj.extractions + +import kotlin.reflect.KParameter +import kotlin.reflect.full.findAnnotation +import rip.crit.nestj.controller.Body +import rip.crit.nestj.controller.Header +import rip.crit.nestj.controller.Param +import rip.crit.nestj.controller.Query +import rip.crit.nestj.controller.RequestObject +import rip.crit.nestj.http.request.Request + +object Extractions { + fun value(parameter: KParameter, request: Request): Any? = + when { + parameter.findAnnotation() != null -> request + parameter.findAnnotation() != null -> body(parameter, request) + parameter.findAnnotation() != null -> + request.getPathParams()[parameter.findAnnotation()!!.name] + parameter.findAnnotation() != null -> + request.getQueryParams()[parameter.findAnnotation()!!.name] + parameter.findAnnotation
() != null -> + request + .getHeaders() + .entries + .firstOrNull { it.key.equals(parameter.findAnnotation
()!!.name, true) } + ?.value + else -> null + } + + private fun body(parameter: KParameter, request: Request): Any = + when (parameter.type.classifier) { + ByteArray::class -> request.getBody() + else -> request.getBody().toString(Charsets.UTF_8) + } +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/gate/Gates.kt b/lib/src/main/kotlin/rip/crit/nestj/gate/Gates.kt new file mode 100644 index 0000000..edf0e48 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/gate/Gates.kt @@ -0,0 +1,17 @@ +package rip.crit.nestj.gate + +import rip.crit.nestj.http.request.Request + +fun interface Gate { + fun canActivate(request: Request): Boolean +} + +typealias Gates = Gate + +object AllowAllGate : Gate { + override fun canActivate(request: Request): Boolean = true +} + +@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) +@Retention(AnnotationRetention.RUNTIME) +annotation class UseGates(vararg val gates: kotlin.reflect.KClass) diff --git a/lib/src/main/kotlin/rip/crit/nestj/http/method/Method.kt b/lib/src/main/kotlin/rip/crit/nestj/http/method/Method.kt new file mode 100644 index 0000000..3bdcd13 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/http/method/Method.kt @@ -0,0 +1,12 @@ +package rip.crit.nestj.http.method + +enum class Method { + GET, + POST, + PUT, + DELETE, + PATCH, + OPTIONS, + HEAD, + ALL, +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/http/pathfinder/Pathfinder.kt b/lib/src/main/kotlin/rip/crit/nestj/http/pathfinder/Pathfinder.kt new file mode 100644 index 0000000..133284e --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/http/pathfinder/Pathfinder.kt @@ -0,0 +1,144 @@ +package rip.crit.nestj.http.pathfinder + +import rip.crit.nestj.http.method.Method +import rip.crit.nestj.http.request.Request +import rip.crit.nestj.http.response.Response + +enum class RoutePartType { + STATIC, + PARAMETER, + WILDCARD, +} + +data class RoutePart(val type: RoutePartType, val value: String) + +/** A route selected for a request, together with its extracted path values. */ +data class RouteMatch( + val method: Method, + val path: String, + val handler: (Request) -> Response, + val pathParams: HashMap, +) + +private data class RegisteredRoute( + val method: Method, + val path: String, + val parts: List, + val handler: (Request) -> Response, + val order: Int, +) + +/** A simple pathfinder for routing HTTP requests to handlers based on path and method. */ +class Pathfinder { + private val registeredRoutes = mutableListOf() + + val routes: HashMap<(Request) -> Response, Pair> + get() = + HashMap( + registeredRoutes.associate { route -> + route.handler to + (route.method.name to + (route.parts.lastOrNull() ?: RoutePart(RoutePartType.STATIC, ""))) + } + ) + + fun addRoute(path: String, method: String, callback: (Request) -> Response) = + addRoute(path, parseMethod(method), callback) + + fun addRoute(path: String, method: Method, callback: (Request) -> Response) { + val normalizedPath = normalizePath(path) + val parts = parseRoute(normalizedPath) + require(registeredRoutes.none { it.method == method && it.path == normalizedPath }) { + "Route already registered: ${method.name} $normalizedPath" + } + registeredRoutes += + RegisteredRoute(method, normalizedPath, parts, callback, registeredRoutes.size) + } + + fun findRoute(path: String, method: Method): RouteMatch? { + val segments = splitPath(path) + return registeredRoutes + .asSequence() + .filter { it.method == method || it.method == Method.ALL } + .mapNotNull { route -> match(route, segments) } + .sortedWith( + compareByDescending { it.method == method } + .thenByDescending { specificity(it.path) } + .thenBy { match -> + registeredRoutes + .first { it.path == match.path && it.method == match.method } + .order + } + ) + .firstOrNull() + } + + fun findRoute(path: String, method: String): RouteMatch? = findRoute(path, parseMethod(method)) + + fun resolve(path: String, method: String): Pair? = + findRoute(path, method)?.let { + it.method.name to (parseRoute(it.path).lastOrNull() ?: RoutePart(RoutePartType.STATIC, "")) + } + + private fun match(route: RegisteredRoute, segments: List): RouteMatch? { + val params = linkedMapOf() + var index = 0 + for ((type, value) in route.parts) { + when (type) { + RoutePartType.STATIC -> if (segments.getOrNull(index) != value) return null else index++ + RoutePartType.PARAMETER -> { + params[value] = segments.getOrNull(index) ?: return null + index++ + } + RoutePartType.WILDCARD -> { + params[value] = segments.drop(index).joinToString("/") + index = segments.size + } + } + } + if (index != segments.size) return null + return RouteMatch(route.method, route.path, route.handler, params) + } + + private fun parseRoute(path: String): List { + val segments = splitPath(path) + return segments.mapIndexed { index, segment -> + when { + segment.startsWith(":") -> { + require(segment.length > 1) { "Route parameter names cannot be empty" } + RoutePart(RoutePartType.PARAMETER, segment.drop(1)) + } + segment == "*" -> { + require(index == segments.lastIndex) { "A wildcard must be the final route segment" } + RoutePart(RoutePartType.WILDCARD, "*") + } + else -> RoutePart(RoutePartType.STATIC, segment) + } + } + } + + private fun specificity(path: String): Int = + parseRoute(path).sumOf { + when (it.type) { + RoutePartType.STATIC -> 4 + RoutePartType.PARAMETER -> 2 + RoutePartType.WILDCARD -> 0 + } + } + + private fun splitPath(path: String): List = + normalizePath(path).removePrefix("/").split('/').filter(String::isNotEmpty) + + private fun normalizePath(path: String): String { + val pathname = path.substringBefore('?').substringBefore('#').trim() + require(pathname.isNotEmpty()) { "Route path cannot be empty" } + return "/" + pathname.trim('/').replace(Regex("/+"), "/").trim('/') + } + + private fun parseMethod(method: String): Method = + try { + Method.valueOf(method.trim().uppercase()) + } catch (_: IllegalArgumentException) { + throw IllegalArgumentException("Unsupported HTTP method: $method") + } +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/http/request/Request.kt b/lib/src/main/kotlin/rip/crit/nestj/http/request/Request.kt new file mode 100644 index 0000000..90a6b4c --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/http/request/Request.kt @@ -0,0 +1,81 @@ +package rip.crit.nestj.http.request + +import rip.crit.nestj.http.method.Method + +interface Request { + fun getMethod(): Method + + fun getPath(): String + + fun getHeaders(): HashMap + + fun getBody(): ByteArray + + fun getQueryParams(): HashMap + + fun getPathParams(): HashMap + + fun getHash(): String + + fun getProtocol(): String +} + +class HTTPRequest( + private val method: Method, + private val path: String, + private val headers: HashMap, + private val body: ByteArray, + private val queryParams: HashMap, + private val pathParams: HashMap, + private val hash: String, + private val protocol: String, +) : Request { + override fun getMethod(): Method = method + + override fun getPath(): String = path + + private val immutableHeaders = headers.toMap() + private val immutableBody = body.copyOf() + private val immutableQueryParams = queryParams.toMap() + private val immutablePathParams = pathParams.toMap() + + override fun getHeaders(): HashMap = HashMap(immutableHeaders) + + override fun getBody(): ByteArray = immutableBody.copyOf() + + override fun getQueryParams(): HashMap = HashMap(immutableQueryParams) + + override fun getPathParams(): HashMap = HashMap(immutablePathParams) + + override fun getHash(): String = hash + + override fun getProtocol(): String = protocol + + constructor( + method: Method, + path: String, + ) : this( + method, + path.substringBefore('?'), + HashMap(), + ByteArray(0), + parseQuery(path), + HashMap(), + "", + "HTTP/1.1", + ) + + companion object { + private fun parseQuery(path: String): HashMap = + path + .substringAfter('?', "") + .substringBefore('#') + .split('&') + .filter(String::isNotEmpty) + .associate { pair -> + val key = pair.substringBefore('=') + key to pair.substringAfter('=', "") + } + .let(::HashMap) + } +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/http/response/Response.kt b/lib/src/main/kotlin/rip/crit/nestj/http/response/Response.kt new file mode 100644 index 0000000..2d5bfbd --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/http/response/Response.kt @@ -0,0 +1,60 @@ +package rip.crit.nestj.http.response + +import rip.crit.nestj.http.request.Request + +interface Response { + fun getBody(): ByteArray + + fun getHeaders(): HashMap + + fun getStatusCode(): Int + + fun getContentType(): String + + fun getRequest(): Request +} + +class HTTPResponse( + private val body: ByteArray, + private val headers: HashMap, + private val statusCode: Int, + private val contentType: String, + private val request: Request, +) : Response { + private val immutableBody = body.copyOf() + private val immutableHeaders = headers.toMap() + + override fun getBody(): ByteArray = immutableBody.copyOf() + + override fun getHeaders(): HashMap = HashMap(immutableHeaders) + + override fun getStatusCode(): Int = statusCode + + override fun getContentType(): String = contentType + + override fun getRequest(): Request = request + + constructor( + body: ByteArray, + statusCode: Int, + request: Request, + ) : this( + body, + HashMap(), + statusCode, + "text/plain", + request, + ) + + constructor( + body: String, + statusCode: Int, + request: Request, + ) : this( + body.toByteArray(Charsets.UTF_8), + hashMapOf("Content-Type" to "text/plain; charset=utf-8"), + statusCode, + "text/plain", + request, + ) +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/http/server/Server.kt b/lib/src/main/kotlin/rip/crit/nestj/http/server/Server.kt new file mode 100644 index 0000000..a1ad65d --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/http/server/Server.kt @@ -0,0 +1,62 @@ +package rip.crit.nestj.http.server + +import rip.crit.nestj.gate.Gate +import rip.crit.nestj.http.method.Method +import rip.crit.nestj.http.pathfinder.Pathfinder +import rip.crit.nestj.http.request.Request +import rip.crit.nestj.http.response.HTTPResponse +import rip.crit.nestj.http.response.Response +import rip.crit.nestj.pipe.HttpPipe + +/** HTTP dispatcher with pipes and gates. */ +class Server(private val pathfinder: Pathfinder = Pathfinder()) { + private val pipes = mutableListOf() + private val gates = mutableListOf() + + fun use(pipe: HttpPipe): Server = apply { pipes += pipe } + + fun use(gate: Gate): Server = apply { gates += gate } + + fun route(path: String, method: Method, handler: (Request) -> Response): Server = apply { + pathfinder.addRoute(path, method, handler) + } + + fun get(path: String, handler: (Request) -> Response): Server = route(path, Method.GET, handler) + + fun post(path: String, handler: (Request) -> Response): Server = route(path, Method.POST, handler) + + fun put(path: String, handler: (Request) -> Response): Server = route(path, Method.PUT, handler) + + fun delete(path: String, handler: (Request) -> Response): Server = + route(path, Method.DELETE, handler) + + fun patch(path: String, handler: (Request) -> Response): Server = + route(path, Method.PATCH, handler) + + fun options(path: String, handler: (Request) -> Response): Server = + route(path, Method.OPTIONS, handler) + + fun head(path: String, handler: (Request) -> Response): Server = route(path, Method.HEAD, handler) + + fun all(path: String, handler: (Request) -> Response): Server = route(path, Method.ALL, handler) + + fun handleRequest(request: Request): Response { + if (gates.any { !it.canActivate(request) }) return HTTPResponse("Forbidden", 403, request) + return try { + val pipedRequest = pipes.fold(request) { current, pipe -> pipe.transform(current) } + val match = + pathfinder.findRoute(pipedRequest.getPath(), pipedRequest.getMethod()) + ?: return HTTPResponse("Route not found", 404, pipedRequest) + match.handler(PathParamsRequest(pipedRequest, match.pathParams)) + } catch (error: IllegalArgumentException) { + HTTPResponse(error.message ?: "Bad request", 400, request) + } + } +} + +private class PathParamsRequest( + private val delegate: Request, + private val params: Map, +) : Request by delegate { + override fun getPathParams(): HashMap = HashMap(params) +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/inject/Injectable.kt b/lib/src/main/kotlin/rip/crit/nestj/inject/Injectable.kt new file mode 100644 index 0000000..40f2de4 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/inject/Injectable.kt @@ -0,0 +1,47 @@ +package rip.crit.nestj.inject + +import kotlin.reflect.KClass +import kotlin.reflect.full.primaryConstructor + +@Target(AnnotationTarget.CLASS) @Retention(AnnotationRetention.RUNTIME) annotation class Injectable + +@Target(AnnotationTarget.VALUE_PARAMETER) +@Retention(AnnotationRetention.RUNTIME) +annotation class Inject(val type: KClass<*>) + +/** Singleton constructor-injection container used by modules and controllers. */ +class DepResolver { + private val instances = linkedMapOf, Any>() + + fun register(type: KClass, instance: T): DepResolver = apply { + instances[type] = instance + } + + fun resolve(type: KClass): T { + @Suppress("UNCHECKED_CAST") + instances[type]?.let { + return it as T + } + require(type.annotations.any { it is Injectable } || type.constructors.isNotEmpty()) { + "No provider for ${type.qualifiedName}" + } + val constructor = + type.primaryConstructor + ?: type.constructors.singleOrNull { it.parameters.isEmpty() } + ?: error("${type.qualifiedName} needs a primary constructor") + val instance = + constructor.callBy( + constructor.parameters + .filterNot { it.isOptional } + .associateWith { parameter -> + val dependency = + parameter.annotations.filterIsInstance().firstOrNull()?.type + ?: parameter.type.classifier as? KClass<*> + ?: error("Cannot resolve ${parameter.name}") + resolve(dependency) + } + ) + instances[type] = instance + return instance + } +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/module/Module.kt b/lib/src/main/kotlin/rip/crit/nestj/module/Module.kt new file mode 100644 index 0000000..91bdd94 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/module/Module.kt @@ -0,0 +1,12 @@ +package rip.crit.nestj.module + +import kotlin.reflect.KClass + +@Retention(AnnotationRetention.RUNTIME) +@Target(AnnotationTarget.CLASS) +annotation class Module( + val imports: Array> = [], + val providers: Array> = [], + val controllers: Array> = [], + val exports: Array> = [], +) diff --git a/lib/src/main/kotlin/rip/crit/nestj/pipe/Pipes.kt b/lib/src/main/kotlin/rip/crit/nestj/pipe/Pipes.kt new file mode 100644 index 0000000..3be05ad --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/pipe/Pipes.kt @@ -0,0 +1,43 @@ +package rip.crit.nestj.pipe + +import rip.crit.nestj.http.request.Request + +enum class Ingest { + HEADER, + BODY, + QUERY, + PARAMS, + IP, + COOKIE_JAR, +} + +@Target(AnnotationTarget.CLASS) +@Retention(AnnotationRetention.RUNTIME) +annotation class Pipe(val name: String = "", val ingests: Array = []) + +fun interface HttpPipe { + fun transform(request: Request): Request +} + +object IdentityPipe : HttpPipe { + override fun transform(request: Request): Request = request +} + +class MaxBodySizePipe(private val maximumBytes: Int) : HttpPipe { + init { + require(maximumBytes >= 0) + } + + override fun transform(request: Request): Request { + require(request.getBody().size <= maximumBytes) { "Request body exceeds $maximumBytes bytes" } + return request + } +} + +class RequiredQueryPipe(private vararg val names: String) : HttpPipe { + override fun transform(request: Request): Request { + val missing = names.filterNot(request.getQueryParams()::containsKey) + require(missing.isEmpty()) { "Missing query parameter(s): ${missing.joinToString()}" } + return request + } +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/pipe/header/Header.kt b/lib/src/main/kotlin/rip/crit/nestj/pipe/header/Header.kt new file mode 100644 index 0000000..2c51141 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/pipe/header/Header.kt @@ -0,0 +1,21 @@ +package rip.crit.nestj.pipe.header + +import rip.crit.nestj.http.request.Request +import rip.crit.nestj.pipe.HttpPipe +import rip.crit.nestj.pipe.Ingest +import rip.crit.nestj.pipe.Pipe + +@Pipe(name = "HeaderPipe", ingests = [Ingest.HEADER]) +class HeaderPipe(private val requiredHeader: String? = null) : HttpPipe { + override fun transform(request: Request): Request { + if ( + requiredHeader != null && request.getHeaders().keys.none { it.equals(requiredHeader, true) } + ) { + throw MissingHeaderException(requiredHeader) + } + return request + } +} + +class MissingHeaderException(header: String) : + IllegalArgumentException("Missing required header: $header") diff --git a/lib/src/main/kotlin/rip/crit/nestj/plugin/Plugin.kt b/lib/src/main/kotlin/rip/crit/nestj/plugin/Plugin.kt new file mode 100644 index 0000000..16a2b57 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/plugin/Plugin.kt @@ -0,0 +1,8 @@ +package rip.crit.nestj.plugin + +import rip.crit.nestj.Application + +/** Extension point discoverable with Java's ServiceLoader. */ +fun interface NestjPlugin { + fun configure(application: Application) +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/serve/ServeDirModule.kt b/lib/src/main/kotlin/rip/crit/nestj/serve/ServeDirModule.kt new file mode 100644 index 0000000..5120d05 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/serve/ServeDirModule.kt @@ -0,0 +1,5 @@ +package rip.crit.nestj.serve + +import rip.crit.nestj.module.Module + +@Module(providers = [ServeDirService::class]) class ServeDirModule diff --git a/lib/src/main/kotlin/rip/crit/nestj/serve/ServeDirService.kt b/lib/src/main/kotlin/rip/crit/nestj/serve/ServeDirService.kt new file mode 100644 index 0000000..e54db68 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/serve/ServeDirService.kt @@ -0,0 +1,29 @@ +package rip.crit.nestj.serve + +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths +import rip.crit.nestj.http.request.Request +import rip.crit.nestj.http.response.HTTPResponse +import rip.crit.nestj.http.response.Response +import rip.crit.nestj.inject.Injectable + +/** Safe static-file service that refuses traversal outside its configured document root. */ +@Injectable +class ServeDirService(root: Path = Paths.get(".")) { + private val root = root.toAbsolutePath().normalize() + + fun serve(request: Request, relativePath: String): Response { + val target = root.resolve(relativePath.removePrefix("/")).normalize() + if (!target.startsWith(root) || !Files.isRegularFile(target)) + return HTTPResponse("Not found", 404, request) + val contentType = Files.probeContentType(target) ?: "application/octet-stream" + return HTTPResponse( + Files.readAllBytes(target), + hashMapOf("Content-Type" to contentType), + 200, + contentType, + request, + ) + } +} diff --git a/lib/src/main/kotlin/rip/crit/nestj/websocket/WebSocket.kt b/lib/src/main/kotlin/rip/crit/nestj/websocket/WebSocket.kt new file mode 100644 index 0000000..cc622e7 --- /dev/null +++ b/lib/src/main/kotlin/rip/crit/nestj/websocket/WebSocket.kt @@ -0,0 +1,121 @@ +package rip.crit.nestj.websocket + +import java.util.UUID +import java.util.concurrent.ConcurrentHashMap + +interface WebSocketGateway { + val path: String + + fun onConnect(session: WebSocketSession) {} + + fun onMessage(session: WebSocketSession, message: String) {} + + fun onDisconnect(session: WebSocketSession, code: Int, reason: String) {} + + fun onError(session: WebSocketSession, error: Throwable) {} +} + +@Target(AnnotationTarget.CLASS) +@Retention(AnnotationRetention.RUNTIME) +annotation class Gateway(val path: String = "/") + +class WebSocketSession( + val id: String = UUID.randomUUID().toString(), + private val sender: (String) -> Unit, + private val closer: (Int, String) -> Unit, +) { + var isOpen: Boolean = true + private set + + fun send(message: String) { + check(isOpen) { "WebSocket session is closed" } + sender(message) + } + + fun close(code: Int = 1000, reason: String = "") { + if (!isOpen) return + isOpen = false + closer(code, reason) + } + + internal fun markClosed() { + isOpen = false + } +} + +class WebSocketServer { + private val gateways = ConcurrentHashMap() + private val sessions = ConcurrentHashMap>() + + fun register(gateway: WebSocketGateway): WebSocketServer = apply { + val path = normalize(gateway.path) + require(gateways.putIfAbsent(path, gateway) == null) { "Gateway already registered: $path" } + } + + fun connect( + path: String, + send: (String) -> Unit, + close: (Int, String) -> Unit = { _, _ -> }, + ): WebSocketSession? { + val gateway = gateways[normalize(path)] ?: return null + lateinit var session: WebSocketSession + session = + WebSocketSession(sender = send) { code, reason -> + close(code, reason) + disconnect(session.id, code, reason) + } + sessions[session.id] = gateway to session + try { + gateway.onConnect(session) + } catch (error: Throwable) { + gateway.onError(session, error) + session.close(1011, "Gateway error") + } + return session + } + + fun receive(sessionId: String, message: String) { + val (gateway, session) = sessions[sessionId] ?: return + if (!session.isOpen) return + try { + gateway.onMessage(session, message) + } catch (error: Throwable) { + gateway.onError(session, error) + } + } + + fun disconnect(sessionId: String, code: Int = 1000, reason: String = "") { + val pair = sessions.remove(sessionId) ?: return + val (gateway, session) = pair + session.markClosed() + gateway.onDisconnect(session, code, reason) + } + + fun broadcast(path: String, message: String) { + val target = gateways[normalize(path)] ?: return + sessions.values.filter { it.first === target }.forEach { it.second.send(message) } + } + + fun heartbeat(path: String, payload: String = "ping") { + broadcast(path, payload) + } + + fun heartbeat( + path: String, + nowMillis: Long, + intervalMillis: Long, + state: HeartbeatState, + payload: String = "ping", + ) { + require(intervalMillis > 0) { "Heartbeat interval must be positive" } + if (nowMillis - state.lastSentAtMillis >= intervalMillis) { + heartbeat(path, payload) + state.lastSentAtMillis = nowMillis + } + } + + private fun normalize(path: String): String = + "/" + path.trim().trim('/').let { if (it.isEmpty()) "" else it } +} + +class HeartbeatState(var lastSentAtMillis: Long = Long.MIN_VALUE / 2) diff --git a/lib/src/test/kotlin/rip/crit/nestj/LibraryTest.kt b/lib/src/test/kotlin/rip/crit/nestj/LibraryTest.kt new file mode 100644 index 0000000..7546050 --- /dev/null +++ b/lib/src/test/kotlin/rip/crit/nestj/LibraryTest.kt @@ -0,0 +1,111 @@ +package rip.crit.nestj + +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertTrue +import rip.crit.nestj.gate.Gate +import rip.crit.nestj.http.method.Method +import rip.crit.nestj.http.request.HTTPRequest +import rip.crit.nestj.http.response.HTTPResponse +import rip.crit.nestj.http.server.Server +import rip.crit.nestj.pipe.HttpPipe +import rip.crit.nestj.websocket.WebSocketGateway +import rip.crit.nestj.websocket.WebSocketServer + +class LibraryTest { + @Test + fun someLibraryMethodReturnsTrue() { + val classUnderTest = Library() + assertTrue(classUnderTest.someLibraryMethod(), "someLibraryMethod should return 'true'") + } + + @Test + fun dispatcherPrefersStaticRoutesAndExposesParameters() { + val server = + Server() + .get("/users/:id") { request -> + HTTPResponse(request.getPathParams().getValue("id"), 200, request) + } + .get("/users/me") { request -> HTTPResponse("me", 200, request) } + + val staticResponse = server.handleRequest(HTTPRequest(Method.GET, "/users/me")) + val parameterResponse = server.handleRequest(HTTPRequest(Method.GET, "/users/42?active=true")) + + assertEquals("me", staticResponse.getBody().toString(Charsets.UTF_8)) + assertEquals("42", parameterResponse.getBody().toString(Charsets.UTF_8)) + } + + @Test + fun dispatcherSupportsWildcardAndAllMethods() { + val server = + Server().all("/assets/*") { request -> + HTTPResponse(request.getPathParams().getValue("*"), 200, request) + } + + val response = server.handleRequest(HTTPRequest(Method.POST, "/assets/css/site.css")) + assertEquals("css/site.css", response.getBody().toString(Charsets.UTF_8)) + assertEquals(404, server.handleRequest(HTTPRequest(Method.GET, "/missing")).getStatusCode()) + } + + @Test + fun methodSpecificRouteOutranksAnAllRoute() { + val server = + Server() + .all("/health") { request -> HTTPResponse("fallback", 200, request) } + .get("/health") { request -> HTTPResponse("ok", 200, request) } + + assertEquals( + "ok", + server.handleRequest(HTTPRequest(Method.GET, "/health")).getBody().toString(Charsets.UTF_8), + ) + } + + @Test + fun gatesBlockAndPipesRunBeforeHandlers() { + val pipe = HttpPipe { request -> + object : rip.crit.nestj.http.request.Request by request { + override fun getPath(): String = "/processed" + } + } + val allowed = + Server().use(pipe).use(Gate { true }).get("/processed") { request -> + HTTPResponse("ok", 200, request) + } + val denied = + Server().use(Gate { false }).get("/") { request -> HTTPResponse("no", 200, request) } + + assertEquals(200, allowed.handleRequest(HTTPRequest(Method.GET, "/original")).getStatusCode()) + assertEquals(403, denied.handleRequest(HTTPRequest(Method.GET, "/")).getStatusCode()) + } + + @Test + fun websocketGatewayReceivesAndBroadcastsMessages() { + val received = mutableListOf() + val sent = mutableListOf() + val gateway = + object : WebSocketGateway { + override val path = "/chat" + + override fun onMessage( + session: rip.crit.nestj.websocket.WebSocketSession, + message: String, + ) { + received += message + session.send("echo:$message") + } + } + val server = WebSocketServer().register(gateway) + val session = requireNotNull(server.connect("/chat", sent::add)) + server.receive(session.id, "hello") + server.broadcast("/chat", "all") + + assertEquals(listOf("hello"), received) + assertEquals(listOf("echo:hello", "all"), sent) + } + + @Test + fun modulesControllersInjectionsAndExtractionsAreWired() { + val response = createTestServer().handleRequest(HTTPRequest(Method.GET, "/hello/Ada")) + assertEquals("Hello, Ada", response.getBody().toString(Charsets.UTF_8)) + } +} diff --git a/lib/src/test/kotlin/rip/crit/nestj/TestServer.kt b/lib/src/test/kotlin/rip/crit/nestj/TestServer.kt new file mode 100644 index 0000000..9fd4a2a --- /dev/null +++ b/lib/src/test/kotlin/rip/crit/nestj/TestServer.kt @@ -0,0 +1,22 @@ +package rip.crit.nestj + +import rip.crit.nestj.controller.Controller +import rip.crit.nestj.controller.Get +import rip.crit.nestj.controller.Param +import rip.crit.nestj.inject.Injectable +import rip.crit.nestj.module.Module + +@Injectable +class GreetingService { + fun greeting(name: String) = "Hello, $name" +} + +@Controller("/hello") +class GreetingController(private val greetings: GreetingService) { + @Get("/:name") fun hello(@Param("name") name: String) = greetings.greeting(name) +} + +@Module(providers = [GreetingService::class], controllers = [GreetingController::class]) +class TestServerModule + +fun createTestServer() = Application.create(TestServerModule::class).server diff --git a/orm-core/build.gradle.kts b/orm-core/build.gradle.kts new file mode 100644 index 0000000..37b6f30 --- /dev/null +++ b/orm-core/build.gradle.kts @@ -0,0 +1,22 @@ +plugins { + alias(libs.plugins.kotlin.jvm) + `java-library` + `maven-publish` + id("com.ncorti.ktfmt.gradle") version "0.27.0" +} + +dependencies { api(kotlin("stdlib")) } + +java { + toolchain { languageVersion = JavaLanguageVersion.of(25) } + withSourcesJar() +} + +publishing { + publications { + create("maven") { + from(components["java"]) + artifactId = "nestj-orm-core" + } + } +} diff --git a/orm-core/src/main/kotlin/rip/crit/nestj/orm/Database.kt b/orm-core/src/main/kotlin/rip/crit/nestj/orm/Database.kt new file mode 100644 index 0000000..f829f08 --- /dev/null +++ b/orm-core/src/main/kotlin/rip/crit/nestj/orm/Database.kt @@ -0,0 +1,62 @@ +package rip.crit.nestj.orm + +import java.sql.Connection +import javax.sql.DataSource + +interface Database : AutoCloseable { + fun transaction(block: (Connection) -> T): T + + fun execute(sql: String, parameters: List = emptyList()): Int + + fun query(sql: String, parameters: List = emptyList()): List +} + +typealias Row = Map + +open class JdbcDatabase(private val dataSource: DataSource) : Database { + override fun transaction(block: (Connection) -> T): T = + dataSource.connection.use { connection -> + val previous = connection.autoCommit + connection.autoCommit = false + try { + block(connection).also { connection.commit() } + } catch (error: Throwable) { + connection.rollback() + throw error + } finally { + connection.autoCommit = previous + } + } + + override fun execute(sql: String, parameters: List): Int = + dataSource.connection.use { connection -> + connection.prepareStatement(sql).use { statement -> + bind(statement, parameters) + statement.executeUpdate() + } + } + + override fun query(sql: String, parameters: List): List = + dataSource.connection.use { connection -> + connection.prepareStatement(sql).use { statement -> + bind(statement, parameters) + statement.executeQuery().use { result -> + val metadata = result.metaData + buildList { + while (result.next()) add( + (1..metadata.columnCount).associate { + metadata.getColumnLabel(it) to result.getObject(it) + } + ) + } + } + } + } + + override fun close() {} + + private fun bind(statement: java.sql.PreparedStatement, parameters: List) = + parameters.forEachIndexed { index, value -> + statement.setObject(index + 1, value) + } +} diff --git a/orm-core/src/main/kotlin/rip/crit/nestj/orm/Repository.kt b/orm-core/src/main/kotlin/rip/crit/nestj/orm/Repository.kt new file mode 100644 index 0000000..1adcf59 --- /dev/null +++ b/orm-core/src/main/kotlin/rip/crit/nestj/orm/Repository.kt @@ -0,0 +1,104 @@ +package rip.crit.nestj.orm + +/** Parameterized SQL fragments. Values are always bound through PreparedStatement. */ +data class Sql(val text: String, val parameters: List = emptyList()) { + operator fun plus(other: Sql) = Sql("$text ${other.text}", parameters + other.parameters) +} + +object SqlBuilder { + fun select(table: String, columns: List = listOf("*"), where: Sql? = null): Sql = + Sql("SELECT ${columns.joinToString(", ")} FROM ${identifier(table)}") + + (where?.let { Sql("WHERE ${it.text}", it.parameters) } ?: Sql("")) + + fun insert(table: String, values: Map): Sql { + require(values.isNotEmpty()) + return Sql( + "INSERT INTO ${identifier(table)} (${values.keys.joinToString(", ", transform = ::identifier)}) VALUES (${values.keys.joinToString(", ") { "?" }})", + values.values.toList(), + ) + } + + fun whereEquals(column: String, value: Any?) = Sql("${identifier(column)} = ?", listOf(value)) + + fun identifier(value: String): String { + require(value.matches(Regex("[A-Za-z_][A-Za-z0-9_]*"))) { "Unsafe SQL identifier" } + return value + } +} + +interface Repository { + fun findById(id: ID): T? + + fun findAll(): List + + fun save(entity: T): T + + fun deleteById(id: ID): Boolean +} + +/** Base repository with explicit mappers, avoiding unsafe reflection-to-SQL conventions. */ +abstract class JdbcRepository( + private val database: Database, + private val table: String, + private val idColumn: String = "id", +) : Repository { + abstract fun fromRow(row: Row): T + + abstract fun insertValues(entity: T): Map + + override fun findById(id: ID): T? = + database + .query( + SqlBuilder.select(table, where = SqlBuilder.whereEquals(idColumn, id)).text, + SqlBuilder.whereEquals(idColumn, id).parameters, + ) + .firstOrNull() + ?.let(::fromRow) + + override fun findAll(): List = database.query(SqlBuilder.select(table).text).map(::fromRow) + + override fun save(entity: T): T { + val statement = SqlBuilder.insert(table, insertValues(entity)) + database.execute(statement.text, statement.parameters) + return entity + } + + override fun deleteById(id: ID): Boolean = + database.execute( + "DELETE FROM ${SqlBuilder.identifier(table)} WHERE ${SqlBuilder.identifier(idColumn)} = ?", + listOf(id), + ) > 0 +} + +interface Migration { + val version: Int + + fun up(database: Database) +} + +class MigrationRunner(private val database: Database) { + fun run(migrations: Iterable) { + migrations + .sortedBy { it.version } + .forEach { migration -> + database.execute( + "CREATE TABLE IF NOT EXISTS nestj_migrations (version INTEGER PRIMARY KEY)" + ) + if ( + database + .query( + "SELECT version FROM nestj_migrations WHERE version = ?", + listOf(migration.version), + ) + .isEmpty() + ) + database.transaction { + migration.up(database) + database.execute( + "INSERT INTO nestj_migrations (version) VALUES (?)", + listOf(migration.version), + ) + } + } + } +} diff --git a/orm-postgres/build.gradle.kts b/orm-postgres/build.gradle.kts new file mode 100644 index 0000000..7779fcd --- /dev/null +++ b/orm-postgres/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + alias(libs.plugins.kotlin.jvm) + `java-library` + `maven-publish` + id("com.ncorti.ktfmt.gradle") version "0.27.0" +} + +dependencies { + api(project(":orm-core")) + implementation(libs.postgres.jdbc) +} + +java { + toolchain { languageVersion = JavaLanguageVersion.of(25) } + withSourcesJar() +} + +publishing { + publications { + create("maven") { + from(components["java"]) + artifactId = "nestj-orm-postgres" + } + } +} diff --git a/orm-postgres/src/main/kotlin/rip/crit/nestj/orm/postgres/PostgresDatabase.kt b/orm-postgres/src/main/kotlin/rip/crit/nestj/orm/postgres/PostgresDatabase.kt new file mode 100644 index 0000000..09cccec --- /dev/null +++ b/orm-postgres/src/main/kotlin/rip/crit/nestj/orm/postgres/PostgresDatabase.kt @@ -0,0 +1,13 @@ +package rip.crit.nestj.orm.postgres + +import org.postgresql.ds.PGSimpleDataSource +import rip.crit.nestj.orm.JdbcDatabase + +class PostgresDatabase(url: String, user: String, password: String) : + JdbcDatabase( + PGSimpleDataSource().apply { + setURL(url) + this.user = user + this.password = password + } + ) diff --git a/orm-sqlite/build.gradle.kts b/orm-sqlite/build.gradle.kts new file mode 100644 index 0000000..c4e63ca --- /dev/null +++ b/orm-sqlite/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + alias(libs.plugins.kotlin.jvm) + `java-library` + `maven-publish` + id("com.ncorti.ktfmt.gradle") version "0.27.0" +} + +dependencies { + api(project(":orm-core")) + implementation(libs.sqlite.jdbc) +} + +java { + toolchain { languageVersion = JavaLanguageVersion.of(25) } + withSourcesJar() +} + +publishing { + publications { + create("maven") { + from(components["java"]) + artifactId = "nestj-orm-sqlite" + } + } +} diff --git a/orm-sqlite/src/main/kotlin/rip/crit/nestj/orm/sqlite/SqliteDatabase.kt b/orm-sqlite/src/main/kotlin/rip/crit/nestj/orm/sqlite/SqliteDatabase.kt new file mode 100644 index 0000000..62b4762 --- /dev/null +++ b/orm-sqlite/src/main/kotlin/rip/crit/nestj/orm/sqlite/SqliteDatabase.kt @@ -0,0 +1,7 @@ +package rip.crit.nestj.orm.sqlite + +import org.sqlite.SQLiteDataSource +import rip.crit.nestj.orm.JdbcDatabase + +class SqliteDatabase(path: String) : + JdbcDatabase(SQLiteDataSource().apply { url = "jdbc:sqlite:$path" }) diff --git a/package.json b/package.json new file mode 100644 index 0000000..d8e1867 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "ws": "^8.21.3" + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..3b0c28c --- /dev/null +++ b/pom.xml @@ -0,0 +1,25 @@ + + 4.0.0 + rip.crit + nestj + 0.1.0-SNAPSHOT + pom + NestJ + + lib + socketio + orm-core + orm-sqlite + orm-postgres + servlet-compat + vaadin + activitypub + + + + forgejo + https://ai.crit.rip/api/packages/jprims/maven + + + diff --git a/servlet-compat/build.gradle.kts b/servlet-compat/build.gradle.kts new file mode 100644 index 0000000..dde22de --- /dev/null +++ b/servlet-compat/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + alias(libs.plugins.kotlin.jvm) + `java-library` + `maven-publish` + id("com.ncorti.ktfmt.gradle") version "0.27.0" +} + +dependencies { + api(project(":lib")) + api(libs.jakarta.servlet) +} + +java { + toolchain { languageVersion = JavaLanguageVersion.of(25) } + withSourcesJar() +} + +publishing { + publications { + create("maven") { + from(components["java"]) + artifactId = "nestj-servlet-compat" + } + } +} diff --git a/servlet-compat/src/main/kotlin/rip/crit/nestj/servlet/ServletBridge.kt b/servlet-compat/src/main/kotlin/rip/crit/nestj/servlet/ServletBridge.kt new file mode 100644 index 0000000..7f02fe0 --- /dev/null +++ b/servlet-compat/src/main/kotlin/rip/crit/nestj/servlet/ServletBridge.kt @@ -0,0 +1,198 @@ +package rip.crit.nestj.servlet + +import jakarta.servlet.ServletConfig +import jakarta.servlet.ServletContext +import jakarta.servlet.ServletInputStream +import jakarta.servlet.ServletOutputStream +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import jakarta.servlet.http.HttpSession +import java.io.ByteArrayInputStream +import java.io.ByteArrayOutputStream +import java.io.PrintWriter +import java.lang.reflect.InvocationHandler +import java.lang.reflect.Proxy +import java.util.UUID +import java.util.concurrent.ConcurrentHashMap +import rip.crit.nestj.http.request.Request +import rip.crit.nestj.http.response.HTTPResponse + +/** Servlet session store suitable for Vaadin's VaadinSession attributes. */ +class SessionStore { + private val sessions = ConcurrentHashMap>() + + fun session(id: String = UUID.randomUUID().toString()): Pair { + val attributes = sessions.computeIfAbsent(id) { ConcurrentHashMap() } + return id to + proxy(HttpSession::class.java) { method, args -> + when (method.name) { + "getId" -> id + "getAttribute" -> attributes[args!![0] as String] + "setAttribute" -> { + attributes[args!![0] as String] = args[1]!! + null + } + "removeAttribute" -> { + attributes.remove(args!![0] as String) + null + } + "invalidate" -> { + sessions.remove(id) + null + } + "getAttributeNames" -> java.util.Collections.enumeration(attributes.keys) + "isNew" -> false + else -> default(method.returnType) + } + } + } +} + +class ServletBridge( + private val contextPath: String = "", + private val sessions: SessionStore = SessionStore(), +) { + val context: ServletContext = + proxy(ServletContext::class.java) { method, args -> + when (method.name) { + "getContextPath" -> contextPath + "log" -> { + if (args?.isNotEmpty() == true) System.err.println(args[0]) + null + } + "getRealPath" -> null + else -> default(method.returnType) + } + } + + fun servletConfig(name: String): ServletConfig = + proxy(ServletConfig::class.java) { method, _ -> + when (method.name) { + "getServletName" -> name + "getServletContext" -> context + "getInitParameterNames" -> java.util.Collections.emptyEnumeration() + else -> default(method.returnType) + } + } + + fun request(request: Request): HttpServletRequest { + val sessionId = + request + .getHeaders() + .entries + .firstOrNull { it.key.equals("cookie", true) } + ?.value + ?.split(';') + ?.map { it.trim() } + ?.firstOrNull { it.startsWith("JSESSIONID=") } + ?.substringAfter('=') + val (id, session) = sessions.session(sessionId ?: UUID.randomUUID().toString()) + return proxy(HttpServletRequest::class.java) { method, args -> + when (method.name) { + "getMethod" -> request.getMethod().name + "getRequestURI" -> request.getPath() + "getContextPath" -> contextPath + "getSession" -> session + "getHeader" -> + request + .getHeaders() + .entries + .firstOrNull { it.key.equals(args!![0] as String, true) } + ?.value + "getHeaderNames" -> java.util.Collections.enumeration(request.getHeaders().keys) + "getInputStream" -> input(request.getBody()) + "getCharacterEncoding" -> "UTF-8" + "getContentType" -> request.getHeaders()["Content-Type"] + "getRequestedSessionId" -> id + "getQueryString" -> + request.getQueryParams().entries.joinToString("&") { "${it.key}=${it.value}" } + "getParameter" -> request.getQueryParams()[args!![0] as String] + "getParameterMap" -> request.getQueryParams().mapValues { arrayOf(it.value) } + else -> default(method.returnType) + } + } + } + + fun response(request: Request): BufferedServletResponse = BufferedServletResponse(request) +} + +class BufferedServletResponse(private val request: Request) { + private val bytes = ByteArrayOutputStream() + private val headers = linkedMapOf() + private var status = 200 + private var contentType = "text/plain" + val servlet: HttpServletResponse = + proxy(HttpServletResponse::class.java) { method, args -> + when (method.name) { + "setStatus" -> { + status = args!![0] as Int + null + } + "setContentType" -> { + contentType = args!![0] as String + null + } + "setHeader", + "addHeader" -> { + headers[args!![0] as String] = args[1] as String + null + } + "getOutputStream" -> output(bytes) + "getWriter" -> PrintWriter(bytes, true, Charsets.UTF_8) + "getStatus" -> status + "getContentType" -> contentType + else -> default(method.returnType) + } + } + + fun toNestjResponse() = + HTTPResponse( + bytes.toByteArray(), + HashMap(headers + ("Content-Type" to contentType)), + status, + contentType, + request, + ) +} + +private fun input(bytes: ByteArray) = + object : ServletInputStream() { + private val input = ByteArrayInputStream(bytes) + + override fun read() = input.read() + + override fun isFinished() = input.available() == 0 + + override fun isReady() = true + + override fun setReadListener(listener: jakarta.servlet.ReadListener?) {} + } + +private fun output(bytes: ByteArrayOutputStream) = + object : ServletOutputStream() { + override fun write(value: Int) = bytes.write(value) + + override fun isReady() = true + + override fun setWriteListener(listener: jakarta.servlet.WriteListener?) {} + } + +private fun proxy( + type: Class, + action: (java.lang.reflect.Method, Array?) -> Any?, +): T = + Proxy.newProxyInstance( + type.classLoader, + arrayOf(type), + InvocationHandler { _, method, args -> action(method, args) }, + ) as T + +private fun default(type: Class<*>): Any? = + when { + !type.isPrimitive -> null + type == Boolean::class.javaPrimitiveType -> false + type == Int::class.javaPrimitiveType -> 0 + type == Long::class.javaPrimitiveType -> 0L + type == Double::class.javaPrimitiveType -> 0.0 + else -> 0 + } diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..d771325 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,22 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/9.7.1/userguide/multi_project_builds.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the foojay-resolver plugin to allow automatic download of JDKs + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} + +rootProject.name = "nestj" +include("lib") +include("socketio") +include("orm-core") +include("orm-sqlite") +include("orm-postgres") +include("servlet-compat") +include("vaadin") +include("activitypub") diff --git a/socketio/build.gradle.kts b/socketio/build.gradle.kts new file mode 100644 index 0000000..6a7554f --- /dev/null +++ b/socketio/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + alias(libs.plugins.kotlin.jvm) + `java-library` + `maven-publish` + id("com.ncorti.ktfmt.gradle") version "0.27.0" +} + +dependencies { + api(project(":lib")) + implementation(libs.netty.socketio) +} + +java { + toolchain { languageVersion = JavaLanguageVersion.of(25) } + withSourcesJar() +} + +publishing { + publications { + create("maven") { + from(components["java"]) + artifactId = "nestj-socketio" + } + } +} diff --git a/socketio/src/main/kotlin/rip/crit/nestj/socketio/SocketIoGateway.kt b/socketio/src/main/kotlin/rip/crit/nestj/socketio/SocketIoGateway.kt new file mode 100644 index 0000000..904377c --- /dev/null +++ b/socketio/src/main/kotlin/rip/crit/nestj/socketio/SocketIoGateway.kt @@ -0,0 +1,52 @@ +package rip.crit.nestj.socketio + +import com.corundumstudio.socketio.Configuration +import com.corundumstudio.socketio.SocketIOServer +import rip.crit.nestj.websocket.WebSocketGateway +import rip.crit.nestj.websocket.WebSocketSession + +class SocketIoGatewayServer(private val host: String = "0.0.0.0", private val port: Int = 3000) : + AutoCloseable { + private val server = + SocketIOServer( + Configuration().apply { + hostname = host + this.port = port + } + ) + + fun register(gateway: WebSocketGateway, event: String = "message"): SocketIoGatewayServer = + apply { + val sessions = mutableMapOf() + server.addConnectListener { client -> + val session = + WebSocketSession( + client.sessionId.toString(), + { message -> client.sendEvent(event, message) }, + { _, _ -> client.disconnect() }, + ) + sessions[session.id] = session + gateway.onConnect(session) + } + server.addDisconnectListener { client -> + sessions.remove(client.sessionId.toString())?.let { + gateway.onDisconnect(it, 1000, "disconnect") + } + } + server.addEventListener(event, String::class.java) { client, data, _ -> + sessions[client.sessionId.toString()]?.let { session -> + try { + gateway.onMessage(session, data) + } catch (error: Throwable) { + gateway.onError(session, error) + } + } + } + } + + fun start() = server.start() + + fun stop() = server.stop() + + override fun close() = stop() +} diff --git a/vaadin/build.gradle.kts b/vaadin/build.gradle.kts new file mode 100644 index 0000000..b39cd94 --- /dev/null +++ b/vaadin/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + alias(libs.plugins.kotlin.jvm) + `java-library` + `maven-publish` + id("com.ncorti.ktfmt.gradle") version "0.27.0" +} + +dependencies { + api(project(":servlet-compat")) + api(libs.vaadin.core) +} + +java { + toolchain { languageVersion = JavaLanguageVersion.of(25) } + withSourcesJar() +} + +publishing { + publications { + create("maven") { + from(components["java"]) + artifactId = "nestj-vaadin" + } + } +} diff --git a/vaadin/src/main/kotlin/rip/crit/nestj/vaadin/VaadinService.kt b/vaadin/src/main/kotlin/rip/crit/nestj/vaadin/VaadinService.kt new file mode 100644 index 0000000..d2899b2 --- /dev/null +++ b/vaadin/src/main/kotlin/rip/crit/nestj/vaadin/VaadinService.kt @@ -0,0 +1,23 @@ +package rip.crit.nestj.vaadin + +import com.vaadin.flow.server.VaadinServlet +import jakarta.servlet.ServletConfig +import rip.crit.nestj.http.request.Request +import rip.crit.nestj.http.response.Response +import rip.crit.nestj.servlet.ServletBridge + +class VaadinService( + private val servlet: VaadinServlet, + private val bridge: ServletBridge = ServletBridge(), +) { + fun initialize(config: ServletConfig = bridge.servletConfig("NestJVaadin")): VaadinService = + apply { + servlet.init(config) + } + + fun handle(request: Request): Response { + val response = bridge.response(request) + servlet.service(bridge.request(request), response.servlet) + return response.toNestjResponse() + } +}