v2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,9 +1,6 @@
 ---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'type: bug, s: help wanted'
-assignees: ''
+name: Bug report about: Create a report to help us improve title: ''
+labels: 'type: bug, s: help wanted' assignees: ''
 
 ---
 

.gitignore

@@ -2,16 +2,16 @@
 .idea/
 .settings/
 
-/build/
-/logs/
-/test/
-/target/
-/Server/bin
-/Server/build
+build/
+bin/
+logs/
+test/
+target/
 
 .obsidianrc
 *.iml
 *.jar
 
 .project
 .classpath
+version.txt

API.md

@@ -9,13 +9,10 @@ Magma is the name for the WebSocket and REST server!
 
 ---
 
-- **Current Version:** 1.0.0-pre
+- **Current Version:** 2.0.0
 
 ## Magma REST
 
-As of version `1.0.0` of obsidian the REST API is only used for loading tracks. This will most likely change in future
-releases.
-
 ### Route Planner
 
 Allows clients to view the route planner and free-up addresses.
@@ -50,7 +47,8 @@ Authorization: <password>
 }
 ```
 
-*If no route planner was configured, both `class` and `details` will be null, the responses vary depending on what route planner was configured. Fields that are consistent:*
+*If no route planner was configured, both `class` and `details` will be null, the responses vary depending on what route
+planner was configured. Fields that are consistent:*
 
 - `class` *string* name of the route planner
 - `details.ip_block` *string* the current ip-block
@@ -68,7 +66,8 @@ Authorization: <password>
 
 **RotatingNanoIpRoutePlanner**
 
-- `details.block_index` *string* containing the file information in which /64 block ips are chosen, this number increases on each ban.
+- `details.block_index` *string* containing the file information in which /64 block ips are chosen, this number
+  increases on each ban.
 - `details.current_address_index` *long* representing the current offset in the ip-block.
 
 #### Unmark a failed address
@@ -101,6 +100,22 @@ Authorization: <password>
 
 *204 - No Content*
 
+### Player Controller
+
+Each request must have a `User-Id` header or query parameter containing your bot's user id
+
+- **Base Path:** `/players/{guild id}`
+
+<sub>The `Client-Name` header or query parameter may be required if the node you're using requires it.</sub>
+
+| endpoint | description                |
+| :------- | :------------------------- |
+| /        | returns info on the player |
+| /play    | plays
+|
+|
+|
+
 ### Tracks Controller
 
 Allows non-jvm clients to search and decode tracks using Obsidian!
@@ -131,7 +146,8 @@ Authorization: <configured password>
         "length": 270000,
         "position": 0,
         "is_stream": false,
-        "is_seekable": true
+        "is_seekable": true,
+        "source_name": "youtube"
       }
     }
   ],
@@ -291,7 +307,6 @@ Stats on the node
 }
 ```
 
-
 #### Player Events
 
 List of current player events Example:
@@ -367,7 +382,8 @@ dispatched when track playback is stuck
 }
 ```
 
-- [**Lavaplayer**](https://github.com/sedmelluq/lavaplayer/blob/bec39953a037b318663fad76873fbab9ce13c033/main/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackStuckEvent.java)
+- [**
+  Lavaplayer**](https://github.com/sedmelluq/lavaplayer/blob/bec39953a037b318663fad76873fbab9ce13c033/main/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackStuckEvent.java)
 
 ##### `TRACK_EXCEPTION`
 

README.md

@@ -8,10 +8,10 @@
 
 ## Usage.
 
-For obsidian to work correctly you must use **Java 11** or above. 
+For obsidian to work correctly you must use **Java 11** or above.
 
 - Goto the [releases page](/releases).
-- Download the **Latest Jar File**
+- Download the **The Latest Jar File**
 - Make an [`obsidian.yml`](/obsidian.yml) file in the same directory as the jar file
 - Open a prompt in the same directory as the jar file.
 
@@ -25,7 +25,13 @@ Now go make a bot with the language and client of your choice!
 
 > Clients are used to interface with Magma, Obsidian's WebSocket and REST API.
 
-- [obby.js](https://github.com/Sxmurai/obby.js), NodeJS (v14+)
+###### v2
+
+- [slate](https://github.com/Axelancerr/Slate), discord.py (Python 3.7+)
+
+###### v1
+
+- [obby.js](https://github.com/Sxmurai/obby.js), generic (NodeJS v14+)
 
 **Want to make your own? Read our [API Docs](/API.md)**
 

Server/build.gradle.kts

@@ -0,0 +1,95 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import java.io.ByteArrayOutputStream
+
+plugins {
+    application
+    id("com.github.johnrengelman.shadow") version "7.0.0"
+    kotlin("jvm") version "1.6.10"
+    kotlin("plugin.serialization") version "1.6.10"
+}
+
+apply(plugin = "kotlin")
+
+description = "A robust and performant audio sending node meant for Discord Bots."
+version = "2.0.0"
+
+application {
+    mainClass.set("obsidian.server.Application")
+}
+
+dependencies {
+    /* kotlin */
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.10")              // standard library
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.10")             // reflection
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0")    // core coroutine library
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2") // json serialization
+
+    /* server */
+    val ktorVersion = "1.6.7"
+    implementation("io.ktor:ktor-server-core:$ktorVersion")   // ktor server core
+    implementation("io.ktor:ktor-server-cio:$ktorVersion")    // ktor cio engine
+    implementation("io.ktor:ktor-locations:$ktorVersion")     // ktor locations
+    implementation("io.ktor:ktor-serialization:$ktorVersion") // ktor serialization
+    implementation("io.ktor:ktor-websockets:$ktorVersion")    // ktor websockets
+
+    /* audio */
+    implementation("moe.kyokobot.koe:core:koe-v2-SNAPSHOT")   // discord send system
+
+    implementation("com.sedmelluq:lavaplayer:1.6.1")        // lavaplayer
+//    implementation("com.sedmelluq:udp-queue-natives:2.0.0") // udp-queue natives
+    implementation(group = "com.sedmelluq", name = "udp-queue-natives", version = "2.0.0")
+    implementation("com.sedmelluq:lavaplayer-ext-ip-rotator:0.3.1") { // ip rotation
+        exclude(group = "com.sedmelluq", module = "lavaplayer")
+    }
+
+    implementation("com.github.natanbc:lavadsp:0.7.7") // audio filters
+    implementation("com.github.natanbc:native-loader:0.7.2")  // lp-cross natives
+
+    /* logging */
+    implementation("ch.qos.logback:logback-classic:1.2.6")           // slf4j logging backend
+    implementation("io.github.microutils:kotlin-logging-jvm:2.0.11") // logging
+
+    val konfVersion = "1.1.2"
+    implementation("com.github.uchuhimo.konf:konf-core:$konfVersion") // konf core shit
+    implementation("com.github.uchuhimo.konf:konf-yaml:$konfVersion") // yaml source
+}
+
+tasks.withType<ShadowJar> {
+    archiveBaseName.set("Obsidian")
+    archiveClassifier.set("")
+}
+
+tasks.withType<KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "16"
+        incremental = true
+        freeCompilerArgs = listOf(
+            "-Xopt-in=kotlin.ExperimentalStdlibApi",
+            "-Xopt-in=kotlin.RequiresOptIn",
+            "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-Xopt-in=io.ktor.locations.KtorExperimentalLocationsAPI",
+            "-Xopt-in=kotlinx.coroutines.ObsoleteCoroutinesApi"
+        )
+    }
+}
+
+/* version info task */
+fun getVersionInfo(): String {
+    val gitVersion = ByteArrayOutputStream()
+    exec {
+        commandLine("git", "rev-parse", "--short", "HEAD")
+        standardOutput = gitVersion
+    }
+
+    return "$version\n${gitVersion.toString().trim()}"
+}
+
+tasks.create("writeVersion") {
+    val resourcePath = sourceSets["main"].resources.srcDirs.first()
+    if (!file(resourcePath).exists()) {
+        resourcePath.mkdirs()
+    }
+
+    file("$resourcePath/version.txt").writeText(getVersionInfo())
+}