fix(Instagram): NonFatal error with Insta & add a few code to diagnosis the error

Author: Udhayarajan

build.gradle.kts

@@ -27,7 +27,7 @@ plugins {
 }
 
 group = "io.github.udhayarajan"
-version = "5.3.6"
+version = "5.3.7"
 //Version Naming incremented if "<NEW_FEATURE_ADDED>.<WORKED_ON_BUG>.<BETA_VERSION_COUNT>"
 //Priority on incrementing Feature > BugFix > Beta
 

src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Extractor.kt

@@ -27,6 +27,7 @@ import com.mugames.vidsnapkit.sanitizeAsHeaderValue
 import io.ktor.client.plugins.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.future.future
+import org.slf4j.LoggerFactory
 import java.util.*
 import javax.net.ssl.SSLHandshakeException
 
@@ -67,6 +68,8 @@ abstract class Extractor(
                 else -> null
             }
         }
+
+        private val logger = LoggerFactory.getLogger(Extractor::class.java)
     }
 
     protected var inputUrl: String = url
@@ -83,7 +86,7 @@ abstract class Extractor(
         set(value) {
             value?.let {
                 headers["Cookie"] = it.sanitizeAsHeaderValue()
-            }?:run {
+            } ?: run {
                 headers.remove("Cookie")
             }
             field = value
@@ -117,15 +120,16 @@ abstract class Extractor(
     private suspend fun safeAnalyze() {
         try {
             if (inputUrl.contains("instagram"))
-                inputUrl = if (cookies != null) {
+                inputUrl = if (cookies == null) {
                     inputUrl.replace("/reels/", "/reel/")
                 } else inputUrl.replace("/reel/", "/reels/")
 
             if (HttpRequest(inputUrl, headers).isAvailable())
                 analyze()
-            else if (inputUrl.contains("instagram") && cookies != null)
+            else if (inputUrl.contains("instagram") && cookies != null) {
+                logger.info("Forcing instagram")
                 analyze(hashMapOf("forced" to true))
-            else clientRequestError()
+            } else clientRequestError()
         } catch (e: Exception) {
             if (e is SSLHandshakeException)
                 clientRequestError()

src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Instagram.kt

@@ -24,6 +24,7 @@ import io.ktor.http.*
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
+import org.slf4j.LoggerFactory
 import java.util.*
 import java.util.regex.Pattern
 
@@ -43,6 +44,8 @@ class Instagram internal constructor(url: String) : Extractor(url) {
         const val HIGHLIGHTS_API = "https://www.instagram.com/api/v1/feed/reels_media/?reel_ids=highlight%s"
         const val GRAPHQL_URL =
             "https://www.instagram.com/graphql/query/?query_hash=b3055c01b4b222b8a47dc12b090e4e64&variables={\"shortcode\":\"%s\"}"
+
+        private val logger = LoggerFactory.getLogger(Instagram::class.java)
     }
 
     private val formats = Formats()
@@ -57,10 +60,11 @@ class Instagram internal constructor(url: String) : Extractor(url) {
                 newLoc.contains(keyword, ignoreCase = true)
             }
 
-            if (newLoc == "https://www.instagram.com/" || !containsRestrictedKeyword){
+            if (newLoc == "https://www.instagram.com/" || !containsRestrictedKeyword) {
                 return true
             }
         }
+        logger.info("Oops!, Cookie is invalid so removing it from header")
         return false
     }
 
@@ -143,8 +147,13 @@ class Instagram internal constructor(url: String) : Extractor(url) {
             if (!isCookieValid())
                 cookies = null
             if (load?.get("forced") == true) {
+                if (cookies == null) {
+                    onProgress(Result.Failed(Error.LoginRequired))
+                    return
+                }
                 inputUrl = inputUrl.replace("/reel/", "/p/")
                 inputUrl = inputUrl.replace("https://instagram.com", "https://www.instagram.com")
+                logger.info("The new url is $inputUrl&__a=1&__d=dis")
                 val items =
                     HttpRequest(inputUrl.plus("&__a=1&__d=dis"), getHeadersWithUserAgent()).getResponse(true) ?: run {
                         clientRequestError("unable to get post event with __a=1&__d=dis")

src/commonMain/kotlin/com/mugames/vidsnapkit/network/HttpRequestHelper.kt

@@ -160,8 +160,12 @@ class HttpInterfaceImpl(
         } catch (e: SendCountExceedException) {
             if (url.contains("instagram") && headers?.containsKey("Cookie") == true)
                 "{error:\"Invalid Cookies\"}"
-            else throw e
+            else{
+                logger.error("getData() url=${url} header=${headers.toString()} SendCountExceedException:", e)
+                throw e
+            }
         } catch (e: Exception) {
+            logger.error("getData() url=${url} header=${headers.toString()} Generic exception:", e)
             throw e
         }
     }