ProxyFox v2.1

.github/workflows/docker.yml

@@ -0,0 +1,54 @@
+name: Docker Build and Publish
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Persist Gradle cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Setup JDK 18
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 18
+
+      - name: Build
+        run: ./gradlew build -x check -x test --no-daemon
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: Artifacts
+          path: |
+            build/libs/
+            module/**/build/libs/
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - run: docker build -t ghcr.io/the-proxyfox-group/proxyfox:latest -t ghcr.io/the-proxyfox-group/proxyfox:${GITHUB_SHA} .
+      - run: docker push ghcr.io/the-proxyfox-group/proxyfox:latest
+      - run: docker push ghcr.io/the-proxyfox-group/proxyfox:${GITHUB_SHA}

.github/workflows/gradle.yml

@@ -1,42 +1,51 @@
 name: Build
-on: [pull_request, push]
+on: [ pull_request, push ]
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+
     services:
       mongo:
         image: mongo
         ports:
           - 27017:27017
+
     steps:
-      - name: checkout repository
+      - name: Checkout repository
         uses: actions/checkout@v3
-      - name: validate gradle wrapper
+
+      - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
-      - uses: actions/cache@v3
+
+      - name: Persist Gradle cache
+        uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: setup jdk 17
+
+      - name: Setup JDK 18
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
-      - name: build
+          java-version: 18
+
+      - name: Build
         run: ./gradlew build --no-daemon
-      - name: capture build artifacts
+
+      - name: Upload build artifacts
         uses: actions/upload-artifact@v3
         with:
           name: Artifacts
           path: |
             build/libs/
             modules/**/build/libs/
-      - name: capture test reports on failure
+
+      - name: Capture test reports on failure
         uses: actions/upload-artifact@v3
         if: failure()
         with:

.github/workflows/publish.yml

@@ -8,25 +8,34 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/cache@v3
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Persist Gradle cache
+        uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
+
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 18
+
       - name: Build and publish with Gradle
         run: ./gradlew poolRelease --no-daemon
+
       - name: Upload build artifacts
         uses: AButler/[email protected]
         with:
           files: 'build/pool/*'
-          repo-token: ${{secrets.GITHUB_TOKEN}}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -4,5 +4,7 @@ build/
 out/
 mods/
 proxyfox.db.properties
-systems.json
-.env
+.env
+.pf-command-lock
+.quilt/
+config/

Dockerfile

@@ -0,0 +1,9 @@
+FROM openjdk:17-jdk-slim
+
+COPY modules/bot/build/libs/proxyfox-*.jar /usr/local/lib/ProxyFox.jar
+
+RUN mkdir /bot
+
+WORKDIR /bot
+
+ENTRYPOINT ["java", "-Xms2G", "-Xmx2G", "-jar", "/usr/local/lib/ProxyFox.jar"]

build.gradle.kts

