Subscriptions ratelimit and warnings, Nebula login requirement, Subscription fetch setting, -1 sub hide

.gitlab-ci.yml

@@ -4,6 +4,7 @@ variables:
 stages:
 - buildAndDeployApkUnstable
 - buildAndDeployApkStable
+- buildAndDeployPlaystore
 
 buildAndDeployApkUnstable:
   stage: buildAndDeployApkUnstable
@@ -25,8 +26,8 @@ buildAndDeployApkStable:
     - branches
   when: manual
 
-buildAndDeployApkStable:
-  stage: buildAndDeployApkStable
+buildAndDeployPlaystore:
+  stage: buildAndDeployPlaystore
   script:
     - sh deploy-playstore.sh
   only:

app/build.gradle

@@ -95,7 +95,7 @@ android {
     }
 
     defaultConfig {
-        minSdk 29
+        minSdk 28
         targetSdk 33
         versionCode gitVersionCode
         versionName gitVersionName

app/src/main/AndroidManifest.xml

@@ -127,6 +127,10 @@
             android:name=".activities.ExceptionActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.FutoVideo.NoActionBar" />
+        <activity
+            android:name=".activities.CaptchaActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
         <activity
             android:name=".activities.LoginActivity"
             android:screenOrientation="portrait"

app/src/main/assets/scripts/source.js

@@ -64,6 +64,14 @@ class ScriptException extends Error {
         }
     }
 }
