Bump ktor from 3.1.2 to 3.2.0

.github/workflows/release.yml

@@ -21,8 +21,7 @@ jobs:
           ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }}
           ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
           ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
-          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSSRH_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSSRH_TOKEN }}
+          ORG_GRADLE_PROJECT_centralPortalToken: ${{ secrets.CENTRALPORTALTOKEN }}
       - name: Generate documentation
         run: ./gradlew dokkaHtmlMultiModule
       - name: Deploy API documentation to Github Pages

README.md

@@ -28,10 +28,12 @@ implementation("io.github.thibaultbee.krtmp:rtmp:1.0.0")
 
 ## Usage
 
-Creates a RTMP publish client with the Factory `RtmpClientConnectionFactory`:
+### Client
+
+Creates a RTMP client with the Factory `RtmpClient`:
 
 ```kotlin
-val client = RtmpPublishClientConnectionFactory().create(
+val client = RtmpClient(
     "rtmp://my.server.com/app/streamkey" // Your RTMP server URL (incl app name and stream key)
 )
 ```
@@ -44,15 +46,6 @@ client.createStream()
 client.publish(Command.Publish.Type.LIVE)
 ```
 
-If you have raw audio and video frames, you need to mux them into FLV tag headers. You can use
-the `FlvMuxer` class for that.
-
-```kotlin
-val flvMuxer = client.flvMuxer
-```
-
-See [FLV](#flv) for more details to write audio and video frames..
-
 If you already have FLV data, write your video/audio data:
 
 ```kotlin
@@ -72,7 +65,21 @@ try {
 }
 ```
 
-For advanced configuration, see `RtmpClientSettings`.
+See [FLV](#flv) for more details to write audio and video frames..
+
+### Server
+
+Use the `RtmpServer` to create a RTMP server:
+
+```kotlin
+val server = RtmpServer("0.0.0.0:1935") // Listening on port 1935
+```
+
+Then start the server:
+
+```kotlin
+server.listen()
+```
 
 # FLV
 
@@ -84,8 +91,9 @@ Features:
 - [x] Demuxer for FLV
 - [x] AMF0 metadata
 - [ ] AMF3 metadata
-- [x] Supported audio codec: AAC
-- [x] Supported video codec: AVC/H.264 and enhanced RTMP codecs: HEVC/H.265, VP9, AV1
+- [x] Support for legacy RTMP
+- [x] Support for enhanced RTMP v1: AV1, HEVC, VP8, VP9
+- [x] Support for enhanced RTMP v2: Multitrack, Opus,...
 
 ## Installation
 
@@ -100,36 +108,36 @@ implementation("io.github.thibaultbee.krtmp:flv:1.0.0")
 Creates a FLV muxer and add audio/video data:
 
 ```kotlin
-val muxer = FlvMuxer()
+val muxer = FLVMuxer(path = "/path/to/file.flv")
+
+// Write FLV header
+flvMuxer.encodeFlvHeader(hasAudio, hasVideo)
 
 // Register audio configurations (if any)
