Added Obsidian Module

Obsidian HTTPD module replacement

Fossil/build.gradle

@@ -16,6 +16,8 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter'
 }
 
+var buildOrder = 2;
+
 test {
     useJUnitPlatform()
 }

Obsidian/.gitignore

@@ -0,0 +1,118 @@
+# User-specific stuff
+.idea/
+
+*.iml
+*.ipr
+*.iws
+
+# IntelliJ
+out/
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Cache of project
+.gradletasknamecache
+
+**/build/
+
+# Common working directory
+run/
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar

Obsidian/build.gradle

@@ -0,0 +1,27 @@
+plugins {
+    id 'java'
+}
+
+group = 'me.totalfreedom'
+version = '1.0'
+
+repositories {
+    mavenCentral()
+    maven {
+        name = "spigotmc-repo"
+        url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/"
+    }
+    maven {
+        name = "sonatype"
+        url = "https://oss.sonatype.org/content/groups/public/"
+    }
+}
+
+dependencies {
+    compileOnly "org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT"
+    compileOnly "io.projectreactor:reactor-core:3.5.7"
+    implementation "org.jetbrains:annotations:23.0.0"
+    implementation "com.google.errorprone:error_prone_annotations:2.11.0"
+}
+
+var buildOrder = 0;

Obsidian/src/main/java/me/totalfreedom/obsidian/core/Disposable.java