@@ -43,18 +43,18 @@ allprojects {
     }
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_18
+        targetCompatibility = JavaVersion.VERSION_18
     }
 
     repositories {
         mavenCentral()
-        maven("https://libraries.minecraft.net/")
         maven("https://oss.sonatype.org/content/repositories/snapshots")
         maven("https://maven.quiltmc.org/repository/release/")
         maven("https://maven.quiltmc.org/repository/snapshot/")
         maven("https://maven.fabricmc.net/")
         maven("https://jitpack.io")
+        maven("https://maven.proxyfox.dev")
     }
 
     dependencies {

docker-compose.yml

@@ -0,0 +1,35 @@
+version: "3"
+
+networks:
+  proxyfox:
+    external: false
+
+services:
+  proxyfox:
+    image: ghcr.io/the-proxyfox-group/proxyfox:latest
+    container_name: proxyfox
+    restart: always
+    environment:
+      - PROXYFOX_KEY=<token>
+      - PROXYFOX_MONGO=mongodb://<username>:<password>@mongo
+    networks:
+      - proxyfox
+    depends_on:
+      - mongo
+
+  mongo:
+    image: mongo:latest
+    container_name: proxyfox_mongo
+    restart: always
+    environment:
+      - MONGO_INITDB_ROOT_USERNAME=<username>
+      - MONGO_INITDB_ROOT_PASSWORD=<password>
+    networks:
+      - proxyfox
+    volumes:
+      - proxyfox-mongo:/data/db
+    ports:
+      - 27017:27017
+
+volumes:
+  proxyfox-mongo:

gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
 group=dev.proxyfox
-version=2.0.13
+version=2.1.0

gradle/libs.versions.toml

@@ -1,49 +1,68 @@
 [versions]
-guava = "31.1-jre"
-logback = "1.2.11"
-kord = "0.8.0-M16"
-kotlin = "1.7.10"
-kotlinx_coroutines = "1.6.4"
+guava = "32.1.1-jre"
+logback = "1.4.8"
+kord = "0.10.0"
+kotlin = "1.9.0"
+kotlinx_coroutines = "1.7.2"
 
-# Database-specific
+# ProxyFox Libraries
+proxyfox_command = "2.0"
+pluralkt = "1.8"
+markt = "1.4"
+
+# Database
 postgres = "42.3.3"
 kjdbc = "0.5.2"
-gson = "2.9.0"
 kmongo = "4.6.0"
+kotlinx_datetime = "0.4.0"
+
+# API
+ktor = "2.1.3"
 
 # Testing
 testng = "7.6.1"
 mockk = "1.+"
 
 # Plugins
 shadow = "7.1.2"
-licenser = "1.1.2"
+licenser = "1.2.0"
 
 [libraries]
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 kord = { module = "dev.kord:kord-core", version.ref = "kord" }
 logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
 
+proxyfox_command = { module = "dev.proxyfox:proxyfox-command", version.ref = "proxyfox_command" }
+pluralkt = { module = "dev.proxyfox:pluralkt", version.ref = "pluralkt" }
+markt = { module = "dev.proxyfox:MarKt", version.ref = "markt" }
+
 kotlin_stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlinx_coroutines_core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx_coroutines" }
 
-gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 kjdbc = { module = "com.vladsch.kotlin-jdbc:kotlin-jdbc", version.ref = "kjdbc" }
 postgres = { module = "org.postgresql:postgresql", version.ref = "postgres" }
-kmongo_base = { module = "org.litote.kmongo:kmongo", version.ref = "kmongo" }
-kmongo_coroutine = { module = "org.litote.kmongo:kmongo-coroutine", version.ref = "kmongo" }
-kmongo_async = { module = "org.litote.kmongo:kmongo-async", version.ref = "kmongo" }
+kmongo_base = { module = "org.litote.kmongo:kmongo-serialization", version.ref = "kmongo" }
+kmongo_coroutine = { module = "org.litote.kmongo:kmongo-coroutine-serialization", version.ref = "kmongo" }
+kmongo_async = { module = "org.litote.kmongo:kmongo-async-serialization", version.ref = "kmongo" }
+kotlinx_datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx_datetime" }
+
+ktor_server = { module = "io.ktor:ktor-server-core", version.ref = "ktor" }
+ktor_server_netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" }
+ktor_content_negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" }
+ktor_serialization = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
 
 testng = { module = "org.testng:testng", version.ref = "testng" }
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 kotlinx_coroutines_test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx_coroutines" }
 
 [bundles]
-base = ["guava", "logback", "kotlin_stdlib", "kotlinx_coroutines_core", "kord"]
+base = ["guava", "logback", "kotlin_stdlib", "kotlinx_coroutines_core", "kord", "proxyfox_command", "pluralkt", "markt"]
+database = ["kmongo_base", "kmongo_coroutine", "kmongo_async", "kotlinx_datetime"]
+api = ["ktor_server", "ktor_server_netty", "ktor_content_negotiation", "ktor_serialization"]
 test = ["testng", "kotlinx_coroutines_test", "mockk"]
-database = ["gson", "kmongo_base", "kmongo_coroutine", "kmongo_async"]
 
 [plugins]
 kotlin_jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
-licenser = { id = "org.quiltmc.gradle.licenser", version.ref = "licenser" }
+licenser = { id = "org.quiltmc.gradle.licenser", version.ref = "licenser" }
+serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

modules/api/server/src/main/kotlin/dev/proxyfox/api/server/ServerMain.kt → modules/api/build.gradle.kts

@@ -6,12 +6,14 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package dev.proxyfox.api.server
+plugins {
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.shadow)
+    alias(libs.plugins.serialization)
+}
 
-fun main() = ServerMain.main()
-
-object ServerMain {
-    fun main() {
-
-    }
+dependencies {
+    api(project(":modules:common"))
+    api(project(":modules:database"))
+    api(libs.bundles.api)
 }

modules/api/src/main/kotlin/dev/proxyfox/api/ApiMain.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2022-2023, The ProxyFox Group
+ *
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package dev.proxyfox.api
+
+import dev.proxyfox.api.routes.*
+import io.ktor.serialization.kotlinx.json.*
+import io.ktor.server.application.*
+import io.ktor.server.engine.*
+import io.ktor.server.netty.*
+import io.ktor.server.plugins.contentnegotiation.*
+import io.ktor.server.routing.*
+
+object ApiMain {
+    fun main() = embeddedServer(Netty, port = System.getenv("PORT")?.toIntOrNull() ?: 8080) {
+        configureRouting()
+        configurePlugins()
+    }.start()
+
+    private fun Application.configurePlugins() {
+        install(ContentNegotiation) {
+            json()
+        }
+    }
+
+    private fun Application.configureRouting() {
+        routing {
+            route("/v1") {
+                systemRoutes()
+                memberRoutes()
+                switchRoutes()
+                messageRoutes()
+                tokenRoutes()
+                coffeeRoutes()
+            }
+        }
+    }
+}