fu flv

Author: ThibaultBee

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

@@ -15,26 +15,26 @@
  */
 package io.github.thibaultbee.krtmp.amf.elements
 
-import io.github.thibaultbee.krtmp.amf.elements.containers.AmfContainer
-import io.github.thibaultbee.krtmp.amf.elements.containers.AmfEcmaArray
-import io.github.thibaultbee.krtmp.amf.elements.containers.AmfObject
-import io.github.thibaultbee.krtmp.amf.elements.containers.AmfStrictArray
+import io.github.thibaultbee.krtmp.amf.elements.containers.amfContainerOf
+import io.github.thibaultbee.krtmp.amf.elements.containers.amfEcmaArrayOf
+import io.github.thibaultbee.krtmp.amf.elements.containers.amfObjectOf
+import io.github.thibaultbee.krtmp.amf.elements.containers.amfStrictArrayOf
 import io.github.thibaultbee.krtmp.amf.elements.primitives.AmfBoolean
-import io.github.thibaultbee.krtmp.amf.elements.primitives.AmfDate
 import io.github.thibaultbee.krtmp.amf.elements.primitives.AmfNull
 import io.github.thibaultbee.krtmp.amf.elements.primitives.AmfNumber
 import io.github.thibaultbee.krtmp.amf.elements.primitives.AmfString