-val audioConfig = FlvAudioConfig(
+val audioConfig = FLVAudioConfig(
     FlvAudioConfig.SoundFormat.AAC,
     FlvAudioConfig.SoundRate.KHZ44,
     FlvAudioConfig.SoundSize.SND8BIT,
     FlvAudioConfig.SoundType.STEREO
 )
-val audioId = muxer.addStream(audioConfig)
-
-// Register audio configurations (if any)
-val videoConfig = FlvVideoConfig(
-
+// Register video configurations (if any)
+val videoConfig = FLVVideoConfig(
 )
-val videoId = muxer.addStream(videoConfig)
 
-// Start the muxer (write FlvTag (if needed) and onMetaData)
-muxer.startStream()
+// Write onMetadata
+muxer.encode(0, OnMetadata(audioConfig, videoConfig))
 
 // Write audio/video data
-muxer.write(audioFrame)
-muxer.write(videoFrame)
-muxer.write(audioFrame)
-muxer.write(videoFrame)
-// till you're done
+muxer.encode(audioFrame)
+muxer.encode(videoFrame)
+muxer.encode(audioFrame)
+muxer.encode(videoFrame)
 
-// Stop the muxer
-muxer.stopStream()
+// Till you're done, then
+muxer.flush()
 
+// Close the output
+muxer.close()
 ```
 
 # AMF
@@ -140,7 +148,7 @@ Features:
 
 - [x] Serializer for AMF0
 - [ ] Serializer for AMF3
-- [ ] Deserializer for AMF0
+- [x] Deserializer for AMF0
 - [ ] Deserializer for AMF3
 
 ## Installation
@@ -172,7 +180,7 @@ val array = Amf.encodeToByteArray(MyData.serializer(), data)
 
 # TODO
 
-- [x] A FLV/RTMP parameter for supported level: (legacy, enhanced v1, enhanced v2,...)
+- [ ] More tests (missing tests samples)
 
 # Licence
 

amf/src/commonMain/kotlin/io/github/thibaultbee/krtmp/amf/elements/containers/AmfContainer.kt

@@ -64,5 +64,5 @@ class AmfContainer internal constructor(private val elements: MutableList<AmfEle
     override fun equals(other: Any?): Boolean = elements == other
     override fun hashCode(): Int = elements.hashCode()
     override fun toString(): String =
-        elements.joinToString(prefix = "[", postfix = "]", separator = ",")
+        elements.joinToString(prefix = "[", postfix = "]", separator = ", ")
 }

amf/src/commonMain/kotlin/io/github/thibaultbee/krtmp/amf/elements/containers/AmfEcmaArray.kt

@@ -83,13 +83,13 @@ class AmfEcmaArray internal constructor(private val elements: MutableMap<String,
     override fun hashCode(): Int = elements.hashCode()
     override fun toString(): String {
         return elements.entries.joinToString(
-            separator = ",",
+            separator = ", ",
             prefix = "{",
             postfix = "}",
             transform = { (k, v) ->
                 buildString {
                     append(k)
-                    append(':')
+                    append('=')
                     append(v)
                 }
             }

amf/src/commonMain/kotlin/io/github/thibaultbee/krtmp/amf/elements/containers/AmfObject.kt

@@ -76,13 +76,13 @@ class AmfObject internal constructor(private val elements: MutableMap<String, Am
     override fun hashCode(): Int = elements.hashCode()
     override fun toString(): String {
         return elements.entries.joinToString(
-            separator = ",",
+            separator = ", ",
             prefix = "{",
             postfix = "}",
             transform = { (k, v) ->
                 buildString {
                     append(k)
-                    append(':')
+                    append('=')
                     append(v)
                 }
             }

amf/src/commonMain/kotlin/io/github/thibaultbee/krtmp/amf/elements/containers/AmfStrictArray.kt

@@ -34,7 +34,8 @@ fun amf0StrictArrayFrom(source: Source): AmfStrictArray {
     return amf0StrictArray
 }
 
-fun amfStrictArrayOf(initialElements: List<Any?>) = AmfStrictArray().apply { addAll(initialElements) }
+fun amfStrictArrayOf(initialElements: List<Any?>) =
+    AmfStrictArray().apply { addAll(initialElements) }
 
 class AmfStrictArray internal constructor(private val elements: MutableList<AmfElement> = mutableListOf()) :
     AmfElement(), MutableList<AmfElement> by elements {
@@ -59,5 +60,5 @@ class AmfStrictArray internal constructor(private val elements: MutableList<AmfE
     override fun equals(other: Any?): Boolean = elements == other
     override fun hashCode(): Int = elements.hashCode()
     override fun toString(): String =
-        elements.joinToString(prefix = "[", postfix = "]", separator = ",")
+        elements.joinToString(prefix = "[", postfix = "]", separator = ", ")
 }

build.gradle.kts

@@ -63,10 +63,10 @@ kover {
     reports {
         verify {
             rule {
-                minBound(65, CoverageUnit.LINE)
+                minBound(35, CoverageUnit.LINE)
 
                 // we allow lower branch coverage, because not all checks in the internal code lead to errors
-                minBound(45, CoverageUnit.BRANCH)
+                minBound(30, CoverageUnit.BRANCH)
             }
         }
     }

buildSrc/src/main/kotlin/Utils.kt

@@ -1,23 +1,22 @@
 import org.gradle.api.Project
-import java.util.Locale
 
 fun Project.loadProperty(
     projectPropertyName: String,
     envName: String = projectPropertyName.uppercase()
-): String {
+): String? {
     val envValue = System.getenv(envName)?.toString()
     if (envValue != null) return envValue
 
     val projectPropertiesValue = project.properties[projectPropertyName]?.toString()
     if (projectPropertiesValue != null) return projectPropertiesValue
 
-    return ""
+    return null
 }
 
 fun Project.loadFileContents(
     projectPropertyName: String,
     envName: String = projectPropertyName.uppercase()
-): String {
+): String? {
     val decodeIfNeeded: (String) -> String = {
         if (it.startsWith("~/")) {
             // the value is a path to file on disk. Read its contents
@@ -35,5 +34,5 @@ fun Project.loadFileContents(
     val projectPropertiesValue = project.properties[projectPropertyName]?.toString()
     if (projectPropertiesValue != null) return decodeIfNeeded(projectPropertiesValue)
 
-    return ""
+    return null
 }

buildSrc/src/main/kotlin/krtmp-publish.gradle.kts

@@ -9,18 +9,30 @@ val javadocJar by tasks.registering(Jar::class) {
 
 publishing {
     repositories {
-        maven(url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {
-            name = "mavenCentral"
-            credentials {
-                username = project.loadProperty("ossrh_username")
-                password = project.loadProperty("ossrh_password")
+        maven(url = "https://central.sonatype.com/api/v1/publisher/deployments/download/") {
+            name = "centralPortal"
+            project.loadProperty("centralPortalToken")?.let {
+                authentication {
+                    create<HttpHeaderAuthentication>("header")
+                }
+
+                credentials(HttpHeaderCredentials::class) {
+                    name = "Authorization"
+                    value = "Bearer $it"
+                }
             }
         }
-        maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/") {
-            name = "mavenCentralSnapshots"
-            credentials {
-                username = project.loadProperty("ossrh_username")
-                password = project.loadProperty("ossrh_password")
+        maven(url = "https://central.sonatype.com/repository/maven-snapshots/") {
+            name = "centralPortalSnapshots"
+            project.loadProperty("centralPortalToken")?.let {
+                authentication {
+                    create<HttpHeaderAuthentication>("header")
+                }
+
+                credentials(HttpHeaderCredentials::class) {
+                    name = "Authorization"
+                    value = "Bearer $it"
+                }
             }
         }
     }

common/src/commonMain/kotlin/io/github/thibaultbee/krtmp/common/logger/DefaultLogger.kt

@@ -3,7 +3,7 @@ package io.github.thibaultbee.krtmp.common.logger
 /**
  * Default logger implementation.
  */
-class DefaultLogger: ILogger {
+class DefaultLogger: IKrtmpLogger {
     override fun e(tag: String, message: String, tr: Throwable?) {
         println("E/$tag: $message")
         tr?.printStackTrace()

common/src/commonMain/kotlin/io/github/thibaultbee/krtmp/common/logger/ILogger.kt → common/src/commonMain/kotlin/io/github/thibaultbee/krtmp/common/logger/IKrtmpLogger.kt

@@ -1,6 +1,6 @@
 package io.github.thibaultbee.krtmp.common.logger
 
-interface ILogger {
+interface IKrtmpLogger {
     /**
      * Logs an error.
      *

common/src/commonMain/kotlin/io/github/thibaultbee/krtmp/common/logger/Logger.kt → common/src/commonMain/kotlin/io/github/thibaultbee/krtmp/common/logger/KrtmpLogger.kt

@@ -1,11 +1,11 @@
 package io.github.thibaultbee.krtmp.common.logger
 
-object Logger {
+object KrtmpLogger {
     /**
      * The logger implementation.
-     * Customize it by setting a new [ILogger] implementation.
+     * Customize it by setting a new [IKrtmpLogger] implementation.
      */
-    var logger: ILogger = DefaultLogger()
+    var logger: IKrtmpLogger = DefaultLogger()
 
     /**
      * Logs an error.

flv/build.gradle.kts

@@ -47,6 +47,7 @@ kotlin {
         commonMain.dependencies {
             implementation(libs.kotlinx.io.core)
             implementation(libs.kotlinx.serialization.core)
+            implementation(libs.kotlinx.coroutines.core)
             api(project(":amf"))
             api(project(":common"))
         }
@@ -55,7 +56,6 @@ kotlin {
         }
         jvmTest.dependencies {
             implementation(libs.kotlin.test)
-            implementation(libs.jcodec)
         }
     }