Fix and Improve Vidmoly Extractor

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt

@@ -13,74 +13,75 @@ class Vidmolyme : Vidmoly() {
     override val mainUrl = "https://vidmoly.me"
 }
 
+class Vidmolyto : Vidmoly() {
+    override val mainUrl = "https://vidmoly.to"
+}
+
+class Vidmolybiz : Vidmoly() {
+    override val mainUrl = "https://vidmoly.biz"
+}
+
 open class Vidmoly : ExtractorApi() {
     override val name = "Vidmoly"
-    override val mainUrl = "https://vidmoly.to"
+    override val mainUrl = "https://vidmoly.net"
     override val requiresReferer = true
 
     private fun String.addMarks(str: String): String {
         return this.replace(Regex("\"?$str\"?"), "\"$str\"")
     }
 
+    private data class Source(
+        @JsonProperty("file") val file: String? = null,
+    )
+
+    private data class SubSource(
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("kind") val kind: String? = null,
+    )
+
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val headers  = mapOf(
-            "user-agent"     to USER_AGENT,
+        val headers = mapOf(
+            "user-agent" to USER_AGENT,
             "Sec-Fetch-Dest" to "iframe"
         )
-        val newUrl = if(url.contains("/w/"))
-            url.replaceFirst("/w/", "/embed-")+"-920x360.html"
+
+        val newUrl = if (url.contains("/w/")) 
+            url.replaceFirst("/w/", "/embed-") + ".html" 
             else url
-        var script: String? = null;
-        var attemps = 0
-        while (attemps < 10 && script.isNullOrEmpty()){
-            attemps++
-            script = app.get(
-                newUrl,
-                headers = headers,
-                referer = referer,
-            ).document.select("script")
-                .firstOrNull { it.data().contains("sources:") }?.data()
-            if(script.isNullOrEmpty())
-                delay(500)
-        }
-        val videoData = script?.substringAfter("sources: [")
-            ?.substringBefore("],")?.addMarks("file")
-        val subData = script?.substringAfter("tracks: [")?.substringBefore("]")?.addMarks("file")
-            ?.addMarks("label")?.addMarks("kind")
-
-        tryParseJson<Source>(videoData)?.file?.let { m3uLink ->
-            M3u8Helper.generateM3u8(
-                name,
-                m3uLink,
-                "$mainUrl/"
-            ).forEach(callback)
-        }
-
-        tryParseJson<List<SubSource>>("[${subData}]")
-            ?.filter { it.kind == "captions" }?.map {
-                subtitleCallback.invoke(
-                    newSubtitleFile(
-                        it.label.toString(),
-                        fixUrl(it.file.toString())
-                    )
-                )
+        val script = app.get(newUrl, headers = headers, referer = referer)
+            .document.select("script")
+            .firstOrNull { it.data().contains("sources:") }
+            ?.data()
+        // Extracts and parses videoData
+        script?.substringAfter("sources: [")
+            ?.substringBefore("]")
+            ?.addMarks("file")
+            ?.replace("'","\"")
+            ?.let { videoData ->
+                tryParseJson<Source>(videoData)?.file?.let { m3uLink ->
+                    M3u8Helper.generateM3u8(name, m3uLink, "$mainUrl/")
+                        .forEach(callback)
+                }
+            }
+        // Extracts and parses captions
+        script?.substringAfter("tracks: [")
+            ?.substringBefore("]")
+            ?.addMarks("file")?.addMarks("label")?.addMarks("kind")
+            ?.replace("'","\"")
+            ?.let { subData ->
+                tryParseJson<List<SubSource>>("[$subData]")
+                    ?.filter { it.kind == "captions" }
+                    ?.forEach {
+                        subtitleCallback(
+                            newSubtitleFile(it.label.toString(), fixUrl(it.file.toString()))
+                        )
+                    }
             }
-
     }
-
-    private data class Source(
-        @JsonProperty("file") val file: String? = null,
-    )
-
-    private data class SubSource(
-        @JsonProperty("file") val file: String? = null,
-        @JsonProperty("label") val label: String? = null,
-        @JsonProperty("kind") val kind: String? = null,
-    )
-
 }