+class CaptchaRequiredException extends Error {
+    constructor(url, body) {
+        super(JSON.stringify({ 'plugin_type': 'CaptchaRequiredException', url, body }));
+        this.plugin_type = "CaptchaRequiredException";
+        this.url = url;
+        this.body = body;
+    }
+}
 class UnavailableException extends ScriptException {
     constructor(msg) {
         super("UnavailableException", msg);

app/src/main/java/com/futo/platformplayer/Extensions_Content.kt

@@ -0,0 +1,15 @@
+package com.futo.platformplayer
+
+import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
+import com.futo.platformplayer.helpers.VideoHelper
+
+fun IPlatformVideoDetails.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
+fun IVideoSource.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
+fun IAudioSource.isDownloadable(): Boolean = VideoHelper.isDownloadable(this);
+
+
+fun IVideoSourceDescriptor.hasAnySource(): Boolean = this.videoSources.any() || (this is VideoUnMuxedSourceDescriptor && this.audioSources.any());

app/src/main/java/com/futo/platformplayer/Settings.kt

@@ -4,6 +4,7 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.webkit.CookieManager
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.activities.*
@@ -63,7 +64,8 @@ class Settings : FragmentedStorageFileJson() {
         try {
             val i = Intent(Intent.ACTION_VIEW);
             val subject = "Feedback Grayjay";
-            val body = "Hey,\n\nI have some feedback on the Grayjay app.\nVersion information (version_name = ${BuildConfig.VERSION_NAME}, version_code = ${BuildConfig.VERSION_CODE}, flavor = ${BuildConfig.FLAVOR}, build_type = ${BuildConfig.BUILD_TYPE}})\n\n";
+            val body = "Hey,\n\nI have some feedback on the Grayjay app.\nVersion information (version_name = ${BuildConfig.VERSION_NAME}, version_code = ${BuildConfig.VERSION_CODE}, flavor = ${BuildConfig.FLAVOR}, build_type = ${BuildConfig.BUILD_TYPE}})\n" +
+                    "Device information (brand= ${Build.BRAND}, manufacturer = ${Build.MANUFACTURER}, device = ${Build.DEVICE}, version-sdk = ${Build.VERSION.SDK_INT}, version-os = ${Build.VERSION.BASE_OS})\n\n";
             val data = Uri.parse("mailto:grayjay@futo.org?subject=" + Uri.encode(subject) + "&body=" + Uri.encode(body));
             i.data = data;
 
@@ -140,7 +142,11 @@ class Settings : FragmentedStorageFileJson() {
                 return FeedStyle.THUMBNAIL;
         }
 
-        @FormField("Background Update", FieldForm.DROPDOWN, "Experimental background update for subscriptions cache (requires restart)", 6)
+        @FormField("Fetch on app boot", FieldForm.TOGGLE, "Shortly after opening the app, start fetching subscriptions.", 6)
+        @Serializable(with = FlexibleBooleanSerializer::class)
+        var fetchOnAppBoot: Boolean = true;
+
+        @FormField("Background Update", FieldForm.DROPDOWN, "Experimental background update for subscriptions cache (requires restart)", 7)
         @DropdownFieldOptionsId(R.array.background_interval)
         var subscriptionsBackgroundUpdateInterval: Int = 0;
 
@@ -156,7 +162,7 @@ class Settings : FragmentedStorageFileJson() {
         };
 
 
-        @FormField("Subscription Concurrency", FieldForm.DROPDOWN, "Specify how many threads are used to fetch channels (requires restart)", 7)
+        @FormField("Subscription Concurrency", FieldForm.DROPDOWN, "Specify how many threads are used to fetch channels (requires restart)", 8)
         @DropdownFieldOptionsId(R.array.thread_count)
         var subscriptionConcurrency: Int = 3;
 
@@ -213,7 +219,7 @@ class Settings : FragmentedStorageFileJson() {
 
         fun isAutoRotate() = autoRotate == 1 || (autoRotate == 2 && StateApp.instance.getCurrentSystemAutoRotate());
 
-        @FormField("Auto-Rotate Dead Zone", FieldForm.DROPDOWN, "Auto-rotate deadzone in degrees", 5)
+        @FormField("Auto-Rotate Dead Zone", FieldForm.DROPDOWN, "This prevents the device from rotating within the given amount of degrees.", 5)
         @DropdownFieldOptionsId(R.array.auto_rotate_dead_zone)
         var autoRotateDeadZone: Int = 0;
 
@@ -333,7 +339,7 @@ class Settings : FragmentedStorageFileJson() {
             "Submit logs to help us narrow down issues", 1
         )
         fun submitLogs() {
-            StateApp.instance.scopeGetter().launch(Dispatchers.IO) {
+            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                 try {
                     if (!Logger.submitLogs()) {
                         withContext(Dispatchers.Main) {
@@ -406,6 +412,33 @@ class Settings : FragmentedStorageFileJson() {
     }
 
 
+    @FormField("External Storage", FieldForm.GROUP, "", 12)
+    var storage = Storage();
+    @Serializable
+    class Storage {
+        var storage_general: String? = null;
+        var storage_download: String? = null;
+
+        fun getStorageGeneralUri(): Uri? = storage_general?.let { Uri.parse(it) };
+        fun getStorageDownloadUri(): Uri? = storage_download?.let { Uri.parse(it) };
+        fun isStorageMainValid(context: Context): Boolean = StateApp.instance.isValidStorageUri(context, getStorageGeneralUri());
+        fun isStorageDownloadValid(context: Context): Boolean = StateApp.instance.isValidStorageUri(context, getStorageDownloadUri());
+
+        @FormField("Change external General directory", FieldForm.BUTTON, "Change the external directory for general files, used for persistent files like auto-backup", 3)
+        fun changeStorageGeneral() {
+            SettingsActivity.getActivity()?.let {
+                StateApp.instance.changeExternalGeneralDirectory(it);
+            }
+        }
+        @FormField("Change external Downloads directory", FieldForm.BUTTON, "Change the external storage for download files, used for exported download files", 4)
+        fun changeStorageDownload() {
+            SettingsActivity.getActivity()?.let {
+                StateApp.instance.changeExternalDownloadDirectory(it);
+            }
+        }
+    }
+
+
     @FormField("Auto Update", "group", "Configure the auto updater", 12)
     var autoUpdate = AutoUpdate();
     @Serializable
@@ -462,7 +495,7 @@ class Settings : FragmentedStorageFileJson() {
         fun viewChangelog() {
             UIDialogs.toast("Retrieving changelog");
             SettingsActivity.getActivity()?.let {
-                StateApp.instance.scopeGetter().launch(Dispatchers.IO) {
+                StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                     try {
                         val version = StateUpdate.instance.downloadVersionCode(ManagedHttpClient()) ?: return@launch;
                         Logger.i(TAG, "Version retrieved $version");
@@ -511,7 +544,9 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField("Set Automatic Backup", FieldForm.BUTTON, "Configure daily backup in case of catastrophic failure. (Written to the external Grayjay directory)", 1)
         fun configureAutomaticBackup() {
-            UIDialogs.showAutomaticBackupDialog(SettingsActivity.getActivity()!!);
+            UIDialogs.showAutomaticBackupDialog(SettingsActivity.getActivity()!!, autoBackupPassword != null) {
+                SettingsActivity.getActivity()?.reloadSettings();
+            };
         }
         @FormField("Restore Automatic Backup", FieldForm.BUTTON, "Restore a previous automatic backup", 2)
         fun restoreAutomaticBackup() {
@@ -542,6 +577,7 @@ class Settings : FragmentedStorageFileJson() {
             StatePayment.instance.clearLicenses();
             SettingsActivity.getActivity()?.let {
                 UIDialogs.toast(it, "Licenses cleared, might require app restart");
+                it.reloadSettings();
             }
         }
     }

app/src/main/java/com/futo/platformplayer/UIDialogs.kt

@@ -15,7 +15,9 @@ import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.dialogs.*
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateBackup
 import com.futo.platformplayer.stores.v2.ManagedStore
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -90,11 +92,25 @@ class UIDialogs {
         }
 
 
-        fun showAutomaticBackupDialog(context: Context) {
-            val dialog = AutomaticBackupDialog(context);
-            registerDialogOpened(dialog);
-            dialog.setOnDismissListener { registerDialogClosed(dialog) };
-            dialog.show();
+        fun showAutomaticBackupDialog(context: Context, skipRestoreCheck: Boolean = false, onClosed: (()->Unit)? = null) {
+            val dialogAction: ()->Unit = {
+                val dialog = AutomaticBackupDialog(context);
+                registerDialogOpened(dialog);
+                dialog.setOnDismissListener { registerDialogClosed(dialog); onClosed?.invoke() };
+                dialog.show();
+            };
+            if(StateBackup.hasAutomaticBackup() && !skipRestoreCheck)
+                UIDialogs.showDialog(context, R.drawable.ic_move_up, "An old backup is available", "Would you like to restore this backup?", null, 0,
+                    UIDialogs.Action("Cancel", {}), //To nothing
+                    UIDialogs.Action("Override", {
+                        dialogAction();
+                    }, UIDialogs.ActionStyle.DANGEROUS),
+                    UIDialogs.Action("Restore", {
+                        UIDialogs.showAutomaticRestoreDialog(context, StateApp.instance.scope);
+                    }, UIDialogs.ActionStyle.PRIMARY));
+            else {
+                dialogAction();
+            }
         }
         fun showAutomaticRestoreDialog(context: Context, scope: CoroutineScope) {
             val dialog = AutomaticRestoreDialog(context, scope);
@@ -134,10 +150,10 @@ class UIDialogs {
                     val buttonView = TextView(context);
                     val dp10 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10f, resources.displayMetrics).toInt();
                     val dp28 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 28f, resources.displayMetrics).toInt();
-                    val dp14 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 14.0f, resources.displayMetrics);
+                    val dp14 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 14.0f, resources.displayMetrics).toInt();
                     buttonView.layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT).apply {
                         if(actions.size > 1)
-                            this.marginEnd = dp28;
+                            this.marginEnd = if(actions.size > 2) dp14 else dp28;
                     };
                     buttonView.setTextColor(Color.WHITE);
                     buttonView.textSize = 14f;
@@ -151,8 +167,9 @@ class UIDialogs {
                         ActionStyle.DANGEROUS_TEXT -> buttonView.setTextColor(ContextCompat.getColor(context, R.color.pastel_red))
                         else -> buttonView.setTextColor(ContextCompat.getColor(context, R.color.colorPrimary))
                     }
+                    val paddingSpecialButtons = if(actions.size > 2) dp14 else dp28;
                     if(act.style != ActionStyle.NONE && act.style != ActionStyle.DANGEROUS_TEXT)
-                        buttonView.setPadding(dp28, dp10, dp28, dp10);
+                        buttonView.setPadding(paddingSpecialButtons, dp10, paddingSpecialButtons, dp10);
                     else
                         buttonView.setPadding(dp10, dp10, dp10, dp10);
 

app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt

@@ -4,7 +4,6 @@ import android.content.ContentResolver
 import android.view.View
 import android.view.ViewGroup
 import com.futo.platformplayer.api.http.ManagedHttpClient
-import com.futo.platformplayer.api.http.server.handlers.HttpConstantHandler
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
@@ -18,6 +17,7 @@ import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Playlist
 import com.futo.platformplayer.states.*
+import com.futo.platformplayer.views.Loader
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuGroup
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
@@ -29,7 +29,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.io.File
+import java.lang.IllegalStateException
 
 class UISlideOverlays {
     companion object {
@@ -45,7 +45,7 @@ class UISlideOverlays {
             menu.show();
         }
 
-        fun showDownloadVideoOverlay(contentResolver: ContentResolver, video: IPlatformVideoDetails, container: ViewGroup): SlideUpMenuOverlay? {
+        fun showDownloadVideoOverlay(video: IPlatformVideoDetails, container: ViewGroup, contentResolver: ContentResolver? = null): SlideUpMenuOverlay? {
             val items = arrayListOf<View>();
             var menu: SlideUpMenuOverlay? = null;
 
@@ -68,6 +68,12 @@ class UISlideOverlays {
                 return null;
             }
 
+            if(!VideoHelper.isDownloadable(video)) {
+                Logger.i(TAG, "Attempted to open downloads without valid sources for [${video.name}]: ${video.url}");
+                UIDialogs.toast( "No downloadable sources (yet)");
+                return null;
+            }
+
             items.add(SlideUpMenuGroup(container.context, "Video", videoSources,
                 listOf(listOf(SlideUpMenuItem(container.context, R.drawable.ic_movie, "None", "Audio Only", "none", {
                     selectedVideo = null;
@@ -76,7 +82,7 @@ class UISlideOverlays {
                         menu?.setOk("Download");
                 }, false)) +
                 videoSources
-                .filter { it is IVideoUrlSource }
+                .filter { it.isDownloadable() }
                 .map {
                     SlideUpMenuItem(container.context, R.drawable.ic_movie, it.name, "${it.width}x${it.height}", it, {
                         selectedVideo = it as IVideoUrlSource;
@@ -88,14 +94,14 @@ class UISlideOverlays {
             ));
 
             if(Settings.instance.downloads.getDefaultVideoQualityPixels() > 0 && videoSources.size > 0)
-                selectedVideo = VideoHelper.selectBestVideoSource(videoSources.filter { it is IVideoUrlSource }.asIterable(),
+                selectedVideo = VideoHelper.selectBestVideoSource(videoSources.filter { it.isDownloadable() }.asIterable(),
                     Settings.instance.downloads.getDefaultVideoQualityPixels(),
                     FutoVideoPlayerBase.PREFERED_VIDEO_CONTAINERS) as IVideoUrlSource;
 
 
             audioSources?.let { audioSources ->
                 items.add(SlideUpMenuGroup(container.context, "Audio", audioSources, audioSources
-                    .filter { it is IAudioUrlSource }
+                    .filter { VideoHelper.isDownloadable(it) }
                     .map {
                         SlideUpMenuItem(container.context, R.drawable.ic_music, it.name, "${it.bitrate}", it, {
                             selectedAudio = it as IAudioUrlSource;
@@ -111,24 +117,27 @@ class UISlideOverlays {
                 menu?.selectOption(asources, preferredAudioSource);
 
 
-                selectedAudio = VideoHelper.selectBestAudioSource(audioSources.filter { it is IAudioUrlSource }.asIterable(),
+                selectedAudio = VideoHelper.selectBestAudioSource(audioSources.filter { it.isDownloadable() }.asIterable(),
                     FutoVideoPlayerBase.PREFERED_AUDIO_CONTAINERS,
                     Settings.instance.playback.getPrimaryLanguage(container.context),
                     if(Settings.instance.downloads.isHighBitrateDefault()) 9999999 else 1) as IAudioUrlSource?;
             }
 
-            items.add(SlideUpMenuGroup(container.context, "Subtitles", subtitleSources, subtitleSources
-                .map {
-                    SlideUpMenuItem(container.context, R.drawable.ic_edit, it.name, "", it, {
-                        if (selectedSubtitle == it) {
-                            selectedSubtitle = null;
-                            menu?.selectOption(subtitleSources, null);
-                        } else {
-                            selectedSubtitle = it;
-                            menu?.selectOption(subtitleSources, it);
-                        }
-                    }, false);
-                }));
+            //ContentResolver is required for subtitles..
+            if(contentResolver != null) {
+                items.add(SlideUpMenuGroup(container.context, "Subtitles", subtitleSources, subtitleSources
+                    .map {
+                        SlideUpMenuItem(container.context, R.drawable.ic_edit, it.name, "", it, {
+                            if (selectedSubtitle == it) {
+                                selectedSubtitle = null;
+                                menu?.selectOption(subtitleSources, null);
+                            } else {
+                                selectedSubtitle = it;
+                                menu?.selectOption(subtitleSources, it);
+                            }
+                        }, false);
+                    }));
+            }
 
             menu = SlideUpMenuOverlay(container.context, container, "Download Video", null, true, items);
 
@@ -153,29 +162,12 @@ class UISlideOverlays {
                         StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                             try {
                                 val subtitleUri = subtitleToDownload.getSubtitlesURI();
-                                if (subtitleUri != null) {
-                                    var subtitles: String? = null;
-                                    if ("file" == subtitleUri.scheme) {
-                                        val inputStream = contentResolver.openInputStream(subtitleUri);
-                                        inputStream?.use { stream ->
-                                            val reader = stream.bufferedReader();
-                                            subtitles = reader.use { it.readText() };
-                                        }
-                                    } else if ("http" == subtitleUri.scheme || "https" == subtitleUri.scheme) {
-                                        val client = ManagedHttpClient();
-                                        val subtitleResponse = client.get(subtitleUri.toString());
-                                        if (!subtitleResponse.isOk) {
-                                            throw Exception("Cannot fetch subtitles from source '${subtitleUri}': ${subtitleResponse.code}");
-                                        }
-
-                                        subtitles = subtitleResponse.body?.toString()
-                                            ?: throw Exception("Subtitles are invalid '${subtitleUri}': ${subtitleResponse.code}");
-                                    } else {
-                                        throw Exception("Unsuported scheme");
-                                    }
+                                //TODO: Remove uri dependency, should be able to work with raw aswell?
+                                if (subtitleUri != null && contentResolver != null) {
+                                    val subtitlesRaw = StateDownloads.instance.downloadSubtitles(subtitleToDownload, contentResolver);
 
                                     withContext(Dispatchers.Main) {
-                                        StateDownloads.instance.download(video, selectedVideo, selectedAudio, if (subtitles != null) SubtitleRawSource(subtitleToDownload.name, subtitleToDownload.format, subtitles!!) else null);
+                                        StateDownloads.instance.download(video, selectedVideo, selectedAudio, subtitlesRaw);
                                     }
                                 } else {
                                     withContext(Dispatchers.Main) {
@@ -191,10 +183,41 @@ class UISlideOverlays {
             };
             return menu.apply { show() };
         }
-        fun showDownloadVideoOverlay(video: IPlatformVideo, container: ViewGroup) {
-            showUnknownVideoDownload("Video", container) { px, bitrate ->
-                StateDownloads.instance.download(video, px, bitrate)
+        fun showDownloadVideoOverlay(video: IPlatformVideo, container: ViewGroup, useDetails: Boolean = false) {
+            val handleUnknownDownload: ()->Unit = {
+                showUnknownVideoDownload("Video", container) { px, bitrate ->
+                    StateDownloads.instance.download(video, px, bitrate)
+                };
             };
+            if(!useDetails)
+                handleUnknownDownload();
+            else {
+                val scope = StateApp.instance.scopeOrNull;
+
+                if(scope != null) {
+                    val loader = showLoaderOverlay("Fetching video details", container);
+                    scope.launch(Dispatchers.IO) {
+                        try {
+                            val videoDetails = StatePlatform.instance.getContentDetails(video.url, false).await();
+                            if(videoDetails !is IPlatformVideoDetails)
+                                throw IllegalStateException("Not a video details");
+
+                            withContext(Dispatchers.Main) {
+                                if(showDownloadVideoOverlay(videoDetails, container, StateApp.instance.contextOrNull?.contentResolver) == null)
+                                    loader.hide(true);
+                            }
+                        }
+                        catch(ex: Throwable) {
+                            withContext(Dispatchers.Main) {
+                                UIDialogs.toast("Failed to fetch details for download");
+                                handleUnknownDownload();
+                                loader.hide(true);
+                            }
+                        }
+                    }
+                }
+                else handleUnknownDownload();
+            }
         }
         fun showDownloadPlaylistOverlay(playlist: Playlist, container: ViewGroup) {
             showUnknownVideoDownload("Video", container) { px, bitrate ->
@@ -269,6 +292,18 @@ class UISlideOverlays {
             menu.show();
         }
 
+        fun showLoaderOverlay(text: String, container: ViewGroup): SlideUpMenuOverlay {
+            val dp70 = 70.dp(container.context.resources);
+            val dp15 = 15.dp(container.context.resources);
+            val overlay = SlideUpMenuOverlay(container.context, container, text, null, true, listOf(
+                Loader(container.context, true, dp70).apply {
+                    this.setPadding(0, dp15, 0, dp15);
+                }
+            ), true);
+            overlay.show();
+            return overlay;
+        }
+
         fun showVideoOptionsOverlay(video: IPlatformVideo, container: ViewGroup, onVideoHidden: (()->Unit)? = null): SlideUpMenuOverlay {
             val items = arrayListOf<View>();
             val lastUpdated = StatePlaylists.instance.getLastUpdatedPlaylist();
@@ -291,7 +326,7 @@ class UISlideOverlays {
                 SlideUpMenuItem(container.context, R.drawable.ic_visibility_off, "Hide", "Hide from Home", "hide",
                     { StateMeta.instance.addHiddenVideo(video.url); onVideoHidden?.invoke() }),
                 SlideUpMenuItem(container.context, R.drawable.ic_download, "Download", "Download the video", "download",
-                    { showDownloadVideoOverlay(video, container); }, false)
+                    { showDownloadVideoOverlay(video, container, true); }, false)
             ))
             items.add(
                 SlideUpMenuGroup(container.context, "Add To", "addto",
@@ -344,7 +379,7 @@ class UISlideOverlays {
                     SlideUpMenuItem(container.context, R.drawable.ic_watchlist_add, StatePlayer.TYPE_WATCHLATER, "${watchLater.size} videos", "watch later",
                         { StatePlaylists.instance.addToWatchLater(SerializedPlatformVideo.fromVideo(video)); }),
                     SlideUpMenuItem(container.context, R.drawable.ic_download, "Download", "Download the video", "download",
-                        { showDownloadVideoOverlay(video, container); }, false))
+                        { showDownloadVideoOverlay(video, container, true); }, false))
             );
 
             val playlistItems = arrayListOf<SlideUpMenuItem>();

app/src/main/java/com/futo/platformplayer/Utility.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.content.res.Resources
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.icu.util.Output
 import android.os.Build
 import android.os.Looper
 import android.os.OperationCanceledException
@@ -15,8 +16,12 @@ import android.view.WindowInsetsController
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import androidx.documentfile.provider.DocumentFile
 import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.api.media.IPlatformClient
+import com.futo.platformplayer.api.media.PlatformMultiClientPool
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
+import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.PlatformVideoWithTime
 import com.futo.platformplayer.others.PlatformLinkMovementMethod
@@ -51,6 +56,11 @@ fun findNonRuntimeException(ex: Throwable?): Throwable? {
         return ex;
 }
 
+fun warnIfMainThread(context: String) {
+    if(BuildConfig.DEBUG && Looper.myLooper() == Looper.getMainLooper())
+        Logger.w(V8Plugin.TAG, "JAVASCRIPT ON MAIN THREAD\nAt: ${context}\n" + Thread.currentThread().stackTrace.joinToString { it.toString() });
+}
+
 fun ensureNotMainThread() {
     if (Looper.myLooper() == Looper.getMainLooper()) {
         Logger.e("Utility", "Throwing exception because a function that should not be called on main thread, is called on main thread")
@@ -63,8 +73,20 @@ fun String.isHexColor(): Boolean {
     return _regexHexColor.matches(this);
 }
 
+fun IPlatformClient.fromPool(pool: PlatformMultiClientPool) = pool.getClientPooled(this);
+
 fun IPlatformVideo.withTimestamp(sec: Long) =  PlatformVideoWithTime(this, sec);
 
+fun DocumentFile.getInputStream(context: Context) = context.contentResolver.openInputStream(this.uri);
+fun DocumentFile.getOutputStream(context: Context) = context.contentResolver.openOutputStream(this.uri);
+fun DocumentFile.copyTo(context: Context, file: DocumentFile) = this.getInputStream(context).use { input ->
+    file.getOutputStream(context)?.use { output -> input?.copyTo(output) }
+};
+fun DocumentFile.readBytes(context: Context) = this.getInputStream(context).use { input -> input?.readBytes() };
+fun DocumentFile.writeBytes(context: Context, byteArray: ByteArray) = context.contentResolver.openOutputStream(this.uri)?.use {
+    it.write(byteArray);
+    it.flush();
+};
 
 fun loadBitmap(url: String): Bitmap {
     try {

app/src/main/java/com/futo/platformplayer/activities/AddSourceActivity.kt

@@ -42,7 +42,8 @@ class AddSourceActivity : AppCompatActivity() {
 
     private val _client = ManagedHttpClient();
 
-    private var _config : SourcePluginConfig? = null;
+    private var _config: SourcePluginConfig? = null;
+    private var _script: String? = null;
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
@@ -74,14 +75,14 @@ class AddSourceActivity : AppCompatActivity() {
         _buttonInstall = findViewById(R.id.button_install);
 
         _buttonBack.setOnClickListener {
-            onBackPressed();
+            finish();
         };
         _buttonCancel.setOnClickListener {
-            onBackPressed();
+            finish();
         }
         _buttonInstall.setOnClickListener {
             _config?.let {
-                install(_config!!);
+                install(_config!!, _script!!);
             };
         };
 
@@ -114,6 +115,7 @@ class AddSourceActivity : AppCompatActivity() {
         setLoading(true);
 
         lifecycleScope.launch(Dispatchers.IO) {
+            val config: SourcePluginConfig;
             try {
                 val configResp = _client.get(url);
                 if(!configResp.isOk)
@@ -121,33 +123,51 @@ class AddSourceActivity : AppCompatActivity() {
                 val configJson = configResp.body?.string();
                 if(configJson.isNullOrEmpty())
                     throw IllegalStateException("No response");
-                val config = SourcePluginConfig.fromJson(configJson, url);
 
-                withContext(Dispatchers.Main) {
-                    loadConfig(config);
-                }
-            }
-            catch(ex: SerializationException) {
+                config = SourcePluginConfig.fromJson(configJson, url);
+            } catch(ex: SerializationException) {
                 Logger.e(TAG, "Failed decode config", ex);
                 withContext(Dispatchers.Main) {
                     UIDialogs.showDialog(this@AddSourceActivity, R.drawable.ic_error,
                         "Invalid Config Format", null, null,
                         0, UIDialogs.Action("Ok", { finish() }, UIDialogs.ActionStyle.PRIMARY));
                 };
-            }
-            catch(ex: Exception) {
+                return@launch;
+            } catch(ex: Exception) {
                 Logger.e(TAG, "Failed fetch config", ex);
                 withContext(Dispatchers.Main) {
                     UIDialogs.showGeneralErrorDialog(this@AddSourceActivity, "Failed to fetch configuration", ex);
                 };
+                return@launch;
+            }
+
+            val script: String?
+            try {
+                val scriptResp = _client.get(config.absoluteScriptUrl);
+                if (!scriptResp.isOk)
+                    throw IllegalStateException("script not available [${scriptResp.code}]");
+                script = scriptResp.body?.string();
+                if (script.isNullOrEmpty())
+                    throw IllegalStateException("script empty");
+            } catch (ex: Exception) {
+                Logger.e(TAG, "Failed fetch script", ex);
+                withContext(Dispatchers.Main) {
+                    UIDialogs.showGeneralErrorDialog(this@AddSourceActivity, "Failed to fetch script", ex);
+                };
+                return@launch;
+            }
+
+            withContext(Dispatchers.Main) {
+                loadConfig(config, script);
             }
         };
     }
 
-    fun loadConfig(config: SourcePluginConfig) {
+    private fun loadConfig(config: SourcePluginConfig, script: String) {
         _config = config;
+        _script = script;
 
-        _sourceHeader.loadConfig(config);
+        _sourceHeader.loadConfig(config, script);
         _sourcePermissions.removeAllViews();
         _sourceWarnings.removeAllViews();
 
@@ -171,7 +191,7 @@ class AddSourceActivity : AppCompatActivity() {
 
         val pastelRed = resources.getColor(R.color.pastel_red);
 
-        for(warning in config.getWarnings())
+        for(warning in config.getWarnings(script))
             _sourceWarnings.addView(
                 SourceInfoView(this,
                 R.drawable.ic_security_pred,
@@ -182,8 +202,8 @@ class AddSourceActivity : AppCompatActivity() {
         setLoading(false);
     }
 
-    fun install(config: SourcePluginConfig) {
-        StatePlugins.instance.installPlugin(this, lifecycleScope, config) {
+    fun install(config: SourcePluginConfig, script: String) {
+        StatePlugins.instance.installPlugin(this, lifecycleScope, config, script) {
             if(it)
                 backToSources();
         }

app/src/main/java/com/futo/platformplayer/activities/AddSourceOptionsActivity.kt

@@ -1,7 +1,10 @@
 package com.futo.platformplayer.activities
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.widget.*
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import com.futo.platformplayer.*
 import com.futo.platformplayer.views.buttons.BigButton
@@ -14,6 +17,31 @@ class AddSourceOptionsActivity : AppCompatActivity() {
     lateinit var _buttonQR: BigButton;
     lateinit var _buttonURL: BigButton;
 
+    private val _qrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
+        scanResult?.let {
+            val content = it.contents
+            if (content == null) {
+                UIDialogs.toast(this, "Failed to scan QR code")
+                return@let
+            }
+
+            val url = if (content.startsWith("https://")) {
+                content
+            } else if (content.startsWith("grayjay://plugin/")) {
+                content.substring("grayjay://plugin/".length)
+            } else {
+                UIDialogs.toast(this, "Not a plugin URL")
+                return@let;
+            }
+
+            val intent = Intent(this, AddSourceActivity::class.java).apply {
+                data = Uri.parse(url);
+            };
+            startActivity(intent);
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_source_options);
@@ -37,8 +65,9 @@ class AddSourceOptionsActivity : AppCompatActivity() {
             integrator.setBeepEnabled(false)
             integrator.setBarcodeImageEnabled(true)
             integrator.setCaptureActivity(QRCaptureActivity::class.java);
-            integrator.initiateScan()
+            _qrCodeResultLauncher.launch(integrator.createScanIntent())
         }
+
         _buttonURL.onClick.subscribe {
             UIDialogs.toast(this, "Not implemented yet..");
         }

app/src/main/java/com/futo/platformplayer/activities/CaptchaActivity.kt

@@ -0,0 +1,120 @@
+package com.futo.platformplayer.activities
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.webkit.CookieManager
+import android.webkit.WebView
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
+import com.futo.platformplayer.*
+import com.futo.platformplayer.api.media.platforms.js.SourceAuth
+import com.futo.platformplayer.api.media.platforms.js.SourceCaptchaData
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginAuthConfig
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginCaptchaConfig
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.others.CaptchaWebViewClient
+import com.futo.platformplayer.others.LoginWebViewClient
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import java.io.File
+import java.lang.Exception
+import java.util.UUID
+
+class CaptchaActivity : AppCompatActivity() {
+    private lateinit var _webView: WebView;
+    private lateinit var _buttonClose: Button;
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_captcha);
+        setNavigationBarColorAndIcons();
+
+        _buttonClose = findViewById(R.id.button_close);
+        _buttonClose.setOnClickListener { finish(); };
+
+        _webView = findViewById(R.id.web_view);
+        _webView.settings.javaScriptEnabled = true;
+        CookieManager.getInstance().setAcceptCookie(true);
+
+
+        val config = if(intent.hasExtra("plugin"))
+            Json.decodeFromString<SourcePluginConfig>(intent.getStringExtra("plugin")!!);
+        else null;
+
+        val captchaConfig = if(config != null)
+            config.captcha ?: throw IllegalStateException("Plugin has no captcha support");
+        else if(intent.hasExtra("captcha"))
+            Json.decodeFromString<SourcePluginCaptchaConfig>(intent.getStringExtra("captcha")!!);
+        else throw IllegalStateException("No valid configuration?");
+        //TODO: Backwards compat removal?
+
+        val extraUrl = if (intent.hasExtra("url"))
+            intent.getStringExtra("url");
+        else null;
+
+        val extraBody = if (intent.hasExtra("body"))
+            intent.getStringExtra("body");
+        else null;
+
+        _webView.settings.userAgentString = captchaConfig.userAgent ?: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36";
+        _webView.settings.useWideViewPort = true;
+        _webView.settings.loadWithOverviewMode = true;
+
+        val webViewClient = if(config != null) CaptchaWebViewClient(config) else CaptchaWebViewClient(captchaConfig);
+        webViewClient.onCaptchaFinished.subscribe { captcha ->
+            _callback?.let {
+                _callback = null;
+                it.invoke(captcha);
+            }
+            finish();
+        };
+        _webView.settings.domStorageEnabled = true;
+        _webView.webViewClient = webViewClient;
+
+        if(captchaConfig.captchaUrl != null)
+            _webView.loadUrl(captchaConfig.captchaUrl);
+        else if(extraUrl != null && extraBody != null)
+            _webView.loadDataWithBaseURL(extraUrl, extraBody, "text/html", "utf-8", null);
+        else if(extraUrl != null)
+            _webView.loadUrl(extraUrl);
+        else throw IllegalStateException("No valid captcha info provided");
+    }
+
+    override fun finish() {
+        lifecycleScope.launch(Dispatchers.Main) {
+            _webView.loadUrl("about:blank");
+        }
+        _callback?.let {
+            _callback = null;
+            it.invoke(null);
+        }
+        super.finish();
+    }
+
+    companion object {
+        private val TAG = "CaptchaActivity";
+        private var _callback: ((SourceCaptchaData?) -> Unit)? = null;
+
+        private fun getCaptchaIntent(context: Context, config: SourcePluginConfig, url: String? = null, body: String? = null): Intent {
+            val intent = Intent(context, CaptchaActivity::class.java);
+            if(url != null)
+                intent.putExtra("url", url);
+            if(body != null)
+                intent.putExtra("body", body);
+            intent.putExtra("plugin", Json.encodeToString(config));
+            return intent;
+        }
+
+        fun showCaptcha(context: Context, config: SourcePluginConfig, url: String? = null, body: String? = null, callback: ((SourceCaptchaData?) -> Unit)? = null) {
+            _callback = callback;
+            context.startActivity(getCaptchaIntent(context, config, url, body));
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/activities/ExceptionActivity.kt

@@ -1,6 +1,7 @@
 package com.futo.platformplayer.activities
 
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -40,7 +41,8 @@ class ExceptionActivity : AppCompatActivity() {
         val context = intent.getStringExtra(EXTRA_CONTEXT) ?: "Unknown Context";
         val stack = intent.getStringExtra(EXTRA_STACK) ?: "Something went wrong... missing stack trace?";
 
-        val exceptionString = "Version information (version_name = ${BuildConfig.VERSION_NAME}, version_code = ${BuildConfig.VERSION_CODE}, flavor = ${BuildConfig.FLAVOR}, build_type = ${BuildConfig.BUILD_TYPE})\n\n" +
+        val exceptionString = "Version information (version_name = ${BuildConfig.VERSION_NAME}, version_code = ${BuildConfig.VERSION_CODE}, flavor = ${BuildConfig.FLAVOR}, build_type = ${BuildConfig.BUILD_TYPE})\n" +
+                "Device information (brand= ${Build.BRAND}, manufacturer = ${Build.MANUFACTURER}, device = ${Build.DEVICE}, version-sdk = ${Build.VERSION.SDK_INT}, version-os = ${Build.VERSION.BASE_OS})\n\n" +
                 Logging.buildLogString(LogLevel.ERROR, TAG, "Uncaught exception (\"$context\"): $stack");
         try {
             val file = File(filesDir, "log.txt");

app/src/main/java/com/futo/platformplayer/activities/IWithResultLauncher.kt

@@ -0,0 +1,9 @@
+package com.futo.platformplayer.activities
+
+import android.content.Intent
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+
+interface IWithResultLauncher {
+    fun launchForResult(intent: Intent, code: Int, handler: (ActivityResult)->Unit);
+}

app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt

@@ -3,7 +3,9 @@ package com.futo.platformplayer.activities
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.webkit.ConsoleMessage
 import android.webkit.CookieManager
+import android.webkit.WebChromeClient
 import android.webkit.WebView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
@@ -68,9 +70,15 @@ class LoginActivity : AppCompatActivity() {
                 view?.evaluateJavascript("setTimeout(()=> document.querySelector(\"${authConfig.loginButton}\")?.click(), 1000)", {});
             }
         }
-        //TODO: Required for some...TBD what to do with it. Clear on finish?
         _webView.settings.domStorageEnabled = true;
 
+        /*
+        _webView.webChromeClient = object: WebChromeClient() {
+            override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
+                Logger.w(TAG, "Login Console: " + consoleMessage?.message());
+                return super.onConsoleMessage(consoleMessage);
+            }
+        }*/
         _webView.webViewClient = webViewClient;
         _webView.loadUrl(authConfig.loginUrl);
     }

app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt

@@ -10,6 +10,9 @@ import android.os.Bundle
 import android.util.TypedValue
 import android.view.View
 import android.widget.FrameLayout
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.view.WindowCompat
@@ -24,6 +27,7 @@ import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.channels.SerializedChannel
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.constructs.Event3
 import com.futo.platformplayer.fragment.mainactivity.bottombar.MenuBottomBarFragment
 import com.futo.platformplayer.fragment.mainactivity.main.*
 import com.futo.platformplayer.fragment.mainactivity.topbar.AddTopBarFragment
@@ -48,7 +52,7 @@ import java.io.StringWriter
 import java.lang.reflect.InvocationTargetException
 import java.util.*
 
-class MainActivity : AppCompatActivity {
+class MainActivity : AppCompatActivity, IWithResultLauncher {
 
     //TODO: Move to dimensions
     private val HEIGHT_MENU_DP = 48f;
@@ -364,6 +368,7 @@ class MainActivity : AppCompatActivity {
         //startActivity(Intent(this, TestActivity::class.java));
     }
 
+
     /*
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -387,7 +392,7 @@ class MainActivity : AppCompatActivity {
 
     override fun onResume() {
         super.onResume();
-        Logger.i(TAG, "onResume")
+        Logger.v(TAG, "onResume")
 
         val curOrientation = _orientationManager.orientation;
 
@@ -403,13 +408,10 @@ class MainActivity : AppCompatActivity {
         val videoToOpen = StateSaved.instance.videoToOpen;
 
         if (_wasStopped) {
-            Logger.i(TAG, "_wasStopped is true");
-            Logger.i(TAG, "set _wasStopped = false");
             _wasStopped = false;
 
-            Logger.i(TAG, "onResume videoToOpen=$videoToOpen");
-
             if (videoToOpen != null && _fragVideoDetail.state == VideoDetailFragment.State.CLOSED) {
+                Logger.i(TAG, "onResume videoToOpen=$videoToOpen");
                 if (StatePlatform.instance.hasEnabledVideoClient(videoToOpen.url)) {
                     navigate(_fragVideoDetail, UrlVideoWithTime(videoToOpen.url, videoToOpen.timeSeconds, false));
                     _fragVideoDetail.maximizeVideoDetail(true);
@@ -422,13 +424,13 @@ class MainActivity : AppCompatActivity {
 
     override fun onPause() {
         super.onPause();
-        Logger.i(TAG, "onPause")
+        Logger.v(TAG, "onPause")
         _isVisible = false;
     }
 
     override fun onStop() {
         super.onStop()
-        Logger.i(TAG, "_wasStopped = true");
+        Logger.v(TAG, "_wasStopped = true");
         _wasStopped = true;
     }
 
@@ -605,6 +607,7 @@ class MainActivity : AppCompatActivity {
                 return;
             };
         };
+
         val name = when(type) {
             "Playlist" -> recon.split("\n").filter { !it.startsWith(ManagedStore.RECONSTRUCTION_HEADER_OPERATOR) }.firstOrNull() ?: type;
             else -> type
@@ -717,22 +720,20 @@ class MainActivity : AppCompatActivity {
             }
             _fragVideoDetail.onOrientationChanged(OrientationManager.Orientation.PORTRAIT);
         }
-
-        Logger.i(TAG, "onRestart5");
     }
 
     override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);
 
         val isStop: Boolean = lifecycle.currentState == Lifecycle.State.CREATED;
-        Logger.i(TAG, "onPictureInPictureModeChanged isInPictureInPictureMode=$isInPictureInPictureMode isStop=$isStop")
+        Logger.v(TAG, "onPictureInPictureModeChanged isInPictureInPictureMode=$isInPictureInPictureMode isStop=$isStop")
         _fragVideoDetail?.onPictureInPictureModeChanged(isInPictureInPictureMode, isStop, newConfig);
-        Logger.i(TAG, "onPictureInPictureModeChanged Ready");
+        Logger.v(TAG, "onPictureInPictureModeChanged Ready");
     }
 
     override fun onDestroy() {
         super.onDestroy();
-        Logger.i(TAG, "onDestroy")
+        Logger.v(TAG, "onDestroy")
 
         _orientationManager.disable();
 
@@ -892,6 +893,28 @@ class MainActivity : AppCompatActivity {
         _fragContainerMain.setPadding(0,0,0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, paddingBottom, resources.displayMetrics).toInt());
     }
 
+
+
+    //TODO: Only calls last handler due to missing request codes on ActivityResultLaunchers.
+    private var resultLauncherMap =  mutableMapOf<Int, (ActivityResult)->Unit>();
+    private var requestCode: Int? = -1;
+    private val resultLauncher: ActivityResultLauncher<Intent> = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()) {
+            result: ActivityResult ->
+        val handler = synchronized(resultLauncherMap) {
+            resultLauncherMap.remove(requestCode);
+        }
+        if(handler != null)
+            handler(result);
+    };
+    override fun launchForResult(intent: Intent, code: Int, handler: (ActivityResult)->Unit) {
+        synchronized(resultLauncherMap) {
+            resultLauncherMap[code] = handler;
+        }
+        requestCode = code;
+        resultLauncher.launch(intent);
+    }
+
     companion object {
         private val TAG = "MainActivity"
 

app/src/main/java/com/futo/platformplayer/activities/PolycentricImportProfileActivity.kt

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.LinearLayout
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
@@ -14,6 +15,7 @@ import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.polycentric.core.*
 import com.google.zxing.integration.android.IntentIntegrator
+import com.journeyapps.barcodescanner.CaptureActivity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -27,6 +29,16 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
     private lateinit var _buttonImportProfile: LinearLayout;
     private lateinit var _editProfile: EditText;
 
+    private val _qrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
+        scanResult?.let {
+            if (it.contents != null) {
+                val scannedUrl = it.contents
+                import(scannedUrl)
+            }
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_polycentric_import_profile);
@@ -45,10 +57,15 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
         };
 
         _buttonScanProfile.setOnClickListener {
-            val integrator = IntentIntegrator(this);
-            integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE);
-            integrator.setPrompt("Scan a QR code");
-            integrator.initiateScan();
+            val integrator = IntentIntegrator(this)
+            integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
+            integrator.setPrompt("Scan a QR code")
+            integrator.setOrientationLocked(true);
+            integrator.setCameraId(0)
+            integrator.setBeepEnabled(false)
+            integrator.setBarcodeImageEnabled(true)
+            integrator.setCaptureActivity(QRCaptureActivity::class.java);
+            _qrCodeResultLauncher.launch(integrator.createScanIntent())
         };
 
         _buttonImportProfile.setOnClickListener {
@@ -66,18 +83,6 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        val result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data)
-        if (result != null) {
-            if (result.contents != null) {
-                val scannedUrl = result.contents;
-                import(scannedUrl);
-            }
-        } else {
-            super.onActivityResult(requestCode, resultCode, data)
-        }
-    }
-
     private fun import(url: String) {
         if (!url.startsWith("polycentric://")) {
             UIDialogs.toast(this, "Not a valid URL");
@@ -126,4 +131,8 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
     companion object {
         private const val TAG = "PolycentricImportProfileActivity";
     }
+
+    class QRCaptureActivity: CaptureActivity() {
+
+    }
 }

app/src/main/java/com/futo/platformplayer/activities/SettingsActivity.kt

@@ -6,15 +6,22 @@ import android.os.Bundle
 import android.view.View
 import android.widget.ImageButton
 import android.widget.LinearLayout
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.*
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.views.Loader
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.ReadOnlyTextField
 import com.google.android.material.button.MaterialButton
 
-class SettingsActivity : AppCompatActivity() {
+class SettingsActivity : AppCompatActivity(), IWithResultLauncher {
     private lateinit var _form: FieldForm;
     private lateinit var _buttonBack: ImageButton;
+    private lateinit var _loader: Loader;
 
     private lateinit var _devSets: LinearLayout;
     private lateinit var _buttonDev: MaterialButton;
@@ -30,9 +37,10 @@ class SettingsActivity : AppCompatActivity() {
         _buttonBack = findViewById(R.id.button_back);
         _buttonDev = findViewById(R.id.button_dev);
         _devSets = findViewById(R.id.dev_settings);
+        _loader = findViewById(R.id.loader);
 
-        _form.fromObject(Settings.instance);
         _form.onChanged.subscribe { field, value ->
+            Logger.i("SettingsActivity", "Setting [${field.field?.name}] changed, saving");
             _form.setObjectValues();
             Settings.instance.save();
         };
@@ -44,18 +52,28 @@ class SettingsActivity : AppCompatActivity() {
             startActivity(Intent(this, DeveloperActivity::class.java));
         }
 
-        var devCounter = 0;
-        _form.findField("code")?.assume<ReadOnlyTextField>()?.setOnClickListener {
-            devCounter++;
-            if(devCounter > 5) {
-                devCounter = 0;
-                SettingsDev.instance.developerMode = true;
-                SettingsDev.instance.save();
-                updateDevMode();
-                UIDialogs.toast(this, "You are now in developer mode");
-            }
-        };
         _lastActivity = this;
+
+        reloadSettings();
+    }
+
+    fun reloadSettings() {
+        _loader.start();
+        _form.fromObject(lifecycleScope, Settings.instance) {
+            _loader.stop();
+
+            var devCounter = 0;
+            _form.findField("code")?.assume<ReadOnlyTextField>()?.setOnClickListener {
+                devCounter++;
+                if(devCounter > 5) {
+                    devCounter = 0;
+                    SettingsDev.instance.developerMode = true;
+                    SettingsDev.instance.save();
+                    updateDevMode();
+                    UIDialogs.toast(this, "You are now in developer mode");
+                }
+            };
+        };
     }
 
     override fun onResume() {
@@ -78,6 +96,28 @@ class SettingsActivity : AppCompatActivity() {
         overridePendingTransition(R.anim.slide_lighten, R.anim.slide_out_up)
     }
 
+
+
+
+    private var resultLauncherMap =  mutableMapOf<Int, (ActivityResult)->Unit>();
+    private var requestCode: Int? = -1;
+    private val resultLauncher: ActivityResultLauncher<Intent> = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()) {
+            result: ActivityResult ->
+        val handler = synchronized(resultLauncherMap) {
+            resultLauncherMap.remove(requestCode);
+        }
+        if(handler != null)
+            handler(result);
+    };
+    override fun launchForResult(intent: Intent, code: Int, handler: (ActivityResult)->Unit) {
+        synchronized(resultLauncherMap) {
+            resultLauncherMap[code] = handler;
+        }
+        requestCode = code;
+        resultLauncher.launch(intent);
+    }
+
     companion object {
         //TODO: Temporary for solving Settings issues
         @SuppressLint("StaticFieldLeak")

app/src/main/java/com/futo/platformplayer/api/http/server/ManagedHttpServer.kt

@@ -63,7 +63,7 @@ class ManagedHttpServer(private val _requestedPort: Int = 0) {
             }
         }.start();
 
-        Logger.i(TAG, "Started ${port}. \n" + getAddresses().map { it.hostAddress }.joinToString("\n"));
+        Logger.i(TAG, "Started HTTP Server ${port}. \n" + getAddresses().map { it.hostAddress }.joinToString("\n"));
     }
     @Synchronized
     fun stop() {

app/src/main/java/com/futo/platformplayer/api/media/LiveChatManager.kt

@@ -94,7 +94,10 @@ class LiveChatManager {
                         if(_pager is JSLiveEventPager)
                             nextInterval = _pager.nextRequest.coerceAtLeast(800).toLong();
 
-                        Logger.i(TAG, "New Live Events (${newEvents.size}) [${newEvents.map { it.type.name }.joinToString(", ")}]");
+                        if(newEvents.size > 0)
+                            Logger.i(TAG, "New Live Events (${newEvents.size}) [${newEvents.map { it.type.name }.joinToString(", ")}]");
+                        else
+                            Logger.v(TAG, "No new Live Events");
 
                         _scope.launch(Dispatchers.Main) {
                             try {

app/src/main/java/com/futo/platformplayer/api/media/PlatformClientPool.kt

@@ -6,17 +6,20 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
 
 class PlatformClientPool {
     private val _parent: JSClient;
     private val _pool: HashMap<JSClient, Int> = hashMapOf();
     private var _poolCounter = 0;
+    private val _poolName: String?;
 
     var isDead: Boolean = false
         private set;
     val onDead = Event2<JSClient, PlatformClientPool>();
 
-    constructor(parentClient: IPlatformClient) {
+    constructor(parentClient: IPlatformClient, name: String? = null) {
+        _poolName = name;
         if(parentClient !is JSClient)
             throw IllegalArgumentException("Pooling only supported for JSClients right now");
         Logger.i(TAG, "Pool for ${parentClient.name} was started");
@@ -47,8 +50,13 @@ class PlatformClientPool {
             _poolCounter++;
             reserved = _pool.keys.find { !it.isBusy };
             if(reserved == null && _pool.size < capacity) {
-                Logger.i(TAG, "Started additional [${_parent.name}] client in pool (${_pool.size + 1}/${capacity})");
+                Logger.i(TAG, "Started additional [${_parent.name}] client in pool [${_poolName}] (${_pool.size + 1}/${capacity})");
                 reserved = _parent.getCopy();
+
+                reserved?.onCaptchaException?.subscribe { client, ex ->
+                    StateApp.instance.handleCaptchaException(client, ex);
+                };
+
                 reserved?.initialize();
                 _pool[reserved!!] = _poolCounter;
             }

app/src/main/java/com/futo/platformplayer/api/media/PlatformID.kt

@@ -6,6 +6,7 @@ import com.futo.platformplayer.getOrDefault
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.getOrThrowNullable
 import com.futo.polycentric.core.combineHashCodes
+import okhttp3.internal.platform.Platform
 
 @kotlinx.serialization.Serializable
 class PlatformID {
@@ -40,6 +41,8 @@ class PlatformID {
     }
 
     companion object {
+        val NONE = PlatformID("Unknown", null);
+
         fun fromV8(config: SourcePluginConfig, value: V8ValueObject): PlatformID {
             val contextName = "PlatformID";
             return PlatformID(
@@ -49,5 +52,9 @@ class PlatformID {
                 value.getOrDefault(config, "claimType", contextName, 0) ?: 0,
                 value.getOrDefault(config, "claimFieldType", contextName, -1) ?: -1);
         }
+
+        fun asUrlID(url: String): PlatformID {
+            return PlatformID("URL", url, null);
+        }
     }
 }

app/src/main/java/com/futo/platformplayer/api/media/PlatformMultiClientPool.kt

@@ -0,0 +1,40 @@
+package com.futo.platformplayer.api.media
+
+class PlatformMultiClientPool {
+    private val _name: String;
+    private val _maxCap: Int;
+    private val _clientPools: HashMap<IPlatformClient, PlatformClientPool> = hashMapOf();
+
+    private var _isFake = false;
+
+    constructor(name: String, maxCap: Int = -1) {
+        _name = name;
+        _maxCap = if(maxCap > 0)
+            maxCap
+        else 99;
+    }
+
+    fun getClientPooled(parentClient: IPlatformClient, capacity: Int = _maxCap): IPlatformClient {
+        if(_isFake)
+            return parentClient;
+        val pool = synchronized(_clientPools) {
+            if(!_clientPools.containsKey(parentClient))
+                _clientPools[parentClient] = PlatformClientPool(parentClient, _name).apply {
+                    this.onDead.subscribe { client, pool ->
+                        synchronized(_clientPools) {
+                            if(_clientPools[parentClient] == pool)
+                                _clientPools.remove(parentClient);
+                        }
+                    }
+                }
+            _clientPools[parentClient]!!;
+        };
+        return pool.getClient(capacity.coerceAtMost(_maxCap));
+    }
+
+    //Allows for testing disabling pooling without changing callers
+    fun asFake(): PlatformMultiClientPool {
+        _isFake = true;
+        return this;
+    }
+}

app/src/main/java/com/futo/platformplayer/api/media/models/ResultCapabilities.kt

@@ -27,6 +27,7 @@ class ResultCapabilities(
         const val TYPE_VIDEOS = "VIDEOS";
         const val TYPE_STREAMS = "STREAMS";
         const val TYPE_LIVE = "LIVE";
+        const val TYPE_POSTS = "POSTS";
         const val TYPE_MIXED = "MIXED";
 
         const val ORDER_CHONOLOGICAL = "CHRONOLOGICAL";

app/src/main/java/com/futo/platformplayer/api/media/models/comments/PolycentricPlatformComment.kt

@@ -39,4 +39,8 @@ class PolycentricPlatformComment : IPlatformComment {
     fun cloneWithUpdatedReplyCount(replyCount: Int?): PolycentricPlatformComment {
         return PolycentricPlatformComment(contextUrl, author, message, rating, date, reference, replyCount);
     }
+
+    companion object {
+        val MAX_COMMENT_SIZE = 2000
+    }
 }

app/src/main/java/com/futo/platformplayer/api/media/models/contents/PlatformContentPlaceholder.kt

@@ -4,7 +4,7 @@ import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import java.time.OffsetDateTime
 
-class PlatformContentPlaceholder(pluginId: String): IPlatformContent {
+class PlatformContentPlaceholder(pluginId: String, exception: Throwable? = null): IPlatformContent {
     override val contentType: ContentType = ContentType.PLACEHOLDER;
     override val id: PlatformID = PlatformID("", null, pluginId);
     override val name: String = "";
@@ -12,4 +12,5 @@ class PlatformContentPlaceholder(pluginId: String): IPlatformContent {
     override val shareUrl: String = "";
     override val datetime: OffsetDateTime? = null;
     override val author: PlatformAuthorLink = PlatformAuthorLink(PlatformID("", pluginId), "", "", null, null);
+    val error: Throwable? = exception
 }

app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformNestedContent.kt

@@ -30,7 +30,7 @@ open class SerializedPlatformNestedContent(
     override val contentProvider: String?,
     override val contentThumbnails: Thumbnails
 ) : IPlatformNestedContent, SerializedPlatformContent {
-    final override val contentType: ContentType get() = ContentType.MEDIA;
+    final override val contentType: ContentType get() = ContentType.NESTED_VIDEO;
 
     override val contentPlugin: String? = StatePlatform.instance.getContentClientOrNull(contentUrl)?.id;
     override val contentSupported: Boolean get() = contentPlugin != null;

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/DevJSClient.kt

@@ -15,29 +15,36 @@ class DevJSClient : JSClient {
 
     private val _devScript: String;
     private var _auth: SourceAuth? = null;
+    private var _captcha: SourceCaptchaData? = null;
 
     val devID: String;
 
-    constructor(context: Context, config: SourcePluginConfig, script: String, auth: SourceAuth? = null, devID: String? = null): super(context, SourcePluginDescriptor(config, auth?.toEncrypted(), listOf("DEV")), null, script) {
+    constructor(context: Context, config: SourcePluginConfig, script: String, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, devID: String? = null): super(context, SourcePluginDescriptor(config, auth?.toEncrypted(), captcha?.toEncrypted(), listOf("DEV")), null, script) {
         _devScript = script;
         _auth = auth;
+        _captcha = captcha;
         this.devID = devID ?: UUID.randomUUID().toString().substring(0, 5);
     }
-    constructor(context: Context, descriptor: SourcePluginDescriptor, script: String, auth: SourceAuth? = null, savedState: String? = null, devID: String? = null): super(context, descriptor, savedState, script) {
+    //TODO: Misisng auth/captcha pass on purpose?
+    constructor(context: Context, descriptor: SourcePluginDescriptor, script: String, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, savedState: String? = null, devID: String? = null): super(context, descriptor, savedState, script) {
         _devScript = script;
         _auth = auth;
+        _captcha = captcha;
         this.devID = devID ?: UUID.randomUUID().toString().substring(0, 5);
     }
 
+    fun setCaptcha(captcha: SourceCaptchaData? = null) {
+        _captcha = captcha;
+    }
     fun setAuth(auth: SourceAuth? = null) {
         _auth = auth;
     }
     fun recreate(context: Context): DevJSClient {
-        return DevJSClient(context, config, _devScript, _auth, devID);
+        return DevJSClient(context, config, _devScript, _auth, _captcha, devID);
     }
 
     override fun getCopy(): JSClient {
-        return DevJSClient(_context, descriptor, _script, _auth, saveState(), devID);
+        return DevJSClient(_context, descriptor, _script, _auth, _captcha, saveState(), devID);
     }
 
     override fun initialize() {

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/JSClient.kt

@@ -25,7 +25,11 @@ import com.futo.platformplayer.api.media.platforms.js.internal.*
 import com.futo.platformplayer.api.media.platforms.js.models.*
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.engine.V8Plugin
+import com.futo.platformplayer.engine.exceptions.PluginEngineException
+import com.futo.platformplayer.engine.exceptions.PluginEngineStoppedException
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.engine.exceptions.ScriptValidationException
 import com.futo.platformplayer.logging.Logger
@@ -59,6 +63,7 @@ open class JSClient : IPlatformClient {
     private var _enabled: Boolean = false;
 
     private val _auth: SourceAuth?;
+    private val _captcha: SourceCaptchaData?;
 
     private val _injectedSaveState: String?;
 
@@ -85,6 +90,7 @@ open class JSClient : IPlatformClient {
     val enableInHome get() = descriptor.appSettings.tabEnabled.enableHome ?: true
 
     val onDisabled = Event1<JSClient>();
+    val onCaptchaException = Event2<JSClient, ScriptCaptchaRequiredException>();
 
     constructor(context: Context, descriptor: SourcePluginDescriptor, saveState: String? = null) {
         this._context = context;
@@ -93,10 +99,11 @@ open class JSClient : IPlatformClient {
         this.descriptor = descriptor;
         _injectedSaveState = saveState;
         _auth = descriptor.getAuth();
+        _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
-        _client = JSHttpClient(this);
-        _clientAuth = JSHttpClient(this, _auth);
+        _client = JSHttpClient(this, null, _captcha);
+        _clientAuth = JSHttpClient(this, _auth, _captcha);
         _plugin = V8Plugin(context, descriptor.config, null, _client, _clientAuth);
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");
@@ -108,6 +115,11 @@ open class JSClient : IPlatformClient {
         }
         else
             throw IllegalStateException("Script for plugin [${descriptor.config.name}] was not available");
+
+        _plugin.onScriptException.subscribe {
+            if(it is ScriptCaptchaRequiredException)
+                onCaptchaException.emit(this, it);
+        };
     }
     constructor(context: Context, descriptor: SourcePluginDescriptor, saveState: String?, script: String) {
         this._context = context;
@@ -116,15 +128,21 @@ open class JSClient : IPlatformClient {
         this.descriptor = descriptor;
         _injectedSaveState = saveState;
         _auth = descriptor.getAuth();
+        _captcha = descriptor.getCaptchaData();
         flags = descriptor.flags.toTypedArray();
 
-        _client = JSHttpClient(this);
-        _clientAuth = JSHttpClient(this, _auth);
+        _client = JSHttpClient(this, null, _captcha);
+        _clientAuth = JSHttpClient(this, _auth, _captcha);
         _plugin = V8Plugin(context, descriptor.config, script, _client, _clientAuth);
         _plugin.withDependency(context, "scripts/polyfil.js");
         _plugin.withDependency(context, "scripts/source.js");
         _plugin.withScript(script);
         _script = script;
+
+        _plugin.onScriptException.subscribe {
+            if(it is ScriptCaptchaRequiredException)
+                onCaptchaException.emit(this, it);
+        };
     }
 
     open fun getCopy(): JSClient {
@@ -561,11 +579,13 @@ open class JSClient : IPlatformClient {
     }
 
     private fun announcePluginUnhandledException(method: String, ex: Throwable) {
+        if(ex is PluginEngineException)
+            return;
         try {
             StateAnnouncement.instance.registerAnnouncement("PluginUnhandled_${config.id}_${method}",
                 "Plugin ${config.name} encountered an error in [${method}]",
                 "${ex.message}\nPlease contact the plugin developer",
-                AnnouncementType.RECURRING,
+                AnnouncementType.SESSION_RECURRING,
                 OffsetDateTime.now());
         }
         catch(_: Throwable) {}

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourceCaptchaData.kt

@@ -0,0 +1,49 @@
+package com.futo.platformplayer.api.media.platforms.js
+
+import com.futo.platformplayer.encryption.EncryptionProvider
+import com.futo.platformplayer.logging.Logger
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+
+data class SourceCaptchaData(val cookieMap: HashMap<String, HashMap<String, String>>? = null, val headers: Map<String, Map<String, String>> = mapOf()) {
+    override fun toString(): String {
+        return "(headers: '$headers', cookieString: '$cookieMap')";
+    }
+
+    fun toEncrypted(): String{
+        return EncryptionProvider.instance.encrypt(serialize());
+    }
+
+    private fun serialize(): String {
+        return Json.encodeToString(SerializedCaptchaData(cookieMap, headers));
+    }
+
+    companion object {
+        val TAG = "SourceAuth";
+
+        fun fromEncrypted(encrypted: String?): SourceCaptchaData? {
+            if(encrypted == null)
+                return null;
+
+            val decrypted = EncryptionProvider.instance.decrypt(encrypted);
+            try {
+                return deserialize(decrypted);
+            }
+            catch(ex: Throwable) {
+                Logger.e(TAG, "Failed to deserialize authentication", ex);
+                return null;
+            }
+        }
+
+        fun deserialize(str: String): SourceCaptchaData {
+            val data = Json.decodeFromString<SerializedCaptchaData>(str);
+            return SourceCaptchaData(data.cookieMap, data.headers);
+        }
+    }
+
+    @Serializable
+    data class SerializedCaptchaData(val cookieMap: HashMap<String, HashMap<String, String>>?,
+                              val headers: Map<String, Map<String, String>> = mapOf())
+}

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginCaptchaConfig.kt

@@ -0,0 +1,12 @@
+package com.futo.platformplayer.api.media.platforms.js
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+class SourcePluginCaptchaConfig(
+    val captchaUrl: String? = null,
+    val completionUrl: String? = null,
+    val cookiesToFind: List<String>? = null,
+    val userAgent: String? = null,
+    val cookiesExclOthers: Boolean = true
+)

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginConfig.kt

@@ -4,6 +4,7 @@ import android.net.Uri
 import com.futo.platformplayer.SignatureProvider
 import com.futo.platformplayer.api.media.Serializer
 import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.states.StatePlugins
 import kotlinx.serialization.decodeFromString
 import java.net.URL
 import java.util.*
@@ -34,11 +35,13 @@ class SourcePluginConfig(
 
     val settings: List<Setting> = listOf(),
 
+    var captcha: SourcePluginCaptchaConfig? = null,
     val authentication: SourcePluginAuthConfig? = null,
     var sourceUrl: String? = null,
     val constants: HashMap<String, String> = hashMapOf(),
 
     //TODO: These should be vals...but prob for serialization reasons cannot be changed.
+    var subscriptionRateLimit: Int? = null,
     var enableInSearch: Boolean = true,
     var enableInHome: Boolean = true,
     var supportedClaimTypes: List<Int> = listOf()
@@ -78,6 +81,15 @@ class SourcePluginConfig(
     fun getWarnings(scriptToCheck: String? = null) : List<Pair<String,String>> {
         val list = mutableListOf<Pair<String,String>>();
 
+        val currentlyInstalledPlugin = StatePlugins.instance.getPlugin(id);
+        if (currentlyInstalledPlugin != null) {
+            if (currentlyInstalledPlugin.config.scriptPublicKey != scriptPublicKey) {
+                list.add(Pair(
+                    "Different Author",
+                    "This plugin was signed by a different author. Please ensure that this is correct and that the plugin was not provided by a malicious actor."));
+            }
+        }
+
         if(scriptPublicKey.isNullOrEmpty() || scriptSignature.isNullOrEmpty())
             list.add(Pair(
                 "Missing Signature",

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginDescriptor.kt

@@ -13,22 +13,28 @@ class SourcePluginDescriptor {
 
     var appSettings: AppPluginSettings = AppPluginSettings();
 
-    var authEncrypted: String?
+    var authEncrypted: String? = null
+        private set;
+    var captchaEncrypted: String? = null
         private set;
 
     val flags: List<String>;
 
     @kotlinx.serialization.Transient
     val onAuthChanged = Event0();
+    @kotlinx.serialization.Transient
+    val onCaptchaChanged = Event0();
 
-    constructor(config :SourcePluginConfig, authEncrypted: String? = null) {
+    constructor(config :SourcePluginConfig, authEncrypted: String? = null, captchaEncrypted: String? = null) {
         this.config = config;
         this.authEncrypted = authEncrypted;
+        this.captchaEncrypted = captchaEncrypted;
         this.flags = listOf();
     }
-    constructor(config :SourcePluginConfig, authEncrypted: String? = null, flags: List<String>) {
+    constructor(config :SourcePluginConfig, authEncrypted: String? = null, captchaEncrypted: String? = null, flags: List<String>) {
         this.config = config;
         this.authEncrypted = authEncrypted;
+        this.captchaEncrypted = captchaEncrypted;
         this.flags = flags;
     }
 
@@ -41,6 +47,13 @@ class SourcePluginDescriptor {
         return map;
     }
 
+    fun updateCaptcha(captcha: SourceCaptchaData?) {
+        captchaEncrypted = captcha?.toEncrypted();
+        onCaptchaChanged.emit();
+    }
+    fun getCaptchaData(): SourceCaptchaData? {
+        return SourceCaptchaData.fromEncrypted(captchaEncrypted);
+    }
 
     fun updateAuth(str: SourceAuth?) {
         authEncrypted = str?.toEncrypted();

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/internal/JSHttpClient.kt

@@ -5,65 +5,72 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourceAuth
+import com.futo.platformplayer.api.media.platforms.js.SourceCaptchaData
 import com.futo.platformplayer.matchesDomain
 
 class JSHttpClient : ManagedHttpClient {
     private val _jsClient: JSClient?;
     private val _auth: SourceAuth?;
+    private val _captcha: SourceCaptchaData?;
 
     var doUpdateCookies: Boolean = true;
     var doApplyCookies: Boolean = true;
     var doAllowNewCookies: Boolean = true;
     val isLoggedIn: Boolean get() = _auth != null;
 
-    private var _currentCookieMap: HashMap<String, HashMap<String, String>>?;
+    private var _currentCookieMap: HashMap<String, HashMap<String, String>>;
 
-    constructor(jsClient: JSClient?, auth: SourceAuth? = null) : super() {
+    constructor(jsClient: JSClient?, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null) : super() {
         _jsClient = jsClient;
         _auth = auth;
+        _captcha = captcha;
 
+        _currentCookieMap = hashMapOf();
         if(!auth?.cookieMap.isNullOrEmpty()) {
-            _currentCookieMap = hashMapOf();
             for(domainCookies in auth!!.cookieMap!!)
-                _currentCookieMap!!.put(domainCookies.key, HashMap(domainCookies.value));
+                _currentCookieMap.put(domainCookies.key, HashMap(domainCookies.value));
         }
-        else _currentCookieMap = null;
+        if(!captcha?.cookieMap.isNullOrEmpty()) {
+            for(domainCookies in captcha!!.cookieMap!!)
+                _currentCookieMap.put(domainCookies.key, HashMap(domainCookies.value));
+        }
+
     }
 
     override fun clone(): ManagedHttpClient {
         val newClient = JSHttpClient(_jsClient, _auth);
         newClient._currentCookieMap = if(_currentCookieMap != null)
-            HashMap(_currentCookieMap!!.toList().associate { Pair(it.first, HashMap(it.second)) })
+            HashMap(_currentCookieMap.toList().associate { Pair(it.first, HashMap(it.second)) })
         else
-            null;
+            hashMapOf();
         return newClient;
     }
 
     override fun beforeRequest(request: Request) {
+        val domain = Uri.parse(request.url).host!!.lowercase();
+
         val auth = _auth;
         if (auth != null) {
-            val domain = Uri.parse(request.url).host!!.lowercase();
-
             //TODO: Possibly add doApplyHeaders
             for (header in auth.headers.filter { domain.matchesDomain(it.key) }.flatMap { it.value.entries })
                 request.headers[header.key] = header.value;
+        }
 
-            if(doApplyCookies) {
-                if (!_currentCookieMap.isNullOrEmpty()) {
-                    val cookiesToApply = hashMapOf<String, String>();
-                    synchronized(_currentCookieMap!!) {
-                        for(cookie in _currentCookieMap!!
-                                .filter { domain.matchesDomain(it.key) }
-                                .flatMap { it.value.toList() })
-                            cookiesToApply[cookie.first] = cookie.second;
-                    };
+        if(doApplyCookies) {
+            if (!_currentCookieMap.isNullOrEmpty()) {
+                val cookiesToApply = hashMapOf<String, String>();
+                synchronized(_currentCookieMap!!) {
+                    for(cookie in _currentCookieMap!!
+                        .filter { domain.matchesDomain(it.key) }
+                        .flatMap { it.value.toList() })
+                        cookiesToApply[cookie.first] = cookie.second;
+                };
 
-                    if(cookiesToApply.size > 0) {
-                        val cookieString = cookiesToApply.map { it.key + "=" + it.value }.joinToString("; ");
-                        request.headers["Cookie"] = cookieString;
-                    }
-                    //printTestCode(request.url, request.body, auth.headers, cookieString, request.headers.filter { !auth.headers.containsKey(it.key) });
+                if(cookiesToApply.size > 0) {
+                    val cookieString = cookiesToApply.map { it.key + "=" + it.value }.joinToString("; ");
+                    request.headers["Cookie"] = cookieString;
                 }
+                //printTestCode(request.url, request.body, auth.headers, cookieString, request.headers.filter { !auth.headers.containsKey(it.key) });
             }
         }
 
@@ -80,7 +87,7 @@ class JSHttpClient : ManagedHttpClient {
             val defaultCookieDomain =
                 "." + domainParts.drop(domainParts.size - 2).joinToString(".");
             for (header in resp.headers) {
-                if (_currentCookieMap != null && header.key.lowercase() == "set-cookie") {
+                if ((_auth != null || _currentCookieMap.isNotEmpty()) && header.key.lowercase() == "set-cookie") {
                     val newCookies = cookieStringToMap(header.value);
                     for (cookie in newCookies) {
                         val endIndex = cookie.value.indexOf(";");
@@ -155,4 +162,5 @@ class JSHttpClient : ManagedHttpClient {
 
         Logger.i("Testing", code);
     }
+
 }

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSContent.kt

@@ -42,7 +42,6 @@ open class JSContent : IPlatformContent, IPluginSourced {
 
         id = PlatformID.fromV8(_pluginConfig, _content.getOrThrow(config, "id", contextName));
         name = HtmlCompat.fromHtml(_content.getOrThrow<String>(config, "name", contextName).decodeUnicode(), HtmlCompat.FROM_HTML_MODE_LEGACY).toString();
-        Logger.i("JSContent", "name=$name");
         author = PlatformAuthorLink.fromV8(_pluginConfig, _content.getOrThrow(config, "author", contextName));
 
         val datetimeInt = _content.getOrThrow<Int>(config, "datetime", contextName).toLong();

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPager.kt

@@ -1,11 +1,14 @@
 package com.futo.platformplayer.api.media.platforms.js.models
 
+import android.os.Looper
 import com.caoccao.javet.values.reference.V8ValueArray
 import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.BuildConfig
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.warnIfMainThread
 
 abstract class JSPager<T> : IPager<T> {
     protected val plugin: V8Plugin;
@@ -37,6 +40,8 @@ abstract class JSPager<T> : IPager<T> {
     }
 
     override fun nextPage() {
+        warnIfMainThread("JSPager.nextPage");
+
         pager = plugin.catchScriptErrors("[${plugin.config.name}] JSPager", "pager.nextPage()") {
             pager.invoke("nextPage", arrayOf<Any>());
         };
@@ -53,6 +58,8 @@ abstract class JSPager<T> : IPager<T> {
     }
 
     override fun getResults(): List<T> {
+        warnIfMainThread("JSPager.getResults");
+
         val previousResults = _lastResults?.let {
             if(!_resultChanged)
                 return@let it;

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPlaybackTracker.kt

@@ -6,6 +6,7 @@ import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.warnIfMainThread
 
 class JSPlaybackTracker: IPlaybackTracker {
     private val _config: IV8PluginConfig;
@@ -20,6 +21,7 @@ class JSPlaybackTracker: IPlaybackTracker {
         private set;
 
     constructor(config: IV8PluginConfig, obj: V8ValueObject) {
+        warnIfMainThread("JSPlaybackTracker.constructor");
         if(!obj.has("onProgress"))
             throw ScriptImplementationException(config, "Missing onProgress on PlaybackTracker");
         if(!obj.has("nextRequest"))
@@ -31,6 +33,7 @@ class JSPlaybackTracker: IPlaybackTracker {
     }
 
     override fun onInit(seconds: Double) {
+        warnIfMainThread("JSPlaybackTracker.onInit");
         synchronized(_obj) {
             if(_hasCalledInit)
                 return;
@@ -44,6 +47,7 @@ class JSPlaybackTracker: IPlaybackTracker {
     }
 
     override fun onProgress(seconds: Double, isPlaying: Boolean) {
+        warnIfMainThread("JSPlaybackTracker.onProgress");
         synchronized(_obj) {
             if(!_hasCalledInit && _hasInit)
                 onInit(seconds);

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSHLSManifestAudioSource.kt

@@ -9,7 +9,7 @@ import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.orNull
 
-class JSHLSManifestAudioSource : IAudioUrlSource, IHLSManifestAudioSource, JSSource {
+class JSHLSManifestAudioSource : IHLSManifestAudioSource, JSSource {
     override val container : String get() = "application/vnd.apple.mpegurl";
     override val codec: String = "HLS";
     override val name : String;
@@ -31,9 +31,6 @@ class JSHLSManifestAudioSource : IAudioUrlSource, IHLSManifestAudioSource, JSSou
         priority = obj.getOrNull(config, "priority", contextName) ?: false;
     }
 
-    override fun getAudioUrl(): String {
-        return url;
-    }
 
     companion object {
         fun fromV8HLSNullable(config: IV8PluginConfig, obj: V8Value?) : JSHLSManifestAudioSource? = obj.orNull { fromV8HLS(config, it as V8ValueObject) };

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSHLSManifestSource.kt

@@ -7,7 +7,7 @@ import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 
-class JSHLSManifestSource : IVideoUrlSource, IHLSManifestSource, JSSource {
+class JSHLSManifestSource : IHLSManifestSource, JSSource {
     override val width : Int = 0;
     override val height : Int = 0;
     override val container : String get() = "application/vnd.apple.mpegurl";
@@ -28,8 +28,4 @@ class JSHLSManifestSource : IVideoUrlSource, IHLSManifestSource, JSSource {
 
         priority = obj.getOrNull(config, "priority", contextName) ?: false;
     }
-
-    override fun getVideoUrl(): String {
-        return url;
-    }
 }

app/src/main/java/com/futo/platformplayer/api/media/structures/DedupContentPager.kt

@@ -25,7 +25,8 @@ class DedupContentPager : IPager<IPlatformContent>, IAsyncPager<IPlatformContent
         _currentResults = dedupResults(_basePager.getResults());
     }
 
-    override fun hasMorePages(): Boolean = _basePager.hasMorePages();
+    override fun hasMorePages(): Boolean =
+        _basePager.hasMorePages();
     override fun nextPage() {
         _basePager.nextPage()
         _currentResults = dedupResults(_basePager.getResults());

app/src/main/java/com/futo/platformplayer/api/media/structures/MultiChronoContentPager.kt

@@ -7,7 +7,7 @@ import java.util.stream.IntStream
  * A PlatformContent MultiPager that orders the results of a page based on the datetime of a content item
  */
 class MultiChronoContentPager : MultiPager<IPlatformContent> {
-    constructor(pagers : Array<IPager<IPlatformContent>>, allowFailure: Boolean = false) : super(pagers.map { it }.toList(), allowFailure) {}
+    constructor(pagers : Array<IPager<IPlatformContent>>, allowFailure: Boolean = false, pageSize: Int = 9) : super(pagers.map { it }.toList(), allowFailure, pageSize) {}
 
     @Synchronized
     override fun selectItemIndex(options: Array<SelectionOption<IPlatformContent>>): Int {

app/src/main/java/com/futo/platformplayer/api/media/structures/MultiPager.kt

@@ -16,7 +16,7 @@ abstract class MultiPager<T> : IPager<T> {
     protected val _subSinglePagers : MutableList<SingleItemPager<T>>;
     protected val _failedPagers: ArrayList<IPager<T>> = arrayListOf();
 
-    private val _pageSize : Int = 9;
+    private var _pageSize : Int = 9;
 
     private var _didInitialize = false;
 
@@ -27,7 +27,8 @@ abstract class MultiPager<T> : IPager<T> {
 
     val totalPagers: Int get() = _pagers.size;
 
-    constructor(pagers : List<IPager<T>>, allowFailure: Boolean = false) {
+    constructor(pagers : List<IPager<T>>, allowFailure: Boolean = false, pageSize: Int = 9) {
+        this._pageSize = pageSize;
         this.allowFailure = allowFailure;
         _pagers = pagers.toMutableList();
         _subSinglePagers = _pagers.map { SingleItemPager(it) }.toMutableList();

app/src/main/java/com/futo/platformplayer/api/media/structures/MultiParallelPager.kt

@@ -137,11 +137,11 @@ abstract class MultiParallelPager<T> : IPager<T>, IAsyncPager<T> {
                 }
             }
         }
-        Logger.i(TAG, "Pager prepare in ${timeForPage}ms");
+        Logger.v(TAG, "Pager prepare in ${timeForPage}ms");
         val timeAwait = measureTimeMillis {
             _currentResults = results.map { it.await() }.mapNotNull { it };
         };
-        Logger.i(TAG, "Pager load in ${timeAwait}ms");
+        Logger.v(TAG, "Pager load in ${timeAwait}ms");
 
         _currentResultExceptions = exceptions;
         return _currentResults;

app/src/main/java/com/futo/platformplayer/api/media/structures/MultiRefreshPager.kt

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.api.media.structures
 
+import com.futo.platformplayer.api.media.models.contents.PlatformContentPlaceholder
 import com.futo.platformplayer.api.media.structures.ReusablePager.Companion.asReusable
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.logging.Logger
@@ -37,8 +38,12 @@ abstract class MultiRefreshPager<T>: IRefreshPager<T>, IPager<T> {
                 synchronized(_pending) {
                     _pending.remove(pendingPager);
                 }
-                if(error != null)
+                if(error != null) {
                     onPagerError.emit(error);
+                    val replacing = _placeHolderPagersPaired[pendingPager];
+                    if(replacing != null)
+                        updatePager(null, replacing, error);
+                }
                 else
                     updatePager(pendingPager.getCompleted());
             }
@@ -60,9 +65,17 @@ abstract class MultiRefreshPager<T>: IRefreshPager<T>, IPager<T> {
     override fun nextPage() = synchronized(_pagersReusable){ _currentPager.nextPage() };
     override fun getResults(): List<T> = synchronized(_pagersReusable){ _currentPager.getResults() };
 
-    private fun updatePager(pagerToAdd: IPager<T>?) {
-        if(pagerToAdd == null)
+    private fun updatePager(pagerToAdd: IPager<T>?, toReplacePager: IPager<T>? = null, error: Throwable? = null) {
+        if(pagerToAdd == null) {
+            if(toReplacePager != null && toReplacePager is PlaceholderPager && error != null) {
+                val pluginId = toReplacePager.placeholderFactory.invoke().id?.pluginId ?: "";
+                _currentPager = PlaceholderPager(5) {
+                    return@PlaceholderPager PlatformContentPlaceholder(pluginId, error)
+                } as IPager<T>;
+                onPagerChanged.emit(_currentPager);
+            }
             return;
+        }
         synchronized(_pagersReusable) {
             Logger.i("RefreshMultiDistributionContentPager", "Received new pager for RefreshPager")
             _pagersReusable.add(pagerToAdd.asReusable());

app/src/main/java/com/futo/platformplayer/api/media/structures/PlaceholderPager.kt

@@ -6,11 +6,11 @@ import com.futo.platformplayer.api.media.models.contents.IPlatformContent
  * A placeholder pager simply generates PlatformContent by some creator function.
  */
 class PlaceholderPager : IPager<IPlatformContent> {
-    private val _creator: ()->IPlatformContent;
+    val placeholderFactory: ()->IPlatformContent;
     private val _pageSize: Int;
 
     constructor(pageSize: Int, placeholderCreator: ()->IPlatformContent) {
-        _creator = placeholderCreator;
+        placeholderFactory = placeholderCreator;
         _pageSize = pageSize;
     }
 
@@ -18,7 +18,7 @@ class PlaceholderPager : IPager<IPlatformContent> {
     override fun getResults(): List<IPlatformContent> {
         val pages = ArrayList<IPlatformContent>();
         for(item in 1.._pageSize)
-            pages.add(_creator());
+            pages.add(placeholderFactory());
         return pages;
     }
     override fun hasMorePages(): Boolean = true;

app/src/main/java/com/futo/platformplayer/cache/ChannelContentCache.kt

@@ -111,7 +111,7 @@ class ChannelContentCache {
         init {
             val results = pager.getResults();
 
-            Logger.i(TAG, "Caching ${results.size} subscription initial results");
+            Logger.i(TAG, "Caching ${results.size} subscription initial results [${pager.hashCode()}]");
             scope.launch(Dispatchers.IO) {
                 try {
                     val newCacheItems = instance.cacheVideos(results);

app/src/main/java/com/futo/platformplayer/casting/StateCasting.kt

@@ -64,7 +64,7 @@ class StateCasting {
         }
 
         override fun serviceResolved(event: ServiceEvent) {
-            Logger.i(TAG, "ChromeCast service resolved: " + event.info);
+            Logger.v(TAG, "ChromeCast service resolved: " + event.info);
             addOrUpdateDevice(event);
         }
 

app/src/main/java/com/futo/platformplayer/constructs/BatchedTaskHandler.kt

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.constructs
 
+import android.provider.Settings.Global
 import com.futo.platformplayer.states.StateApp
 import kotlinx.coroutines.*
 
@@ -39,8 +40,7 @@ class BatchedTaskHandler<TParameter, TResult> {
 
             //Cached
             if(result != null)
-            //TODO: Replace with some kind of constant Deferred<IPlatformStreamVideo>
-                return _scope.async { result as TResult }
+                return CompletableDeferred(result as TResult);
             //Already requesting
             if(taskResult != null)
                 return taskResult as Deferred<TResult>;

app/src/main/java/com/futo/platformplayer/constructs/Event.kt

@@ -8,6 +8,10 @@ abstract class EventBase<Handler, ConditionalHandler>: IEvent {
     protected val _conditionalListeners = mutableListOf<TaggedHandler<ConditionalHandler>>();
     protected val _listeners = mutableListOf<TaggedHandler<Handler>>();
 
+    fun hasListeners(): Boolean =
+        synchronized(_listeners){_listeners.isNotEmpty()} ||
+        synchronized(_conditionalListeners){_conditionalListeners.isNotEmpty()};
+
     fun subscribeConditional(listener: ConditionalHandler) {
         synchronized(_conditionalListeners) {
             _conditionalListeners.add(TaggedHandler(listener));
@@ -65,10 +69,7 @@ abstract class EventBase<Handler, ConditionalHandler>: IEvent {
 
 class Event0() : EventBase<(()->Unit), (()->Boolean)>() {
     fun emit() : Boolean {
-        var handled: Boolean;
-        synchronized(_listeners) {
-            handled = _listeners.isNotEmpty();
-        }
+        var handled = false;
 
         synchronized(_conditionalListeners) {
             for (conditional in _conditionalListeners)
@@ -76,6 +77,7 @@ class Event0() : EventBase<(()->Unit), (()->Boolean)>() {
         }
 
         synchronized(_listeners) {
+            handled = handled || _listeners.isNotEmpty();
             for (handler in _listeners)
                 handler.handler.invoke();
         }
@@ -85,17 +87,14 @@ class Event0() : EventBase<(()->Unit), (()->Boolean)>() {
 }
 class Event1<T1>() : EventBase<((T1)->Unit), ((T1)->Boolean)>() {
     fun emit(value : T1): Boolean {
-        var handled: Boolean;
-        synchronized(_listeners) {
-            handled = _listeners.isNotEmpty();
-        }
-
+        var handled = false;
         synchronized(_conditionalListeners) {
             for (conditional in _conditionalListeners)
                 handled = handled || conditional.handler.invoke(value);
         }
 
         synchronized(_listeners) {
+            handled = handled || _listeners.isNotEmpty();
             for (handler in _listeners)
                 handler.handler.invoke(value);
         }
@@ -105,10 +104,7 @@ class Event1<T1>() : EventBase<((T1)->Unit), ((T1)->Boolean)>() {
 }
 class Event2<T1, T2>() : EventBase<((T1, T2)->Unit), ((T1, T2)->Boolean)>() {
     fun emit(value1 : T1, value2 : T2): Boolean {
-        var handled: Boolean;
-        synchronized(_listeners) {
-            handled = _listeners.isNotEmpty();
-        }
+        var handled = false;
 
         synchronized(_conditionalListeners) {
             for (conditional in _conditionalListeners)
@@ -116,6 +112,7 @@ class Event2<T1, T2>() : EventBase<((T1, T2)->Unit), ((T1, T2)->Boolean)>() {
         }
 
         synchronized(_listeners) {
+            handled = handled || _listeners.isNotEmpty();
             for (handler in _listeners)
                 handler.handler.invoke(value1, value2);
         }
@@ -126,10 +123,7 @@ class Event2<T1, T2>() : EventBase<((T1, T2)->Unit), ((T1, T2)->Boolean)>() {
 
 class Event3<T1, T2, T3>() : EventBase<((T1, T2, T3)->Unit), ((T1, T2, T3)->Boolean)>() {
     fun emit(value1 : T1, value2 : T2, value3 : T3): Boolean {
-        var handled: Boolean;
-        synchronized(_listeners) {
-            handled = _listeners.isNotEmpty();
-        }
+        var handled = false;
 
         synchronized(_conditionalListeners) {
             for (conditional in _conditionalListeners)
@@ -137,6 +131,7 @@ class Event3<T1, T2, T3>() : EventBase<((T1, T2, T3)->Unit), ((T1, T2, T3)->Bool
         }
 
         synchronized(_listeners) {
+            handled = handled || _listeners.isNotEmpty();
             for (handler in _listeners)
                 handler.handler.invoke(value1, value2, value3);
         }

app/src/main/java/com/futo/platformplayer/constructs/TaskHandler.kt

@@ -57,6 +57,7 @@ class TaskHandler<TParameter, TResult> {
     fun run(parameter: TParameter) {
         val id = ++_idGenerator;
 
+        var handled = false;
         _scope().launch(_dispatcher) {
             if (id != _idGenerator)
                 return@launch;
@@ -67,35 +68,53 @@ class TaskHandler<TParameter, TResult> {
                     return@launch;
 
                 withContext(Dispatchers.Main) {
-                    if (id != _idGenerator)
+                    if (id != _idGenerator) {
+                        handled = true;
                         return@withContext;
+                    }
 
                     try {
                         onSuccess.emit(result);
+                        handled = true;
                     }
                     catch (e: Throwable) {
                         Logger.w(TAG, "Handled exception in TaskHandler onSuccess.", e);
                         onError.emit(e, parameter);
+                        handled = true;
                     }
                 }
             }
             catch (e: Throwable) {
                 Log.i("TaskHandler", "TaskHandler.run in exception: " + e.message);
-                if (id != _idGenerator)
+                if (id != _idGenerator) {
+                    handled = true;
                     return@launch;
+                }
 
                 withContext(Dispatchers.Main) {
+                    handled = true;
                     if (id != _idGenerator)
                         return@withContext;
 
                     if (!onError.emit(e, parameter)) {
                         Logger.e(TAG, "Uncaught exception handled by TaskHandler.", e);
                     } else {
-                        Logger.w(TAG, "Handled exception in TaskHandler invoke.", e);
+                        //Logger.w(TAG, "Handled exception in TaskHandler invoke.", e); (Prevents duplicate logs)
                     }
                 }
             }
-        }
+        }/*.invokeOnCompletion { //Commented for now, because it doesn't fix the bug it was intended to fix, but might want it later anyway
+            if(!handled) {
+                if(it is CancellationException) {
+                    Logger.w(TAG, "Detected unhandled TaskHandler due to cancellation, forwarding cancellation");
+                    onError.emit(it, parameter);
+                }
+                else {
+                    //TODO: Forward exception?
+                    Logger.w(TAG, "Detected unhandled TaskHandler due to [${it}]", it);
+                }
+            }
+        }*/
     }
 
     @Synchronized

app/src/main/java/com/futo/platformplayer/debug/Stopwatch.kt

@@ -5,6 +5,16 @@ import com.google.android.exoplayer2.util.Log
 class Stopwatch {
     var startTime = System.nanoTime()
 
+    val elapsedMs: Double get() {
+        val now = System.nanoTime()
+        val diff = now - startTime
+        return diff / 1000000.0
+    }
+
+    fun reset() {
+        startTime = System.nanoTime()
+    }
+
     fun logAndNext(tag: String, message: String): Long {
         val now = System.nanoTime()
         val diff = now - startTime

app/src/main/java/com/futo/platformplayer/developer/DeveloperEndpoints.kt

@@ -416,7 +416,7 @@ class DeveloperEndpoints(private val context: Context) {
             val resp = _client.get(body.url!!, body.headers);
 
             context.respondCode(200,
-                Json.encodeToString(PackageHttp.BridgeHttpResponse(resp.code, resp.body?.string())),
+                Json.encodeToString(PackageHttp.BridgeHttpResponse(resp.url, resp.code, resp.body?.string())),
                 context.query.getOrDefault("CT", "text/plain"));
         }
         catch(ex: Exception) {

app/src/main/java/com/futo/platformplayer/dialogs/AutomaticBackupDialog.kt

@@ -11,6 +11,7 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateBackup
 import com.google.android.material.button.MaterialButton
 
@@ -58,13 +59,13 @@ class AutomaticBackupDialog(context: Context) : AlertDialog(context) {
             }
             clearFocus();
             dismiss();
+
             Logger.i(TAG, "Set AutoBackupPassword");
             Settings.instance.backup.autoBackupPassword = _editPassword.text.toString();
             Settings.instance.backup.didAskAutoBackup = true;
             Settings.instance.save();
 
             UIDialogs.toast(context, "AutoBackup enabled");
-
             try {
                 StateBackup.startAutomaticBackup(true);
             }

app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt

@@ -2,12 +2,16 @@ package com.futo.platformplayer.dialogs
 
 import android.app.AlertDialog
 import android.content.Context
+import android.graphics.Color
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import android.widget.*
 import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
@@ -32,6 +36,8 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
     private lateinit var _buttonCancel: MaterialButton;
     private lateinit var _editComment: EditText;
     private lateinit var _inputMethodManager: InputMethodManager;
+    private lateinit var _textCharacterCount: TextView;
+    private lateinit var _textCharacterCountMax: TextView;
 
     val onCommentAdded = Event1<IPlatformComment>();
 
@@ -42,6 +48,26 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
         _buttonCancel = findViewById(R.id.button_cancel);
         _buttonCreate = findViewById(R.id.button_create);
         _editComment = findViewById(R.id.edit_comment);
+        _textCharacterCount = findViewById(R.id.character_count);
+        _textCharacterCountMax = findViewById(R.id.character_count_max);
+
+        _editComment.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) = Unit
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                _textCharacterCount.text = count.toString();
+
+                if (count > PolycentricPlatformComment.MAX_COMMENT_SIZE) {
+                    _textCharacterCount.setTextColor(Color.RED);
+                    _textCharacterCountMax.setTextColor(Color.RED);
+                    _buttonCreate.alpha = 0.4f;
+                } else {
+                    _textCharacterCount.setTextColor(Color.WHITE);
+                    _textCharacterCountMax.setTextColor(Color.WHITE);
+                    _buttonCreate.alpha = 1.0f;
+                }
+            }
+        });
 
         _inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager;
 
@@ -53,11 +79,16 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol
         _buttonCreate.setOnClickListener {
             clearFocus();
 
+            if (_editComment.text.count() > PolycentricPlatformComment.MAX_COMMENT_SIZE) {
+                UIDialogs.toast(context, "Comment should be less than 5000 characters");
+                return@setOnClickListener;
+            }
+
             val comment = _editComment.text.toString();
             val processHandle = StatePolycentric.instance.processHandle!!
             val eventPointer = processHandle.post(comment, null, ref)
 
-            StateApp.instance.scopeGetter().launch(Dispatchers.IO) {
+            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                 try {
                     processHandle.fullyBackfillServers()
                 } catch (e: Throwable) {

app/src/main/java/com/futo/platformplayer/downloads/PlaylistDownloadDescriptor.kt

@@ -1,8 +1,19 @@
 package com.futo.platformplayer.downloads
 
+import com.futo.platformplayer.api.media.models.video.IPlatformVideo
+
 @kotlinx.serialization.Serializable
 data class PlaylistDownloadDescriptor(
     val id: String,
     val targetPxCount: Long?,
     val targetBitrate: Long?
-);
+) {
+    var preventDownload: MutableList<String> = arrayListOf();
+
+    fun getPreventDownloadList(): List<String> = synchronized(preventDownload){ preventDownload };
+    fun shouldDownload(video: IPlatformVideo): Boolean {
+        synchronized(preventDownload) {
+            return !preventDownload.contains(video.url);
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/downloads/VideoDownload.kt

@@ -13,12 +13,16 @@ import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideoDetails
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.exceptions.DownloadException
+import com.futo.platformplayer.hasAnySource
 import com.futo.platformplayer.helpers.FileHelper.Companion.sanitizeFileName
 import com.futo.platformplayer.helpers.VideoHelper
+import com.futo.platformplayer.isDownloadable
 import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
 import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
 import com.futo.platformplayer.toHumanBitrate
 import com.futo.platformplayer.toHumanBytesSpeed
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -27,7 +31,6 @@ import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.time.OffsetDateTime
-import java.util.concurrent.CancellationException
 import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinTask
 import java.util.concurrent.ThreadLocalRandom
@@ -147,27 +150,37 @@ class VideoDownload {
             if(original !is IPlatformVideoDetails)
                 throw IllegalStateException("Original content is not media?");
 
+            if(original.video.hasAnySource() && !original.isDownloadable()) {
+                Logger.i(TAG, "Attempted to download unsupported video [${original.name}]:${original.url}");
+                throw DownloadException("Unsupported video for downloading", false);
+            }
+
             videoDetails = SerializedPlatformVideoDetails.fromVideo(original, if (subtitleSource != null) listOf(subtitleSource!!) else listOf());
             if(videoSource == null && targetPixelCount != null) {
                 val vsource = VideoHelper.selectBestVideoSource(videoDetails!!.video, targetPixelCount!!.toInt(), arrayOf())
-                    ?: throw IllegalStateException("Could not find a valid video source for video");
-                if(vsource is IVideoUrlSource)
-                    videoSource = VideoUrlSource.fromUrlSource(vsource);
-                else
-                    throw IllegalStateException("Download video source is not a url source");
+                //    ?: throw IllegalStateException("Could not find a valid video source for video");
+                if(vsource != null) {
+                    if (vsource is IVideoUrlSource)
+                        videoSource = VideoUrlSource.fromUrlSource(vsource);
+                    else
+                        throw DownloadException("Video source is not supported for downloading (yet)", false);
+                }
             }
 
             if(audioSource == null && targetBitrate != null) {
                 val asource = VideoHelper.selectBestAudioSource(videoDetails!!.video, arrayOf(), null, targetPixelCount)
                     ?: if(videoSource != null ) null
-                    else throw IllegalStateException("Could not find a valid audio source for video");
+                    else throw DownloadException("Could not find a valid video or audio source for download")
                 if(asource == null)
                     audioSource = null;
                 else if(asource is IAudioUrlSource)
                     audioSource = AudioUrlSource.fromUrlSource(asource);
                 else
-                    throw IllegalStateException("Download audio source is not a url source");
+                    throw DownloadException("Audio source is not supported for downloading (yet)", false);
             }
+
+            if(videoSource == null && audioSource == null)
+                throw DownloadException("No valid sources found for video/audio");
         }
     }
     suspend fun download(client: ManagedHttpClient, onProgress: ((Double) -> Unit)? = null) = coroutineScope {
@@ -358,7 +371,7 @@ class VideoDownload {
             }
 
             if (isCancelled)
-                throw IllegalStateException("Cancelled");
+                throw CancellationException("Cancelled");
         } while (read > 0);
 
         lastSpeed = 0;
@@ -410,7 +423,7 @@ class VideoDownload {
             }
 
             if(isCancelled)
-                throw IllegalStateException("Cancelled");
+                throw CancellationException("Cancelled", null);
         }
         onProgress(sourceLength, totalRead, 0);
     }

app/src/main/java/com/futo/platformplayer/engine/V8Plugin.kt

@@ -18,24 +18,41 @@ import com.futo.platformplayer.engine.internal.V8Converter
 import com.futo.platformplayer.engine.packages.*
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateAssets
-import kotlinx.coroutines.*
 
 class V8Plugin {
     val config: IV8PluginConfig;
     private val _client: ManagedHttpClient;
     private val _clientAuth: ManagedHttpClient;
 
+
     val httpClient: ManagedHttpClient get() = _client;
     val httpClientAuth: ManagedHttpClient get() = _clientAuth;
 
+    private val _runtimeLock = Object();
     var _runtime : V8Runtime? = null;
 
     private val _deps : LinkedHashMap<String, String> = LinkedHashMap();
     private val _depsPackages : MutableList<V8Package> = mutableListOf();
     private var _script : String? = null;
 
+    var isStopped = true;
     val onStopped = Event1<V8Plugin>();
 
+    //TODO: Implement a more universal isBusy system for plugins + JSClient + pooling? TBD if propagation would be beneficial
+    private val _busyCounterLock = Object();
+    private var _busyCounter = 0;
+    val isBusy get() = synchronized(_busyCounterLock) { _busyCounter > 0 };
+
+    /**
+     * Called before a busy counter is about to be removed.
+     * Is primarily used to prevent additional calls to dead runtimes.
+     *
+     * Parameter is the busy count after this execution
+     */
+    val afterBusy = Event1<Int>();
+
+    val onScriptException = Event1<ScriptException>();
+
     constructor(context: Context, config: IV8PluginConfig, script: String? = null, client: ManagedHttpClient = ManagedHttpClient(), clientAuth: ManagedHttpClient = ManagedHttpClient()) {
         this._client = client;
         this._clientAuth = clientAuth;
@@ -78,7 +95,7 @@ class V8Plugin {
 
     fun start() {
         val script = _script ?: throw IllegalStateException("Attempted to start V8 without script");
-        synchronized(this) {
+        synchronized(_runtimeLock) {
             if (_runtime != null)
                 return;
 
@@ -118,32 +135,79 @@ class V8Plugin {
                 catchScriptErrors("Plugin[${config.name}]") {
                     it.getExecutor(script).executeVoid()
                 };
+                isStopped = false;
             }
         }
     }
     fun stop(){
         Logger.i(TAG, "Stopping plugin [${config.name}]");
-        synchronized(this) {
-            _runtime?.let {
-                _runtime = null;
-                if(!it.isClosed && !it.isDead)
-                    it.close();
-            };
+        isStopped = true;
+        whenNotBusy {
+            synchronized(_runtimeLock) {
+                isStopped = true;
+                _runtime?.let {
+                    _runtime = null;
+                    if(!it.isClosed && !it.isDead)
+                        it.close();
+                    Logger.i(TAG, "Stopped plugin [${config.name}]");
+                };
+            }
+            onStopped.emit(this);
         }
-        onStopped.emit(this);
     }
 
     fun execute(js: String) : V8Value {
         return executeTyped<V8Value>(js);
     }
     fun <T : V8Value> executeTyped(js: String) : T {
+        warnIfMainThread("V8Plugin.executeTyped");
+        if(isStopped)
+            throw PluginEngineStoppedException(config, "Instance is stopped", js);
+
+        synchronized(_busyCounterLock) {
+            _busyCounter++;
+        }
+
         val runtime = _runtime ?: throw IllegalStateException("JSPlugin not started yet");
-        return catchScriptErrors("Plugin[${config.name}]", js) { runtime.getExecutor(js).execute() };
+        try {
+            return catchScriptErrors("Plugin[${config.name}]", js) {
+                runtime.getExecutor(js).execute()
+            };
+        }
+        finally {
+            synchronized(_busyCounterLock) {
+                //Free busy *after* afterBusy calls are done to prevent calls on dead runtimes
+                try {
+                    afterBusy.emit(_busyCounter - 1);
+                }
+                catch(ex: Throwable) {
+                    Logger.e(TAG, "Unhandled V8Plugin.afterBusy", ex);
+                }
+                _busyCounter--;
+            }
+        }
     }
     fun executeBoolean(js: String) : Boolean? = catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueBoolean>(js).value };
     fun executeString(js: String) : String? = catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueString>(js).value };
     fun executeInteger(js: String) : Int? = catchScriptErrors("Plugin[${config.name}]") { executeTyped<V8ValueInteger>(js).value };
 
+    fun whenNotBusy(handler: (V8Plugin)->Unit) {
+        synchronized(_busyCounterLock) {
+            if(_busyCounter == 0)
+                handler(this);
+            else {
+                val tag = Object();
+                afterBusy.subscribe(tag) {
+                    if(it == 0) {
+                        Logger.w(TAG, "V8Plugin afterBusy handled");
+                        afterBusy.remove(tag);
+                        handler(this);
+                    }
+                }
+            }
+        }
+    }
+
     private fun getPackage(context: Context, packageName: String): V8Package {
         //TODO: Auto get all package types?
         return when(packageName) {
@@ -155,7 +219,13 @@ class V8Plugin {
     }
 
     fun <T : Any> catchScriptErrors(context: String, code: String? = null, handle: ()->T): T {
-        return catchScriptErrors(this.config, context, code, handle);
+        try {
+            return catchScriptErrors(this.config, context, code, handle);
+        }
+        catch(ex: ScriptException) {
+            onScriptException.emit(ex);
+            throw ex;
+        }
     }
 
     companion object {
@@ -180,7 +250,7 @@ class V8Plugin {
                 if(result is V8ValueObject) {
                     val type = result.getString("plugin_type");
                     if(type != null && type.endsWith("Exception"))
-                        Companion.throwExceptionFromV8(
+                        throwExceptionFromV8(
                             config,
                             result.getOrThrow(config, "plugin_type", "V8Plugin"),
                             result.getOrThrow(config, "message", "V8Plugin"),
@@ -197,19 +267,28 @@ class V8Plugin {
                 throw ScriptCompilationException(config, "Compilation: ${scriptEx.message}\n(${scriptEx.scriptingError.lineNumber})[${scriptEx.scriptingError.startColumn}-${scriptEx.scriptingError.endColumn}]: ${scriptEx.scriptingError.sourceLine}", null, codeStripped);
             }
             catch(executeEx: JavetExecutionException) {
-                val exMessage = extractJSExceptionMessage(executeEx);
+                if(executeEx.scriptingError?.context?.containsKey("plugin_type") == true) {
+                    val pluginType = executeEx.scriptingError.context["plugin_type"].toString();
 
-                if(executeEx.scriptingError?.context?.containsKey("plugin_type") == true)
+                    //Captcha
+                    if (pluginType == "CaptchaRequiredException") {
+                        throw ScriptCaptchaRequiredException(config,
+                            executeEx.scriptingError.context["url"]?.toString(),
+                            executeEx.scriptingError.context["body"]?.toString(),
+                            executeEx, executeEx.scriptingError?.stack, codeStripped);
+                    }
+
+                    //Others
                     throwExceptionFromV8(
                         config,
-                        executeEx.scriptingError.context["plugin_type"].toString(),
-                        (exMessage ?: ""),
+                        pluginType,
+                        (extractJSExceptionMessage(executeEx) ?: ""),
                         executeEx,
                         executeEx.scriptingError?.stack,
                         codeStripped
                     );
-
-                throw ScriptExecutionException(config, "${exMessage}", null, executeEx.scriptingError?.stack, codeStripped);
+                }
+                throw ScriptExecutionException(config, extractJSExceptionMessage(executeEx) ?: "", null, executeEx.scriptingError?.stack, codeStripped);
             }
             catch(ex: Exception) {
                 throw ex;

app/src/main/java/com/futo/platformplayer/engine/exceptions/PluginEngineException.kt

@@ -0,0 +1,11 @@
+package com.futo.platformplayer.engine.exceptions
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.getOrThrow
+import java.lang.Exception
+
+
+open class PluginEngineException(config: IV8PluginConfig, error: String, code: String? = null) : PluginException(config, error, null, code) {
+
+}

app/src/main/java/com/futo/platformplayer/engine/exceptions/PluginEngineStoppedException.kt

@@ -0,0 +1,11 @@
+package com.futo.platformplayer.engine.exceptions
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.getOrThrow
+import java.lang.Exception
+
+
+class PluginEngineStoppedException(config: IV8PluginConfig, error: String, code: String? = null) : PluginEngineException(config, error, code) {
+
+}

app/src/main/java/com/futo/platformplayer/engine/exceptions/ScriptCaptchaRequiredException.kt

@@ -0,0 +1,18 @@
+package com.futo.platformplayer.engine.exceptions
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.engine.IV8PluginConfig
+import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.getOrThrow
+
+class ScriptCaptchaRequiredException(config: IV8PluginConfig, val url: String?, val body: String?, ex: Exception? = null, stack: String? = null, code: String? = null) : ScriptException(config, "Captcha required", ex, stack, code) {
+
+    companion object {
+        fun fromV8(config: IV8PluginConfig, obj: V8ValueObject) : ScriptException {
+            val contextName = "ScriptCaptchaRequiredException";
+            return ScriptCaptchaRequiredException(config,
+                obj.getOrDefault<String>(config, "url", contextName, null),
+                obj.getOrDefault<String>(config, "body", contextName, null));
+        }
+    }
+}

app/src/main/java/com/futo/platformplayer/engine/packages/PackageHttp.kt

@@ -108,11 +108,12 @@ class PackageHttp: V8Package {
     }
 
     @kotlinx.serialization.Serializable
-    class BridgeHttpResponse(val code: Int, val body: String?, val headers: Map<String, List<String>>? = null) : IV8Convertable {
+    class BridgeHttpResponse(val url: String, val code: Int, val body: String?, val headers: Map<String, List<String>>? = null) : IV8Convertable {
         val isOk = code >= 200 && code < 300;
 
         override fun toV8(runtime: V8Runtime): V8Value? {
             val obj = runtime.createV8ValueObject();
+            obj.set("url", url);
             obj.set("code", code);
             obj.set("body", body);
             obj.set("headers", headers);
@@ -227,7 +228,7 @@ class PackageHttp: V8Package {
                     val resp = client.requestMethod(method, url, headers);
                     val responseBody = resp.body?.string();
                     logResponse(method, url, resp.code, resp.headers, responseBody);
-                    return@catchHttp BridgeHttpResponse(resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
+                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
                 }
             };
         }
@@ -241,7 +242,7 @@ class PackageHttp: V8Package {
                     val resp = client.requestMethod(method, url, body, headers);
                     val responseBody = resp.body?.string();
                     logResponse(method, url, resp.code, resp.headers, responseBody);
-                    return@catchHttp BridgeHttpResponse(resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
+                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
                 }
             };
         }
@@ -256,7 +257,7 @@ class PackageHttp: V8Package {
                     val resp = client.get(url, headers);
                     val responseBody = resp.body?.string();
                     logResponse("GET", url, resp.code, resp.headers, responseBody);
-                    return@catchHttp BridgeHttpResponse(resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
+                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
                 }
             };
         }
@@ -270,7 +271,7 @@ class PackageHttp: V8Package {
                     val resp = client.post(url, body, headers);
                     val responseBody = resp.body?.string();
                     logResponse("POST", url, resp.code, resp.headers, responseBody);
-                    return@catchHttp BridgeHttpResponse(resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
+                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
                 }
             };
         }
@@ -367,7 +368,7 @@ class PackageHttp: V8Package {
             }
             //Forward timeouts
             catch(ex: SocketTimeoutException) {
-                return BridgeHttpResponse(408, null);
+                return BridgeHttpResponse("", 408, null);
             }
         }
     }
@@ -461,7 +462,7 @@ class PackageHttp: V8Package {
         }
         //Forward timeouts
         catch(ex: SocketTimeoutException) {
-            return BridgeHttpResponse(408, null);
+            return BridgeHttpResponse("", 408, null);
         }
     }
 

app/src/main/java/com/futo/platformplayer/exceptions/DownloadException.kt

@@ -0,0 +1,12 @@
+package com.futo.platformplayer.exceptions
+
+class DownloadException : Throwable {
+    val isRetryable: Boolean;
+
+    constructor(innerException: Throwable, retryable: Boolean = true): super(innerException) {
+        isRetryable = retryable;
+    }
+    constructor(msg: String, retryable: Boolean = true): super(msg) {
+        isRetryable = retryable;
+    }
+}

app/src/main/java/com/futo/platformplayer/exceptions/RateLimitException.kt

@@ -0,0 +1,9 @@
+package com.futo.platformplayer.exceptions
+
+class RateLimitException : Throwable {
+    val pluginIds: List<String>;
+
+    constructor(pluginIds: List<String>): super() {
+        this.pluginIds = pluginIds ?: listOf();
+    }
+}

app/src/main/java/com/futo/platformplayer/fragment/channel/tab/ChannelAboutFragment.kt

@@ -77,7 +77,7 @@ class ChannelAboutFragment : Fragment, IChannelTabFragment {
         };
         _textName?.text = channel.name;
 
-        val metadata = "${channel.subscribers.toHumanNumber()} subscribers";
+        val metadata = if(channel.subscribers > 0) "${channel.subscribers.toHumanNumber()} subscribers" else "";
         _textMetadata?.text = metadata;
         _lastChannel = channel;
         setLinks(channel.links, channel.name);

app/src/main/java/com/futo/platformplayer/fragment/channel/tab/ChannelContentsFragment.kt

@@ -29,6 +29,7 @@ import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.engine.exceptions.PluginException
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.main.FeedView
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.states.StatePolycentric
@@ -76,7 +77,9 @@ class ChannelContentsFragment : Fragment(), IChannelTabFragment {
         }).success {
             setLoading(false);
             setPager(it);
-        }.exception<Throwable> {
+        }
+        .exception<ScriptCaptchaRequiredException> {  }
+        .exception<Throwable> {
             Logger.w(TAG, "Failed to load initial videos.", it);
             UIDialogs.showGeneralRetryErrorDialog(requireContext(), it.message ?: "", it, { loadNextPage() });
     };

app/src/main/java/com/futo/platformplayer/fragment/channel/tab/ChannelListFragment.kt

@@ -14,6 +14,7 @@ import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.main.ChannelFragment
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
 import com.futo.platformplayer.logging.Logger
@@ -52,7 +53,8 @@ class ChannelListFragment : Fragment, IChannelTabFragment {
         _authorLinks.add(PlatformAuthorLink(it.id, it.name, it.url, it.thumbnail));
         adapter.notifyItemInserted(adapter.childToParentPosition(_authorLinks.size - 1));
         loadNext();
-    }.exceptionWithParameter<Throwable> { ex, para ->
+    }.exception<ScriptCaptchaRequiredException> {  }
+        .exceptionWithParameter<Throwable> { ex, para ->
         Logger.w(ChannelFragment.TAG, "Failed to load results.", ex);
         UIDialogs.toast(requireContext(), "Failed to fetch\n${para}", false)
         loadNext();

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ChannelFragment.kt

@@ -361,7 +361,7 @@ class ChannelFragment : MainFragment() {
 
             _buttonSubscribe.setSubscribeChannel(channel);
             _textChannel.text = channel.name;
-            _textChannelSub.text = "${channel.subscribers.toHumanNumber()} subscribers";
+            _textChannelSub.text = if(channel.subscribers > 0) "${channel.subscribers.toHumanNumber()} subscribers" else "";
 
             _creatorThumbnail.setThumbnail(channel.thumbnail, true);
             Glide.with(_imageBanner)

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ContentSearchResultsFragment.kt

@@ -15,6 +15,7 @@ import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
 import com.futo.platformplayer.views.FeedStyle
 import kotlinx.coroutines.Dispatchers
@@ -86,7 +87,7 @@ class ContentSearchResultsFragment : MainFragment() {
                     StatePlatform.instance.searchRefresh(fragment.lifecycleScope, query, null, _sortBy, _filterValues, _enabledClientIds)
                 }
             })
-            .success { loadedResult(it); }
+            .success { loadedResult(it); }.exception<ScriptCaptchaRequiredException> {  }
             .exception<Throwable> {
                 Logger.w(ChannelFragment.TAG, "Failed to load results.", it);
                 UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/CreatorSearchResultsFragment.kt

@@ -13,6 +13,7 @@ import com.futo.platformplayer.Settings
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.fragment.mainactivity.topbar.SearchTopBarFragment
 import com.futo.platformplayer.views.FeedStyle
 
@@ -56,6 +57,7 @@ class CreatorSearchResultsFragment : MainFragment() {
         constructor(fragment: CreatorSearchResultsFragment, inflater: LayoutInflater): super(fragment, inflater) {
             _taskSearch = TaskHandler<String, IPager<PlatformAuthorLink>>({fragment.lifecycleScope}, { query -> StatePlatform.instance.searchChannels(query) })
                 .success { loadedResult(it); }
+                .exception<ScriptCaptchaRequiredException> {  }
                 .exception<Throwable> {
                     Logger.w(ChannelFragment.TAG, "Failed to load results.", it);
                     UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HomeFragment.kt

@@ -8,21 +8,27 @@ import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.futo.platformplayer.*
+import com.futo.platformplayer.activities.CaptchaActivity
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
 import com.futo.platformplayer.api.media.structures.EmptyPager
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptExecutionException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.fragment.mainactivity.topbar.ImportTopBarFragment
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.others.CaptchaWebViewClient
 import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePlugins
+import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.views.announcements.AnnouncementView
 import com.futo.platformplayer.views.FeedStyle
 import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
@@ -84,14 +90,15 @@ class HomeFragment : MainFragment() {
         private val _taskGetPager: TaskHandler<Boolean, IPager<IPlatformContent>>;
 
         constructor(fragment: HomeFragment, inflater: LayoutInflater, cachedRecyclerData: RecyclerData<InsertedViewAdapterWithLoader<ContentPreviewViewHolder>, LinearLayoutManager, IPager<IPlatformContent>, IPlatformContent, IPlatformContent, InsertedViewHolder<ContentPreviewViewHolder>>? = null) : super(fragment, inflater, cachedRecyclerData) {
-            _announcementsView = AnnouncementView(context).apply {
-                headerView.addView(AnnouncementView(context))
+            _announcementsView = AnnouncementView(context, null).apply {
+                headerView.addView(this);
             };
 
             _taskGetPager = TaskHandler<Boolean, IPager<IPlatformContent>>({ fragment.lifecycleScope }, {
                 StatePlatform.instance.getHomeRefresh(fragment.lifecycleScope)
             })
             .success { loadedResult(it); }
+            .exception<ScriptCaptchaRequiredException> {  }
             .exception<ScriptExecutionException> {
                 Logger.w(ChannelFragment.TAG, "Plugin failure.", it);
                 UIDialogs.showDialog(context, R.drawable.ic_error_pred, "Failed to get Home\nPlugin [${it.config.name}]", it.message, null, 0,
@@ -100,17 +107,20 @@ class HomeFragment : MainFragment() {
                 );
             }
             .exception<ScriptImplementationException> {
-                Logger.w(ChannelFragment.TAG, "Plugin failure.", it);
+                Logger.w(TAG, "Plugin failure.", it);
                 UIDialogs.showDialog(context, R.drawable.ic_error_pred, "Failed to get Home\nPlugin [${it.config.name}]", it.message, null, 0,
                     UIDialogs.Action("Ignore", {}),
                     UIDialogs.Action("Sources", { fragment.navigate<SourcesFragment>() }, UIDialogs.ActionStyle.PRIMARY)
                 );
             }
             .exception<Throwable> {
-                Logger.w(ChannelFragment.TAG, "Failed to load channel.", it);
+                Logger.w(TAG, "Failed to load channel.", it);
                 UIDialogs.showGeneralRetryErrorDialog(context, "Failed to get Home", it, {
                     loadResults()
-                });
+                }) {
+                    finishRefreshLayoutLoader();
+                    setLoading(false);
+                };
             };
         }
 
@@ -131,6 +141,8 @@ class HomeFragment : MainFragment() {
             } else {
                 setLoading(false);
             }
+
+            finishRefreshLayoutLoader();
         }
 
         override fun reload() {

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ImportSubscriptionsFragment.kt

@@ -32,7 +32,7 @@ class ImportSubscriptionsFragment : MainFragment() {
 
 
     override fun onShownWithView(parameter: Any?, isBack: Boolean) {
-        super.onShown(parameter, isBack);
+        super.onShownWithView(parameter, isBack);
         _view?.onShown(parameter, isBack);
     }
 

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt

@@ -346,24 +346,24 @@ class PostDetailFragment : MainFragment {
 
                         _rating.visibility = VISIBLE;
                         _rating.setRating(RatingLikeDislikes(likes, dislikes), hasLiked, hasDisliked);
-                        _rating.onLikeDislikeUpdated.subscribe(this) { processHandle, newHasLiked, newHasDisliked ->
-                            if (newHasLiked) {
-                                processHandle.opinion(ref, Opinion.like);
-                            } else if (newHasDisliked) {
-                                processHandle.opinion(ref, Opinion.dislike);
+                        _rating.onLikeDislikeUpdated.subscribe(this) { args ->
+                            if (args.hasLiked) {
+                                args.processHandle.opinion(ref, Opinion.like);
+                            } else if (args.hasDisliked) {
+                                args.processHandle.opinion(ref, Opinion.dislike);
                             } else {
-                                processHandle.opinion(ref, Opinion.neutral);
+                                args.processHandle.opinion(ref, Opinion.neutral);
                             }
 
-                            StateApp.instance.scopeGetter().launch(Dispatchers.IO) {
+                            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                                 try {
-                                    processHandle.fullyBackfillServers();
+                                    args.processHandle.fullyBackfillServers();
                                 } catch (e: Throwable) {
                                     Logger.e(TAG, "Failed to backfill servers", e)
                                 }
                             }
 
-                            StatePolycentric.instance.updateLikeMap(ref, newHasLiked, newHasDisliked)
+                            StatePolycentric.instance.updateLikeMap(ref, args.hasLiked, args.hasDisliked)
                         };
                     }
                 } catch (e: Throwable) {

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt

@@ -185,7 +185,7 @@ class SourceDetailFragment : MainFragment() {
             val config = _config;
 
             if (config != null) {
-                _sourceHeader.loadConfig(config);
+                _sourceHeader.loadConfig(config, StatePlugins.instance.getScript(config.id));
             } else {
                 _sourceHeader.clear();
             }

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt

@@ -12,13 +12,16 @@ import com.futo.platformplayer.*
 import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
+import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.cache.ChannelContentCache
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.engine.exceptions.PluginException
 import com.futo.platformplayer.exceptions.ChannelException
+import com.futo.platformplayer.exceptions.RateLimitException
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StateSubscriptions
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.FragmentedStorageFileJson
@@ -28,8 +31,10 @@ import com.futo.platformplayer.views.adapters.ContentPreviewViewHolder
 import com.futo.platformplayer.views.adapters.InsertedViewAdapterWithLoader
 import com.futo.platformplayer.views.adapters.InsertedViewHolder
 import com.futo.platformplayer.views.subscriptions.SubscriptionBar
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -124,11 +129,15 @@ class SubscriptionsFeedFragment : MainFragment() {
             if (announcementsView == null && !isHomeEnabled) {
                 val c = context;
                 if (c != null) {
-                    _announcementsView = AnnouncementView(c).apply {
-                        headerView?.addView(AnnouncementView(c))
+                    _announcementsView = AnnouncementView(c, null).apply {
+                        headerView?.addView(this)
                     };
                 }
             }
+
+            if (!StateSubscriptions.instance.isGlobalUpdating) {
+                finishRefreshLayoutLoader();
+            }
         }
 
         override fun cleanup() {
@@ -155,8 +164,17 @@ class SubscriptionsFeedFragment : MainFragment() {
         private val _filterLock = Object();
         private val _filterSettings = FragmentedStorage.get<FeedFilterSettings>("subFeedFilter");
 
+        private var _bypassRateLimit = false;
         private val _lastExceptions: List<Throwable>? = null;
         private val _taskGetPager = TaskHandler<Boolean, IPager<IPlatformContent>>({StateApp.instance.scope}, { withRefresh ->
+            if(!_bypassRateLimit) {
+                val subRequestCounts = StateSubscriptions.instance.getSubscriptionRequestCount();
+                val reqCountStr = subRequestCounts.map { "    ${it.key.config.name}: ${it.value}/${it.key.config.subscriptionRateLimit}" }.joinToString("\n");
+                val rateLimitPlugins = subRequestCounts.filter { clientCount -> clientCount.key.config.subscriptionRateLimit?.let { rateLimit -> clientCount.value > rateLimit } == true }
+                Logger.w(TAG, "Refreshing subscriptions with requests:\n" + reqCountStr);
+                if(rateLimitPlugins.any())
+                    throw RateLimitException(rateLimitPlugins.map { it.key.id });
+            }
             val resp = StateSubscriptions.instance.getGlobalSubscriptionFeed(StateApp.instance.scope, withRefresh);
 
             val currentExs = StateSubscriptions.instance.globalSubscriptionExceptions;
@@ -166,9 +184,37 @@ class SubscriptionsFeedFragment : MainFragment() {
             return@TaskHandler resp;
         })
             .success { loadedResult(it); }
+            .exception<RateLimitException> {
+                fragment.lifecycleScope.launch(Dispatchers.IO) {
+                    val subs = StateSubscriptions.instance.getSubscriptions();
+                    val subsByLimited = it.pluginIds.map{ StatePlatform.instance.getClientOrNull(it) }
+                        .filterIsInstance<JSClient>()
+                        .associateWith { client -> subs.filter { it.getClient() == client } }
+                        .map { Pair(it.key, it.value) }
+
+                    withContext(Dispatchers.Main) {
+                        UIDialogs.showDialog(context, R.drawable.ic_security_pred,
+                            "Rate Limit Warning",  "This is a temporary measure to prevent people from hitting rate limit until we have better support for lots of subscriptions." +
+                                    "\n\nYou have too many subscriptions for the following plugins:\n",
+                            subsByLimited.map { "${it.first.config.name}: ${it.second.size} Subscriptions" } .joinToString("\n"), 0, UIDialogs.Action("Refresh Anyway", {
+                                _bypassRateLimit = true;
+                                loadResults();
+                            }, UIDialogs.ActionStyle.DANGEROUS_TEXT),
+                            UIDialogs.Action("OK", {
+                                finishRefreshLayoutLoader();
+                                setLoading(false);
+                            }, UIDialogs.ActionStyle.PRIMARY));
+                    }
+                }
+            }
             .exception<Throwable> {
                 Logger.w(ChannelFragment.TAG, "Failed to load channel.", it);
-                UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });
+                if(it !is CancellationException)
+                    UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });
+                else {
+                    finishRefreshLayoutLoader();
+                    setLoading(false);
+                }
             };
 
         private fun initializeToolbarContent() {
@@ -251,7 +297,11 @@ class SubscriptionsFeedFragment : MainFragment() {
                 } catch (e: Throwable) {
                     Logger.e(TAG, "Failed to finish loading", e)
                 }
-            }
+            }/*.invokeOnCompletion { //Commented for now, because it doesn't fix the bug it was intended to fix, but might want it later anyway
+                if(it is CancellationException) {
+                    setLoading(false);
+                }
+            }*/
         }
 
         private fun handleExceptions(exs: List<Throwable>) {

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt

@@ -306,12 +306,12 @@ class VideoDetailFragment : MainFragment {
 
     override fun onResume() {
         super.onResume();
-        Logger.i(TAG, "onResume");
+        Logger.v(TAG, "onResume");
         _isActive = true;
         _leavingPiP = false;
 
         _viewDetail?.let {
-            Logger.i(TAG, "onResume preventPictureInPicture=false");
+            Logger.v(TAG, "onResume preventPictureInPicture=false");
             it.preventPictureInPicture = false;
 
             if (state != State.CLOSED) {
@@ -326,7 +326,7 @@ class VideoDetailFragment : MainFragment {
     }
     override fun onPause() {
         super.onPause();
-        Logger.i(TAG, "onPause");
+        Logger.v(TAG, "onPause");
         _isActive = false;
 
         if(!isInPictureInPicture && state != State.CLOSED)
@@ -334,7 +334,7 @@ class VideoDetailFragment : MainFragment {
     }
 
     override fun onStop() {
-        Logger.i(TAG, "onStop");
+        Logger.v(TAG, "onStop");
 
         stopIfRequired();
         super.onStop();
@@ -352,7 +352,7 @@ class VideoDetailFragment : MainFragment {
             shouldStop = false;
         }
 
-        Logger.i(TAG, "shouldStop: $shouldStop");
+        Logger.v(TAG, "shouldStop: $shouldStop");
         if(shouldStop) {
             _viewDetail?.let {
                 val v = it.video ?: return@let;
@@ -361,13 +361,13 @@ class VideoDetailFragment : MainFragment {
 
             _viewDetail?.onStop();
             StateCasting.instance.onStop();
-            Logger.i(TAG, "called onStop() shouldStop: $shouldStop");
+            Logger.v(TAG, "called onStop() shouldStop: $shouldStop");
         }
     }
 
     override fun onDestroyMainView() {
         super.onDestroyMainView();
-        Logger.i(TAG, "onDestroyMainView");
+        Logger.v(TAG, "onDestroyMainView");
         _viewDetail?.let {
             _viewDetail = null;
             it.onDestroy();

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt

@@ -94,11 +94,13 @@ import com.google.android.exoplayer2.Format
 import com.google.android.exoplayer2.ui.PlayerControlView
 import com.google.android.exoplayer2.ui.TimeBar
 import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCodeException
+import com.google.common.base.Stopwatch
 import com.google.protobuf.ByteString
 import kotlinx.coroutines.*
 import userpackage.Protocol
 import java.time.OffsetDateTime
 import kotlin.collections.ArrayList
+import kotlin.math.abs
 import kotlin.math.roundToLong
 import kotlin.streams.toList
 
@@ -231,9 +233,19 @@ class VideoDetailView : ConstraintLayout {
 
     private val DP_5 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics);
     private val DP_2 = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2f, resources.displayMetrics);
+
     private var _retryJob: Job? = null;
     private var _retryCount = 0;
-    private val _retryIntervals: Array<Long> = arrayOf(1, 2, 4, 8, 16, 32);
+    //TODO: Determine better behavior, waiting 60 seconds for an error that is guaranteed to happen is a bit much. (Needed? If so, maybe need special UI for retrying)
+    private val _retryIntervals: Array<Long> = arrayOf(1, 1);//2, 4, 8, 16, 32);
+
+    private var _liveTryJob: Job? = null;
+    private val _liveStreamCheckInterval = listOf(
+        Pair(-10 * 60, 5 * 60), //around 10 minutes, try every 5 minute
+        Pair(-5 * 60, 30), //around 5 minutes, try every 30 seconds
+        Pair(0, 10) //around live, try every 10 seconds
+    );
+
 
     constructor(context: Context, attrs : AttributeSet? = null) : super(context, attrs) {
         inflate(context, R.layout.fragview_video_detail, this);
@@ -490,7 +502,7 @@ class VideoDetailView : ConstraintLayout {
         MediaControlReceiver.onLowerVolumeReceived.subscribe(this) { handleLowerVolume() };
         MediaControlReceiver.onPlayReceived.subscribe(this) { handlePlay() };
         MediaControlReceiver.onPauseReceived.subscribe(this) { handlePause() };
-        MediaControlReceiver.onNextReceived.subscribe(this) { nextVideo() };
+        MediaControlReceiver.onNextReceived.subscribe(this) { nextVideo(true) };
         MediaControlReceiver.onPreviousReceived.subscribe(this) { prevVideo() };
         MediaControlReceiver.onCloseReceived.subscribe(this) {
             Logger.i(TAG, "MediaControlReceiver.onCloseReceived")
@@ -596,7 +608,7 @@ class VideoDetailView : ConstraintLayout {
             },
             RoundButton(context, R.drawable.ic_download, "Download", TAG_DOWNLOAD) {
                 video?.let {
-                    _slideUpOverlay = UISlideOverlays.showDownloadVideoOverlay(context.contentResolver, it, _overlayContainer);
+                    _slideUpOverlay = UISlideOverlays.showDownloadVideoOverlay(it, _overlayContainer, context.contentResolver);
                 };
             },
             RoundButton(context, R.drawable.ic_share, "Share", TAG_SHARE) {
@@ -659,7 +671,7 @@ class VideoDetailView : ConstraintLayout {
 
     //Lifecycle
     fun onResume() {
-        Logger.i(TAG, "onResume");
+        Logger.v(TAG, "onResume");
         _onPauseCalled = false;
 
         Logger.i(TAG, "_video: ${video?.name ?: "no video"}");
@@ -693,7 +705,7 @@ class VideoDetailView : ConstraintLayout {
         _player.updateRotateLock();
     }
     fun onPause() {
-        Logger.i(TAG, "onPause");
+        Logger.v(TAG, "onPause");
 
         _onPauseCalled = true;
         _taskLoadVideo.cancel();
@@ -721,6 +733,8 @@ class VideoDetailView : ConstraintLayout {
         _overlay_quality_selector?.hide();
         _retryJob?.cancel();
         _retryJob = null;
+        _liveTryJob?.cancel();
+        _liveTryJob = null;
         _taskLoadVideo.cancel();
         handleStop();
         _didStop = true;
@@ -807,6 +821,8 @@ class VideoDetailView : ConstraintLayout {
 
         _retryJob?.cancel();
         _retryJob = null;
+        _liveTryJob?.cancel();
+        _liveTryJob = null;
         _retryCount = 0;
         fetchVideo();
 
@@ -896,6 +912,8 @@ class VideoDetailView : ConstraintLayout {
 
             _retryJob?.cancel();
             _retryJob = null;
+            _liveTryJob?.cancel();
+            _liveTryJob = null;
             _retryCount = 0;
             fetchVideo();
         }
@@ -926,16 +944,26 @@ class VideoDetailView : ConstraintLayout {
             StateDownloads.instance.getCachedVideo(videoDetail.id) ?: videoDetail;
         this.video = video;
         this._playbackTracker = null;
+
         if(video is JSVideoDetails) {
             val me = this;
             fragment.lifecycleScope.launch(Dispatchers.IO) {
                 try {
-                    val tracker = video.getPlaybackTracker() ?: StatePlatform.instance.getPlaybackTracker(video.url);
+                    val stopwatch = com.futo.platformplayer.debug.Stopwatch()
+                    var tracker = video.getPlaybackTracker()
+                    Logger.i(TAG, "video.getPlaybackTracker took ${stopwatch.elapsedMs}ms")
+
+                    if (tracker == null) {
+                        stopwatch.reset()
+                        tracker = StatePlatform.instance.getPlaybackTracker(video.url);
+                        Logger.i(TAG, "StatePlatform.instance.getPlaybackTracker took ${stopwatch.elapsedMs}ms")
+                    }
+
                     if(me.video == video)
                         me._playbackTracker = tracker;
                 }
                 catch(ex: Throwable) {
-                    fragment.lifecycleScope.launch(Dispatchers.Main) {
+                    withContext(Dispatchers.Main) {
                         UIDialogs.showGeneralErrorDialog(context, "Failed to get Playback Tracker", ex);
                     };
                 }
@@ -991,6 +1019,7 @@ class VideoDetailView : ConstraintLayout {
         _subTitle.text = subTitleSegments.joinToString(" • ");
 
         _rating.onLikeDislikeUpdated.remove(this);
+
         if (ref != null) {
             _rating.visibility = View.GONE;
 
@@ -1013,24 +1042,24 @@ class VideoDetailView : ConstraintLayout {
                     withContext(Dispatchers.Main) {
                         _rating.visibility = View.VISIBLE;
                         _rating.setRating(RatingLikeDislikes(likes, dislikes), hasLiked, hasDisliked);
-                        _rating.onLikeDislikeUpdated.subscribe(this) { processHandle, newHasLiked, newHasDisliked ->
-                            if (newHasLiked) {
-                                processHandle.opinion(ref, Opinion.like);
-                            } else if (newHasDisliked) {
-                                processHandle.opinion(ref, Opinion.dislike);
+                        _rating.onLikeDislikeUpdated.subscribe(this) { args ->
+                            if (args.hasLiked) {
+                                args.processHandle.opinion(ref, Opinion.like);
+                            } else if (args.hasDisliked) {
+                                args.processHandle.opinion(ref, Opinion.dislike);
                             } else {
-                                processHandle.opinion(ref, Opinion.neutral);
+                                args.processHandle.opinion(ref, Opinion.neutral);
                             }
 
-                            StateApp.instance.scopeGetter().launch(Dispatchers.IO) {
+                            fragment.lifecycleScope.launch(Dispatchers.IO) {
                                 try {
-                                    processHandle.fullyBackfillServers();
+                                    args.processHandle.fullyBackfillServers();
                                 } catch (e: Throwable) {
                                     Logger.e(TAG, "Failed to backfill servers", e)
                                 }
                             }
 
-                            StatePolycentric.instance.updateLikeMap(ref, newHasLiked, newHasDisliked)
+                            StatePolycentric.instance.updateLikeMap(ref, args.hasLiked, args.hasDisliked)
                         };
                     }
                 } catch (e: Throwable) {
@@ -1075,12 +1104,14 @@ class VideoDetailView : ConstraintLayout {
             _layoutRating.visibility = View.GONE;
         }
 
+
         //Overlay
         updateQualitySourcesOverlay(video);
 
         setLoading(false);
 
         //Set Mediasource
+
         val toResume = _videoResumePositionMilliseconds;
         _videoResumePositionMilliseconds = 0;
         loadCurrentVideo(toResume);
@@ -1108,6 +1139,7 @@ class VideoDetailView : ConstraintLayout {
             _textResume.text = "";
         }
 
+
         StatePlayer.instance.startOrUpdateMediaSession(context, video);
         StatePlayer.instance.setCurrentlyPlaying(video);
 
@@ -1115,6 +1147,8 @@ class VideoDetailView : ConstraintLayout {
         if(video.isLive && video.live != null) {
             loadLiveChat(video);
         }
+        if(video.isLive && video.live == null && !video.video.videoSources.any())
+            startLiveTry(video);
 
         updateMoreButtons();
     }
@@ -1244,7 +1278,7 @@ class VideoDetailView : ConstraintLayout {
         //If LiveStream, set to end
         if(videoSource is IDashManifestSource || videoSource is IHLSManifestSource) {
             if (video?.isLive == true) {
-                _player.seekToEnd(5000);
+                _player.seekToEnd(6000);
             }
 
             val videoTracks = _player.exoPlayer?.player?.currentTracks?.groups?.firstOrNull { it.mediaTrackGroup.type == C.TRACK_TYPE_VIDEO }
@@ -1329,9 +1363,11 @@ class VideoDetailView : ConstraintLayout {
         }
     }
 
-    fun nextVideo(): Boolean {
+    fun nextVideo(forceLoop: Boolean = false): Boolean {
         Logger.i(TAG, "nextVideo")
-        val next = StatePlayer.instance.nextQueueItem(_player.duration < 100 || (_player.position.toFloat() / _player.duration) < 0.9);
+        var next = StatePlayer.instance.nextQueueItem(_player.duration < 100 || (_player.position.toFloat() / _player.duration) < 0.9);
+        if(next == null && forceLoop)
+            next = StatePlayer.instance.restartQueue();
         if(next != null) {
             setVideoOverview(next);
             return true;
@@ -1574,10 +1610,10 @@ class VideoDetailView : ConstraintLayout {
         _lastSubtitleSource = toSet;
     }
 
-    private fun handleUnavailableVideo() {
+    private fun handleUnavailableVideo(msg: String? = null) {
         if (!nextVideo()) {
             if(video?.datetime == null || video?.datetime!! < OffsetDateTime.now().minusHours(1))
-                UIDialogs.showDialog(context, R.drawable.ic_lock, "Unavailable video", "This video is unavailable.", null, 0,
+                UIDialogs.showDialog(context, R.drawable.ic_lock, "Unavailable video", msg ?: "This video is unavailable.", null, 0,
                     UIDialogs.Action("Back", {
                         this@VideoDetailView.onClose.emit();
                     }, UIDialogs.ActionStyle.PRIMARY));
@@ -1946,7 +1982,7 @@ class VideoDetailView : ConstraintLayout {
     }
 
     fun setProgressBarOverlayed(isOverlayed: Boolean?) {
-        Logger.i(TAG, "setProgressBarOverlayed(isOverlayed: ${isOverlayed ?: "null"})");
+        Logger.v(TAG, "setProgressBarOverlayed(isOverlayed: ${isOverlayed ?: "null"})");
         isOverlayed?.let{ _cast.setProgressBarOverlayed(it) };
 
         if(isOverlayed == null) {
@@ -2056,7 +2092,7 @@ class VideoDetailView : ConstraintLayout {
         }
         .exception<ScriptUnavailableException> {
             Logger.w(TAG, "exception<ScriptUnavailableException>", it);
-            handleUnavailableVideo();
+            handleUnavailableVideo(it.message);
         }
         .exception<ScriptException> {
             Logger.w(TAG, "exception<ScriptException>", it)
@@ -2065,6 +2101,8 @@ class VideoDetailView : ConstraintLayout {
                 _retryCount = 0;
                 _retryJob?.cancel();
                 _retryJob = null;
+                _liveTryJob?.cancel();
+                _liveTryJob = null;
                 UIDialogs.showGeneralRetryErrorDialog(context, "Failed to load video (ScriptException)", it, ::fetchVideo);
             }
         }
@@ -2075,6 +2113,8 @@ class VideoDetailView : ConstraintLayout {
                 _retryCount = 0;
                 _retryJob?.cancel();
                 _retryJob = null;
+                _liveTryJob?.cancel();
+                _liveTryJob = null;
                 UIDialogs.showGeneralRetryErrorDialog(context, "Failed to load video", it, ::fetchVideo);
             }
         } else TaskHandler(IPlatformVideoDetails::class.java, {fragment.lifecycleScope});
@@ -2092,14 +2132,16 @@ class VideoDetailView : ConstraintLayout {
             Log.i(TAG, "handleErrorOrCall _retryCount=$_retryCount, starting retry job");
 
             _retryJob?.cancel();
-            _retryJob = StateApp.instance.scopeGetter().launch(Dispatchers.Main) {
+            _retryJob = StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
                 try {
                     delay(_retryIntervals[_retryCount++] * 1000);
                     fetchVideo();
                 } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to fetch video.", e)
+                    Logger.e(TAG, "Failed to retry fetch video.", e)
                 }
             }
+            _liveTryJob?.cancel();
+            _liveTryJob = null;
         } else if (isConnected && nextVideo()) {
             Log.i(TAG, "handleErrorOrCall retries failed, is connected, skipped to next video");
         } else {
@@ -2108,6 +2150,45 @@ class VideoDetailView : ConstraintLayout {
         }
     }
 
+    private fun startLiveTry(liveTryVideo: IPlatformVideoDetails) {
+        val datetime = liveTryVideo.datetime ?: return;
+        val diffSeconds = datetime.getNowDiffSeconds();
+        val toWait = _liveStreamCheckInterval.toList().sortedBy { abs(diffSeconds - it.first) }.firstOrNull()?.second?.toLong() ?: return;
+
+        fragment.lifecycleScope.launch(Dispatchers.Main){
+            UIDialogs.toast(context, "Not yet available, retrying in ${toWait}s");
+        }
+
+        _liveTryJob?.cancel();
+        _liveTryJob = fragment.lifecycleScope.launch(Dispatchers.IO) {
+            try {
+                delay(toWait * 1000);
+                val videoDetail = StatePlatform.instance.getContentDetails(liveTryVideo.url, true).await();
+                if(videoDetail !is IPlatformVideoDetails)
+                    throw IllegalStateException("Expected media content, found ${video?.contentType}");
+
+                if(videoDetail.datetime != null && videoDetail.live == null && !videoDetail.video.videoSources.any()) {
+                    if(videoDetail.datetime!! > OffsetDateTime.now())
+                        withContext(Dispatchers.Main) {
+                            UIDialogs.toast(context, "Planned in ${videoDetail.datetime?.toHumanNowDiffString(true)}");
+                        }
+                    startLiveTry(liveTryVideo);
+                }
+                else
+                    withContext(Dispatchers.Main) {
+                        setVideoDetails(videoDetail);
+                        _liveTryJob = null;
+                    }
+            }
+            catch(ex: Throwable) {
+                Logger.e(TAG, "Failed to live try fetch video.", ex);
+                withContext(Dispatchers.Main) {
+                    UIDialogs.toast(context, "Failed to retry for live stream");
+                }
+            }
+        }
+    }
+
     fun applyFragment(frag: VideoDetailFragment) {
         fragment = frag;
         fragment.onMinimize.subscribe {

app/src/main/java/com/futo/platformplayer/helpers/VideoHelper.kt

@@ -4,7 +4,10 @@ import android.net.Uri
 import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
+import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource
+import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSAudioUrlRangeSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSVideoUrlRangeSource
 import com.futo.platformplayer.logging.Logger
@@ -17,6 +20,12 @@ import com.google.android.exoplayer2.upstream.ResolvingDataSource
 class VideoHelper {
     companion object {
 
+        fun isDownloadable(detail: IPlatformVideoDetails) =
+            (detail.video.videoSources.any { isDownloadable(it) }) ||
+                    (if (detail is VideoUnMuxedSourceDescriptor) detail.audioSources.any { isDownloadable(it) } else false);
+        fun isDownloadable(source: IVideoSource) = source is IVideoUrlSource;
+        fun isDownloadable(source: IAudioSource) = source is IAudioUrlSource;
+
         fun selectBestVideoSource(desc: IVideoSourceDescriptor, desiredPixelCount : Int, prefContainers : Array<String>) : IVideoSource? = selectBestVideoSource(desc.videoSources.toList(), desiredPixelCount, prefContainers);
         fun selectBestVideoSource(sources: Iterable<IVideoSource>, desiredPixelCount : Int, prefContainers : Array<String>) : IVideoSource? {
             val targetVideo = if(desiredPixelCount > 0)

app/src/main/java/com/futo/platformplayer/listeners/OrientationManager.kt

@@ -14,6 +14,8 @@ class OrientationManager : OrientationEventListener {
 
     constructor(context: Context) : super(context) { }
 
+    //TODO: Something weird is going on here
+    //TODO: Old implementation felt pretty good for me, but now with 0 deadzone still feels bad, even though code should be identical?
     override fun onOrientationChanged(orientationAnglep: Int) {
         if (orientationAnglep == -1) return
 

app/src/main/java/com/futo/platformplayer/models/HistoryVideo.kt

@@ -1,8 +1,13 @@
 package com.futo.platformplayer.models
 
+import com.futo.platformplayer.api.media.PlatformID
+import com.futo.platformplayer.api.media.models.PlatformAuthorLink
+import com.futo.platformplayer.api.media.models.Thumbnails
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
+import java.time.LocalDateTime
 import java.time.OffsetDateTime
+import java.time.ZoneOffset
 
 @kotlinx.serialization.Serializable
 class HistoryVideo {
@@ -18,4 +23,41 @@ class HistoryVideo {
         this.position = position;
         this.date = date;
     }
+
+
+    fun toReconString(): String {
+        return "${video.url}|||${date.toEpochSecond()}|||${position}|||${video.name}";
+    }
+
+    companion object {
+        fun fromReconString(str: String, resolve: ((url: String)->SerializedPlatformVideo)? = null): HistoryVideo {
+            var index = str.indexOf("|||");
+            if(index < 0) throw IllegalArgumentException("Invalid history string: " + str);
+            val url = str.substring(0, index);
+
+            var indexNext = str.indexOf("|||", index + 3);
+            if(indexNext < 0) throw IllegalArgumentException("Invalid history string: " + str);
+            val dateSec = str.substring(index + 3, indexNext).toLong();
+
+            index = indexNext;
+            indexNext =  str.indexOf("|||", index + 3);
+            if(indexNext < 0) throw IllegalArgumentException("Invalid history string: " + str);
+            val position = str.substring(index + 3, indexNext).toLong();
+            val name = str.substring(indexNext + 3);
+
+            val video = resolve?.invoke(url) ?: SerializedPlatformVideo(
+                id = PlatformID.asUrlID(url),
+                name = name,
+                thumbnails = Thumbnails(),
+                author = PlatformAuthorLink(PlatformID.NONE, "Unknown", ""),
+                datetime = null,
+                url = url,
+                shareUrl = url,
+                duration = 0,
+                viewCount = -1
+            );
+
+            return HistoryVideo(video, position, OffsetDateTime.of(LocalDateTime.ofEpochSecond(dateSec, 0, ZoneOffset.UTC), ZoneOffset.UTC));
+        }
+    }
 }

app/src/main/java/com/futo/platformplayer/models/Subscription.kt

@@ -3,24 +3,48 @@ package com.futo.platformplayer.models
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.channels.SerializedChannel
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.getNowDiffDays
 import com.futo.platformplayer.serializers.OffsetDateTimeSerializer
+import com.futo.platformplayer.states.StatePlatform
 import java.time.OffsetDateTime
 
 @kotlinx.serialization.Serializable
 class Subscription {
     var channel: SerializedChannel;
 
+    //Last found content
     @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
     var lastVideo : OffsetDateTime = OffsetDateTime.MAX;
     @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
     var lastLiveStream : OffsetDateTime = OffsetDateTime.MAX;
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
+    var lastPost : OffsetDateTime = OffsetDateTime.MAX;
 
+    //Last update time
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
+    var lastVideoUpdate : OffsetDateTime = OffsetDateTime.MIN;
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
+    var lastStreamUpdate : OffsetDateTime = OffsetDateTime.MIN;
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
+    var lastLiveStreamUpdate : OffsetDateTime = OffsetDateTime.MIN;
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeSerializer::class)
+    var lastPostUpdate : OffsetDateTime = OffsetDateTime.MIN;
+
+    //Last video interval
     var uploadInterval : Int = 0;
+    var uploadPostInterval : Int = 0;
+
 
     constructor(channel : SerializedChannel) {
         this.channel = channel;
     }
 
+    fun shouldFetchStreams() = lastLiveStream.getNowDiffDays() < 7;
+    fun shouldFetchLiveStreams() = lastLiveStream.getNowDiffDays() < 14;
+    fun shouldFetchPosts() = lastPost.getNowDiffDays() < 2;
+
+    fun getClient() = StatePlatform.instance.getChannelClientOrNull(channel.url);
+
     fun updateChannel(channel: IPlatformChannel) {
         this.channel = SerializedChannel.fromChannel(channel);
     }

app/src/main/java/com/futo/platformplayer/models/Telemetry.kt

@@ -9,7 +9,6 @@ data class Telemetry(
     val buildType: String,
     val debug: Boolean,
     val isUnstableBuild: Boolean,
-    val time: Long,
     val brand: String,
     val manufacturer: String,
     val model: String

app/src/main/java/com/futo/platformplayer/others/CaptchaWebViewClient.kt

@@ -0,0 +1,76 @@
+package com.futo.platformplayer.others
+
+import android.webkit.*
+import com.futo.platformplayer.api.media.Serializer
+import com.futo.platformplayer.api.media.platforms.js.SourceCaptchaData
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginAuthConfig
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginCaptchaConfig
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.constructs.Event2
+import com.futo.platformplayer.logging.Logger
+import kotlinx.serialization.encodeToString
+
+class CaptchaWebViewClient : WebViewClient {
+    val onCaptchaFinished = Event1<SourceCaptchaData?>();
+    val onPageLoaded = Event2<WebView?, String?>()
+
+    private val _pluginConfig: SourcePluginConfig?;
+    private val _captchaConfig: SourcePluginCaptchaConfig;
+
+    private var _didNotify = false;
+    private val _extractor: WebViewRequirementExtractor;
+
+    constructor(config: SourcePluginConfig) : super() {
+        _pluginConfig = config;
+        _captchaConfig = config.captcha!!;
+        _extractor = WebViewRequirementExtractor(
+            config.allowUrls,
+            null,
+            null,
+            config.captcha!!.cookiesToFind,
+            config.captcha!!.completionUrl,
+            config.captcha!!.cookiesExclOthers
+        );
+        Logger.i(TAG, "Captcha [${config.name}]" +
+                "\nRequired Cookies: ${Serializer.json.encodeToString(config.captcha!!.cookiesToFind)}",);
+    }
+    constructor(captcha: SourcePluginCaptchaConfig) : super() {
+        _pluginConfig = null;
+        _captchaConfig = captcha;
+        _extractor = WebViewRequirementExtractor(
+            null,
+            null,
+            null,
+            captcha.cookiesToFind,
+            captcha.completionUrl,
+            captcha.cookiesExclOthers
+        );
+    }
+
+    override fun onPageFinished(view: WebView?, url: String?) {
+        super.onPageFinished(view, url);
+        Logger.i(TAG, "onPageFinished url = ${url}")
+        onPageLoaded.emit(view, url);
+    }
+
+    override fun shouldInterceptRequest(view: WebView?, request: WebResourceRequest?): WebResourceResponse? {
+        if(request == null)
+            return super.shouldInterceptRequest(view, request as WebResourceRequest?);
+
+        val extracted = _extractor.handleRequest(view, request);
+        if(extracted != null && !_didNotify) {
+            _didNotify = true;
+            onCaptchaFinished.emit(SourceCaptchaData(
+               extracted.cookies,
+               extracted.headers
+            ));
+        }
+
+        return super.shouldInterceptRequest(view, request);
+    }
+
+    companion object {
+        private val TAG = "CaptchaWebViewClient";
+    }
+}

app/src/main/java/com/futo/platformplayer/others/LoginWebViewClient.kt

@@ -12,6 +12,7 @@ import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.matchesDomain
 import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 
 class LoginWebViewClient : WebViewClient {
     private val LOG_VERBOSE = false;
@@ -46,6 +47,7 @@ class LoginWebViewClient : WebViewClient {
         onPageLoaded.emit(view, url);
     }
 
+    //TODO: Use new WebViewRequirementExtractor when time to test extensively
     override fun shouldInterceptRequest(view: WebView?, request: WebResourceRequest?): WebResourceResponse? {
         if(request == null)
             return super.shouldInterceptRequest(view, request as WebResourceRequest?);

app/src/main/java/com/futo/platformplayer/others/WebViewRequirementExtractor.kt

@@ -0,0 +1,125 @@
+package com.futo.platformplayer.others
+
+import android.net.Uri
+import android.webkit.CookieManager
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import com.futo.platformplayer.api.media.platforms.js.SourceAuth
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.matchesDomain
+
+class WebViewRequirementExtractor {
+    private val allowedUrls: List<String>;
+    private val headersToFind: List<String>?;
+    private val domainHeadersToFind: Map<String, List<String>>?;
+    private val cookiesToFind: List<String>?;
+    private val completionUrl: String?;
+
+    private val exclOtherCookies: Boolean;
+
+
+    private val headersFoundMap: HashMap<String, HashMap<String, String>> = hashMapOf();
+    private val cookiesFoundMap = hashMapOf<String, HashMap<String, String>>();
+    private var urlFound = false;
+
+
+    constructor(allowedUrls: List<String>?, headers: List<String>?, domainHeaders: Map<String, List<String>>?, cookies: List<String>?, url: String?, exclOtherCookies: Boolean = false) {
+        this.allowedUrls = allowedUrls ?: listOf("everywhere");
+        this.exclOtherCookies = exclOtherCookies;
+        headersToFind = headers;
+        domainHeadersToFind = domainHeaders;
+        cookiesToFind = cookies;
+        completionUrl = url;
+    }
+
+
+    fun handleRequest(view: WebView?, request: WebResourceRequest, logVerbose: Boolean = false): ExtractedData? {
+
+        val domain = request.url.host;
+        val domainLower = request.url.host?.lowercase();
+        if(completionUrl == null)
+            urlFound = true;
+        else urlFound = urlFound || request.url == Uri.parse(completionUrl);
+
+        //HEADERS
+        if(domainLower != null) {
+            val headersToFind = ((headersToFind?.map { Pair(it.lowercase(), domainLower) } ?: listOf()) +
+                    (domainHeadersToFind?.filter { domainLower.matchesDomain(it.key.lowercase())}
+                        ?.flatMap { it.value.map { header -> Pair(header.lowercase(), it.key.lowercase()) } } ?: listOf()));
+
+            val foundHeaders = request.requestHeaders.filter { requestHeader -> headersToFind.any { it.first.equals(requestHeader.key, true)} &&
+                    (!requestHeader.key.equals("Authorization", ignoreCase = true) || requestHeader.value != "undefined") } //TODO: More universal fix (optional regex?)
+            for(header in foundHeaders) {
+                for(headerDomain in headersToFind.filter { it.first.equals(header.key, true) }) {
+                    if (!headersFoundMap.containsKey(headerDomain.second))
+                        headersFoundMap[headerDomain.second] = hashMapOf();
+                    headersFoundMap[headerDomain.second]!![header.key.lowercase()] = header.value;
+                }
+            }
+        }
+
+
+        //COOKIES
+        //TODO: This is not an ideal solution, we want to intercept the response, but interception need to be rewritten to support that. Correct implementation commented underneath
+        //TODO: For now we assume cookies are legit for all subdomains of a top-level domain, this is the most common scenario anyway
+        val cookieString = CookieManager.getInstance().getCookie(request.url.toString());
+        if(cookieString != null) {
+            val domainParts = domain!!.split(".");
+            val cookieDomain = "." + domainParts.drop(domainParts.size - 2).joinToString(".");
+            if(allowedUrls.any { it == "everywhere" || it.lowercase().matchesDomain(cookieDomain) })
+                cookiesToFind?.let { cookiesToFind ->
+                    val cookies = cookieString.split(";");
+                    for(cookieStr in cookies) {
+                        val cookieSplitIndex = cookieStr.indexOf("=");
+                        if(cookieSplitIndex <= 0) continue;
+                        val cookieKey = cookieStr.substring(0, cookieSplitIndex).trim();
+                        val cookieVal = cookieStr.substring(cookieSplitIndex + 1).trim();
+
+                        if (exclOtherCookies && !cookiesToFind.contains(cookieKey))
+                            continue;
+
+                        if (cookiesFoundMap.containsKey(cookieDomain))
+                            cookiesFoundMap[cookieDomain]!![cookieKey] = cookieVal;
+                        else
+                            cookiesFoundMap[cookieDomain] = hashMapOf(Pair(cookieKey, cookieVal));
+                    }
+                };
+        }
+
+        val headersFound = headersToFind?.map { it.lowercase() }?.all { reqHeader -> headersFoundMap.any { it.value.containsKey(reqHeader) } } ?: true
+        val domainHeadersFound = domainHeadersToFind?.all {
+            if(it.value.isEmpty())
+                return@all true;
+            if(!headersFoundMap.containsKey(it.key.lowercase()))
+                return@all false;
+            val foundDomainHeaders = headersFoundMap[it.key.lowercase()] ?: mapOf();
+            return@all it.value.all { reqHeader -> foundDomainHeaders.containsKey(reqHeader.lowercase()) };
+        } ?: true;
+        val cookiesFound = cookiesToFind?.all { toFind -> cookiesFoundMap.any { it.value.containsKey(toFind) } } ?: true;
+
+        if(logVerbose) {
+            val builder = StringBuilder();
+            builder.appendLine("Request (method: ${request.method}, host: ${request.url.host}, url: ${request.url}, path: ${request.url.path}):");
+            for (pair in request.requestHeaders) {
+                builder.appendLine(" ${pair.key}: ${pair.value}");
+            }
+            builder.appendLine(" Cookies: ${cookiesFoundMap.values.sumOf { it.values.size }}");
+            Logger.i(TAG, builder.toString());
+            Logger.i(TAG, "Result (urlFound: $urlFound, headersFound: $headersFound, cookiesFound: $cookiesFound)");
+        }
+
+        if (urlFound && headersFound && domainHeadersFound && cookiesFound)
+            return ExtractedData(cookiesFoundMap, headersFoundMap);
+        return null;
+    }
+
+
+
+    data class ExtractedData(
+        val cookies: HashMap<String, HashMap<String, String>>,
+        val headers: HashMap<String, HashMap<String, String>>
+    );
+    companion object {
+        val TAG = "WebViewRequirementExtractor";
+    }
+}

app/src/main/java/com/futo/platformplayer/serializers/PlatformContentSerializer.kt

@@ -20,10 +20,10 @@ class PlatformContentSerializer() : JsonContentPolymorphicSerializer<SerializedP
         if(obj?.jsonPrimitive?.isString ?: true)
             return when(obj?.jsonPrimitive?.contentOrNull) {
                 "MEDIA" -> SerializedPlatformVideo.serializer();
-                "NESTED" -> SerializedPlatformNestedContent.serializer();
+                "NESTED_VIDEO" -> SerializedPlatformNestedContent.serializer();
                 "ARTICLE" -> throw NotImplementedError("Articles not yet implemented");
                 "POST" -> throw NotImplementedError("Post not yet implemented");
-                else -> throw NotImplementedError("Unknown Content Type Value: ${obj?.jsonPrimitive?.int}")
+                else -> throw NotImplementedError("Unknown Content Type Value: ${obj?.jsonPrimitive?.contentOrNull}")
             };
         else
             return when(obj?.jsonPrimitive?.int) {

app/src/main/java/com/futo/platformplayer/services/DownloadService.kt

@@ -12,12 +12,14 @@ import com.futo.platformplayer.*
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.downloads.VideoDownload
+import com.futo.platformplayer.exceptions.DownloadException
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.Announcement
 import com.futo.platformplayer.states.AnnouncementType
 import com.futo.platformplayer.states.StateAnnouncement
 import com.futo.platformplayer.states.StateDownloads
 import com.futo.platformplayer.stores.FragmentedStorage
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
@@ -134,15 +136,21 @@ class DownloadService : Service() {
                     Logger.w(TAG, "Video had no video or videodetail, removing download");
                     StateDownloads.instance.removeDownload(currentVideo);
                 }
+                else if(ex is DownloadException && !ex.isRetryable) {
+                    Logger.w(TAG, "Video had exception that should not be retried");
+                    StateDownloads.instance.removeDownload(currentVideo);
+                    StateDownloads.instance.preventPlaylistDownload(currentVideo);
+                }
                 else
                     Logger.e(TAG, "Failed download [${currentVideo.name}]: ${ex.message}", ex);
                 currentVideo.error = ex.message;
                 currentVideo.changeState(VideoDownload.State.ERROR);
                 ignore.add(currentVideo);
 
-                StateAnnouncement.instance.registerAnnouncement(currentVideo?.id?.value?:"" + currentVideo?.id?.pluginId?:"" + "_FailDownload",
-                    "Download failed",
-                    "Download for [${currentVideo.name}] failed.\nDownloads are automatically retried.\nReason: ${ex.message}", AnnouncementType.SESSION, null, "download");
+                if(ex !is CancellationException)
+                    StateAnnouncement.instance.registerAnnouncement(currentVideo?.id?.value?:"" + currentVideo?.id?.pluginId?:"" + "_FailDownload",
+                        "Download failed",
+                        "Download for [${currentVideo.name}] failed.\nDownloads are automatically retried.\nReason: ${ex.message}", AnnouncementType.SESSION, null, "download");
 
                 //Give it a sec
                 Thread.sleep(500);

app/src/main/java/com/futo/platformplayer/services/MediaPlaybackService.kt

@@ -50,7 +50,7 @@ class MediaPlaybackService : Service() {
     private var _focusRequest: AudioFocusRequest? = null;
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        Logger.i(TAG, "onStartCommand");
+        Logger.v(TAG, "onStartCommand");
 
 
         if(!FragmentedStorage.isInitialized) {
@@ -91,43 +91,49 @@ class MediaPlaybackService : Service() {
         _mediaSession?.setCallback(object: MediaSessionCompat.Callback() {
             override fun onSeekTo(pos: Long) {
                 super.onSeekTo(pos)
-                Log.i(TAG, "Media session callback onSeekTo(pos = $pos)");
+                Logger.i(TAG, "Media session callback onSeekTo(pos = $pos)");
                 MediaControlReceiver.onSeekToReceived.emit(pos);
             }
 
             override fun onPlay() {
                 super.onPlay();
-                Log.i(TAG, "Media session callback onPlay()");
+                Logger.i(TAG, "Media session callback onPlay()");
                 MediaControlReceiver.onPlayReceived.emit();
             }
 
             override fun onPause() {
                 super.onPause();
-                Log.i(TAG, "Media session callback onPause()");
+                Logger.i(TAG, "Media session callback onPause()");
                 MediaControlReceiver.onPauseReceived.emit();
             }
 
             override fun onStop() {
                 super.onStop();
-                Log.i(TAG, "Media session callback onStop()");
+                Logger.i(TAG, "Media session callback onStop()");
                 MediaControlReceiver.onCloseReceived.emit();
             }
 
             override fun onSkipToPrevious() {
                 super.onSkipToPrevious();
-                Log.i(TAG, "Media session callback onSkipToPrevious()");
+                Logger.i(TAG, "Media session callback onSkipToPrevious()");
                 MediaControlReceiver.onPreviousReceived.emit();
             }
+
+            override fun onSkipToNext() {
+                super.onSkipToNext()
+                Logger.i(TAG, "Media session callback onSkipToNext()");
+                MediaControlReceiver.onNextReceived.emit();
+            }
         });
     }
 
     override fun onCreate() {
-        Logger.i(TAG, "onCreate called");
+        Logger.v(TAG, "onCreate");
         super.onCreate()
     }
 
     override fun onDestroy() {
-        Logger.i(TAG, "onDestroy called");
+        Logger.v(TAG, "onDestroy");
         _instance = null;
         MediaControlReceiver.onCloseReceived.emit();
         super.onDestroy();
@@ -138,7 +144,7 @@ class MediaPlaybackService : Service() {
     }
 
     fun closeMediaSession() {
-        Logger.i(TAG, "closeMediaSession called");
+        Logger.v(TAG, "closeMediaSession");
         stopForeground(true);
 
         val focusRequest = _focusRequest;
@@ -159,7 +165,7 @@ class MediaPlaybackService : Service() {
     }
 
     fun updateMediaSession(videoUpdated: IPlatformVideo?) {
-        Logger.i(TAG, "updateMediaSession called");
+        Logger.v(TAG, "updateMediaSession");
         var isUpdating = false;
         val video: IPlatformVideo;
         if(videoUpdated == null) {
@@ -270,7 +276,7 @@ class MediaPlaybackService : Service() {
         val notif = builder.build();
         notif.flags = notif.flags or NotificationCompat.FLAG_ONGOING_EVENT or NotificationCompat.FLAG_NO_CLEAR;
 
-        Logger.i(TAG, "Updating notification bitmap=${if (bitmap != null) "not null" else "null"} channelId=${channel.id} icon=${icon} video=${video?.name ?: ""} playWhenReady=${playWhenReady} session.sessionToken=${session.sessionToken}");
+        Logger.i(TAG, "Updating notification bitmap=${if (bitmap != null) "yes" else "no."} channelId=${channel.id} icon=${icon} video=${video?.name ?: ""} playWhenReady=${playWhenReady} session.sessionToken=${session.sessionToken}");
 
         startForeground(MEDIA_NOTIF_ID, notif, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK);
 
@@ -285,6 +291,7 @@ class MediaPlaybackService : Service() {
                 PlaybackStateCompat.ACTION_PLAY or
                 PlaybackStateCompat.ACTION_PAUSE or
                 PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS or
+                PlaybackStateCompat.ACTION_SKIP_TO_NEXT or
                 PlaybackStateCompat.ACTION_PLAY_PAUSE
             )
             .setState(state, pos, 1f, SystemClock.elapsedRealtime())

app/src/main/java/com/futo/platformplayer/states/StateApp.kt

@@ -2,7 +2,9 @@ package com.futo.platformplayer.states
 
 import android.Manifest
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.media.AudioManager
@@ -10,16 +12,31 @@ import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
+import android.net.Uri
 import android.os.Environment
+import android.provider.DocumentsContract
 import android.util.DisplayMetrics
+import androidx.activity.ComponentActivity
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.net.toUri
+import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.work.*
 import com.futo.platformplayer.*
+import com.futo.platformplayer.R
+import com.futo.platformplayer.activities.CaptchaActivity
+import com.futo.platformplayer.activities.IWithResultLauncher
 import com.futo.platformplayer.activities.MainActivity
+import com.futo.platformplayer.api.media.Serializer
+import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
 import com.futo.platformplayer.background.BackgroundWorker
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event0
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
+import com.futo.platformplayer.fragment.mainactivity.main.HomeFragment
+import com.futo.platformplayer.fragment.mainactivity.main.SourceDetailFragment
 import com.futo.platformplayer.logging.AndroidLogConsumer
 import com.futo.platformplayer.logging.FileLogConsumer
 import com.futo.platformplayer.logging.LogLevel
@@ -28,7 +45,10 @@ import com.futo.platformplayer.receivers.AudioNoisyReceiver
 import com.futo.platformplayer.services.DownloadService
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.v2.ManagedStore
+import com.stripe.android.core.utils.encodeToJson
 import kotlinx.coroutines.*
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import java.io.File
 import java.time.OffsetDateTime
 import java.util.*
@@ -42,7 +62,9 @@ import java.util.concurrent.TimeUnit
 class StateApp {
     val isMainActive: Boolean get() = contextOrNull != null && contextOrNull is MainActivity; //if context is MainActivity, it means its active
 
+    /*
     private val externalRootDirectory = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS), "Grayjay");
+
     fun getExternalRootDirectory(): File? {
         if(!externalRootDirectory.exists()) {
             val result = externalRootDirectory.mkdirs();
@@ -52,6 +74,61 @@ class StateApp {
         }
         else
             return externalRootDirectory;
+    }*/
+
+    fun getExternalGeneralDirectory(context: Context): DocumentFile? {
+        val generalUri = Settings.instance.storage.getStorageGeneralUri();
+        if(isValidStorageUri(context, generalUri))
+            return DocumentFile.fromTreeUri(context, generalUri!!);
+        return null;
+    }
+    fun changeExternalGeneralDirectory(context: IWithResultLauncher, onChanged: ((DocumentFile?)->Unit)? = null) {
+        if(context is Context)
+            requestDirectoryAccess(context, "General Files", "This directory is used to save auto-backups and other persistent files.", null) {
+                if(it != null)
+                    context.contentResolver.takePersistableUriPermission(it, Intent.FLAG_GRANT_WRITE_URI_PERMISSION.or(Intent.FLAG_GRANT_READ_URI_PERMISSION));
+                if(it != null && isValidStorageUri(context, it)) {
+                    Logger.i(TAG, "Changed external general directory: ${it}");
+                    Settings.instance.storage.storage_general = it.toString();
+                    Settings.instance.save();
+
+                    onChanged?.invoke(getExternalGeneralDirectory(context));
+                }
+                else
+                    scopeOrNull?.launch(Dispatchers.Main) {
+                        UIDialogs.toast("Failed to gain access to\n [${it?.lastPathSegment}]");
+                    };
+            };
+    }
+    fun getExternalDownloadDirectory(context: Context): DocumentFile? {
+        val downloadUri = Settings.instance.storage.storage_download?.let { Uri.parse(it) };
+        if(isValidStorageUri(context, downloadUri))
+            return DocumentFile.fromTreeUri(context, downloadUri!!);
+        return null;
+    }
+    fun changeExternalDownloadDirectory(context: IWithResultLauncher, onChanged: ((DocumentFile?)->Unit)? = null) {
+
+        scopeOrNull?.launch(Dispatchers.Main) {
+            UIDialogs.toast("External download directory not yet used by export (WIP)");
+        };
+        if(context is Context)
+            requestDirectoryAccess(context, "Download Exports", "This directory is used to export downloads to for external usage.", null) {
+                if(it != null)
+                    context.contentResolver.takePersistableUriPermission(it, Intent.FLAG_GRANT_WRITE_URI_PERMISSION.or(Intent.FLAG_GRANT_READ_URI_PERMISSION));
+                if(it != null && isValidStorageUri(context, it)) {
+                    Logger.i(TAG, "Changed external download directory: ${it}");
+                    Settings.instance.storage.storage_general = it.toString();
+                    Settings.instance.save();
+
+                    onChanged?.invoke(getExternalDownloadDirectory(context));
+                }
+            };
+    }
+    fun isValidStorageUri(context: Context, uri: Uri?): Boolean {
+        if(uri == null)
+            return false;
+
+        return context.contentResolver.persistedUriPermissions.any { it.uri == uri && it.isReadPermission && it.isWritePermission };
     }
 
     //Scope
@@ -158,6 +235,32 @@ class StateApp {
         return state;
     }
 
+    fun requestDirectoryAccess(activity: IWithResultLauncher, name: String, purpose: String? = null, path: Uri?, handle: (Uri?)->Unit)
+    {
+        if(activity is Context)
+        {
+            UIDialogs.showDialog(activity, R.drawable.ic_security, "Directory required for\n${name}", "Please select a directory for ${name}.\n${purpose}".trim(), null, 0,
+                UIDialogs.Action("Cancel", {}),
+                UIDialogs.Action("Ok", {
+                    val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+                    if(path != null)
+                        intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, path);
+                    intent.flags = Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                        .or(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                        .or(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
+                        .or(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);
+
+                    activity.launchForResult(intent, 99) {
+                        if(it.resultCode == Activity.RESULT_OK) {
+                            handle(it.data?.data);
+                        }
+                        else
+                            UIDialogs.showDialogOk(context, R.drawable.ic_security_pred, "No access granted");
+                    };
+                }, UIDialogs.ActionStyle.PRIMARY));
+        }
+    }
+
     //Lifecycle
     fun setGlobalContext(context: Context, coroutineScope: CoroutineScope? = null) {
         _context = context;
@@ -260,7 +363,7 @@ class StateApp {
         }
 
         Logger.onLogSubmitted.subscribe {
-            scopeGetter().launch(Dispatchers.Main) {
+            scopeOrNull?.launch(Dispatchers.Main) {
                 try {
                     if (it != null) {
                         UIDialogs.toast("Uploaded " + (it ?: "null"), true);
@@ -330,24 +433,50 @@ class StateApp {
             StatePlaylists.instance.toMigrateCheck()
         ).flatten(), 0);
 
-        scope.launch {
-            delay(5000);
-            StateSubscriptions.instance.updateSubscriptionFeed(scope, false);
+        if(Settings.instance.subscriptions.fetchOnAppBoot) {
+            scope.launch(Dispatchers.IO) {
+                val subRequestCounts = StateSubscriptions.instance.getSubscriptionRequestCount();
+                val reqCountStr = subRequestCounts.map { "    ${it.key.config.name}: ${it.value}/${it.key.config.subscriptionRateLimit}" }.joinToString("\n");
+                val isRateLimitReached = !subRequestCounts.any { clientCount -> clientCount.key.config.subscriptionRateLimit?.let { rateLimit -> clientCount.value > rateLimit } == true };
+                if (isRateLimitReached) {
+                    Logger.w(TAG, "Subscriptions request on boot, request counts:\n${reqCountStr}");
+                    delay(5000);
+                    StateSubscriptions.instance.updateSubscriptionFeed(scope, false);
+                }
+                else
+                    Logger.w(TAG, "Too many subscription requests required:\n${reqCountStr}");
+            }
         }
 
         val interval = Settings.instance.subscriptions.getSubscriptionsBackgroundIntervalMinutes();
         scheduleBackgroundWork(context, interval != 0, interval);
 
-
         if(!Settings.instance.backup.didAskAutoBackup && !Settings.instance.backup.shouldAutomaticBackup()) {
             StateAnnouncement.instance.registerAnnouncement("backup", "Set Automatic Backup", "Configure daily backups of your data to restore in case of catastrophic failure.", AnnouncementType.SESSION, null, null, "Configure", {
-                UIDialogs.showAutomaticBackupDialog(context);
-                StateAnnouncement.instance.deleteAnnouncement("backup");
+                if(context is IWithResultLauncher && !Settings.instance.storage.isStorageMainValid(context)) {
+                    UIDialogs.toast("Missing general directory");
+                    changeExternalGeneralDirectory(context) {
+                        UIDialogs.showAutomaticBackupDialog(context);
+                        StateAnnouncement.instance.deleteAnnouncement("backup");
+                    };
+                }
+                else {
+                    UIDialogs.showAutomaticBackupDialog(context);
+                    StateAnnouncement.instance.deleteAnnouncement("backup");
+                }
             }, "No Backup", {
                 Settings.instance.backup.didAskAutoBackup = true;
                 Settings.instance.save();
             });
         }
+        else if(Settings.instance.backup.didAskAutoBackup && Settings.instance.backup.shouldAutomaticBackup() && !Settings.instance.storage.isStorageMainValid(context)) {
+            if(context is IWithResultLauncher) {
+                Logger.i(TAG, "Backup set without general directory, please select general external directory");
+                changeExternalGeneralDirectory(context) {
+                    Logger.i(TAG, "Directory set, Auto-backup should resume to this location");
+                };
+            }
+        }
 
         instance.scopeOrNull?.launch(Dispatchers.IO) {
             try {
@@ -471,7 +600,6 @@ class StateApp {
                 if (_lastNetworkState != NetworkState.DISCONNECTED) {
                     scopeOrNull?.launch(Dispatchers.Main) {
                         try {
-                            Logger.i(TAG, "onConnectionAvailable emitted");
                             onConnectionAvailable.emit();
                         } catch (e: Throwable) {
                             Logger.e(TAG, "Failed to emit onConnectionAvailable", e)
@@ -533,6 +661,33 @@ class StateApp {
         }
     }
 
+    private var hasCaptchaDialog = false;
+    fun handleCaptchaException(client: JSClient, exception: ScriptCaptchaRequiredException) {
+        Logger.w(HomeFragment.TAG, "[${client.name}] Plugin captcha required.", exception);
+
+        scopeOrNull?.launch(Dispatchers.Main) {
+            if(hasCaptchaDialog)
+                return@launch;
+            hasCaptchaDialog = true;
+            UIDialogs.showConfirmationDialog(context, "Captcha required\nPlugin [${client.config.name}]", {
+                CaptchaActivity.showCaptcha(context, client.config, exception.url, exception.body) {
+                    hasCaptchaDialog = false;
+                    StatePlugins.instance.setPluginCaptcha(client.config.id, it);
+                    scopeOrNull?.launch(Dispatchers.IO) {
+                        try {
+                            StatePlatform.instance.reloadClient(context, client.config.id);
+                        } catch (e: Throwable) {
+                            Logger.e(SourceDetailFragment.TAG, "Failed to reload client.", e)
+                            return@launch;
+                        }
+                    }
+                }
+            }, {
+                hasCaptchaDialog = false;
+            })
+        }
+    }
+
     companion object {
         private val TAG = "StateApp";
         @SuppressLint("StaticFieldLeak") //This is only alive while MainActivity is alive

app/src/main/java/com/futo/platformplayer/states/StateBackup.kt

@@ -1,17 +1,33 @@
 package com.futo.platformplayer.states
 
+import android.app.Activity
 import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.provider.DocumentsContract.EXTRA_INITIAL_URI
+import androidx.activity.ComponentActivity
 import androidx.core.app.ShareCompat
 import androidx.core.content.FileProvider
+import androidx.core.net.toUri
+import androidx.documentfile.provider.DocumentFile
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.activities.IWithResultLauncher
+import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.activities.SettingsActivity
+import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
+import com.futo.platformplayer.copyTo
+import com.futo.platformplayer.copyToOutputStream
 import com.futo.platformplayer.encryption.EncryptionProvider
+import com.futo.platformplayer.getInputStream
 import com.futo.platformplayer.getNowDiffHours
+import com.futo.platformplayer.getOutputStream
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.readBytes
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.v2.ManagedStore
+import com.futo.platformplayer.writeBytes
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -22,6 +38,9 @@ import kotlinx.serialization.json.Json
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
+import java.io.FileInputStream
+import java.io.FileNotFoundException
+import java.io.InputStream
 import java.time.OffsetDateTime
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
@@ -34,12 +53,22 @@ class StateBackup {
 
         private val _autoBackupLock = Object();
 
+        private fun getAutomaticBackupDocumentFiles(context: Context, create: Boolean = false): Pair<DocumentFile?, DocumentFile?> {
+            if(!Settings.instance.storage.isStorageMainValid(context))
+                return Pair(null, null);
+            val uri = Settings.instance.storage.getStorageGeneralUri() ?: return Pair(null, null);
+            val dir = DocumentFile.fromTreeUri(context, uri) ?: return Pair(null, null);
+            val mainBackupFile = dir.findFile("GrayjayBackup.ezip") ?: if(create) dir.createFile("grayjay/ezip", "GrayjayBackup.ezip") else null;
+            val secondaryBackupFile = dir.findFile("GrayjayBackup.ezip.old") ?: if(create) dir.createFile("grayjay/ezip", "GrayjayBackup.ezip.old") else null;
+            return Pair(mainBackupFile, secondaryBackupFile);
+        }
+        /*
         private fun getAutomaticBackupFiles(): Pair<File, File> {
             val dir = StateApp.instance.getExternalRootDirectory();
             if(dir == null)
                 throw IllegalStateException("Can't access external files");
             return Pair(File(dir, "GrayjayBackup.ezip"), File(dir, "GrayjayBackup.ezip.old"))
-        }
+        }*/
 
 
         fun getAllMigrationStores(): List<ManagedStore<*>> = listOf(
@@ -56,10 +85,11 @@ class StateBackup {
             return password.padStart(32, '9');
         }
         fun hasAutomaticBackup(): Boolean {
-            if(StateApp.instance.getExternalRootDirectory() == null)
+            val context = StateApp.instance.contextOrNull ?: return false;
+            if(!Settings.instance.storage.isStorageMainValid(context))
                 return false;
-            val files = getAutomaticBackupFiles();
-            return files.first.exists() || files.second.exists();
+            val files = getAutomaticBackupDocumentFiles(context,);
+            return files.first?.exists() ?: false || files.second?.exists() ?: false;
         }
         fun startAutomaticBackup(force: Boolean = false) {
             val lastBackupHoursAgo = Settings.instance.backup.lastAutoBackupTime.getNowDiffHours();
@@ -72,20 +102,27 @@ class StateBackup {
                 try {
                     Logger.i(TAG, "Starting AutoBackup (Last ${lastBackupHoursAgo} ago)");
                     synchronized(_autoBackupLock) {
+                        val context = StateApp.instance.contextOrNull ?: return@synchronized;
                         val data = export();
                         val zip = data.asZip();
 
                         val encryptedZip = EncryptionProvider.instance.encrypt(zip, getAutomaticBackupPassword());
 
-                        val backupFiles = getAutomaticBackupFiles();
-                        val exportFile = backupFiles.first;
-                        if (exportFile.exists())
-                            exportFile.copyTo(backupFiles.second, true);
+                        if(!Settings.instance.storage.isStorageMainValid(context)) {
+                            StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
+                                UIDialogs.toast("Missing permissions for auto-backup, please set the external general directory in settings");
+                            }
+                        }
+                        else {
+                            val backupFiles = getAutomaticBackupDocumentFiles(context, true);
+                            val exportFile = backupFiles.first;
+                            if (exportFile?.exists() == true && backupFiles.second != null)
+                                exportFile!!.copyTo(context, backupFiles.second!!);
+                            exportFile!!.writeBytes(context, encryptedZip);
 
-                        exportFile.writeBytes(encryptedZip);
-
-                        Settings.instance.backup.lastAutoBackupTime = OffsetDateTime.now(); //OffsetDateTime.now();
-                        Settings.instance.save();
+                            Settings.instance.backup.lastAutoBackupTime = OffsetDateTime.now(); //OffsetDateTime.now();
+                            Settings.instance.save();
+                        }
                     }
                     Logger.i(TAG, "Finished AutoBackup");
                 }
@@ -97,32 +134,51 @@ class StateBackup {
                 }
             }
         }
+
+        //TODO: This goes has recently changed to use DocumentFiles and DocumentTree, and might need additional checks/edgecases covered.
         fun restoreAutomaticBackup(context: Context, scope: CoroutineScope, password: String, ifExists: Boolean = false) {
             if(ifExists && !hasAutomaticBackup()) {
                 Logger.i(TAG, "No AutoBackup exists, not restoring");
                 return;
             }
 
-            //TODO: Sadly on reinstalls of app this fails on file permissions.
-
             Logger.i(TAG, "Starting AutoBackup restore");
             synchronized(_autoBackupLock) {
 
-                val backupFiles = getAutomaticBackupFiles();
+                val backupFiles = getAutomaticBackupDocumentFiles(StateApp.instance.context, false);
                 try {
-                    if (!backupFiles.first.exists())
+                    if (backupFiles.first?.exists() != true)
                         throw IllegalStateException("Backup file does not exist");
 
-                    val backupBytesEncrypted = backupFiles.first.readBytes();
+                    val backupBytesEncrypted = backupFiles.first!!.readBytes(context) ?: throw IllegalStateException("Could not read stream of [${backupFiles.first?.uri}]");
                     val backupBytes = EncryptionProvider.instance.decrypt(backupBytesEncrypted, getAutomaticBackupPassword(password));
                     importZipBytes(context, scope, backupBytes);
                     Logger.i(TAG, "Finished AutoBackup restore");
-                } catch (ex: Throwable) {
+                }
+                catch (exSec: FileNotFoundException) {
+                    Logger.e(TAG, "Failed to access backup file", exSec);
+                    val activity = if(SettingsActivity.getActivity() != null)
+                        SettingsActivity.getActivity();
+                    else if(StateApp.instance.isMainActive)
+                        StateApp.instance.contextOrNull;
+                    else null;
+                    if(activity != null) {
+                        if(activity is IWithResultLauncher)
+                            StateApp.instance.requestDirectoryAccess(activity, "Grayjay Backup Directory", "Allows restoring of a backup", backupFiles.first?.parentFile?.uri) {
+                                if(it != null) {
+                                    val customFiles = StateBackup.getAutomaticBackupDocumentFiles(activity);
+                                    if(customFiles.first != null && customFiles.first!!.isFile && customFiles.first!!.exists() && customFiles.first!!.canRead())
+                                        restoreAutomaticBackup(context, scope, password, ifExists);
+                                }
+                            };
+                    }
+                }
+                catch (ex: Throwable) {
                     Logger.e(TAG, "Failed main AutoBackup restore", ex)
-                    if (!backupFiles.second.exists())
+                    if (backupFiles.second?.exists() != true)
                         throw ex;
 
-                    val backupBytesEncrypted = backupFiles.second.readBytes();
+                    val backupBytesEncrypted = backupFiles.second!!.readBytes(context) ?: throw IllegalStateException("Could not read stream of [${backupFiles.second?.uri}]");
                     val backupBytes = EncryptionProvider.instance.decrypt(backupBytesEncrypted, getAutomaticBackupPassword(password));
                     importZipBytes(context, scope, backupBytes);
                     Logger.i(TAG, "Finished AutoBackup restore");
@@ -156,7 +212,8 @@ class StateBackup {
             );
             val storesToSave = getAllMigrationStores()
                 .associateBy { it.name }
-                .mapValues { it.value.getAllReconstructionStrings() };
+                .mapValues { it.value.getAllReconstructionStrings() }
+                .toMutableMap();
             val settings = Settings.instance.encode();
             val pluginSettings = StatePlugins.instance.getPlugins()
                 .associateBy { it.config.id }
@@ -166,7 +223,12 @@ class StateBackup {
                 .associateBy { it.config.id }
                 .mapValues { it.value.config.sourceUrl!! };
 
-            return ExportStructure(exportInfo, settings, storesToSave, pluginUrls, pluginSettings);
+
+            val export = ExportStructure(exportInfo, settings, storesToSave, pluginUrls, pluginSettings);
+            //export.videoCache = StatePlaylists.instance.getHistory()
+            //    .distinctBy { it.video.url }
+            //    .map { it.video };
+            return export;
         }
 
 
@@ -342,6 +404,7 @@ class StateBackup {
         val plugins: Map<String, String>,
         val pluginSettings: Map<String, Map<String, String?>>,
     ) {
+        var videoCache: List<SerializedPlatformVideo>? = null;
 
         fun asZip(): ByteArray {
             return ByteArrayOutputStream().use { byteStream ->

app/src/main/java/com/futo/platformplayer/states/StateDownloads.kt

@@ -1,12 +1,16 @@
 package com.futo.platformplayer.states
 
+import android.content.ContentResolver
+import android.net.Uri
 import android.os.StatFs
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.exceptions.AlreadyQueuedException
 import com.futo.platformplayer.api.media.models.streams.sources.*
+import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.constructs.Event0
@@ -108,6 +112,11 @@ class StateDownloads {
     fun getPlaylistDownload(playlistId: String): PlaylistDownloadDescriptor? {
         return _downloadPlaylists.findItem { it.id == playlistId };
     }
+    fun savePlaylistDownload(playlistDownload: PlaylistDownloadDescriptor) {
+        synchronized(playlistDownload.preventDownload) {
+            _downloadPlaylists.save(playlistDownload);
+        }
+    }
     fun deleteCachedPlaylist(id: String) {
         val pdl = getPlaylistDownload(id);
         if(pdl != null)
@@ -142,6 +151,19 @@ class StateDownloads {
         _downloading.delete(download);
         onDownloadsChanged.emit();
     }
+    fun preventPlaylistDownload(download: VideoDownload) {
+        if(download.video != null && download.groupID != null && download.groupType == VideoDownload.GROUP_PLAYLIST) {
+            getPlaylistDownload(download.groupID!!)?.let {
+                synchronized(it.preventDownload) {
+                    if(download.video?.url != null && !it.preventDownload.contains(download.video!!.url)) {
+                        it.preventDownload.add(download.video!!.url);
+                        savePlaylistDownload(it);
+                        Logger.w(TAG, "Preventing further download attempts in playlist [${it.id}] for [${download.name}]:${download.video?.url}");
+                    }
+                }
+            }
+        }
+    }
 
     fun checkForDownloadsTodos() {
         val hasPlaylistChanged = checkForOutdatedPlaylists();
@@ -157,12 +179,15 @@ class StateDownloads {
         val playlistsDownloaded = getCachedPlaylists();
         for(playlist in playlistsDownloaded) {
             val playlistDownload = getPlaylistDownload(playlist.playlist.id) ?: continue;
-
-            if(playlist.playlist.videos.any{ getCachedVideo(it.id) == null }) {
-                Logger.i(TAG, "Found new videos on playlist [${playlist.playlist.name}]");
+            val toIgnore = playlistDownload.getPreventDownloadList();
+            val missingVideoCount = playlist.playlist.videos.count { !toIgnore.contains(it.url) && getCachedVideo(it.id) == null };
+            if(missingVideoCount > 0) {
+                Logger.i(TAG, "Found new videos (${missingVideoCount}) on playlist [${playlist.playlist.name}] to download");
                 continueDownload(playlistDownload, playlist.playlist);
                 hasChanged = true;
             }
+            else
+                Logger.v(TAG, "Offline playlist [${playlist.playlist.name}] is up to date");
         }
         return hasChanged;
     }
@@ -171,6 +196,11 @@ class StateDownloads {
         var hasNew = false;
         for(item in playlist.videos) {
             val existing = getCachedVideo(item.id);
+
+            if(!playlistDownload.shouldDownload(item)) {
+                Logger.i(TAG, "Not downloading for playlist [${playlistDownload.id}] Video [${item.name}]:${item.url}")
+                continue;
+            }
             if(existing == null) {
                 val ongoingDownload = getDownloading().find { it.id.value == item.id.value && it.id.value != null };
                 if(ongoingDownload != null) {
@@ -291,6 +321,32 @@ class StateDownloads {
         }
     }
 
+    suspend fun downloadSubtitles(subtitle: ISubtitleSource, contentResolver: ContentResolver): SubtitleRawSource? {
+        val subtitleUri = subtitle.getSubtitlesURI();
+        if(subtitleUri == null)
+            return null;
+        var subtitles: String? = null;
+        if ("file" == subtitleUri.scheme) {
+            val inputStream = contentResolver.openInputStream(subtitleUri);
+            inputStream?.use { stream ->
+                val reader = stream.bufferedReader();
+                subtitles = reader.use { it.readText() };
+            }
+        } else if ("http" == subtitleUri.scheme || "https" == subtitleUri.scheme) {
+            val client = ManagedHttpClient();
+            val subtitleResponse = client.get(subtitleUri.toString());
+            if (!subtitleResponse.isOk) {
+                throw Exception("Cannot fetch subtitles from source '${subtitleUri}': ${subtitleResponse.code}");
+            }
+
+            subtitles = subtitleResponse.body?.toString()
+                ?: throw Exception("Subtitles are invalid '${subtitleUri}': ${subtitleResponse.code}");
+        } else {
+            throw NotImplementedError("Unsuported scheme");
+        }
+        return if (subtitles != null) SubtitleRawSource(subtitle.name, subtitle.format, subtitles!!) else null;
+    }
+
     fun cleanupDownloads(): Pair<Int, Long> {
         val expected = getDownloadedVideos();
         val validFiles = HashSet(expected.flatMap { it.videoSource.map { it.filePath } + it.audioSource.map { it.filePath } });

app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt

@@ -8,6 +8,7 @@ import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.IPluginSourced
 import com.futo.platformplayer.api.media.PlatformClientPool
+import com.futo.platformplayer.api.media.PlatformMultiClientPool
 import com.futo.platformplayer.api.media.exceptions.NoPlatformClientException
 import com.futo.platformplayer.api.media.models.FilterGroup
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
@@ -30,6 +31,7 @@ import com.futo.platformplayer.awaitFirstNotNullDeferred
 import com.futo.platformplayer.constructs.BatchedTaskHandler
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.fromPool
 import com.futo.platformplayer.getNowDiffDays
 import com.futo.platformplayer.getNowDiffSeconds
 import com.futo.platformplayer.logging.Logger
@@ -38,6 +40,7 @@ import com.futo.platformplayer.stores.*
 import kotlinx.coroutines.*
 import okhttp3.internal.concat
 import java.time.OffsetDateTime
+import kotlin.reflect.jvm.internal.impl.builtins.jvm.JavaToKotlinClassMap.PlatformMutabilityMapping
 import kotlin.streams.toList
 
 /***
@@ -45,7 +48,7 @@ import kotlin.streams.toList
  */
 class StatePlatform {
     private val TAG = "StatePlatform";
-    private val VIDEO_CACHE = 1024 * 1024 * 10;
+    private val VIDEO_CACHE = 100;
 
     private val _scope = CoroutineScope(Dispatchers.IO);
 
@@ -61,7 +64,18 @@ class StatePlatform {
     private val _availableClients : ArrayList<IPlatformClient> = ArrayList();
     private val _enabledClients : ArrayList<IPlatformClient> = ArrayList();
 
-    private val _clientPools: HashMap<IPlatformClient, PlatformClientPool> = hashMapOf();
+    //ClientPools are used to isolate plugin usage of certain components from others
+    //This prevents for example a background task like subscriptions from blocking a user from opening a video
+    //It also allows parallel usage of plugins that would otherwise be impossible.
+    //Pools always follow the behavior of the base client. So if user disables a plugin, it kills all pooled clients.
+    //Each pooled client adds additional memory usage.
+    //WARNING: Be careful with pooling some calls, as they might use the plugin subsequently afterwards. For example pagers might block plugins in future calls.
+    private val _mainClientPool = PlatformMultiClientPool("Main", 2); //Used for all main user events, generally user critical
+    private val _pagerClientPool = PlatformMultiClientPool("Pagers", 2); //Used primarily for calls that result in front-end pagers, preventing them from blocking other calls.
+    private val _channelClientPool = PlatformMultiClientPool("Channels", 15); //Used primarily for subscription/background channel fetches
+    private val _trackerClientPool = PlatformMultiClientPool("Trackers", 1); //Used exclusively for playback trackers
+    private val _liveEventClientPool = PlatformMultiClientPool("LiveEvents", 1); //Used exclusively for live events
+
 
     private val _primaryClientPersistent = FragmentedStorage.get<StringStorage>("primaryClient");
     private var _primaryClientObj : IPlatformClient? = null;
@@ -83,14 +97,16 @@ class StatePlatform {
     private val _batchTaskGetVideoDetails: BatchedTaskHandler<String, IPlatformContentDetails> = BatchedTaskHandler<String, IPlatformContentDetails>(_scope,
         { url ->
             Logger.i(StatePlatform::class.java.name, "Fetching video details [${url}]");
-            _enabledClients.find { it.isContentDetailsUrl(url) }?.getContentDetails(url)
-            ?: throw NoPlatformClientException("No client enabled that supports this url ($url)");
+            _enabledClients.find { it.isContentDetailsUrl(url) }?.let {
+                _mainClientPool.getClientPooled(it).getContentDetails(url)
+            } ?: throw NoPlatformClientException("No client enabled that supports this url ($url)");
         },
         {
             if(!Settings.instance.browsing.videoCache)
                 return@BatchedTaskHandler null;
             else {
                 val cached = synchronized(_cache) { _cache.get(it); } ?: return@BatchedTaskHandler null;
+                Logger.i(TAG, "Video Cache Hit [${cached.video.name}]");
                 if (cached.creationTime.getNowDiffSeconds() > _cacheExpirationSeconds) {
                     Logger.i(TAG, "Invalidated cache for [${it}]");
                     synchronized(_cache) {
@@ -156,7 +172,11 @@ class StatePlatform {
                     _icons[plugin.config.id] = StatePlugins.instance.getPluginIconOrNull(plugin.config.id) ?:
                             ImageVariable(plugin.config.absoluteIconUrl, null);
 
-                    _availableClients.add(JSClient(context, plugin));
+                    val client = JSClient(context, plugin);
+                    client.onCaptchaException.subscribe { client, ex ->
+                        StateApp.instance.handleCaptchaException(client, ex);
+                    }
+                    _availableClients.add(client);
                 }
 
                 if(_availableClients.distinctBy { it.id }.count() < _availableClients.size)
@@ -231,21 +251,7 @@ class StatePlatform {
     fun getClient(id: String): IPlatformClient {
         return getClientOrNull(id) ?: throw IllegalArgumentException("Client with id $id does not exist");
     }
-    fun getClientPooled(parentClient: IPlatformClient, capacity: Int): IPlatformClient {
-        val pool = synchronized(_clientPools) {
-            if(!_clientPools.containsKey(parentClient))
-                _clientPools[parentClient] = PlatformClientPool(parentClient).apply {
-                    this.onDead.subscribe { client, pool ->
-                        synchronized(_clientPools) {
-                            if(_clientPools[parentClient] == pool)
-                                _clientPools.remove(parentClient);
-                        }
-                    }
-                }
-            _clientPools[parentClient]!!;
-        };
-        return pool.getClient(capacity);
-    }
+
     fun getClientsByClaimType(claimType: Int): List<IPlatformClient> {
         return getEnabledClients().filter { it.isClaimTypeSupported(claimType) };
     }
@@ -285,6 +291,9 @@ class StatePlatform {
                     StatePlugins.instance.getPlugin(id)
                         ?: throw IllegalStateException("Client existed, but plugin config didn't")
                 );
+            newClient.onCaptchaException.subscribe { client, ex ->
+                StateApp.instance.handleCaptchaException(client, ex);
+            }
 
             synchronized(_clientsLock) {
                 if (_enabledClients.contains(client)) {
@@ -373,7 +382,7 @@ class StatePlatform {
                 synchronized(clientIdsOngoing) {
                     clientIdsOngoing.add(it.id);
                 }
-                val homeResult = it.getHome();
+                val homeResult = it.fromPool(_pagerClientPool).getHome();
                 synchronized(clientIdsOngoing) {
                     clientIdsOngoing.remove(it.id);
                 }
@@ -393,17 +402,19 @@ class StatePlatform {
         val deferred: List<Pair<IPlatformClient, Deferred<IPager<IPlatformContent>?>>> = clients.map {
             return@map Pair(it, scope.async(Dispatchers.IO) {
                 try {
-                    val searchResult = it.getHome();
+                    val searchResult = it.fromPool(_pagerClientPool).getHome();
                     return@async searchResult;
                 } catch(ex: Throwable) {
                     Logger.e(TAG, "getHomeRefresh", ex);
-                    return@async null;
+                    throw ex;
+                    //return@async null;
                 }
             });
         }.toList();
 
         val finishedPager = deferred.map { it.second }.awaitFirstNotNullDeferred() ?: return EmptyPager();
         val toAwait = deferred.filter { it.second != finishedPager.first };
+
         return RefreshDistributionContentPager(
             listOf(finishedPager.second),
             toAwait.map { it.second },
@@ -572,6 +583,7 @@ class StatePlatform {
                     pagers.put(it.searchChannels(query), 1f);
             }
             catch(ex: Throwable) {
+                Logger.e(TAG, "Failed search channels", ex)
                 UIDialogs.toast("Failed search channels on [${it.name}]\n(${ex.message})");
             }
         };
@@ -604,13 +616,22 @@ class StatePlatform {
     }
 
     fun getPlaybackTracker(url: String): IPlaybackTracker? {
-        return getContentClientOrNull(url)?.getPlaybackTracker(url);
+        val baseClient = getContentClientOrNull(url) ?: return null;
+        if (baseClient !is JSClient) {
+            return baseClient.getPlaybackTracker(url);
+        }
+        val client = _trackerClientPool.getClientPooled(baseClient, 1);
+        return client.getPlaybackTracker(url);
     }
 
     fun hasEnabledChannelClient(url : String) : Boolean = getEnabledClients().any { it.isChannelUrl(url) };
-    fun getChannelClient(url : String) : IPlatformClient = getChannelClientOrNull(url)
+    fun getChannelClient(url : String, exclude: List<String>? = null) : IPlatformClient = getChannelClientOrNull(url, exclude)
         ?: throw NoPlatformClientException("No client enabled that supports this channel url (${url})");
-    fun getChannelClientOrNull(url : String) : IPlatformClient? = getEnabledClients().find { it.isChannelUrl(url) };
+    fun getChannelClientOrNull(url : String, exclude: List<String>? = null) : IPlatformClient? =
+        if(exclude == null)
+            getEnabledClients().find { it.isChannelUrl(url) }
+        else
+            getEnabledClients().find { !exclude.contains(it.id) && it.isChannelUrl(url) };
 
     fun getChannel(url: String, updateSubscriptions: Boolean = true): Deferred<IPlatformChannel>  {
         Logger.i(TAG, "Platform - getChannel");
@@ -621,13 +642,13 @@ class StatePlatform {
             return _scope.async { getChannelLive(url, updateSubscriptions) };
     }
 
-    fun getChannelContent(channelUrl: String, isSubscriptionOptimized: Boolean = false, usePooledClients: Int = 0): IPager<IPlatformContent> {
+    fun getChannelContent(channelUrl: String, isSubscriptionOptimized: Boolean = false, usePooledClients: Int = 0, ignorePlugins: List<String>? = null): IPager<IPlatformContent> {
         Logger.i(TAG, "Platform - getChannelVideos");
-        val baseClient = getChannelClient(channelUrl);
+        val baseClient = getChannelClient(channelUrl, ignorePlugins);
         val clientCapabilities = baseClient.getChannelCapabilities();
 
         val client = if(usePooledClients > 1)
-            getClientPooled(baseClient, usePooledClients);
+            _channelClientPool.getClientPooled(baseClient, usePooledClients);
         else baseClient;
 
         var lastStream: OffsetDateTime? = null;
@@ -643,19 +664,24 @@ class StatePlatform {
                 toQuery.add(ResultCapabilities.TYPE_STREAMS);
             if(clientCapabilities.hasType(ResultCapabilities.TYPE_LIVE))
                 toQuery.add(ResultCapabilities.TYPE_LIVE);
+            if(clientCapabilities.hasType(ResultCapabilities.TYPE_POSTS))
+                toQuery.add(ResultCapabilities.TYPE_POSTS);
 
             if(isSubscriptionOptimized) {
                 val sub = StateSubscriptions.instance.getSubscription(channelUrl);
                 if(sub != null) {
-                    val daysSinceLiveStream = sub.lastLiveStream.getNowDiffDays()
-                    if(daysSinceLiveStream > 7) {
-                        Logger.i(TAG, "Subscription [${channelUrl}] Last livestream > 7 days, skipping live streams [${daysSinceLiveStream} days ago]");
+                    if(!sub.shouldFetchStreams()) {
+                        Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 7 days, skipping live streams [${sub.lastLiveStream.getNowDiffDays()} days ago]");
                         toQuery.remove(ResultCapabilities.TYPE_LIVE);
                     }
-                    if(daysSinceLiveStream > 14) {
-                        Logger.i(TAG, "Subscription [${channelUrl}] Last livestream > 15 days, skipping streams [${daysSinceLiveStream} days ago]");
+                    if(!sub.shouldFetchLiveStreams()) {
+                        Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 15 days, skipping streams [${sub.lastLiveStream.getNowDiffDays()} days ago]");
                         toQuery.remove(ResultCapabilities.TYPE_STREAMS);
                     }
+                    if(!sub.shouldFetchPosts()) {
+                        Logger.i(TAG, "Subscription [${sub.channel.name}:${channelUrl}] Last livestream > 5 days, skipping posts [${sub.lastPost.getNowDiffDays()} days ago]");
+                        toQuery.remove(ResultCapabilities.TYPE_POSTS);
+                    }
                 }
             }
 
@@ -778,7 +804,7 @@ class StatePlatform {
         if(!client.capabilities.hasGetComments)
             return EmptyPager();
 
-        return client.getComments(url);
+        return client.fromPool(_mainClientPool).getComments(url);
     }
     fun getSubComments(comment: IPlatformComment): IPager<IPlatformComment> {
         Logger.i(TAG, "Platform - getSubComments");
@@ -789,7 +815,7 @@ class StatePlatform {
     fun getLiveEvents(url: String): IPager<IPlatformLiveEvent>? {
         Logger.i(TAG, "Platform - getLiveChat");
         var client = getContentClient(url);
-        return client.getLiveEvents(url);
+        return client.fromPool(_liveEventClientPool).getLiveEvents(url);
     }
     fun getLiveChatWindow(url: String): ILiveChatWindowDescriptor? {
         Logger.i(TAG, "Platform - getLiveChat");

app/src/main/java/com/futo/platformplayer/states/StatePlayer.kt

@@ -25,7 +25,7 @@ class StatePlayer {
     private val MIN_BUFFER_DURATION = 10000;
     private val MAX_BUFFER_DURATION = 60000;
     private val MIN_PLAYBACK_START_BUFFER = 500;
-    private val MIN_PLAYBACK_RESUME_BUFFER = 1000;
+    private val MIN_PLAYBACK_RESUME_BUFFER = 2500;
     private val BUFFER_SIZE = 1024 * 64;
 
     var isOpen : Boolean = false

app/src/main/java/com/futo/platformplayer/states/StatePlaylists.kt

@@ -4,6 +4,8 @@ import android.content.Context
 import android.net.Uri
 import androidx.core.content.FileProvider
 import com.futo.platformplayer.R
+import com.futo.platformplayer.api.media.PlatformID
+import com.futo.platformplayer.api.media.exceptions.NoPlatformClientException
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
@@ -38,6 +40,11 @@ class StatePlaylists {
         })
         .load();
     private val _historyStore = FragmentedStorage.storeJson<HistoryVideo>("history")
+        .withRestore(object: ReconstructStore<HistoryVideo>() {
+            override fun toReconstruction(obj: HistoryVideo): String = obj.toReconString();
+            override suspend fun toObject(id: String, backup: String, reconstructionBuilder: Builder): HistoryVideo
+                = HistoryVideo.fromReconString(backup, null);
+        })
         .load();
     val playlistStore = FragmentedStorage.storeJson<Playlist>("playlists")
         .withRestore(PlaylistBackup())
@@ -49,7 +56,7 @@ class StatePlaylists {
     val onWatchLaterChanged = Event0();
 
     fun toMigrateCheck(): List<ManagedStore<*>> {
-        return listOf(playlistStore, _watchlistStore);
+        return listOf(playlistStore, _watchlistStore, _historyStore);
     }
 
     fun getWatchLater() : List<SerializedPlatformVideo> {
@@ -122,6 +129,11 @@ class StatePlaylists {
                 }
 
                 if (shouldUpdate) {
+
+                    //A unrecovered item
+                    if(historyVideo.video.author.id.value == null && historyVideo.video.duration == 0L)
+                        historyVideo.video = SerializedPlatformVideo.fromVideo(video);
+
                     historyVideo.position = pos;
                     historyVideo.date = OffsetDateTime.now();
                     _historyStore.saveAsync(historyVideo);
@@ -254,6 +266,12 @@ class StatePlaylists {
                     builder.messages.add("${name}:[${it}] is no longer available");
                     return@map null;
                 }
+                catch(ex: NoPlatformClientException) {
+                    throw ReconstructionException(name, "No source enabled for [${it}]", ex);
+                    //TODO: Propagate this to dialog, and then back, allowing users to enable plugins...
+                    //builder.messages.add("No source enabled for [${it}]");
+                    //return@map null;
+                }
                 catch(ex: Throwable) {
                     throw ReconstructionException(name, "${name}:[${it}] ${ex.message}", ex);
                 }

app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt

@@ -6,6 +6,7 @@ import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourceAuth
+import com.futo.platformplayer.api.media.platforms.js.SourceCaptchaData
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginDescriptor
 import com.futo.platformplayer.logging.Logger
@@ -27,12 +28,20 @@ class StatePlugins {
     private val TAG = "StatePlugins";
 
     private val FORCE_REINSTALL_EMBEDDED = false;
+    private var _isFirstEmbedUpdate = true;
 
     private val _pluginScripts = FragmentedStorage.getDirectory<PluginScriptsDirectory>();
     private var _plugins = FragmentedStorage.storeJson<SourcePluginDescriptor>("plugins")
         .load();
     private val iconsDir = FragmentedStorage.getDirectory<PluginIconStorage>();
 
+
+    private val _syncObject = Object()
+    private var _embeddedSources: Map<String, String>? = null
+    private var _embeddedSourcesDefault: List<String>? = null
+    private var _sourcesUnderConstruction: Map<String, ImageVariable>? = null
+
+
     fun getPluginIconOrNull(id: String): ImageVariable? {
         if(iconsDir.hasIcon(id))
             return iconsDir.getIconBinary(id);
@@ -53,18 +62,6 @@ class StatePlugins {
         }
     }
 
-    @Serializable
-    private data class PluginConfig(
-        val SOURCES_EMBEDDED: Map<String, String>,
-        val SOURCES_EMBEDDED_DEFAULT: List<String>,
-        val SOURCES_UNDER_CONSTRUCTION: Map<String, String>
-    )
-
-    private val _syncObject = Object()
-    private var _embeddedSources: Map<String, String>? = null
-    private var _embeddedSourcesDefault: List<String>? = null
-    private var _sourcesUnderConstruction: Map<String, ImageVariable>? = null
-
     private fun ensureSourcesConfigLoaded(context: Context) {
         if (_embeddedSources != null && _embeddedSourcesDefault != null && _sourcesUnderConstruction != null) {
             return
@@ -122,8 +119,11 @@ class StatePlugins {
                     Logger.i(TAG, "Found outdated embedded plugin [${existing.config.id}] ${existing.config.name}, deleting and reinstalling");
                     deletePlugin(embedded.key);
                 }
+                else if(existing != null && _isFirstEmbedUpdate)
+                    Logger.i(TAG, "Embedded plugin [${existing.config.id}] ${existing.config.name}, up to date (${existing.config.version} >= ${embeddedConfig?.version})");
             }
         }
+        _isFirstEmbedUpdate = false;
     }
     fun installMissingEmbeddedPlugins(context: Context) {
         val plugins = getPlugins();
@@ -177,18 +177,16 @@ class StatePlugins {
     }
     fun installPlugin(context: Context, scope: CoroutineScope, sourceUrl: String, handler: ((Boolean) -> Unit)? = null) {
         scope.launch(Dispatchers.IO) {
+            val client = ManagedHttpClient();
+            val config: SourcePluginConfig;
             try {
-                val configResp = ManagedHttpClient().get(sourceUrl);
+                val configResp = client.get(sourceUrl);
                 if(!configResp.isOk)
                     throw IllegalStateException("Failed request with ${configResp.code}");
                 val configJson = configResp.body?.string();
                 if(configJson.isNullOrEmpty())
                     throw IllegalStateException("No response");
-                val config = SourcePluginConfig.fromJson(configJson, sourceUrl);
-
-                withContext(Dispatchers.Main) {
-                    installPlugin(context, scope, config, handler);
-                }
+                config = SourcePluginConfig.fromJson(configJson, sourceUrl);
             }
             catch(ex: SerializationException) {
                 Logger.e(TAG, "Failed decode config", ex);
@@ -199,8 +197,8 @@ class StatePlugins {
                             finish();
                             handler?.invoke(false);
                         }, UIDialogs.ActionStyle.PRIMARY));
-
                 };
+                return@launch;
             }
             catch(ex: Exception) {
                 Logger.e(TAG, "Failed fetch config", ex);
@@ -209,13 +207,36 @@ class StatePlugins {
                         handler?.invoke(false);
                     });
                 };
+                return@launch;
+            }
+
+            val script: String?
+            try {
+                val scriptResp = client.get(config.absoluteScriptUrl);
+                if (!scriptResp.isOk)
+                    throw IllegalStateException("script not available [${scriptResp.code}]");
+                script = scriptResp.body?.string();
+                if (script.isNullOrEmpty())
+                    throw IllegalStateException("script empty");
+            } catch (ex: Exception) {
+                Logger.e(TAG, "Failed fetch script", ex);
+                withContext(Dispatchers.Main) {
+                    UIDialogs.showGeneralErrorDialog(context, "Failed to fetch script", ex);
+                };
+                return@launch;
+            }
+
+            withContext(Dispatchers.Main) {
+                installPlugin(context, scope, config, script, handler);
             }
         }
     }
-    fun installPlugin(context: Context, scope: CoroutineScope, config: SourcePluginConfig, handler: ((Boolean)->Unit)? = null) {
+    fun installPlugin(context: Context, scope: CoroutineScope, config: SourcePluginConfig, script: String, handler: ((Boolean)->Unit)? = null) {
         val client = ManagedHttpClient();
         val warnings = config.getWarnings();
 
+        if (script.isEmpty())
+            throw IllegalStateException("script empty");
 
         fun doInstall(reinstall: Boolean) {
             UIDialogs.showDialogProgress(context) {
@@ -224,13 +245,6 @@ class StatePlugins {
 
                 scope.launch(Dispatchers.IO) {
                     try {
-                        val scriptResp = client.get(config.absoluteScriptUrl);
-                        if (!scriptResp.isOk)
-                            throw IllegalStateException("script not available [${scriptResp.code}]");
-                        val script = scriptResp.body?.string();
-                        if (script.isNullOrEmpty())
-                            throw IllegalStateException("script empty");
-
                         withContext(Dispatchers.Main) {
                             it.setText("Validating script...");
                             it.setProgress(0.25);
@@ -359,7 +373,7 @@ class StatePlugins {
             if(icon != null)
                 iconsDir.saveIconBinary(config.id, icon);
 
-            _plugins.save(SourcePluginDescriptor(config, null, flags));
+            _plugins.save(SourcePluginDescriptor(config, null, null, flags));
             return null;
         }
         catch(ex: Throwable) {
@@ -394,6 +408,18 @@ class StatePlugins {
         }
     }
 
+    fun setPluginCaptcha(id: String, captcha: SourceCaptchaData?) {
+        if(id == StateDeveloper.DEV_ID) {
+            StatePlatform.instance.getDevClient()?.let {
+                it.setCaptcha(captcha);
+            };
+            return;
+        }
+
+        val descriptor = getPlugin(id) ?: throw IllegalArgumentException("Plugin [${id}] does not exist");
+        descriptor.updateCaptcha(captcha);
+        _plugins.save(descriptor);
+    }
     fun setPluginAuth(id: String, auth: SourceAuth?) {
         if(id == StateDeveloper.DEV_ID) {
             StatePlatform.instance.getDevClient()?.let {
@@ -408,6 +434,13 @@ class StatePlugins {
     }
 
 
+    @Serializable
+    private data class PluginConfig(
+        val SOURCES_EMBEDDED: Map<String, String>,
+        val SOURCES_EMBEDDED_DEFAULT: List<String>,
+        val SOURCES_UNDER_CONSTRUCTION: Map<String, String>
+    )
+
     companion object {
         private var _instance : StatePlugins? = null;
         val instance : StatePlugins

app/src/main/java/com/futo/platformplayer/states/StatePolycentric.kt

@@ -126,7 +126,7 @@ class StatePolycentric {
         }
     }
 
-    fun getChannelContent(profile: PolycentricProfile, isSubscriptionOptimized: Boolean = false, channelConcurrency: Int = -1): IPager<IPlatformContent> {
+    fun getChannelContent(profile: PolycentricProfile, isSubscriptionOptimized: Boolean = false, channelConcurrency: Int = -1, ignorePlugins: List<String>? = null): IPager<IPlatformContent> {
         //TODO: Currently abusing subscription concurrency for parallelism
         val concurrency = if (channelConcurrency == -1) Settings.instance.subscriptions.getSubscriptionsConcurrency() else channelConcurrency;
         val pagers = profile.ownedClaims.groupBy { it.claim.claimType }.mapNotNull {
@@ -138,7 +138,7 @@ class StatePolycentric {
                 return@mapNotNull null;
             }
 
-            return@mapNotNull StatePlatform.instance.getChannelContent(url, isSubscriptionOptimized, concurrency);
+            return@mapNotNull StatePlatform.instance.getChannelContent(url, isSubscriptionOptimized, concurrency, ignorePlugins);
         }.toTypedArray();
 
         val pager = MultiChronoContentPager(pagers);
@@ -302,7 +302,7 @@ class StatePolycentric {
                         thumbnail =  imageBundle?.selectBestImage(dp_25 * dp_25)?.let { img -> img.toURLInfoSystemLinkUrl(ev.system.toProto(), img.process, listOf(PolycentricCache.SERVER)) },
                         subscribers = null
                     ),
-                    msg = post.content,
+                    msg = if (post.content.count() > PolycentricPlatformComment.MAX_COMMENT_SIZE) post.content.substring(0, PolycentricPlatformComment.MAX_COMMENT_SIZE) else post.content,
                     rating = RatingLikeDislikes(likes, dislikes),
                     date = if (unixMilliseconds != null) Instant.ofEpochMilli(unixMilliseconds).atOffset(ZoneOffset.UTC) else OffsetDateTime.MIN,
                     replyCount = replies.toInt(),

app/src/main/java/com/futo/platformplayer/states/StateSubscriptions.kt

@@ -2,9 +2,12 @@ package com.futo.platformplayer.states
 
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.api.media.models.ResultCapabilities
 import com.futo.platformplayer.api.media.models.channels.IPlatformChannel
 import com.futo.platformplayer.api.media.models.channels.SerializedChannel
 import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.structures.*
 import com.futo.platformplayer.api.media.structures.ReusablePager.Companion.asReusable
 import com.futo.platformplayer.cache.ChannelContentCache
@@ -12,9 +15,11 @@ import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.engine.exceptions.PluginException
+import com.futo.platformplayer.engine.exceptions.ScriptCaptchaRequiredException
 import com.futo.platformplayer.exceptions.ChannelException
 import com.futo.platformplayer.findNonRuntimeException
 import com.futo.platformplayer.fragment.mainactivity.main.PolycentricProfile
+import com.futo.platformplayer.getNowDiffDays
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.Subscription
 import com.futo.platformplayer.polycentric.PolycentricCache
@@ -67,7 +72,7 @@ class StateSubscriptions {
         return Pair(_lastGlobalSubscriptionProgress, _lastGlobalSubscriptionTotal);
     }
     fun updateSubscriptionFeed(scope: CoroutineScope, onlyIfNull: Boolean = false, onProgress: ((Int, Int)->Unit)? = null) {
-        Logger.i(TAG, "updateSubscriptionFeed");
+        Logger.v(TAG, "updateSubscriptionFeed");
         scope.launch(Dispatchers.IO) {
             synchronized(_globalSubscriptionsLock) {
                 if (isGlobalUpdating || (onlyIfNull && _globalSubscriptionFeed != null)) {
@@ -216,13 +221,38 @@ class StateSubscriptions {
         }
     }
 
-    fun getSubscriptionsFeed(allowFailure: Boolean = false): MultiChronoContentPager {
+    fun getSubscriptionRequestCount(): Map<JSClient, Int> {
+        val subs = getSubscriptions();
+        val pluginReqCounts = mutableMapOf<JSClient, Int>();
+
+        for(sub in subs) {
+            val client = StatePlatform.instance.getChannelClientOrNull(sub.channel.url);
+            if(client !is JSClient)
+                continue;
+
+            val channelCaps = client.getChannelCapabilities();
+            if(!pluginReqCounts.containsKey(client))
+                pluginReqCounts[client] = 1;
+            else
+                pluginReqCounts[client] = pluginReqCounts[client]!! + 1;
+
+            if(channelCaps.hasType(ResultCapabilities.TYPE_STREAMS) && sub.shouldFetchStreams())
+                pluginReqCounts[client] = pluginReqCounts[client]!! + 1;
+            if(channelCaps.hasType(ResultCapabilities.TYPE_LIVE) && sub.shouldFetchLiveStreams())
+                pluginReqCounts[client] = pluginReqCounts[client]!! + 1;
+            if(channelCaps.hasType(ResultCapabilities.TYPE_POSTS) && sub.shouldFetchPosts())
+                pluginReqCounts[client] = pluginReqCounts[client]!! + 1;
+        }
+        return pluginReqCounts;
+    }
+
+    fun getSubscriptionsFeed(allowFailure: Boolean = false): IPager<IPlatformContent> {
         val result = getSubscriptionsFeedWithExceptions(allowFailure, true);
         if(result.second.any())
             throw result.second.first();
         return result.first;
     }
-    fun getSubscriptionsFeedWithExceptions(allowFailure: Boolean = false, withCacheFallback: Boolean = false, cacheScope: CoroutineScope? = null, onProgress: ((Int, Int)->Unit)? = null, onNewCacheHit: ((Subscription, IPlatformContent)->Unit)? = null): Pair<MultiChronoContentPager, List<Throwable>> {
+    fun getSubscriptionsFeedWithExceptions(allowFailure: Boolean = false, withCacheFallback: Boolean = false, cacheScope: CoroutineScope? = null, onProgress: ((Int, Int)->Unit)? = null, onNewCacheHit: ((Subscription, IPlatformContent)->Unit)? = null): Pair<IPager<IPlatformContent>, List<Throwable>> {
         val subsPager: Array<IPager<IPlatformContent>>;
         val exs: ArrayList<Throwable> = arrayListOf();
 
@@ -230,8 +260,11 @@ class StateSubscriptions {
         var finished = 0;
         val exceptionMap: HashMap<Subscription, Throwable> = hashMapOf();
         val concurrency = Settings.instance.subscriptions.getSubscriptionsConcurrency();
+        val failedPlugins = arrayListOf<String>();
         for (sub in getSubscriptions().filter { StatePlatform.instance.hasEnabledChannelClient(it.channel.url) }) {
             tasks.add(_subscriptionsPool.submit<Pair<Subscription, IPager<IPlatformContent>?>> {
+                val toIgnore = synchronized(failedPlugins){ failedPlugins.toList() };
+
                 var polycentricProfile : PolycentricCache.CachedPolycentricProfile? = null;
                 val getProfileTime = measureTimeMillis {
                     try {
@@ -258,9 +291,9 @@ class StateSubscriptions {
                     val time = measureTimeMillis {
                         val profile = polycentricProfile?.profile
                         pager = if (profile != null)
-                            StatePolycentric.instance.getChannelContent(profile, true, concurrency)
+                            StatePolycentric.instance.getChannelContent(profile, true, concurrency, toIgnore)
                         else
-                            StatePlatform.instance.getChannelContent(sub.channel.url, true, concurrency);
+                            StatePlatform.instance.getChannelContent(sub.channel.url, true, concurrency, toIgnore);
 
                         if (cacheScope != null)
                             pager = ChannelContentCache.cachePagerResults(cacheScope, pager) {
@@ -276,12 +309,22 @@ class StateSubscriptions {
                     );
                 }
                 catch(ex: Throwable) {
+                    Logger.e(TAG, "Subscription [${sub.channel.name}] failed", ex);
                     finished++;
                     onProgress?.invoke(finished, tasks.size);
                     val channelEx = ChannelException(sub.channel, ex);
                     synchronized(exceptionMap) {
                         exceptionMap.put(sub, channelEx);
                     }
+                    if(ex is ScriptCaptchaRequiredException) {
+                        synchronized(failedPlugins) {
+                            //Fail all subscription calls to plugin if it has a captcha issue
+                            if(ex.config is SourcePluginConfig && !failedPlugins.contains(ex.config.id)) {
+                                Logger.w(TAG, "Subscriptions fetch ignoring plugin [${ex.config.name}] due to Captcha");
+                                failedPlugins.add(ex.config.id);
+                            }
+                        }
+                    }
                     if(!withCacheFallback)
                         throw channelEx;
                     else {
@@ -327,9 +370,10 @@ class StateSubscriptions {
             throw exs.first();
 
         Logger.i(TAG, "Subscription pager with ${subsPager.size} channels");
-        val pager = MultiChronoContentPager(subsPager, allowFailure);
+        val pager = MultiChronoContentPager(subsPager, allowFailure, 15);
         pager.initialize();
-        return Pair(pager, exs);
+        //return Pair(pager, exs);
+        return Pair(DedupContentPager(pager), exs);
     }
 
     //New Migration

app/src/main/java/com/futo/platformplayer/states/StateTelemetry.kt

@@ -37,14 +37,13 @@ class StateTelemetry {
                     BuildConfig.BUILD_TYPE,
                     BuildConfig.DEBUG,
                     BuildConfig.IS_UNSTABLE_BUILD,
-                    Instant.now().epochSecond,
                     Build.BRAND,
                     Build.MANUFACTURER,
                     Build.MODEL
                 );
 
                 val headers = hashMapOf(
-                    "Content-Type" to "text/plain"
+                    "Content-Type" to "application/json"
                 );
 
                 val json = Json.encodeToString(telemetry);

app/src/main/java/com/futo/platformplayer/stores/v2/ManagedStore.kt

@@ -118,6 +118,7 @@ class ManagedStore<T>{
         val builder = ReconstructStore.Builder();
 
         for (recon in items) {
+            onProgress?.invoke(0, total);
             //Retry once
             for (i in 0 .. 1) {
                 try {

app/src/main/java/com/futo/platformplayer/views/Loader.kt

@@ -5,8 +5,10 @@ import android.graphics.drawable.Animatable
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.LinearLayout
+import androidx.core.view.updateLayoutParams
 import com.futo.platformplayer.R
 
 class Loader : LinearLayout {
@@ -15,7 +17,7 @@ class Loader : LinearLayout {
     private val _animatable: Animatable;
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
-        LayoutInflater.from(context).inflate(R.layout.view_loader, this, true);
+        inflate(context, R.layout.view_loader, this);
         _imageLoader = findViewById(R.id.image_loader);
         _animatable = _imageLoader.drawable as Animatable;
 
@@ -29,6 +31,18 @@ class Loader : LinearLayout {
 
         visibility = View.GONE;
     }
+    constructor(context: Context, automatic: Boolean, height: Int = -1) : super(context) {
+        inflate(context, R.layout.view_loader, this);
+        _imageLoader = findViewById(R.id.image_loader);
+        _animatable = _imageLoader.drawable as Animatable;
+        _automatic = automatic;
+
+        if(height > 0) {
+            layoutParams = ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, height);
+        }
+
+        visibility = View.GONE;
+    }
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()

app/src/main/java/com/futo/platformplayer/views/adapters/CommentViewHolder.kt

@@ -6,6 +6,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.futo.platformplayer.*
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
@@ -35,12 +36,14 @@ class CommentViewHolder : ViewHolder {
     private val _buttonReplies: PillButton;
     private val _layoutRating: LinearLayout;
     private val _pillRatingLikesDislikes: PillRatingLikesDislikes;
+    private val _layoutComment: ConstraintLayout;
 
     var onClick = Event1<IPlatformComment>();
     var comment: IPlatformComment? = null
         private set;
 
     constructor(viewGroup: ViewGroup) : super(LayoutInflater.from(viewGroup.context).inflate(R.layout.list_comment, viewGroup, false)) {
+        _layoutComment = itemView.findViewById(R.id.layout_comment);
         _creatorThumbnail = itemView.findViewById(R.id.image_thumbnail);
         _textAuthor = itemView.findViewById(R.id.text_author);
         _textMetadata = itemView.findViewById(R.id.text_metadata);
@@ -53,29 +56,31 @@ class CommentViewHolder : ViewHolder {
         _layoutRating = itemView.findViewById(R.id.layout_rating);
         _pillRatingLikesDislikes = itemView.findViewById(R.id.rating);
 
-        _pillRatingLikesDislikes.onLikeDislikeUpdated.subscribe { processHandle, hasLiked, hasDisliked ->
+        _pillRatingLikesDislikes.onLikeDislikeUpdated.subscribe { args ->
             val c = comment
             if (c !is PolycentricPlatformComment) {
                 throw Exception("Not implemented for non polycentric comments")
             }
 
-            if (hasLiked) {
-                processHandle.opinion(c.reference, Opinion.like);
-            } else if (hasDisliked) {
-                processHandle.opinion(c.reference, Opinion.dislike);
+            if (args.hasLiked) {
+                args.processHandle.opinion(c.reference, Opinion.like);
+            } else if (args.hasDisliked) {
+                args.processHandle.opinion(c.reference, Opinion.dislike);
             } else {
-                processHandle.opinion(c.reference, Opinion.neutral);
+                args.processHandle.opinion(c.reference, Opinion.neutral);
             }
 
-            StateApp.instance.scopeGetter().launch(Dispatchers.IO) {
+            _layoutComment.alpha = if (args.dislikes > 2 && args.dislikes / (args.likes + args.dislikes) >= 0.7) 0.5f else 1.0f;
+
+            StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
                 try {
-                    processHandle.fullyBackfillServers();
+                    args.processHandle.fullyBackfillServers();
                 } catch (e: Throwable) {
                     Logger.e(TAG, "Failed to backfill servers.", e)
                 }
             }
 
-            StatePolycentric.instance.updateLikeMap(c.reference, hasLiked, hasDisliked)
+            StatePolycentric.instance.updateLikeMap(c.reference, args.hasLiked, args.hasDisliked)
         };
 
         _buttonReplies.onClick.subscribe {
@@ -98,6 +103,13 @@ class CommentViewHolder : ViewHolder {
             _textMetadata.visibility = View.GONE;
         }
 
+        val rating = comment.rating;
+        if (rating is RatingLikeDislikes) {
+            _layoutComment.alpha = if (rating.dislikes > 0 && rating.dislikes / (rating.likes + rating.dislikes) >= 0.7) 0.5f else 1.0f;
+        } else {
+            _layoutComment.alpha = 1.0f;
+        }
+
         _textBody.text = comment.message.fixHtmlLinks();
 
         if (readonly) {