Plugins can now register routes

TrueWinter · May 7, 2024 · 14e61c4 · 14e61c4
1 parent b45ec53
commit 14e61c4
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 16 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>SimofaProject</artifactId>
         <groupId>dev.truewinter.simofa</groupId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>dev.truewinter</groupId>
             <artifactId>PluginManager</artifactId>
-            <version>0.0.6</version>
+            <version>0.0.7</version>
             <!--<scope>system</scope>
             <systemPath>${basedir}/../../PluginManager/target/PluginManager-0.0.5.jar</systemPath>-->
         </dependency>
@@ -42,6 +42,11 @@
             <artifactId>slf4j-simple</artifactId>
             <version>2.0.5</version>
         </dependency>
+        <dependency>
+            <groupId>io.javalin</groupId>
+            <artifactId>javalin</artifactId>
+            <version>5.4.2</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/api/src/main/java/dev/truewinter/simofa/api/SimofaAPI.java b/api/src/main/java/dev/truewinter/simofa/api/SimofaAPI.java
@@ -1,5 +1,9 @@
 package dev.truewinter.simofa.api;
 
+import dev.truewinter.PluginManager.Plugin;
+import io.javalin.http.Handler;
+import io.javalin.http.HandlerType;
+
 import java.sql.SQLException;
 import java.util.List;
 
@@ -65,4 +69,9 @@ public interface SimofaAPI {
      * to match the passed DeploymentServer.
      */
     void editDeploymentServer(DeploymentServer deploymentServer) throws SQLException;
+
+    /**
+     * Registers a route at /c/{plugin_name}/{path}
+     */
+    void registerRoute(Plugin<SimofaAPI> plugin, HandlerType method, String path, Handler handler);
 }
diff --git a/common/pom.xml b/common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>dev.truewinter.simofa</groupId>
         <artifactId>SimofaProject</artifactId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
     </parent>
 
     <groupId>dev.truewinter.simofa.common</groupId>

diff --git a/deploy/pom.xml b/deploy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>dev.truewinter.simofa</groupId>
         <artifactId>SimofaProject</artifactId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
     </parent>
 
     <groupId>dev.truewinter</groupId>

diff --git a/officialplugins/deploymentservermonitor/pom.xml b/officialplugins/deploymentservermonitor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>SimofaProject</artifactId>
         <groupId>dev.truewinter.simofa</groupId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/officialplugins/pom.xml b/officialplugins/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>SimofaProject</artifactId>
         <groupId>dev.truewinter.simofa</groupId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/officialplugins/pushover/pom.xml b/officialplugins/pushover/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>SimofaProject</artifactId>
         <groupId>dev.truewinter.simofa</groupId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <artifactId>SimofaProject</artifactId>
     <packaging>pom</packaging>
     <!-- Do not manually modify the version. Use versions:set instead -->
-    <version>0.1.2</version>
+    <version>0.1.3</version>
 
     <modules>
         <module>simofa</module>

diff --git a/simofa/pom.xml b/simofa/pom.xml
@@ -7,19 +7,14 @@
     <parent>
         <groupId>dev.truewinter.simofa</groupId>
         <artifactId>SimofaProject</artifactId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
     </parent>
 
     <groupId>dev.truewinter</groupId>
     <artifactId>Simofa</artifactId>
     <version>${parent.version}</version>
 
     <dependencies>
-        <dependency>
-            <groupId>io.javalin</groupId>
-            <artifactId>javalin</artifactId>
-            <version>5.4.2</version>
-        </dependency>
         <dependency>
             <groupId>io.javalin</groupId>
             <artifactId>javalin-rendering</artifactId>

diff --git a/simofa/src/main/java/dev/truewinter/simofa/API.java b/simofa/src/main/java/dev/truewinter/simofa/API.java
@@ -1,19 +1,24 @@
 package dev.truewinter.simofa;
 
+import dev.truewinter.PluginManager.Plugin;
 import dev.truewinter.simofa.api.DeploymentServer;
 import dev.truewinter.simofa.api.SimofaAPI;
 import dev.truewinter.simofa.api.Website;
 import dev.truewinter.simofa.api.WebsiteBuild;
 import dev.truewinter.simofa.database.Database;
+import io.javalin.http.Handler;
+import io.javalin.http.HandlerType;
 
 import java.sql.SQLException;
 import java.util.List;
 
 public class API implements SimofaAPI {
     private final Database database;
+    private final WebServer server;
 
-    protected API(Database database) {
+    protected API(Database database, WebServer server) {
         this.database = database;
+        this.server = server;
     }
 
     @Override
@@ -78,4 +83,9 @@ public void addDeploymentServer(DeploymentServer deploymentServer) throws SQLExc
     public void editDeploymentServer(DeploymentServer deploymentServer) throws SQLException {
         database.getDeploymentServerDatabase().editDeploymentServer(deploymentServer);
     }
+
+    @Override
+    public void registerRoute(Plugin<SimofaAPI> plugin, HandlerType method, String path, Handler handler) {
+        server.registerRoute(method, String.format("/c/%s/%s", plugin.getName(), path), handler);
+    }
 }
diff --git a/simofa/src/main/java/dev/truewinter/simofa/Simofa.java b/simofa/src/main/java/dev/truewinter/simofa/Simofa.java
@@ -104,7 +104,7 @@ public static void main(String[] args) throws Exception {
         logger.info("Initialized build queue manager");
 
         logger.info("Loading plugins");
-        pluginManager = SimofaPluginManager.getInstance(new API(database));
+        pluginManager = SimofaPluginManager.getInstance(new API(database, webServer));
         pluginManager.getPluginManager().loadPlugins(Util.getPluginJars());
         logger.info("Loaded plugins");
 

diff --git a/simofa/src/main/java/dev/truewinter/simofa/WebServer.java b/simofa/src/main/java/dev/truewinter/simofa/WebServer.java
@@ -11,6 +11,8 @@
 import dev.truewinter.simofa.routes.Route;
 import dev.truewinter.simofa.routes.webhook.GithubWebhookRoute;
 import io.javalin.Javalin;
+import io.javalin.http.Handler;
+import io.javalin.http.HandlerType;
 import io.javalin.http.Header;
 import io.javalin.http.staticfiles.Location;
 import io.javalin.rendering.template.JavalinPebble;
@@ -144,6 +146,14 @@ public void run() {
         }
     }
 
+    public void registerRoute(HandlerType method, String path, Handler handler) {
+        if (server == null) {
+            throw new IllegalStateException("Web server not started yet");
+        }
+
+        server.addHandler(method, path, handler);
+    }
+
     public void stopServer() {
         if (server != null) {
             server.stop();