add support for custom AMF object in RTMP clients

Author: xiuminga

library/src/main/java/com/pedro/library/util/streamclient/RtmpStreamClient.kt

@@ -178,5 +178,4 @@ class RtmpStreamClient(
   fun setCustomAmfObject(amfObject: Map<String, Any>) {
     rtmpClient.setCustomAmfObject(amfObject)
   }
-
 }

library/src/main/java/com/pedro/library/util/streamclient/UdpStreamClient.kt

@@ -40,7 +40,6 @@ class UdpStreamClient(
     udpClient.setDelay(millis)
   }
 
-
   override fun setReTries(reTries: Int) {
     udpClient.setReTries(reTries)
   }

rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfObject.kt

@@ -92,6 +92,7 @@ open class AmfObject(private val properties: LinkedHashMap<AmfString, AmfData> =
     val newValue: AmfData = when (data) {
       is String   -> AmfString(data)
       is Int      -> AmfNumber(data.toDouble())
+      is Long     -> AmfNumber(data.toDouble())
       is Double   -> AmfNumber(data)
       is Float    -> AmfNumber(data.toDouble())
       is Boolean  -> AmfBoolean(data)

rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManagerAmf0.kt

@@ -39,9 +39,17 @@ class CommandsManagerAmf0: CommandsManager() {
     val connect = CommandAmf0("connect", ++commandId, getCurrentTimestamp(), streamId,
         BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_CONNECTION.mark))
     val connectInfo = AmfObject()
-    connectInfo.setProperty("app", appName + auth)
+
+    // Prefer custom app/tcUrl if provided, and always append auth to keep auth flow working
+    val customApp = customAmfObject["app"]?.toString()
+    val customTcUrl = customAmfObject["tcUrl"]?.toString()
+    val finalApp = (customApp ?: appName) + auth
+    val finalTcUrl = (customTcUrl ?: tcUrl) + auth
+
+    connectInfo.setProperty("app", finalApp)
     connectInfo.setProperty("flashVer", flashVersion)
-    connectInfo.setProperty("tcUrl", tcUrl + auth)
+    connectInfo.setProperty("tcUrl", finalTcUrl)
+
     if (!videoDisabled) {
       if (videoCodec == VideoCodec.H265) {
         val list = mutableListOf<AmfData>()
@@ -56,8 +64,14 @@ class CommandsManagerAmf0: CommandsManager() {
       }
     }
     connectInfo.setProperty("objectEncoding", 0.0)
+
+    // Inject other custom AMF fields as-is; skip app/tcUrl since we've handled them with auth
     customAmfObject.forEach { (key, value) ->
-      connectInfo.setProperty(key, value)
+      when (key) {
+        "app" -> connectInfo.setProperty("app", finalApp)
+        "tcUrl" -> connectInfo.setProperty("tcUrl", finalTcUrl)
+        else -> connectInfo.setProperty(key, value)
+      }
     }
     connect.addData(connectInfo)
 

rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt

@@ -252,12 +252,28 @@ class RtmpClient(private val connectChecker: ConnectChecker) {
 
         tunneled = urlParser.scheme.startsWith("rtmpt")
         tlsEnabled = urlParser.scheme.endsWith("s")
-        commandsManager.host = urlParser.host
         val defaultPort = if (tlsEnabled) 443 else if (tunneled) 80 else 1935
-        commandsManager.port = urlParser.port ?: defaultPort
-        commandsManager.appName = urlParser.getAppName()
-        commandsManager.streamName = urlParser.getStreamName()
-        commandsManager.tcUrl = urlParser.getTcUrl()
+
+        // Prefer values from customAmfObject; fallback to URL parsed values
+        val co = commandsManager.customAmfObject
+        commandsManager.host = (co["host"] as? String) ?: urlParser.host
+        commandsManager.port = (co["port"]  as? Int) ?: (urlParser.port ?: defaultPort)
+        commandsManager.appName = (co["app"] as? String) ?: urlParser.getAppName()
+        commandsManager.streamName = (co["streamName"] as? String) ?: urlParser.getStreamName()
+        commandsManager.tcUrl = (co["tcUrl"] as? String) ?: urlParser.getTcUrl()
+
+        // Print connection summary for visibility
+        runCatching {
+          val used = mapOf(
+            "host" to (co["host"] != null),
+            "port" to (co["port"] != null),
+            "app" to (co["app"] != null),
+            "streamName" to (co["streamName"] != null),
+            "tcUrl" to (co["tcUrl"] != null)
+          )
+          Log.i(TAG, "connect config => host=${commandsManager.host}, port=${commandsManager.port}, app=${commandsManager.appName}, stream=${commandsManager.streamName}, tcUrl=${commandsManager.tcUrl}, tls=$tlsEnabled, tunneled=$tunneled, fromCustom=$used")
+        }
+
         if (commandsManager.appName.isEmpty()) {
           isStreaming = false
           onMainThread {