@@ -0,0 +1,9 @@
+package me.totalfreedom.obsidian.core;
+
+public interface Disposable
+{
+    void dispose();
+
+    boolean isDisposed();
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/core/Observable.java

@@ -0,0 +1,5 @@
+package me.totalfreedom.obsidian.core;
+
+public interface Observable<T> {
+    void subscribe(Observer<T> observer);
+}

Obsidian/src/main/java/me/totalfreedom/obsidian/core/Observer.java

@@ -0,0 +1,11 @@
+package me.totalfreedom.obsidian.core;
+
+public interface Observer<T>
+{
+    void onNext(T item);
+
+    void onError(Throwable throwable);
+
+    void onComplete();
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/core/Scheduler.java

@@ -0,0 +1,15 @@
+package me.totalfreedom.obsidian.core;
+
+import java.util.concurrent.TimeUnit;
+
+public interface Scheduler
+{
+    Disposable schedule(Runnable task);
+
+    Disposable schedule(Runnable task, long delay, TimeUnit unit);
+
+    Disposable schedulePeriodically(Runnable task, long initialDelay, long period, TimeUnit unit);
+
+    void dispose();
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/http/WebClient.java

@@ -0,0 +1,8 @@
+package me.totalfreedom.obsidian.http;
+
+import reactor.core.publisher.Mono;
+
+public interface WebClient {
+    Mono<WebResponse> sendRequest(WebRequest request);
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/http/WebHandler.java

@@ -0,0 +1,8 @@
+package me.totalfreedom.obsidian.http;
+
+import reactor.core.publisher.Mono;
+
+public interface WebHandler {
+    Mono<WebResponse> handleRequest(WebRequest request);
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/http/WebHeaders.java

@@ -0,0 +1,20 @@
+package me.totalfreedom.obsidian.http;
+
+import java.util.List;
+import java.util.Set;
+
+public interface WebHeaders
+{
+    List<String> getHeader(String name);
+
+    void addHeader(String name, String value);
+
+    void setHeader(String name, String value);
+
+    void removeHeader(String name);
+
+    boolean containsHeader(String name);
+
+    Set<String> getHeaderNames();
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/http/WebMethod.java

@@ -0,0 +1,12 @@
+package me.totalfreedom.obsidian.http;
+
+public enum WebMethod {
+    GET,
+    POST,
+    PUT,
+    DELETE,
+    PATCH,
+    HEAD,
+    OPTIONS
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/http/WebRequest.java

@@ -0,0 +1,15 @@
+package me.totalfreedom.obsidian.http;
+
+import java.awt.image.DataBuffer;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface WebRequest {
+    WebMethod getMethod();
+    String getUri();
+    WebHeaders getHeaders();
+    Mono<ByteBuffer> getBody();
+    Flux<DataBuffer> getBodyFlux();
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/http/WebResponse.java

@@ -0,0 +1,17 @@
+package me.totalfreedom.obsidian.http;
+
+import java.awt.image.DataBuffer;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface WebResponse {
+    WebStatus getStatus();
+    WebHeaders getHeaders();
+    void setStatus(WebStatus status);
+    void setHeader(String name, String value);
+    Mono<Void> write(ByteBuffer data);
+    Mono<Void> write(DataBuffer dataBuffer);
+    Mono<Void> write(Flux<DataBuffer> dataFlux);
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/http/WebServer.java

@@ -0,0 +1,9 @@
+package me.totalfreedom.obsidian.http;
+
+public interface WebServer {
+    void start();
+    void stop();
+    void registerHandler(String uri, WebHandler handler);
+    void unregisterHandler(String uri);
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/http/WebStatus.java

@@ -0,0 +1,26 @@
+package me.totalfreedom.obsidian.http;
+
+public enum WebStatus
+{
+    OK(200),
+    CREATED(201),
+    NO_CONTENT(204),
+    BAD_REQUEST(400),
+    UNAUTHORIZED(401),
+    FORBIDDEN(403),
+    NOT_FOUND(404),
+    INTERNAL_SERVER_ERROR(500);
+
+    private final int code;
+
+    WebStatus(final int code)
+    {
+        this.code = code;
+    }
+
+    public int getCode()
+    {
+        return code;
+    }
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/security/OAuth2Credentials.java

@@ -0,0 +1,15 @@
+package me.totalfreedom.obsidian.security;
+
+public interface OAuth2Credentials
+{
+    String getClientId();
+
+    String getClientSecret();
+
+    String getUsername();
+
+    String getPassword();
+
+    String getScope();
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/security/OAuth2Service.java

@@ -0,0 +1,12 @@
+package me.totalfreedom.obsidian.security;
+
+import reactor.core.publisher.Mono;
+
+public interface OAuth2Service
+{
+    Mono<OAuth2Token> authenticate(OAuth2Credentials credentials);
+
+    Mono<Boolean> validateToken(OAuth2Token token);
+
+    Mono<OAuth2Token> refreshAccessToken(OAuth2Token token);
+}

Obsidian/src/main/java/me/totalfreedom/obsidian/security/OAuth2Token.java

@@ -0,0 +1,22 @@
+package me.totalfreedom.obsidian.security;
+
+import java.time.Instant;
+
+public interface OAuth2Token
+{
+    String getAccessToken();
+
+    void setAccessToken(String accessToken);
+
+    String getRefreshToken();
+
+    void setRefreshToken(String refreshToken);
+
+    String getTokenType();
+
+    void setTokenType(String tokenType);
+
+    Instant getExpiresAt();
+
+    void setExpiresAt(Instant expiresAt);
+}

Obsidian/src/main/java/me/totalfreedom/obsidian/sql/SQLConnection.java

@@ -0,0 +1,13 @@
+package me.totalfreedom.obsidian.sql;
+
+import reactor.core.publisher.Mono;
+
+public interface SQLConnection
+{
+    Mono<SQLResult> executeQuery(SQLQuery query);
+
+    Mono<Integer> executeUpdate(SQLQuery query);
+
+    void close();
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/sql/SQLQuery.java

@@ -0,0 +1,10 @@
+package me.totalfreedom.obsidian.sql;
+
+import java.util.List;
+
+public interface SQLQuery {
+    String getQuery();
+    List<Object> getParameters();
+    void setParameter(int index, Object value);
+}
+

Obsidian/src/main/java/me/totalfreedom/obsidian/sql/SQLResult.java

@@ -0,0 +1,8 @@
+package me.totalfreedom.obsidian.sql;
+
+public interface SQLResult
+{
+    boolean next();
+
+    <T> T getColumn(int index, Class<T> type);
+}

Obsidian/src/main/resources/plugin.yml

@@ -0,0 +1,7 @@
+name: Obsidian
+version: '${version}'
+main: me.totalfreedom.obsidian.Obsidian
+api-version: '1.20'
+load: STARTUP
+libraries:
+  - io.projectreactor:reactor-core:3.5.4

build.gradle

@@ -52,19 +52,23 @@ subprojects {
         useJUnitPlatform()
     }
 
-    var weight = -1;
+    var buildOrder = -1;
 
     afterEvaluate {
-        if (weight == -1) {
+        if (buildOrder == -1) {
-            weight = 0
+            buildOrder = 0
         }
     }
 }
 
 tasks.register('buildChain') {
-    dependsOn subprojects.sort {
+    dependsOn subprojects.sort { a, b ->
-        a, b -> a.properties.weight <=> b.properties.weight
+        def buildOrderA = a.hasProperty('buildOrder') ? a.buildOrder : 0
+        def buildOrderB = b.hasProperty('buildOrder') ? b.buildOrder : 0
+
+        buildOrderA <=> buildOrderB
     }.collect {
         ":${it.path}:build"
     }
 }
+

settings.gradle

@@ -3,4 +3,5 @@ include 'Patchwork'
 include 'Datura'
 include 'Fossil'
 include 'Corvo'
+include 'Obsidian'