port

xdnw · Jan 17, 2024 · 3a081e6 · 3a081e6
1 parent 811c6cf
commit 3a081e6
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 deletions.
diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/binding/ProviderParser.java b/src/main/java/link/locutus/discord/commands/manager/v2/binding/ProviderParser.java
@@ -12,14 +12,18 @@ public ProviderParser(Key<T> key, T value) {
         this.value = value;
     }
 
+    public T getValue() {
+        return value;
+    }
+
     @Override
     public T apply(ArgumentStack arg) {
-        return value;
+        return getValue();
     }
 
     @Override
     public T apply(ValueStore store, Object t) {
-        return value;
+        return getValue();
     }
 
     @Override

diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/binding/SimpleValueStore.java b/src/main/java/link/locutus/discord/commands/manager/v2/binding/SimpleValueStore.java
@@ -32,7 +32,7 @@ public <V extends T> Parser<V> get(Key<V> key) {
             return new ProviderParser<>((Key) key, this);
         }
         if (key.getType() == WebStore.class) {
-            return new ProviderParser<>((Key) key, new WebStore(this));
+            return new SupplierParser<>((Key) key, () -> new WebStore(this));
         }
         if (!key.getAnnotationTypes().isEmpty()) {
             Set<Class<?>> types = new LinkedHashSet<>(key.getAnnotationTypes());

diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/binding/SupplierParser.java b/src/main/java/link/locutus/discord/commands/manager/v2/binding/SupplierParser.java
@@ -0,0 +1,14 @@
+package link.locutus.discord.commands.manager.v2.binding;
+
+import java.util.function.Supplier;
+
+public class SupplierParser<T> extends ProviderParser<T> {
+    public SupplierParser(Key<T> key, Supplier<T> value) {
+        super(key, (T) value);
+    }
+
+    @Override
+    public T getValue() {
+        return ((Supplier<T>) super.getValue()).get();
+    }
+}
diff --git a/src/main/java/link/locutus/discord/web/jooby/WebRoot.java b/src/main/java/link/locutus/discord/web/jooby/WebRoot.java
@@ -1,6 +1,7 @@
 package link.locutus.discord.web.jooby;
 
 
+import com.aayushatharva.brotli4j.Brotli4jLoader;
 import gg.jte.ContentType;
 import gg.jte.TemplateEngine;
 import io.javalin.Javalin;
@@ -81,12 +82,12 @@ public WebRoot(int portMain, int portHTTPS) {
         this.app = Javalin.create(config -> {
             config.plugins.register(plugin);
 //            config.enableCorsForOrigin();
-            config.compression.brotliAndGzip();
-//            config.server(() -> {
-//                Server server = new Server(); // configure this however you want
-//                LocutusSSLHandler.configureServer(server, portMain, portHTTPS);
-//                return server;
-//            });
+            // check if brotli available
+            if (Brotli4jLoader.isAvailable()) {
+                config.compression.brotliAndGzip();
+            } else {
+                config.compression.gzipOnly();
+            }
             for (Map.Entry<String, String> entry : staticFileMap.entrySet()) {
                 config.staticFiles.add(new Consumer<StaticFileConfig>() {
                     @Override
@@ -98,7 +99,7 @@ public void accept(StaticFileConfig staticFiles) {
                     }
                 });
             }
-        }).start();
+        }).start(Settings.INSTANCE.WEB.PORT_HTTPS > 0 ? Settings.INSTANCE.WEB.PORT_HTTPS : Settings.INSTANCE.WEB.PORT_HTTP);
 
         System.out.println("Started");
 
@@ -107,6 +108,7 @@ public void accept(StaticFileConfig staticFiles) {
         this.app.get("/test", new Handler() {
             @Override
             public void handle(@NotNull Context context) throws Exception {
+                System.out.println("Test");
                 pageHandler.handle(context);
             }
         });

diff --git a/src/main/jte/alert.jte b/src/main/jte/alert.jte
@@ -1,6 +1,5 @@
 @param link.locutus.discord.commands.manager.v2.binding.WebStore ws
 @param String title
 @param String message
-
 <h1 class="text-primary">${title}</h1>
 <p>${message}</p>
diff --git a/src/main/jte/main.jte b/src/main/jte/main.jte
@@ -4,12 +4,10 @@
 @import link.locutus.discord.web.jooby.WebRoot
 @import link.locutus.discord.config.Settings
 @import gg.jte.Content
-
 @param WebStore ws
 @param Content content
 @param String title
 @param List<Map.Entry<String, String>> navbar
-
 <!DOCTYPE html>
 <html lang="en">
 <head>