fix rtmp url parser

Author: pedroSG94

common/src/main/java/com/pedro/common/UrlParser.kt

@@ -67,12 +67,12 @@ class UrlParser private constructor(
   }
 
   fun getAppName(): String {
-    val app = path.ifEmpty { query ?: "" }
-    val indexes = app.getIndexes('/')
-    return when (indexes.size) {
-      0 -> app
-      1 -> app.substring(0, indexes[0])
-      else -> app.substring(0, indexes[1])
+    val queries = getAllQueries().map { (key, value) -> "$key=$value" }.joinToString("&")
+    val path = getFullPath().ifEmpty { query ?: "" }.replace(queries, "")
+    val segments = path.split('/').filter { it.isNotEmpty() }
+    return when(segments.size) {
+      1, 2 -> segments[0]
+      else -> segments.subList(0, 2).joinToString("/")
     }
   }
 
@@ -95,7 +95,7 @@ class UrlParser private constructor(
 
   private fun getAllQueries(): Map<String, String> {
     val queries = query?.split("&") ?: emptyList()
-    val map = HashMap<String, String>()
+    val map = LinkedHashMap<String, String>()
     queries.forEach { entry ->
       val data = entry.split(Pattern.compile("="), 2)
       if (data.size == 2) map[data[0]] = data[1]

common/src/test/java/com/pedro/common/UrlParserTest.kt

@@ -17,9 +17,9 @@ class UrlParserTest {
       assertEquals("rtmp", urlParser.scheme)
       assertEquals("localhost", urlParser.host)
       assertEquals(1935, urlParser.port)
-      assertEquals("live", urlParser.getAppName())
-      assertEquals("test/fake", urlParser.getStreamName())
-      assertEquals("rtmp://localhost:1935/live", urlParser.getTcUrl())
+      assertEquals("live?test", urlParser.getAppName())
+      assertEquals("fake", urlParser.getStreamName())
+      assertEquals("rtmp://localhost:1935/live?test", urlParser.getTcUrl())
 
       val url0 = "rtmp://192.168.238.182:1935/live/100044?userId=100044&roomTitle=123123&roomCover=http://192.168.238.182/xxxx.png"
       val urlParser0 = UrlParser.parse(url0, arrayOf("rtmp"))
@@ -35,9 +35,9 @@ class UrlParserTest {
       assertEquals("rtmp", urlParser1.scheme)
       assertEquals("localhost", urlParser1.host)
       assertEquals(1935, urlParser1.port)
-      assertEquals("live", urlParser1.getAppName())
-      assertEquals("test/fake", urlParser1.getStreamName())
-      assertEquals("rtmp://localhost:1935/live", urlParser1.getTcUrl())
+      assertEquals("live?test", urlParser1.getAppName())
+      assertEquals("fake", urlParser1.getStreamName())
+      assertEquals("rtmp://localhost:1935/live?test", urlParser1.getTcUrl())
       assertEquals("user", urlParser1.getAuthUser())
       assertEquals("pass", urlParser1.getAuthPassword())
 
@@ -103,7 +103,16 @@ class UrlParserTest {
       assertEquals("v2/pub", urlParser8.getAppName())
       assertEquals("streamName?token", urlParser8.getStreamName())
       assertEquals("rtmp://192.168.0.1:1935/v2/pub", urlParser8.getTcUrl())
-    } catch (e: URISyntaxException) {
+
+      val url9 = "rtmp://192.168.0.1:1935/live/test?asd/asd/streamName"
+      val urlParser9 = UrlParser.parse(url9, arrayOf("rtmp"))
+      assertEquals("rtmp", urlParser9.scheme)
+      assertEquals("192.168.0.1", urlParser9.host)
+      assertEquals(1935, urlParser9.port)
+      assertEquals("live/test?asd", urlParser9.getAppName())
+      assertEquals("asd/streamName", urlParser9.getStreamName())
+      assertEquals("rtmp://192.168.0.1:1935/live/test?asd", urlParser9.getTcUrl())
+    } catch (_: URISyntaxException) {
       assert(false)
     }
   }