+import io.github.thibaultbee.krtmp.amf.elements.primitives.amfDateOf
 import kotlinx.datetime.Instant
 import kotlinx.io.IOException
 
 object AmfElementFactory {
-    fun buildContainer(value: List<Any?>) = AmfContainer(value)
+    fun buildContainer(value: List<Any?>) = amfContainerOf(value)
 
-    fun buildEcmaArray(value: Map<String, Any?>) = AmfEcmaArray(value)
+    fun buildEcmaArray(value: Map<String, Any?>) = amfEcmaArrayOf(value)
 
-    fun buildObject(value: Map<String, Any?>) = AmfObject(value)
+    fun buildObject(value: Map<String, Any?>) = amfObjectOf(value)
 
-    fun buildStrictArray(value: List<Any?>) = AmfStrictArray(value)
+    fun buildStrictArray(value: List<Any?>) = amfStrictArrayOf(value)
 
     fun build(value: Any?): AmfElement {
         if (value == null) {
@@ -45,15 +45,16 @@ object AmfElementFactory {
             is Boolean -> AmfBoolean(value)
             is Double -> AmfNumber(value)
             is String -> AmfString(value)
-            is List<*> -> AmfStrictArray(value)
-            is Instant -> AmfDate(value)
+            is List<*> -> amfStrictArrayOf(value)
+            is Instant -> amfDateOf(value)
             is Map<*, *> -> {
                 if (value.keys.any { it !is String }) {
                     throw IOException("AMF ECMA array keys must be String. At least one is not a String in ${value.keys}")
                 }
                 @Suppress("UNCHECKED_CAST")
-                AmfEcmaArray(value as Map<String, Any?>)
+                amfEcmaArrayOf(value as Map<String, Any?>)
             }
+
             else -> throw IOException("Can't build an AmfParameter for ${value::class.simpleName}: $value")
         }
     }

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

@@ -15,15 +15,15 @@
  */
 package io.github.thibaultbee.krtmp.amf.elements
 
-import io.github.thibaultbee.krtmp.amf.elements.containers.Amf0Container
-import io.github.thibaultbee.krtmp.amf.elements.containers.Amf0EcmaArray
-import io.github.thibaultbee.krtmp.amf.elements.containers.Amf0Object
-import io.github.thibaultbee.krtmp.amf.elements.containers.Amf0StrictArray
-import io.github.thibaultbee.krtmp.amf.elements.primitives.Amf0Boolean
-import io.github.thibaultbee.krtmp.amf.elements.primitives.Amf0Date
-import io.github.thibaultbee.krtmp.amf.elements.primitives.Amf0Null
-import io.github.thibaultbee.krtmp.amf.elements.primitives.Amf0Number
-import io.github.thibaultbee.krtmp.amf.elements.primitives.Amf0String
+import io.github.thibaultbee.krtmp.amf.elements.containers.amf0ContainerFrom
+import io.github.thibaultbee.krtmp.amf.elements.containers.amf0EcmaArrayFrom
+import io.github.thibaultbee.krtmp.amf.elements.containers.amf0ObjectFrom
+import io.github.thibaultbee.krtmp.amf.elements.containers.amf0StrictArrayFrom
+import io.github.thibaultbee.krtmp.amf.elements.primitives.amf0BooleanFrom
+import io.github.thibaultbee.krtmp.amf.elements.primitives.amf0DateFrom
+import io.github.thibaultbee.krtmp.amf.elements.primitives.amf0NullFrom
+import io.github.thibaultbee.krtmp.amf.elements.primitives.amf0NumberFrom
+import io.github.thibaultbee.krtmp.amf.elements.primitives.amf0StringFrom
 import kotlinx.io.IOException
 import kotlinx.io.Source
 
@@ -41,25 +41,25 @@ interface AmfElementReader {
 
 object Amf0ElementReader : AmfElementReader {
     override fun readContainer(numOfElements: Int, source: Source) =
-        Amf0Container(numOfElements, source)
+        amf0ContainerFrom(numOfElements, source)
 
-    override fun readEcmaArray(source: Source) = Amf0EcmaArray(source)
+    override fun readEcmaArray(source: Source) = amf0EcmaArrayFrom(source)
 
-    override fun readObject(source: Source) = Amf0Object(source)
+    override fun readObject(source: Source) = amf0ObjectFrom(source)
 
-    override fun buildStrictArray(source: Source) = Amf0StrictArray(source)
+    override fun buildStrictArray(source: Source) = amf0StrictArrayFrom(source)
 
     override fun read(source: Source): AmfElement {
         return when (val type = source.peek().readByte()) {
-            Amf0Type.NUMBER.value -> Amf0Number(source)
-            Amf0Type.BOOLEAN.value -> Amf0Boolean(source)
-            Amf0Type.STRING.value -> Amf0String(source)
-            Amf0Type.LONG_STRING.value -> Amf0String(source)
-            Amf0Type.OBJECT.value -> Amf0Object(source)
-            Amf0Type.NULL.value -> Amf0Null(source)
-            Amf0Type.ECMA_ARRAY.value -> Amf0EcmaArray(source)
-            Amf0Type.STRICT_ARRAY.value -> Amf0StrictArray(source)
-            Amf0Type.DATE.value -> Amf0Date(source)
+            Amf0Type.NUMBER.value -> amf0NumberFrom(source)
+            Amf0Type.BOOLEAN.value -> amf0BooleanFrom(source)
+            Amf0Type.STRING.value -> amf0StringFrom(source)
+            Amf0Type.LONG_STRING.value -> amf0StringFrom(source)
+            Amf0Type.OBJECT.value -> amf0ObjectFrom(source)
+            Amf0Type.NULL.value -> amf0NullFrom(source)
+            Amf0Type.ECMA_ARRAY.value -> amf0EcmaArrayFrom(source)
+            Amf0Type.STRICT_ARRAY.value -> amf0StrictArrayFrom(source)
+            Amf0Type.DATE.value -> amf0DateFrom(source)
             else -> throw IOException("Invalid AMF0 type: $type")
         }
     }

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

@@ -27,7 +27,7 @@ import kotlinx.io.Source
  * @param expectedNumOfElements the number of elements in the container
  * @param source the source containing elements
  */
-fun Amf0Container(expectedNumOfElements: Int, source: Source): AmfContainer {
+fun amf0ContainerFrom(expectedNumOfElements: Int, source: Source): AmfContainer {
     val amfContainer = AmfContainer()
     var numOfElements = 0
     while (numOfElements < expectedNumOfElements) {
@@ -37,13 +37,14 @@ fun Amf0Container(expectedNumOfElements: Int, source: Source): AmfContainer {
     return amfContainer
 }
 
-fun AmfContainer(initialElements: List<Any?>) =
+fun amfContainerOf(initialElements: List<Any?>) =
     AmfContainer().apply { addAll(initialElements) }
 
 /**
  * A container is a list of [AmfElement]. Contrary to [AmfStrictArray], it doesn't have a size.
  */
-class AmfContainer(private val elements: MutableList<AmfElement> = mutableListOf()) : AmfElement(),
+class AmfContainer internal constructor(private val elements: MutableList<AmfElement> = mutableListOf()) :
+    AmfElement(),
     MutableList<AmfElement> by elements {
 
     override val size0: Int

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

@@ -26,7 +26,7 @@ import kotlinx.io.Source
 import kotlinx.io.readString
 import kotlinx.io.writeString
 
-fun Amf0EcmaArray(source: Source): AmfEcmaArray {
+fun amf0EcmaArrayFrom(source: Source): AmfEcmaArray {
     val type = source.readByte()
     require(type == Amf0Type.ECMA_ARRAY.value) { "Amf0EcmaArray cannot read buffer because it's not ECMA_ARRAY type" }
 
@@ -47,10 +47,10 @@ fun Amf0EcmaArray(source: Source): AmfEcmaArray {
     return amf0EcmaArray
 }
 
-fun AmfEcmaArray(initialElements: Map<String, Any?>) =
+fun amfEcmaArrayOf(initialElements: Map<String, Any?>) =
     AmfEcmaArray().apply { putAll(initialElements) }
 
-class AmfEcmaArray(private val elements: MutableMap<String, AmfElement> = mutableMapOf()) :
+class AmfEcmaArray internal constructor(private val elements: MutableMap<String, AmfElement> = mutableMapOf()) :
     AmfElement(), MutableMap<String, AmfElement> by elements {
     override val size0: Int
         get() {

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

@@ -26,7 +26,7 @@ import kotlinx.io.Source
 import kotlinx.io.readString
 import kotlinx.io.writeString
 
-fun Amf0Object(source: Source): AmfObject {
+fun amf0ObjectFrom(source: Source): AmfObject {
     val type = source.readByte()
     require(type == Amf0Type.OBJECT.value) { "Amf0Object cannot read buffer because it's not OBJECT type" }
 
@@ -41,9 +41,10 @@ fun Amf0Object(source: Source): AmfObject {
     return amf0Object
 }
 
-fun AmfObject(initialElements: Map<String, Any?>) = AmfObject().apply { putAll(initialElements) }
+fun amfObjectOf(initialElements: Map<String, Any?> = emptyMap()) =
+    AmfObject().apply { putAll(initialElements) }
 
-class AmfObject(private val elements: MutableMap<String, AmfElement> = mutableMapOf()) :
+class AmfObject internal constructor(private val elements: MutableMap<String, AmfElement> = mutableMapOf()) :
     AmfElement(), MutableMap<String, AmfElement> by elements {
     override val size0: Int
         get() {

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

@@ -22,7 +22,7 @@ import io.github.thibaultbee.krtmp.amf.elements.extensions.addAll
 import kotlinx.io.Sink
 import kotlinx.io.Source
 
-fun Amf0StrictArray(source: Source): AmfStrictArray {
+fun amf0StrictArrayFrom(source: Source): AmfStrictArray {
     val type = source.readByte()
     require(type == Amf0Type.STRICT_ARRAY.value) { "Amf0StrictArray cannot read buffer because it's not STRICT_ARRAY type" }
 
@@ -34,9 +34,9 @@ fun Amf0StrictArray(source: Source): AmfStrictArray {
     return amf0StrictArray
 }
 
-fun AmfStrictArray(initialElements: List<Any?>) = AmfStrictArray().apply { addAll(initialElements) }
+fun amfStrictArrayOf(initialElements: List<Any?>) = AmfStrictArray().apply { addAll(initialElements) }
 
-class AmfStrictArray(private val elements: MutableList<AmfElement> = mutableListOf()) :
+class AmfStrictArray internal constructor(private val elements: MutableList<AmfElement> = mutableListOf()) :
     AmfElement(), MutableList<AmfElement> by elements {
     override val size0: Int
         get() = 5 + elements.sumOf { it.size0 }

amf/src/commonMain/kotlin/io/github/thibaultbee/krtmp/amf/elements/primitives/AmfBoolean.kt

@@ -21,7 +21,7 @@ import io.github.thibaultbee.krtmp.amf.elements.AmfPrimitive
 import kotlinx.io.Sink
 import kotlinx.io.Source
 
-fun Amf0Boolean(source: Source): AmfBoolean {
+fun amf0BooleanFrom(source: Source): AmfBoolean {
     val type = source.readByte()
     require(type == Amf0Type.BOOLEAN.value) { "Amf0Boolean cannot read buffer because it's not BOOLEAN type" }
     return AmfBoolean(source.readByte() == AMF0_TRUE)

amf/src/commonMain/kotlin/io/github/thibaultbee/krtmp/amf/elements/primitives/AmfDate.kt

@@ -23,13 +23,13 @@ import kotlinx.io.Source
 import kotlinx.io.readDouble
 import kotlinx.io.writeDouble
 
-fun Amf0Date(source: Source): AmfDate {
+fun amf0DateFrom(source: Source): AmfDate {
     val type = source.readByte()
     require(type == Amf0Type.DATE.value) { "Amf0Date cannot read buffer because it's not DATE type" }
     return AmfDate(source.readDouble().toLong(), source.readShort())
 }
 
-fun AmfDate(instant: Instant): AmfDate {
+fun amfDateOf(instant: Instant): AmfDate {
     return AmfDate(instant.toEpochMilliseconds(), 0)
 }
 

amf/src/commonMain/kotlin/io/github/thibaultbee/krtmp/amf/elements/primitives/AmfInt.kt

@@ -19,7 +19,7 @@ import io.github.thibaultbee.krtmp.amf.elements.AmfPrimitive
 import kotlinx.io.Sink
 
 class AmfInt(override val value: Int) : AmfPrimitive<Int>() {
-    override val size0 = -1
+    override val size0 = throw NotImplementedError("Int not supported in AMF0")
 
     override val size3: Int
         get() {

amf/src/commonMain/kotlin/io/github/thibaultbee/krtmp/amf/elements/primitives/AmfNull.kt

@@ -20,7 +20,7 @@ import io.github.thibaultbee.krtmp.amf.elements.AmfElement
 import kotlinx.io.Sink
 import kotlinx.io.Source
 
-fun Amf0Null(source: Source): AmfNull {
+fun amf0NullFrom(source: Source): AmfNull {
     val type = source.readByte()
     require(type == Amf0Type.NULL.value) { "Amf0Null cannot read buffer because it's not NULL type" }
     return AmfNull()
@@ -44,5 +44,5 @@ open class AmfNull : AmfElement() {
 
     override fun toString() = "null"
 
-    companion object Default: AmfNull()
+    companion object Default : AmfNull()
 }