Merge pull request #41 from Udhayarajan/clinet-optimisation

Optimisation
Udhayarajan · Jul 24, 2023 · 807a549 · 807a549
2 parents 8e7a0b4 + 964f2e8
commit 807a549
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 16 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -28,7 +28,7 @@ plugins {
 }
 
 group = "io.github.udhayarajan"
-version = "5.6.11"
+version = "5.6.12"
 // Version Naming incremented if "<NEW_FEATURE_ADDED>.<WORKED_ON_BUG>.<BETA_VERSION_COUNT_OR_PRE_RELEASE>"
 // Priority on incrementing Feature > BugFix > Beta
 

diff --git a/src/commonMain/kotlin/com/mugames/vidsnapkit/Util.kt b/src/commonMain/kotlin/com/mugames/vidsnapkit/Util.kt
@@ -39,8 +39,10 @@ class Util {
          */
         fun decodeHTML(text: String?): String? {
             if (text == null) return null
+            var data = text.replace("%(?![0-9a-fA-F]{2})".toRegex(), "%25")
+            data = data.replace("\\+".toRegex(), "%2B")
             val decoder = HtmlDecoderFactory.createDecoderFactory()
-            val decoded = decoder.decodeHtml(text)
+            val decoded = decoder.decodeHtml(data)
 //            decoded = HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY).toString()
             try {
                 return URLDecoder.decode(decoded, "UTF-8")

diff --git a/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Extractor.kt b/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Extractor.kt
@@ -102,6 +102,8 @@ abstract class Extractor(
         AcceptAllCookiesStorage()
     }
 
+    private var closeClient = true
+
     protected var httpRequestService = run {
         val str = if (inputUrl.contains(Regex("/reels/audio/|tiktok"))) store else null
         HttpRequestService.create(storage = str)
@@ -130,8 +132,10 @@ abstract class Extractor(
      * @see HttpRequestService.create
      * For more about timeouts, [refer](https://ktor.io/docs/timeout.html#configure_plugin)
      */
-    fun setCustomClient(httpClient: HttpClient) {
-        httpRequestService.close()
+    fun setCustomClient(httpClient: HttpClient, autoCloseClient: Boolean = true) {
+        if (closeClient)
+            httpRequestService.close()
+        closeClient = autoCloseClient
         val str = if (inputUrl.contains(Regex("/reels/audio/|tiktok"))) store else null
         httpRequestService = HttpRequestService.create(httpClient, str)
     }
@@ -217,7 +221,8 @@ abstract class Extractor(
             filteredFormats.forEach {
                 it.cookies.addAll(store.get(Url(inputUrl)))
             }
-            httpRequestService.close()
+            if (closeClient)
+                httpRequestService.close()
             onProgress(Result.Success(filteredFormats))
         }
     }
@@ -253,27 +258,32 @@ abstract class Extractor(
     }
 
     protected fun clientRequestError(msg: String = "error making request") {
-        httpRequestService.close()
+        if (closeClient)
+            httpRequestService.close()
         onProgress(Result.Failed(Error.NonFatalError(msg)))
     }
 
-    public fun failed(error: Error) {
-        httpRequestService.close()
+    fun failed(error: Error) {
+        if (closeClient)
+            httpRequestService.close()
         onProgress(Result.Failed(error))
     }
 
     protected fun loginRequired() {
-        httpRequestService.close()
+        if (closeClient)
+            httpRequestService.close()
         onProgress(Result.Failed(Error.LoginRequired))
     }
 
     protected fun internalError(msg: String, e: Exception? = null) {
-        httpRequestService.close()
+        if (closeClient)
+            httpRequestService.close()
         onProgress(Result.Failed(Error.InternalError(msg, e)))
     }
 
     protected fun missingLogic() {
-        httpRequestService.close()
+        if (closeClient)
+            httpRequestService.close()
         onProgress(Result.Failed(Error.MethodMissingLogic))
     }
 

diff --git a/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Facebook.kt b/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Facebook.kt
@@ -449,12 +449,14 @@ class Facebook internal constructor(url: String) : Extractor(url) {
             )
         )
 
-        val blurredImage = media.getJSONObject("blurred_image")
-        scopedFormats.imageData.add(
+        val blurredImage = media.getNullableJSONObject("blurred_image")
+        blurredImage?.getString("uri")?.let {
             ImageResource(
-                blurredImage.getString("uri"), resolution = Util.getResolutionFromUrl(blurredImage.getString("uri"))
+                it, resolution = Util.getResolutionFromUrl(blurredImage.getString("uri"))
             )
-        )
+        }?.let {
+            scopedFormats.imageData.add(it)
+        }
 
         val previewImage = media.getJSONObject("previewImage")
         scopedFormats.imageData.add(

diff --git a/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Instagram.kt b/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Instagram.kt
@@ -19,6 +19,7 @@ package com.mugames.vidsnapkit.extractor
 
 import com.mugames.vidsnapkit.*
 import com.mugames.vidsnapkit.dataholders.*
+import io.ktor.client.statement.*
 import io.ktor.http.*
 import kotlinx.coroutines.withTimeoutOrNull
 import org.json.JSONArray
@@ -136,6 +137,7 @@ class Instagram internal constructor(url: String) : Extractor(url) {
     }
 
     private fun isHighlightsPost(): Boolean {
+        if (inputUrl.contains("/s/")) return true
         return inputUrl.contains("stories/highlights/".toRegex())
     }
 
@@ -254,6 +256,10 @@ class Instagram internal constructor(url: String) : Extractor(url) {
         } else if (isHighlightsPost()) {
             headers["User-Agent"] =
                 "Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Instagram 105.0.0.11.118 (iPhone11,8; iOS 12_3_1; en_US; en-US; scale=2.00; 828x1792; 165586599)"
+            if (!isCookieValid()) {
+                loginRequired()
+                return
+            }
             val highlightsId = getHighlightsId()
             highlightsId?.let {
                 extractHighlights(it)
@@ -305,6 +311,10 @@ class Instagram internal constructor(url: String) : Extractor(url) {
             // possibly user url
             headers["User-Agent"] =
                 "Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Instagram 105.0.0.11.118 (iPhone11,8; iOS 12_3_1; en_US; en-US; scale=2.00; 828x1792; 165586599)"
+            if (!isCookieValid()) {
+                loginRequired()
+                return
+            }
             val userId = getUserID()
             userId?.let {
                 extractStories(it)
@@ -678,7 +688,7 @@ class Instagram internal constructor(url: String) : Extractor(url) {
         val appID = getAppID(page)
         headers["X-Ig-App-Id"] = appID
         val res = httpRequestService.getResponse(GRAPHQL_URL.format(queryHash, getShortcode()), headers)
-        logger.info("graphQL response = $res")
+        logger.info("graphQL response = ${res.toString().substring(0, 80)}")
         val shortcodeMedia =
             res?.toJSONObject()?.getJSONObject("data")?.getNullableJSONObject("shortcode_media") ?: run {
                 logger.info("unable to even get from graphQL so trying direct ex")