Websocket fixes, onConcluded support

Additional risk check
Proxy support, Additional http header access support
2026-05-17 05:22:40 +02:00 · 2024-05-21 22:31:04 +02:00 · 2024-05-20 22:38:18 +02:00 · 2024-05-20 22:28:51 +02:00 · 2024-05-20 15:45:17 +02:00 · 2024-05-20 15:44:43 +02:00
51 changed files with 1320 additions and 212 deletions
@@ -0,0 +1,15 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_287_2206)">
+<path d="M22.0557 38.25L43.1117 6H1L22.0557 38.25Z" fill="url(#paint0_linear_287_2206)"/>
+<path d="M6 28.2444C6.85811 27.3291 8.98625 25.2353 10.6338 24.1827C12.2814 23.13 14.257 20.1209 15.0388 18.7479C17.4224 15.2392 22.7618 7.91286 25.0501 6.67716C25.462 6.35678 26.0608 5.85718 26.3087 5.64745C27.1668 3.7405 30.0844 0.498738 34.8898 2.78706C35.3017 2.64974 36.32 2.61542 36.7777 2.61542C36.4153 2.86334 35.6564 3.58795 35.5191 4.50328C35.153 7.02039 33.7647 8.48874 33.1164 8.90825C32.6587 11.8259 32.0294 14.4002 30.6564 15.3155L31.915 17.5466C33.8029 19.5489 37.7159 23.8737 38.2649 25.1552C36.4344 24.5603 35.2521 23.992 34.8898 23.7822L38.2649 28.416C36.2818 28.2635 31.8235 26.9744 29.8556 23.0385C30.6336 25.1438 31.4001 27.7677 31.6862 28.8165C30.6183 27.9393 28.3224 25.3955 27.6816 22.2376C27.8647 25.304 27.8342 27.4816 27.7961 28.1872C27.2812 27.7105 26.0913 26.2307 25.4505 24.1255V27.6723C24.6821 26.604 23.1363 24.0104 22.9967 22.0533C23.1255 24.2716 23.047 25.3115 22.9906 25.5556L20.0731 22.8097C19.2912 23.2292 17.1898 24.1827 15.0388 24.6403C13.5743 25.876 11.797 28.969 11.0915 30.3611V28.5877L9.14643 30.5327L9.83291 28.4733L8.57433 29.5602C8.28828 29.7318 7.62468 30.0751 7.25857 30.0751C7.39585 29.7547 7.65904 29.4076 7.77345 29.2741L6.11441 29.9034C6.3051 29.3504 6.90388 28.13 7.77345 27.6723C6.58351 28.13 6.09536 28.2444 6 28.2444Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_287_2206" x1="22.0557" y1="38.25" x2="22.0557" y2="-4.75" gradientUnits="userSpaceOnUse">
+<stop stop-color="#01D6E6"/>
+<stop offset="1" stop-color="#0182E7"/>
+</linearGradient>
+<clipPath id="clip0_287_2206">
+<rect width="44" height="44" fill="white"/>
+</clipPath>
+</defs>
+</svg>
@@ -262,6 +262,17 @@ function getDevLogs(lastIndex, cb) {
        .then(x=>x.json())
        .then(y=> cb && cb(y));
 }
+function getDevHttpExchanges(cb) {
+    fetch("/plugin/getDevHttpExchanges", {
+        timeout: 1000
+    })
+        .then(x=>x.json())
+        .then(y=> cb && cb(y));
+}
+function setDevHttpProxy(url, port) {
+    return fetch("/dev/setDevProxy?url=" + encodeURIComponent(url) + "&port=" + port)
+        .then(x=>x.json());
+}
 function sendFakeDevLog(devId, msg) {
    return syncGET("/plugin/fakeDevLog?devId=" + devId + "&msg=" + msg, {});
 }
@@ -7,6 +7,9 @@
 	    <!--<link href="./dependencies/vuetify.min.css" rel="stylesheet">-->
 		<link href="https://cdn.jsdelivr.net/npm/vuetify@2.7.1/dist/vuetify.min.css" rel="stylesheet">

+		<title>DevPortal</title>
+		<link rel="icon" type="image/x-icon" href="/favicon.svg">
+
 	  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
 	
 		<style>
@@ -150,7 +153,7 @@
 			.pastPluginUrl {
 			    margin-left: auto;
 				margin-right: auto;
-				width: 500px;
+				width: 700px;
 				text-align: center;
 				margin-top: 10px;
 				margin-bottom: 10px;
@@ -160,13 +163,122 @@
 				box-shadow: 0px 1px 2px #131313;
 				font-weight: lighter;
 				cursor: pointer;
+				position: relative;
+			}
+			.pastPluginUrl .deleteButton {
+				position: absolute;
+				right: 15px;
+				height: 100%;
+				width: 30px;
+				top: 0px;
+				padding-top: 2px;
+				display: grid;
+				justify-items: center;
+				align-items: center;
+				cursor: pointer;
+				font-weight: 400;
+				transform: scaleX(1.5);
+			}
+
+			[v-cloak] {
+				display: none;
+			}
+			#cloakLoader {
+				display: block;
+				position: absolute;
+				text-align: center;
+				left: 0px;
+				top: 0px;
+				width: 100%;
+				height: 100%;
+				background-color: black;
+				color: white;
+				padding-top: 50px;
+				font-family: sans-serif;
+			}
+			.httpContainer {
+				position: relative;
+			}
+			.httpLine {
+			}
+			.httpLine .request {
+				height: 50px;
+				position: relative;
+				cursor: pointer;
+			}
+			.httpLine .request .status {
+				position: absolute;
+				left: 10px;
+				width: 40px;
+				top: 10px;
+				padding: 5px;
+				background-color: #333;
+				border-radius: 5px;
+				text-align: center;
+			}
+			.httpLine .request .status.error {
+				background-color: #880000;
+			}
+			.httpLine .request .status.success {
+				background-color: #008800;
+			}
+			.httpLine .request .status.warn {
+				background-color: #803500;
+			}
+			.httpLine .request .method {
+				position: absolute;
+				left: 55px;
+				top: 10px;
+				padding: 5px;
+				background-color: #333;
+				border-radius: 5px;
+				width: 50px;
+				text-align: center;
+			}
+			.httpLine .request .url {
+				position: absolute;
+				left: 110px;
+				top: 10px;
+				padding: 5px;
+				background-color: #333;
+				border-radius: 5px;
+			}
+			.httpLine .response {
+				background-color: #111;
+    			margin-left: 55px;
+    			border-radius: 6px;
+    			padding: 10px;
+			}
+			.httpLine .response .body{
+				white-space: pre-wrap;
+				font-family: monospace;
+				background-color: black;
+				padding: 10px;
+			}
+			.httpLine .response .headers {
+				margin: 10px;
+			}
+			.httpLine .response .headers .key {
+				display: inline-block;
+				font-weight: bold;
+				font-size: 14px;
+				color: #FFF;
+			}
+			.httpLine .response .headers .value {
+				display: inline-block;
+				font-size: 14px;
+				color: #AAA;
 			}
 		</style>
 	</head>
 	<body>
 	  <div id="app">
 		<v-app>
-		  <v-main>
+			<div v-cloak id="cloakLoader" v-if="!page">
+				<h2>Loading..</h2>
+				First load may take longer
+			</div>
+		  <v-main v-cloak>
 			<div id="topMenu">
 				<div style="height: 100%; display: inline-block; padding-left: 10px; padding-right: 20px;">
 					<img src="./dependencies/FutoMainLogo.svg"
@@ -250,10 +362,13 @@
 						</div>


-						<div v-if="pastPluginUrls" style="margin-top: 60px;">
+						<div v-if="pastPluginUrls" style="margin-top: 60px; margin-left: 25px;">
 							<h2 style="font-weight: lighter; text-align: center;">Past Plugins</h2>
 							<div class="pastPluginUrl" v-for="pastPluginUrl in pastPluginUrls" @click="this.Plugin.newPluginUrl = pastPluginUrl; loadPlugin(pastPluginUrl)">
 								{{pastPluginUrl}}
+								<div class="deleteButton" @click="(ev)=>{ev.stopPropagation(); deletePastPlugin(pastPluginUrl)}">
+									X
+								</div>
 							</div>
 						</div>
 					</div>
@@ -505,7 +620,62 @@
 						</v-card-text>
 						<v-card-actions>
 							<v-spacer></v-spacer>
-							<v-btn>Clear</v-btn>
+							<v-btn @click="Integration.logs = []">Clear</v-btn>
+						</v-card-actions>
+					</v-card>
+					<v-card style="margin: 20px;" v-if="Plugin.currentPlugin && Integration.httpExchanges">
+						<v-card-title>
+							Http Logs
+						</v-card-title>
+						</v-card-header>
+						<v-card-text>
+							<div style="position: absolute; top: 0px; right: 15px;">
+								<v-checkbox v-model="Integration.showHttpRequests" label="Show Http Requests"></v-checkbox>
+							</div>
+							<div class="httpContainer" v-if="Integration.showHttpRequests">
+								<div class="httpLine" v-for="exchange of Integration.httpExchanges">
+									<div class="request" @click="toggleHttpExchange(exchange)">
+										<div :class="[{ success: exchange.response.status < 300, warn: exchange.response.status >= 300 && exchange.response.status < 400, error: exchange.response.status >= 400 }, 'status']">
+											{{exchange.response.status}}
+										</div>
+										<div class="method">
+											{{exchange.request.method}}
+										</div>
+										<div class="url">
+											{{exchange.request.url}}
+										</div>
+									</div>
+									<div class="response" v-if="exchange.response.show">
+										<h2>Request Headers</h2>
+										<div class="headers">
+											<div class="header" v-for="(headerValue, header) in exchange.request.headers">
+												<div class="key">
+													{{header}}
+												</div>
+												<div class="value">
+													{{headerValue}}
+												</div>
+											</div>
+										</div>
+										<h2>Response</h2>
+										<div class="headers">
+											<div class="header" v-for="(headerValue, header) in exchange.response.headers">
+												<div class="key">
+													{{header}}
+												</div>
+												<div class="value">
+													{{headerValue}}
+												</div>
+											</div>
+										</div>
+										<div class="body">{{exchange.response.body}}</div>
+									</div>
+								</div>
+							</div>
+						</v-card-text>
+						<v-card-actions>
+							<v-spacer></v-spacer>
+							<v-btn v-if="Integration.showHttpRequests" @click="Integration.httpExchanges = []">Clear</v-btn>
 						</v-card-actions>
 					</v-card>
 				</div>
@@ -562,7 +732,9 @@
 				lastLogIndex: -1,
 				lastLogDevID: "",
 				logs: [],
-				lastInjectTime: ""
+				httpExchanges: [],
+				lastInjectTime: "",
+				showHttpRequests: false
 			},
 			Plugin: {
 				loadUsingTag: false,
@@ -646,6 +818,16 @@
 							});
 						}
 					});
+					if(this.Integration.showHttpRequests) {
+						getDevHttpExchanges((exchanges)=>{
+							Vue.nextTick(()=>{
+								for(i = 0; i < exchanges.length; i++) {
+									exchanges[i].response.show = false;
+									this.Integration.httpExchanges.unshift(exchanges[i]);
+								}
+							});
+						});
+					}
 				}
 				catch(ex) {
 					console.error("Failed update", ex);
@@ -687,6 +869,12 @@
 					this.reloadPlugin();
 				});
 			},
+			deletePastPlugin(url) {
+				let currentPastPlugins = this.pastPluginUrls;
+				currentPastPlugins = currentPastPlugins.filter(x=>x.toLowerCase() != url.toLowerCase());
+				this.pastPluginUrls = currentPastPlugins;
+				localStorage.setItem("pastPlugins", JSON.stringify(currentPastPlugins));
+			},
 			loginTestPlugin() {
 				pluginLoginTestPlugin();
 				setTimeout(()=>{
@@ -922,6 +1110,9 @@
 			},
 			showTestResults(results) {
 			
+			},
+			toggleHttpExchange(exchange) {
+				exchange.response.show = !exchange.response.show;
 			},
 			copyClipboard(cpy) {
 				if(navigator.clipboard)
@@ -357,6 +357,15 @@ class AudioUrlSource {
            this.requestModifier = obj.requestModifier;
    }
 }
+class AudioUrlWidevineSource extends AudioUrlSource {
+    constructor(obj) {
+        super(obj);
+        this.plugin_type = "AudioUrlWidevineSource";
+
+        this.bearerToken = obj.bearerToken;
+        this.licenseUri = obj.licenseUri;
+    }
+}
 class AudioUrlRangeSource extends AudioUrlSource {
    constructor(obj) {
        super(obj);
@@ -50,12 +50,9 @@ fun Protocol.Claim.resolveChannelUrls(): List<String> {

 suspend fun ProcessHandle.fullyBackfillServersAnnounceExceptions() {
    val systemState = SystemState.fromStorageTypeSystemState(Store.instance.getSystemState(system))
-    if (!systemState.servers.contains(PolycentricCache.STAGING_SERVER)) {
-        removeServer(PolycentricCache.STAGING_SERVER)
-    }
-
    if (!systemState.servers.contains(PolycentricCache.SERVER)) {
-        removeServer(PolycentricCache.SERVER)
+        Logger.w("Backfill", "Polycentric prod server not added, adding it.")
+        addServer(PolycentricCache.SERVER)
    }

    val exceptions = fullyBackfillServers()
@@ -18,6 +18,7 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.api.media.models.comments.IPlatformComment
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.dialogs.AutoUpdateDialog
 import com.futo.platformplayer.dialogs.AutomaticBackupDialog
@@ -31,12 +32,17 @@ import com.futo.platformplayer.dialogs.ConnectedCastingDialog
 import com.futo.platformplayer.dialogs.ImportDialog
 import com.futo.platformplayer.dialogs.ImportOptionsDialog
 import com.futo.platformplayer.dialogs.MigrateDialog
+import com.futo.platformplayer.dialogs.PluginUpdateDialog
 import com.futo.platformplayer.dialogs.ProgressDialog
 import com.futo.platformplayer.engine.exceptions.PluginException
+import com.futo.platformplayer.fragment.mainactivity.main.MainFragment
+import com.futo.platformplayer.fragment.mainactivity.main.SourceDetailFragment
+import com.futo.platformplayer.fragment.mainactivity.main.VideoDetailFragment
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.models.ImportCache
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateBackup
+import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.stores.v2.ManagedStore
 import com.futo.platformplayer.views.ToastView
 import kotlinx.coroutines.CoroutineScope
@@ -184,6 +190,14 @@ class UIDialogs {
            dialog.show();
        }

+        fun showPluginUpdateDialog(context: Context, oldConfig: SourcePluginConfig, newConfig: SourcePluginConfig) {
+            val dialog = PluginUpdateDialog(context, oldConfig, newConfig);
+            registerDialogOpened(dialog);
+            dialog.setOnDismissListener { registerDialogClosed(dialog) };
+            dialog.show();
+        }
+
+
        fun showDialog(context: Context, icon: Int, text: String, textDetails: String? = null, code: String? = null, defaultCloseAction: Int, vararg actions: Action) {
            val builder = AlertDialog.Builder(context);
            val view = LayoutInflater.from(context).inflate(R.layout.dialog_multi_button, null);
@@ -269,22 +283,48 @@ class UIDialogs {
                }, UIDialogs.ActionStyle.PRIMARY)
            );
        }
-        fun showGeneralRetryErrorDialog(context: Context, msg: String, ex: Throwable? = null, retryAction: (() -> Unit)? = null, closeAction: (() -> Unit)? = null) {
+        fun showGeneralRetryErrorDialog(context: Context, msg: String, ex: Throwable? = null, retryAction: (() -> Unit)? = null, closeAction: (() -> Unit)? = null, mainFragment: MainFragment? = null) {
+            val pluginConfig = if(ex is PluginException) ex.config else null;
            val pluginInfo = if(ex is PluginException)
                "\nPlugin [${ex.config.name}]" else "";
-            showDialog(context,
-                R.drawable.ic_error_pred,
-                "${msg}${pluginInfo}",
-                (if(ex != null ) "${ex.message}" else ""),
-                if(ex is PluginException) ex.code else null,
-                0,
-                UIDialogs.Action(context.getString(R.string.retry), {
-                    retryAction?.invoke();
-                }, UIDialogs.ActionStyle.PRIMARY),
-                UIDialogs.Action(context.getString(R.string.close), {
-                    closeAction?.invoke()
-                }, UIDialogs.ActionStyle.NONE)
-            );
+
+            var exMsg = if(ex != null ) "${ex.message}" else "";
+            if(pluginConfig != null && pluginConfig is SourcePluginConfig && StatePlugins.instance.hasUpdateAvailable(pluginConfig))
+                exMsg += "\n\nAn update is available"
+
+            if(mainFragment != null && pluginConfig != null && pluginConfig is SourcePluginConfig && StatePlugins.instance.hasUpdateAvailable(pluginConfig))
+                showDialog(context,
+                    R.drawable.ic_error_pred,
+                    "${msg}${pluginInfo}",
+                    exMsg,
+                    if(ex is PluginException) ex.code else null,
+                    1,
+                    UIDialogs.Action(context.getString(R.string.update), {
+                        mainFragment.navigate<SourceDetailFragment>(SourceDetailFragment.UpdatePluginAction(pluginConfig));
+                        if(mainFragment is VideoDetailFragment)
+                            mainFragment.minimizeVideoDetail();
+                    }, UIDialogs.ActionStyle.ACCENT),
+                    UIDialogs.Action(context.getString(R.string.close), {
+                        closeAction?.invoke()
+                    }, UIDialogs.ActionStyle.NONE),
+                    UIDialogs.Action(context.getString(R.string.retry), {
+                        retryAction?.invoke();
+                    }, UIDialogs.ActionStyle.PRIMARY)
+                );
+            else
+                showDialog(context,
+                    R.drawable.ic_error_pred,
+                    "${msg}${pluginInfo}",
+                    exMsg,
+                    if(ex is PluginException) ex.code else null,
+                    0,
+                    UIDialogs.Action(context.getString(R.string.close), {
+                        closeAction?.invoke()
+                    }, UIDialogs.ActionStyle.NONE),
+                    UIDialogs.Action(context.getString(R.string.retry), {
+                        retryAction?.invoke();
+                    }, UIDialogs.ActionStyle.PRIMARY)
+                );
        }

        fun showSingleButtonDialog(context: Context, icon: Int, text: String, buttonText: String, action: (() -> Unit)) {
@@ -224,7 +224,7 @@ class AddSourceActivity : AppCompatActivity() {
        val isNew = !StatePlatform.instance.getAvailableClients().any { it.id == config.id };
        StatePlugins.instance.installPlugin(this, lifecycleScope, config, script) {
            if(it) {
-                StatePlatform.instance.clearUpdateAvailable(config)
+                StatePlugins.instance.clearUpdateAvailable(config)
                if(isNew)
                    lifecycleScope.launch {
                        StatePlatform.instance.enableClient(listOf(config.id));
@@ -12,6 +12,7 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.polycentric.PolycentricCache
 import com.futo.platformplayer.polycentric.PolycentricStorage
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
@@ -77,7 +78,7 @@ class PolycentricCreateProfileActivity : AppCompatActivity() {
                            Logger.e(TAG, "Failed to save process secret to secret storage.", e)
                        }

-                        processHandle.addServer("https://srv1-stg.polycentric.io");
+                        processHandle.addServer(PolycentricCache.SERVER);
                        processHandle.setUsername(username);
                        StatePolycentric.instance.setProcessHandle(processHandle);
                    } catch (e: Throwable) {
@@ -7,4 +7,5 @@ interface IPlaybackTracker {

    fun onInit(seconds: Double);
    fun onProgress(seconds: Double, isPlaying: Boolean);
+    fun onConcluded();
 }
@@ -0,0 +1,6 @@
+package com.futo.platformplayer.api.media.models.streams.sources
+
+interface IAudioUrlWidevineSource : IAudioUrlSource {
+    val bearerToken: String
+    val licenseUri: String
+}
@@ -46,6 +46,7 @@ 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.ScriptCaptchaRequiredException
+import com.futo.platformplayer.engine.exceptions.ScriptException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.engine.exceptions.ScriptValidationException
 import com.futo.platformplayer.logging.Logger
@@ -57,6 +58,7 @@ import com.futo.platformplayer.states.StatePlugins
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.time.OffsetDateTime
+import kotlin.Exception
 import kotlin.reflect.full.findAnnotations
 import kotlin.reflect.jvm.kotlinFunction
 import kotlin.streams.asSequence
@@ -46,7 +46,8 @@ class SourcePluginConfig(
    var enableInHome: Boolean = true,
    var supportedClaimTypes: List<Int> = listOf(),
    var primaryClaimFieldType: Int? = null,
-    var developerSubmitUrl: String? = null
+    var developerSubmitUrl: String? = null,
+    var allowAllHttpHeaderAccess: Boolean = false,
 ) : IV8PluginConfig {

    val absoluteIconUrl: String? get() = resolveAbsoluteUrl(iconUrl, sourceUrl);
@@ -80,6 +81,44 @@ class SourcePluginConfig(
        return _allowUrlsLowerVal!!;
    };

+    fun isLowRiskUpdate(oldScript: String, newConfig: SourcePluginConfig, newScript: String): Boolean{
+        //New allow header access
+        if(!allowAllHttpHeaderAccess && newConfig.allowAllHttpHeaderAccess)
+            return false;
+
+        //All urls should already be allowed
+        for(url in newConfig.allowUrls) {
+            if(!allowUrls.contains(url))
+                return false;
+        }
+        //All packages should already be allowed
+        for(pack in newConfig.packages) {
+            if(!packages.contains(pack))
+                return false;
+        }
+        //Developer Submit Url should be same or empty
+        if(!newConfig.developerSubmitUrl.isNullOrEmpty() && developerSubmitUrl != newConfig.developerSubmitUrl)
+            return false;
+
+        //Should have a public key
+        if(scriptPublicKey.isNullOrEmpty() || scriptSignature.isNullOrEmpty())
+            return false;
+
+        //Should be same public key
+        if(scriptPublicKey != newConfig.scriptPublicKey)
+            return false;
+
+        //Old signature should be valid
+        if(!validate(oldScript))
+            return false;
+
+        //New signature should be valid
+        if(!newConfig.validate(newScript))
+            return false;
+
+        return true;
+    }
+
    fun getWarnings(scriptToCheck: String? = null) : List<Pair<String,String>> {
        val list = mutableListOf<Pair<String,String>>();

@@ -108,6 +147,11 @@ class SourcePluginConfig(
            list.add(Pair(
                "Unrestricted Web Access",
                "This plugin requires access to all URLs, this may include malicious URLs."));
+        if(allowAllHttpHeaderAccess)
+            list.add(Pair(
+                "Unrestricted Http Header access",
+                "Allows this plugin to access all headers (including cookies and authorization headers) for unauthenticated requests."
+            ))

        return list;
    }
@@ -91,8 +91,10 @@ class SourcePluginDescriptor {
    @Serializable
    class AppPluginSettings {

-        @FormField(R.string.check_for_updates_setting, FieldForm.TOGGLE, R.string.check_for_updates_setting_description, 0)
+        @FormField(R.string.check_for_updates_setting, FieldForm.TOGGLE, R.string.check_for_updates_setting_description, -1)
        var checkForUpdates: Boolean = true;
+        @FormField(R.string.automatic_update_setting, FieldForm.TOGGLE, R.string.automatic_update_setting_description, 0)
+        var automaticUpdate: Boolean = false;

        @FormField(R.string.visibility, "group", R.string.enable_where_this_plugins_content_are_visible, 2)
        var tabEnabled = TabEnabled();
@@ -2,14 +2,22 @@ package com.futo.platformplayer.api.media.platforms.js.internal

 import android.net.Uri
 import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.api.media.platforms.js.DevJSClient
 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.models.JSRequest
 import com.futo.platformplayer.api.media.platforms.js.models.JSRequestModifier
+import com.futo.platformplayer.developer.DeveloperEndpoints
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.matchesDomain
+import com.futo.platformplayer.states.StateDeveloper
+import com.google.common.net.MediaType
+import okhttp3.OkHttpClient
+import okio.GzipSource
+import java.net.InetSocketAddress
+import java.net.Proxy
 import java.util.UUID

 class JSHttpClient : ManagedHttpClient {
@@ -28,7 +36,15 @@ class JSHttpClient : ManagedHttpClient {
    private var _currentCookieMap: HashMap<String, HashMap<String, String>>;
    private var _otherCookieMap: HashMap<String, HashMap<String, String>>;

-    constructor(jsClient: JSClient?, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, config: SourcePluginConfig? = null) : super() {
+    constructor(jsClient: JSClient?, auth: SourceAuth? = null, captcha: SourceCaptchaData? = null, config: SourcePluginConfig? = null) : super(
+            //Temporary ugly solution for DevPortal proxy support
+            (if(jsClient?.config?.id == StateDeveloper.DEV_ID && StateDeveloper.instance.devProxy != null)
+                OkHttpClient.Builder().proxy(Proxy(Proxy.Type.HTTP,
+                    InetSocketAddress(StateDeveloper.instance.devProxy!!.url, StateDeveloper.instance.devProxy!!.port)
+                ))
+            else
+                OkHttpClient.Builder())
+        ) {
        _jsClient = jsClient;
        _jsConfig = config;
        _auth = auth;
@@ -201,6 +217,16 @@ class JSHttpClient : ManagedHttpClient {
                }
            }
        }
+
+        if(_jsClient is DevJSClient) {
+            //val peekBody = resp.peekBody(1000 * 1000).string();
+            StateDeveloper.instance.addDevHttpExchange(
+                StateDeveloper.DevHttpExchange(
+                    StateDeveloper.DevHttpRequest(resp.request.method, resp.request.url.toString(), mapOf(*resp.request.headers.map { Pair(it.first, it.second) }.toTypedArray()), ""),
+                    StateDeveloper.DevHttpRequest("RESP", resp.request.url.toString(), mapOf(*resp.headers.map { Pair(it.first, it.second) }.toTypedArray()), "", resp.code)
+                ));
+        }
+
        return resp;
    }

@@ -17,6 +17,8 @@ class JSPlaybackTracker: IPlaybackTracker {

    private var _lastRequest: Long = Long.MIN_VALUE;

+    private val _hasOnConcluded: Boolean;
+
    override var nextRequest: Int = 1000
        private set;

@@ -26,6 +28,7 @@ class JSPlaybackTracker: IPlaybackTracker {
            throw ScriptImplementationException(config, "Missing onProgress on PlaybackTracker");
        if(!obj.has("nextRequest"))
            throw ScriptImplementationException(config, "Missing nextRequest on PlaybackTracker");
+        _hasOnConcluded = obj.has("onConcluded");

        this._config = config;
        this._obj = obj;
@@ -59,6 +62,16 @@ class JSPlaybackTracker: IPlaybackTracker {
            }
        }
    }
+    override fun onConcluded() {
+        warnIfMainThread("JSPlaybackTracker.onConcluded");
+        if(_hasOnConcluded) {
+            synchronized(_obj) {
+                Logger.i("JSPlaybackTracker", "onConcluded");
+                _obj.invokeVoid("onConcluded", -1);
+            }
+        }
+    }
+

    override fun shouldUpdate(): Boolean = (_lastRequest < 0 || (System.currentTimeMillis() - _lastRequest) > nextRequest);
 }
@@ -0,0 +1,24 @@
+package com.futo.platformplayer.api.media.platforms.js.models.sources
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlWidevineSource
+import com.futo.platformplayer.api.media.platforms.js.JSClient
+import com.futo.platformplayer.getOrThrow
+
+class JSAudioUrlWidevineSource : JSAudioUrlSource, IAudioUrlWidevineSource {
+    override val bearerToken: String
+    override val licenseUri: String
+
+    @Suppress("ConvertSecondaryConstructorToPrimary")
+    constructor(plugin: JSClient, obj: V8ValueObject) : super(plugin, obj) {
+        val contextName = "JSAudioUrlWidevineSource"
+        val config = plugin.config
+        bearerToken = _obj.getOrThrow(config, "bearerToken", contextName)
+        licenseUri = _obj.getOrThrow(config, "licenseUri", contextName)
+    }
+
+    override fun toString(): String {
+        val url = getAudioUrl()
+        return "(name=$name, container=$container, bitrate=$bitrate, codec=$codec, url=$url, language=$language, duration=$duration, bearerToken=$bearerToken, licenseUri=$licenseUri)"
+    }
+}
@@ -66,6 +66,7 @@ abstract class JSSource {
        const val TYPE_VIDEO_WITH_METADATA = "VideoUrlRangeSource";
        const val TYPE_DASH = "DashSource";
        const val TYPE_HLS = "HLSSource";
+        const val TYPE_AUDIOURL_WIDEVINE = "AudioUrlWidevineSource"

        fun fromV8VideoNullable(plugin: JSClient, obj: V8Value?) : IVideoSource? = obj.orNull { fromV8Video(plugin, it as V8ValueObject) };
        fun fromV8Video(plugin: JSClient, obj: V8ValueObject) : IVideoSource {
@@ -88,6 +89,7 @@ abstract class JSSource {
            return when(type) {
                TYPE_HLS -> JSHLSManifestAudioSource.fromV8HLS(plugin, obj);
                TYPE_AUDIOURL -> JSAudioUrlSource(plugin, obj);
+                TYPE_AUDIOURL_WIDEVINE -> JSAudioUrlWidevineSource(plugin, obj);
                TYPE_AUDIO_WITH_METADATA -> JSAudioUrlRangeSource(plugin, obj);
                else -> throw NotImplementedError("Unknown type ${type}");
            }
@@ -116,14 +116,10 @@ class DeveloperEndpoints(private val context: Context) {
    }

    //Dependencies
-    //@HttpGET("/dependencies/vue.js", "application/javascript")
-    //val depVue = StateAssets.readAsset(context, "devportal/dependencies/vue.js", true);
-    //@HttpGET("/dependencies/vuetify.js", "application/javascript")
-    //val depVuetify = StateAssets.readAsset(context, "devportal/dependencies/vuetify.js", true);
-    //@HttpGET("/dependencies/vuetify.min.css", "text/css")
-    //val depVuetifyCss = StateAssets.readAsset(context, "devportal/dependencies/vuetify.min.css", true);
    @HttpGET("/dependencies/FutoMainLogo.svg", "image/svg+xml")
    val depFutoLogo = StateAssets.readAsset(context, "devportal/dependencies/FutoMainLogo.svg");
+    @HttpGET("/favicon.svg", "image/svg+xml")
+    val favicon = StateAssets.readAsset(context, "devportal/dependencies/favicon.svg");

    @HttpGET("/reference_plugin.d.ts", "text/plain")
    fun devSourceTSWithRefs(httpContext: HttpContext) {
@@ -448,6 +444,25 @@ class DeveloperEndpoints(private val context: Context) {
            context.respondCode(500, ex::class.simpleName + ":" + ex.message, "text/plain")
        }
    }
+    @HttpGET("/dev/setDevProxy")
+    fun devSetDevProxy(context: HttpContext) {
+        try {
+            val url = context.query.getOrDefault("url", "");
+            val port = context.query.getOrDefault("port", "");
+            if(url.isNullOrEmpty() || port.isNullOrEmpty() || port.toIntOrNull() == null)
+            {
+                StateDeveloper.instance.devProxy = null;
+                context.respondCode(400);
+                return;
+            }
+            StateDeveloper.instance.devProxy = StateDeveloper.DevProxySettings(url, port.toInt());
+            context.respondCode(200, "true", "application/json");
+        }
+        catch(ex: Exception) {
+            Logger.e("DeveloperEndpoints", ex.message, ex);
+            context.respondCode(500, ex::class.simpleName + ":" + ex.message, "text/plain")
+        }
+    }

    @HttpGET("/plugin/getDevLogs")
    fun pluginGetDevLogs(context: HttpContext) {
@@ -459,6 +474,15 @@ class DeveloperEndpoints(private val context: Context) {
            context.respondCode(500, ex.message ?: "", "text/plain")
        }
    }
+    @HttpGET("/plugin/getDevHttpExchanges")
+    fun pluginGetDevExchanges(context: HttpContext) {
+        try {
+            context.respondJson(200, StateDeveloper.instance.getHttpExchangesAndClear());
+        }
+        catch(ex: Exception) {
+            context.respondCode(500, ex.message ?: "", "text/plain")
+        }
+    }
    @HttpGET("/plugin/fakeDevLog")
    fun pluginFakeDevLog(context: HttpContext) {
        try {
@@ -0,0 +1,253 @@
+package com.futo.platformplayer.dialogs
+
+import android.app.AlertDialog
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.graphics.drawable.Animatable
+import android.media.MediaCas.PluginDescriptor
+import android.net.Uri
+import android.os.Bundle
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.method.ScrollingMovementMethod
+import android.text.style.ForegroundColorSpan
+import android.view.LayoutInflater
+import android.view.View
+import android.view.WindowManager
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.view.isVisible
+import com.bumptech.glide.Glide
+import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.activities.AddSourceActivity
+import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.api.media.exceptions.NoPlatformClientException
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginDescriptor
+import com.futo.platformplayer.assume
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.models.ImportCache
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateBackup
+import com.futo.platformplayer.states.StatePlugins
+import com.futo.platformplayer.stores.v2.ManagedStore
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class PluginUpdateDialog : AlertDialog {
+    companion object {
+        private val TAG = "PluginUpdateDialog";
+    }
+    private val _context: Context;
+
+    private lateinit var _buttonCancel1: Button;
+    private lateinit var _buttonCancel2: Button;
+    private lateinit var _buttonUpdate: LinearLayout;
+
+    private lateinit var _buttonOk: LinearLayout;
+    private lateinit var _buttonInstall: LinearLayout;
+
+    private lateinit var _textPlugin: TextView;
+    private lateinit var _textProgres: TextView;
+    private lateinit var _textError: TextView;
+    private lateinit var _textResult: TextView;
+
+    private lateinit var _uiChoiceTop: FrameLayout;
+    private lateinit var _uiProgressTop: FrameLayout;
+    private lateinit var _uiRiskTop: FrameLayout;
+
+    private lateinit var _uiChoiceBot: LinearLayout;
+    private lateinit var _uiResultBot: LinearLayout;
+    private lateinit var _uiRiskBot: LinearLayout;
+    private lateinit var _uiProgressBot: LinearLayout;
+
+    private lateinit var _iconPlugin: ImageView;
+    private lateinit var _updateSpinner: ImageView;
+
+    private var _isUpdating = false;
+
+    private val _oldConfig: SourcePluginConfig;
+    private val _newConfig: SourcePluginConfig;
+
+
+    constructor(context: Context, oldConfig: SourcePluginConfig, newConfig: SourcePluginConfig): super(context) {
+        _context = context;
+        _oldConfig = oldConfig;
+        _newConfig = newConfig;
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState);
+        setContentView(LayoutInflater.from(context).inflate(R.layout.dialog_plugin_update, null));
+
+        _buttonCancel1 = findViewById(R.id.button_cancel_1);
+        _buttonCancel2 = findViewById(R.id.button_cancel_2);
+        _buttonUpdate = findViewById(R.id.button_update);
+
+        _buttonOk = findViewById(R.id.button_ok);
+        _buttonInstall = findViewById(R.id.button_install);
+
+        _textPlugin = findViewById(R.id.text_plugin);
+        _textProgres = findViewById(R.id.text_progress);
+        _textError = findViewById(R.id.text_error);
+        _textResult = findViewById(R.id.text_result);
+
+        _uiChoiceTop = findViewById(R.id.dialog_ui_choice_top);
+        _uiProgressTop = findViewById(R.id.dialog_ui_progress_top);
+        _uiRiskTop = findViewById(R.id.dialog_ui_risk_top);
+
+        _uiChoiceBot = findViewById(R.id.dialog_ui_bottom_choice);
+        _uiResultBot = findViewById(R.id.dialog_ui_bottom_result);
+        _uiRiskBot = findViewById(R.id.dialog_ui_bottom_risk);
+        _uiProgressBot = findViewById(R.id.dialog_ui_bottom_progress);
+
+        _updateSpinner = findViewById(R.id.update_spinner);
+        _iconPlugin = findViewById(R.id.icon_plugin);
+
+        _buttonCancel1.setOnClickListener {
+            dismiss();
+        };
+        _buttonCancel2.setOnClickListener {
+            dismiss();
+        };
+        _buttonUpdate.setOnClickListener {
+            if (_isUpdating)
+                return@setOnClickListener;
+            _isUpdating = true;
+            update();
+        };
+
+        Glide.with(_iconPlugin)
+            .load(_oldConfig.absoluteIconUrl)
+            .fallback(R.drawable.ic_sources)
+            .into(_iconPlugin);
+        _textPlugin.text = _oldConfig.name;
+
+        val descriptor = StatePlugins.instance.getPlugin(_oldConfig.id);
+        if(descriptor != null) {
+            if(descriptor.appSettings.automaticUpdate) {
+                if (_isUpdating)
+                    return;
+                _isUpdating = true;
+                update();
+            }
+        }
+    }
+
+    override fun dismiss() {
+        super.dismiss();
+    }
+
+    private fun update() {
+        _uiChoiceTop.visibility = View.GONE;
+        _uiRiskTop.visibility = View.GONE;
+        _uiChoiceBot.visibility = View.GONE;
+        _uiResultBot.visibility = View.GONE;
+        _uiRiskBot.visibility = View.GONE;
+        _uiProgressTop.visibility = View.VISIBLE;
+        _uiProgressBot.visibility = View.VISIBLE;
+
+        setCancelable(false);
+        setCanceledOnTouchOutside(false);
+
+        Logger.i(TAG, "Keep screen on set import")
+        window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+        _updateSpinner.drawable?.assume<Animatable>()?.start();
+
+        val scope = StateApp.instance.scopeOrNull;
+        scope?.launch(Dispatchers.IO) {
+            try {
+                val client = ManagedHttpClient();
+                val script = StatePlugins.instance.getScript(_oldConfig.id) ?: "";
+
+                val newScript = client.get(_newConfig.absoluteScriptUrl)?.body?.string();
+                if(newScript.isNullOrEmpty())
+                    throw IllegalStateException("No script found");
+
+                if(_oldConfig.isLowRiskUpdate(script, _newConfig, newScript)){
+
+                    StatePlugins.instance.installPluginBackground(context, StateApp.instance.scope, _newConfig, newScript,
+                        { text: String, progress: Double ->
+                            _textProgres.setText(text);
+                        },
+                        { ex ->
+                            if(ex == null) {
+                                StatePlugins.instance.clearUpdateAvailable(_newConfig);
+                                _iconPlugin.setImageResource(R.drawable.ic_check);
+                                _textError.visibility = View.GONE;
+                                _textResult.visibility = View.VISIBLE;
+                            }
+                            else {
+                                _iconPlugin.setImageResource(R.drawable.ic_error_pred);
+                                _textError.text = ex.message + "\n\nYou can retry inside the sources tab";
+                                _textError.visibility = View.VISIBLE;
+                                _textResult.visibility = View.GONE;
+                            }
+                            try {
+                                _buttonOk.setOnClickListener {
+                                    dismiss();
+                                }
+                                _uiProgressTop.visibility = View.GONE;
+                                _uiProgressBot.visibility = View.GONE;
+                                _uiChoiceTop.visibility = View.VISIBLE;
+                                _uiResultBot.visibility = View.VISIBLE;
+                            } catch (e: Throwable) {
+                                Logger.e(TAG, "Failed to update UI.", e)
+                            } finally {
+                                Logger.i(TAG, "Keep screen on unset update")
+                                window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                            }
+                        });
+
+                }
+                else {
+                    withContext(Dispatchers.Main) {
+                        try {
+                            _buttonInstall.setOnClickListener {
+                                dismiss();
+
+                                val intent = Intent(_context, AddSourceActivity::class.java).apply {
+                                    data = Uri.parse(_newConfig.sourceUrl)
+                                };
+
+                                _context.startActivity(intent);
+                            }
+
+                            _uiProgressTop.visibility = View.GONE;
+                            _uiProgressBot.visibility = View.GONE;
+                            _uiRiskTop.visibility = View.VISIBLE;
+                            _uiRiskBot.visibility = View.VISIBLE;
+                        } catch (e: Throwable) {
+                            Logger.e(TAG, "Failed to update UI.", e)
+                        } finally {
+                            Logger.i(TAG, "Keep screen on unset update")
+                            window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                        }
+                    }
+                }
+            } catch (e: Throwable) {
+                Logger.e(TAG, "Failed to update.", e);
+                withContext(Dispatchers.Main) {
+                    _buttonOk.setOnClickListener {
+                        dismiss();
+                    }
+                    _iconPlugin.setImageResource(R.drawable.ic_error_pred);
+                    _textResult.visibility = View.GONE;
+                    _uiProgressTop.visibility = View.GONE;
+                    _uiProgressBot.visibility = View.GONE;
+                    _uiChoiceTop.visibility = View.VISIBLE;
+                    _uiResultBot.visibility = View.VISIBLE;
+                    _textError.visibility = View.VISIBLE;
+                    _textError.text = e.message + "\n\nYou can retry inside the sources tab"
+                }
+            }
+        }
+    }
+}
@@ -9,6 +9,7 @@ import com.caoccao.javet.interop.V8Runtime
 import com.caoccao.javet.values.V8Value
 import com.caoccao.javet.values.reference.V8ValueObject
 import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.api.media.platforms.js.internal.JSHttpClient
 import com.futo.platformplayer.engine.IV8PluginConfig
 import com.futo.platformplayer.engine.V8Plugin
@@ -190,6 +191,8 @@ class PackageHttp: V8Package {
        @Transient
        private val _client: ManagedHttpClient;

+        val parentConfig: IV8PluginConfig get() = _package._config;
+
        @Transient
        private val _defaultHeaders = mutableMapOf<String, String>();
        @Transient
@@ -242,7 +245,8 @@ 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.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
+                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers,
+                        _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
                }
            };
        }
@@ -256,7 +260,8 @@ 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.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
+                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers,
+                        _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
                }
            };
        }
@@ -271,7 +276,8 @@ 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.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
+                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers,
+                        _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
                }
            };
        }
@@ -285,7 +291,8 @@ 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.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers));
+                    return@catchHttp BridgeHttpResponse(resp.url, resp.code, responseBody, sanitizeResponseHeaders(resp.headers,
+                        _client !is JSHttpClient || _client.isLoggedIn || _package._config !is SourcePluginConfig || !_package._config.allowAllHttpHeaderAccess));
                }
            };
        }
@@ -305,18 +312,31 @@ class PackageHttp: V8Package {
            }
        }

-        private fun sanitizeResponseHeaders(headers: Map<String, List<String>>?): Map<String, List<String>> {
+        private fun sanitizeResponseHeaders(headers: Map<String, List<String>>?, onlyWhitelisted: Boolean = false): Map<String, List<String>> {
            val result = mutableMapOf<String, List<String>>()
-            headers?.forEach { (header, values) ->
-                val lowerCaseHeader = header.lowercase()
-                if (WHITELISTED_RESPONSE_HEADERS.contains(lowerCaseHeader)) {
-                    result[lowerCaseHeader] = values
+            if(onlyWhitelisted)
+                headers?.forEach { (header, values) ->
+                    val lowerCaseHeader = header.lowercase()
+                    if (WHITELISTED_RESPONSE_HEADERS.contains(lowerCaseHeader)) {
+                        result[lowerCaseHeader] = values
+                    }
+                }
+            else {
+                headers?.forEach { (header, values) ->
+                    val lowerCaseHeader = header.lowercase()
+                    if(lowerCaseHeader == "set-cookie") {
+                        result[lowerCaseHeader] = values.filter{
+                            !it.lowercase().contains("httponly")
+                        };
+                    }
+                    else
+                        result[lowerCaseHeader] = values;
                }
            }
            return result
        }

-        /*private fun logRequest(method: String, url: String, headers: Map<String, String> = HashMap(), body: String?) {
+        private fun logRequest(method: String, url: String, headers: Map<String, String> = HashMap(), body: String?) {
            Logger.v(TAG) {
                val stringBuilder = StringBuilder();
                stringBuilder.appendLine("HTTP request (useAuth = )");
@@ -333,7 +353,7 @@ class PackageHttp: V8Package {

                return@v stringBuilder.toString();
            };
-        }*/
+        }

        /*private fun logResponse(method: String, url: String, responseCode: Int? = null, responseHeaders: Map<String, List<String>> = HashMap(), responseBody: String? = null) {
            Logger.v(TAG) {
@@ -413,7 +433,7 @@ class PackageHttp: V8Package {
            val hasClosed = socketObj.has("closed");
            val hasFailure = socketObj.has("failure");

-            //socketObj.setWeak(); //We have to manage this lifecycle
+            socketObj.setWeak(); //We have to manage this lifecycle
            _listeners = socketObj;

            _socket = _packageClient.logExceptions {
@@ -422,8 +442,14 @@ class PackageHttp: V8Package {
                    override fun open() {
                        Logger.i(TAG, "Websocket opened: " + _url);
                        _isOpen = true;
-                        if(hasOpen)
-                            _listeners?.invokeVoid("open", arrayOf<Any>());
+                        if(hasOpen) {
+                            try {
+                                _listeners?.invokeVoid("open", arrayOf<Any>());
+                            }
+                            catch(ex: Throwable){
+                                Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] open failed: " + ex.message, ex);
+                            }
+                        }
                    }
                    override fun message(msg: String) {
                        if(hasMessage) {
@@ -435,18 +461,37 @@ class PackageHttp: V8Package {
                    }
                    override fun closing(code: Int, reason: String) {
                        if(hasClosing)
-                            _listeners?.invokeVoid("closing", code, reason);
+                        {
+                            try {
+                                _listeners?.invokeVoid("closing", code, reason);
+                            }
+                            catch(ex: Throwable){
+                                Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] closing failed: " + ex.message, ex);
+                            }
+                        }
                    }
                    override fun closed(code: Int, reason: String) {
                        _isOpen = false;
-                        if(hasClosed)
-                            _listeners?.invokeVoid("closed", code, reason);
+                        if(hasClosed) {
+                            try {
+                                _listeners?.invokeVoid("closed", code, reason);
+                            }
+                            catch(ex: Throwable){
+                                Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] closed failed: " + ex.message, ex);
+                            }
+                        }
                    }
                    override fun failure(exception: Throwable) {
                        _isOpen = false;
                        Logger.e(TAG, "Websocket failure: ${exception.message} (${_url})", exception);
-                        if(hasFailure)
-                            _listeners?.invokeVoid("failure", exception.message);
+                        if(hasFailure) {
+                            try {
+                                _listeners?.invokeVoid("failure", exception.message);
+                            }
+                            catch(ex: Throwable){
+                                Logger.e(TAG, "Socket for [${_packageClient.parentConfig.name}] closed failed: " + ex.message, ex);
+                            }
+                        }
                    }
                });
            };
@@ -456,6 +501,16 @@ class PackageHttp: V8Package {
        fun send(msg: String) {
            _socket?.send(msg);
        }
+
+        @V8Function
+        fun close() {
+            _socket?.close(1000, "");
+        }
+        @V8Function
+        fun close(code: Int?, reason: String?) {
+            _socket?.close(code ?: 1000, reason ?: "");
+            _listeners?.close()
+        }
    }

    data class RequestDescriptor(
@@ -152,7 +152,7 @@ class ChannelFragment : MainFragment() {
                }
                .exception<Throwable> {
                    Logger.e(TAG, "Failed to load channel.", it);
-                    UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadChannel() });
+                    UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadChannel() }, null, fragment);
                }

            val tabs: TabLayout = findViewById(R.id.tabs);
@@ -99,7 +99,7 @@ class ContentSearchResultsFragment : MainFragment() {
            .success { loadedResult(it); }.exception<ScriptCaptchaRequiredException> {  }
            .exception<Throwable> {
                Logger.w(TAG, "Failed to load results.", it);
-                UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });
+                UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() }, null, fragment);
            }

            setPreviewsEnabled(Settings.instance.search.previewFeedItems);
@@ -60,7 +60,7 @@ class CreatorSearchResultsFragment : MainFragment() {
                .exception<ScriptCaptchaRequiredException> {  }
                .exception<Throwable> {
                    Logger.w(ChannelFragment.TAG, "Failed to load results.", it);
-                    UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });
+                    UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() }, null, fragment);
                }
        }

@@ -144,7 +144,7 @@ abstract class FeedView<TFragment, TResult, TConverted, TPager, TViewHolder> : L
            Logger.w(TAG, "Failed to load next page.", it);
            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_next_page), it, {
                loadNextPage();
-            });
+            }, null, fragment);
            //UIDialogs.showDataRetryDialog(layoutInflater, it.message, { loadNextPage() });
        };

@@ -174,7 +174,7 @@ class HistoryFragment : MainFragment() {
                Logger.w(TAG, "Failed to load next page.", it);
                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_next_page), it, {
                    loadNextPage();
-                });
+                }, null, fragment);
            };
        }

@@ -126,10 +126,10 @@ class HomeFragment : MainFragment() {
                Logger.w(TAG, "Failed to load channel.", it);
                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_get_home), it, {
                    loadResults()
-                }) {
+                }, {
                    finishRefreshLayoutLoader();
                    setLoading(false);
-                };
+                }, fragment);
            };

            setPreviewsEnabled(Settings.instance.home.previewFeedItems);
@@ -146,7 +146,7 @@ class PlaylistFragment : MainFragment() {
                .exception<Throwable> {
                    Logger.w(TAG, "Failed to load playlist.", it);
                    val c = context ?: return@exception;
-                    UIDialogs.showGeneralRetryErrorDialog(c, context.getString(R.string.failed_to_load_playlist), it, ::fetchPlaylist);
+                    UIDialogs.showGeneralRetryErrorDialog(c, context.getString(R.string.failed_to_load_playlist), it, ::fetchPlaylist, null, fragment);
                };
        }

@@ -69,7 +69,7 @@ class PlaylistSearchResultsFragment : MainFragment() {
                .success { loadedResult(it); }
                .exception<Throwable> {
                    Logger.w(ChannelFragment.TAG, "Failed to load results.", it);
-                    UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() });
+                    UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults() }, null, fragment);
                }
        }

@@ -162,7 +162,7 @@ class PostDetailFragment : MainFragment {
            .success { setPostDetails(it) }
            .exception<Throwable> {
                Logger.w(ChannelFragment.TAG, context.getString(R.string.failed_to_load_post), it);
-                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_post), it, ::fetchPost);
+                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_post), it, ::fetchPost, null, _fragment);
            } else TaskHandler(IPlatformPostDetails::class.java) { _fragment.lifecycleScope };

        private val _taskLoadPolycentricProfile = TaskHandler<PlatformID, PolycentricCache.CachedPolycentricProfile?>(StateApp.instance.scopeGetter, { PolycentricCache.instance.getProfileAsync(it) })
@@ -101,6 +101,11 @@ class SourceDetailFragment : MainFragment() {
                loadConfig(parameter);
                updateSourceViews();
            }
+            else if(parameter is UpdatePluginAction) {
+                loadConfig(parameter.config);
+                updateSourceViews();
+                checkForUpdatesSource();
+            }

            setLoading(false);
        }
@@ -567,4 +572,8 @@ class SourceDetailFragment : MainFragment() {
        const val TAG = "SourceDetailFragment";
        fun newInstance() = SourceDetailFragment().apply {}
    }
+
+    class UpdatePluginAction(val config: SourcePluginConfig) {
+
+    }
 }
@@ -262,7 +262,7 @@ class SubscriptionsFeedFragment : MainFragment() {
            .exception<Throwable> {
                Logger.w(ChannelFragment.TAG, "Failed to load channel.", it);
                if(it !is CancellationException)
-                    UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults(true) });
+                    UIDialogs.showGeneralRetryErrorDialog(context, it.message ?: "", it, { loadResults(true) }, null, fragment);
                else {
                    finishRefreshLayoutLoader();
                    setLoading(false);
@@ -40,7 +40,7 @@ class SuggestionsFragment : MainFragment {
    .success { suggestions -> updateSuggestions(suggestions, false) }
    .exception<Throwable> {
        Logger.w(ChannelFragment.TAG, "Failed to load suggestions.", it);
-        UIDialogs.showGeneralRetryErrorDialog(requireContext(), it.message ?: "", it, { loadSuggestions() });
+        UIDialogs.showGeneralRetryErrorDialog(requireContext(), it.message ?: "", it, { loadSuggestions() }, null, this);
    };

    constructor(): super() {
@@ -690,7 +690,7 @@ class VideoDetailView : ConstraintLayout {
            _lastAudioSource = null;
            _lastSubtitleSource = null;
            video = null;
-            _playbackTracker = null;
+            cleanupPlaybackTracker();
            Logger.i(TAG, "Keep screen on unset onClose")
            fragment.activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
        };
@@ -1033,7 +1033,7 @@ class VideoDetailView : ConstraintLayout {

        _searchVideo = null;
        video = null;
-        _playbackTracker = null;
+        cleanupPlaybackTracker();
        _url = url;
        _videoResumePositionMilliseconds = resumeSeconds * 1000;
        _rating.visibility = View.GONE;
@@ -1071,7 +1071,7 @@ class VideoDetailView : ConstraintLayout {
        }

        this.video = null;
-        this._playbackTracker = null;
+        cleanupPlaybackTracker();
        _searchVideo = video;
        _videoResumePositionMilliseconds = resumeSeconds * 1000;
        setLastPositionMilliseconds(_videoResumePositionMilliseconds, false);
@@ -1206,7 +1206,7 @@ class VideoDetailView : ConstraintLayout {
        }
        this.videoLocal = videoLocal;
        this.video = video;
-        this._playbackTracker = null;
+        cleanupPlaybackTracker();

        if(video is JSVideoDetails) {
            val me = this;
@@ -1522,6 +1522,22 @@ class VideoDetailView : ConstraintLayout {
        }
    }

+    fun cleanupPlaybackTracker(){
+        val tracker = _playbackTracker;
+        if(tracker != null) {
+            _playbackTracker = null;
+            fragment.lifecycleScope.launch(Dispatchers.IO) {
+                Logger.i(TAG, "Cleaning up old playback tracker");
+                try {
+                    tracker.onConcluded();
+                }
+                catch(ex: Throwable) {
+                    Logger.e(TAG, "Failed to cleanup playback tracker", ex);
+                }
+            }
+        }
+    }
+
    //Source Loads
    private fun loadCurrentVideo(resumePositionMs: Long = 0) {
        _didStop = false;
@@ -2016,7 +2032,7 @@ class VideoDetailView : ConstraintLayout {
    private fun fetchVideo() {
        Logger.i(TAG, "fetchVideo")
        video = null;
-        _playbackTracker = null;
+        cleanupPlaybackTracker();

        val url = _url;
        if (url != null && url.isNotBlank()) {
@@ -2476,7 +2492,7 @@ class VideoDetailView : ConstraintLayout {
            Logger.w(TAG, "exception<ScriptImplementationException>", it)

            if (!nextVideo()) {
-                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video_scriptimplementationexception), it, ::fetchVideo);
+                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video_scriptimplementationexception), it, ::fetchVideo, null, fragment);
            } else {
                StateAnnouncement.instance.registerAnnouncement(video?.id?.value + "_Q_INVALIDVIDEO", context.getString(R.string.invalid_video), context.getString(
                                    R.string.there_was_an_invalid_video_in_your_queue_videoname_by_authorname_playback_was_skipped).replace("{videoName}", video?.name ?: "").replace("{authorName}", video?.author?.name ?: ""), AnnouncementType.SESSION)
@@ -2512,7 +2528,7 @@ class VideoDetailView : ConstraintLayout {
                _retryJob = null;
                _liveTryJob?.cancel();
                _liveTryJob = null;
-                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video_scriptexception), it, ::fetchVideo);
+                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video_scriptexception), it, ::fetchVideo, null, fragment);
            }
        }
        .exception<Throwable> {
@@ -2524,7 +2540,7 @@ class VideoDetailView : ConstraintLayout {
                _retryJob = null;
                _liveTryJob?.cancel();
                _liveTryJob = null;
-                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video), it, ::fetchVideo);
+                UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video), it, ::fetchVideo, null, fragment);
            }
        } else TaskHandler(IPlatformVideoDetails::class.java, {fragment.lifecycleScope});

@@ -316,7 +316,6 @@ class PolycentricCache {
            .build();

        private const val TAG = "PolycentricCache"
-        const val STAGING_SERVER = "https://srv1-stg.polycentric.io"
        const val SERVER = "https://srv1-prod.polycentric.io"
        private var _instance: PolycentricCache? = null;
        private val CACHE_EXPIRATION_SECONDS = 60 * 5;
@@ -571,18 +571,22 @@ class StateApp {
        StateAnnouncement.instance.deleteAnnouncement("plugin-update")

        scopeOrNull?.launch(Dispatchers.IO) {
-            val updateAvailable = StatePlatform.instance.checkForUpdates()
+            val updateAvailable = StatePlugins.instance.checkForUpdates()

            withContext(Dispatchers.Main) {
                if (updateAvailable.isNotEmpty()) {
                    UIDialogs.appToast(
                        ToastView.Toast(updateAvailable
-                            .map { " - " + it.name }
+                            .map { " - " + it.first.name }
                            .joinToString("\n"),
                            true,
                            null,
                            "Plugin updates available"
                        ));
+
+                    for(update in updateAvailable)
+                        if(StatePlatform.instance.isClientEnabled(update.first.id))
+                            UIDialogs.showPluginUpdateDialog(context, update.first, update.second);
                }
            }
        }
@@ -19,6 +19,9 @@ class StateDeveloper {

    private var _devLogsIndex: Int = 0;
    private val _devLogs: MutableList<DevLog> = mutableListOf();
+    private val _devHttpExchanges: MutableList<DevHttpExchange> = mutableListOf();
+
+    var devProxy: DevProxySettings? = null;

    fun initializeDev(id: String) {
        currentDevID = id;
@@ -94,6 +97,21 @@ class StateDeveloper {
        }
    }

+    fun addDevHttpExchange(exchange: DevHttpExchange) {
+        synchronized(_devHttpExchanges) {
+            if(_devHttpExchanges.size > 15)
+                _devHttpExchanges.removeAt(0);
+            _devHttpExchanges.add(exchange);
+        }
+    }
+    fun getHttpExchangesAndClear(): List<DevHttpExchange> {
+        synchronized(_devHttpExchanges) {
+            val data = _devHttpExchanges.toList();
+            _devHttpExchanges.clear();
+            return data;
+        }
+    }
+
    fun setDevClientSettings(settings: HashMap<String, String?>) {
        val client = StatePlatform.instance.getDevClient();
        client?.let {
@@ -138,4 +156,12 @@ class StateDeveloper {

    @kotlinx.serialization.Serializable
    data class DevLog(val id: Int, val devId: String, val type: String, val log: String);
+
+    @kotlinx.serialization.Serializable
+    data class DevHttpRequest(val method: String, val url: String, val headers: Map<String, String>, val body: String, val status: Int = 0);
+    @kotlinx.serialization.Serializable
+    data class DevHttpExchange(val request: DevHttpRequest, val response: DevHttpRequest);
+
+    @kotlinx.serialization.Serializable
+    data class DevProxySettings(val url: String, val port: Int)
 }
@@ -456,6 +456,18 @@ class StateDownloads {
                }
            }
        }
+
+        try {
+            val currentDownloads = _downloaded.getItems().map { it.url }.toHashSet();
+            val exporting = _exporting.findItems { !currentDownloads.contains(it.videoLocal.url) };
+            for (export in exporting)
+                _exporting.delete(export);
+        }
+        catch(ex: Throwable) {
+            Logger.e(TAG, "Failed to delete dangling export:", ex);
+            UIDialogs.toast("Failed to delete dangling export:\n" + ex);
+        }
+
        return Pair(totalDeletedCount, totalDeleted);
    }

@@ -80,7 +80,6 @@ class StatePlatform {
    private val _clientsLock = Object();
    private val _availableClients : ArrayList<IPlatformClient> = ArrayList();
    private val _enabledClients : ArrayList<IPlatformClient> = ArrayList();
-    private var _updatesAvailableMap: HashSet<String> = hashSetOf();

    //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
@@ -925,66 +924,7 @@ class StatePlatform {
        }
    }

-    fun hasUpdateAvailable(c: SourcePluginConfig): Boolean {
-        val updatesAvailableMap = _updatesAvailableMap
-        synchronized(updatesAvailableMap) {
-            return updatesAvailableMap.contains(c.id)
-        }
-    }

-    suspend fun checkForUpdates(): List<SourcePluginConfig> = withContext(Dispatchers.IO) {
-        var configs = mutableListOf<SourcePluginConfig>()
-        val updatesAvailableFor = hashSetOf<String>()
-        for (availableClient in getAvailableClients().filter { it is JSClient && it.descriptor.appSettings.checkForUpdates }) {
-            if (availableClient !is JSClient) {
-                continue
-            }
-
-            if (checkForUpdates(availableClient.config)) {
-                configs.add(availableClient.config);
-                updatesAvailableFor.add(availableClient.config.id)
-            }
-        }
-
-        _updatesAvailableMap = updatesAvailableFor
-        return@withContext configs;
-    }
-
-    fun clearUpdateAvailable(c: SourcePluginConfig) {
-        val updatesAvailableMap = _updatesAvailableMap
-        synchronized(updatesAvailableMap) {
-            updatesAvailableMap.remove(c.id)
-        }
-    }
-
-    private suspend fun checkForUpdates(c: SourcePluginConfig): Boolean = withContext(Dispatchers.IO) {
-        val sourceUrl = c.sourceUrl ?: return@withContext false;
-
-        Logger.i(TAG, "Check for source updates '${c.name}'.");
-        try {
-            val client = ManagedHttpClient();
-            val response = client.get(sourceUrl);
-            Logger.i(TAG, "Downloading source config '$sourceUrl'.");
-
-            if (!response.isOk || response.body == null) {
-                return@withContext false;
-            }
-
-            val configJson = response.body.string();
-            Logger.i(TAG, "Downloaded source config ($sourceUrl):\n${configJson}");
-
-            val config = SourcePluginConfig.fromJson(configJson);
-            if (config.version <= c.version) {
-                return@withContext false;
-            }
-
-            Logger.i(TAG, "Update is available (config.version=${config.version}, source.config.version=${c.version}).");
-            return@withContext true;
-        } catch (e: Throwable) {
-            Logger.e(TAG, "Failed to check for updates.", e);
-            return@withContext false;
-        }
-    }

    companion object {
        private var _instance : StatePlatform? = null;
@@ -43,6 +43,7 @@ class StatePlugins {
    private var _embeddedSourcesDefault: List<String>? = null
    private var _sourcesUnderConstruction: Map<String, ImageVariable>? = null

+    private var _updatesAvailableMap: HashSet<String> = hashSetOf();

    fun getPluginIconOrNull(id: String): ImageVariable? {
        if(iconsDir.hasIcon(id))
@@ -55,6 +56,70 @@ class StatePlugins {
            .load();
    }

+
+    suspend fun checkForUpdates(): List<Pair<SourcePluginConfig, SourcePluginConfig>> = withContext(Dispatchers.IO) {
+        var configs = mutableListOf<Pair<SourcePluginConfig, SourcePluginConfig>>()
+        val updatesAvailableFor = hashSetOf<String>()
+        for (availableClient in StatePlatform.instance.getAvailableClients().filter { it is JSClient && it.descriptor.appSettings.checkForUpdates }) {
+            if (availableClient !is JSClient) {
+                continue
+            }
+
+            val newConfig = checkForUpdates(availableClient.config);
+            if (newConfig != null) {
+                configs.add(Pair(availableClient.config, newConfig));
+                updatesAvailableFor.add(availableClient.config.id)
+            }
+        }
+
+        _updatesAvailableMap = updatesAvailableFor
+        return@withContext configs;
+    }
+    private suspend fun checkForUpdates(c: SourcePluginConfig): SourcePluginConfig? = withContext(Dispatchers.IO) {
+        val sourceUrl = c.sourceUrl ?: return@withContext null;
+
+        Logger.i(TAG, "Check for source updates '${c.name}'.");
+        try {
+            val client = ManagedHttpClient();
+            val response = client.get(sourceUrl);
+            Logger.i(TAG, "Downloading source config '$sourceUrl'.");
+
+            if (!response.isOk || response.body == null) {
+                return@withContext null;
+            }
+
+            val configJson = response.body.string();
+            Logger.i(TAG, "Downloaded source config ($sourceUrl):\n${configJson}");
+
+            val config = SourcePluginConfig.fromJson(configJson);
+            if (config.version <= c.version) {
+                return@withContext null;
+            }
+
+            Logger.i(TAG, "Update is available (config.version=${config.version}, source.config.version=${c.version}).");
+            return@withContext config;
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to check for updates.", e);
+            return@withContext null;
+        }
+    }
+    fun hasUpdateAvailable(c: SourcePluginConfig): Boolean {
+        val updatesAvailableMap = _updatesAvailableMap
+        synchronized(updatesAvailableMap) {
+            return updatesAvailableMap.contains(c.id)
+        }
+    }
+    fun clearUpdateAvailable(c: SourcePluginConfig) {
+        val updatesAvailableMap = _updatesAvailableMap
+        synchronized(updatesAvailableMap) {
+            updatesAvailableMap.remove(c.id)
+        }
+    }
+
+
+
+
+
    fun loginPlugin(context: Context, id: String, afterLogin: ()->Unit): Boolean {
        val descriptor = getPlugin(id) ?: return false;
        val config = descriptor.config;
@@ -353,6 +418,49 @@ class StatePlugins {
        else verifyCanInstall();
    }

+    fun installPluginBackground(context: Context, scope: CoroutineScope, config: SourcePluginConfig, script: String, onProgress: (text: String, progress: Double)->Unit, onConcluded: (ex: Throwable?)->Unit) {
+        scope.launch(Dispatchers.IO) {
+            val client = ManagedHttpClient();
+            try {
+                withContext(Dispatchers.Main) {
+                    onProgress.invoke("Validating script", 0.25);
+                }
+
+                val tempDescriptor = SourcePluginDescriptor(config);
+                val plugin = JSClient(context, tempDescriptor, null, script);
+                plugin.validate();
+
+                withContext(Dispatchers.Main) {
+                    onProgress.invoke("Downloading Icon", 0.5);
+                }
+
+                val icon = config.absoluteIconUrl?.let { absIconUrl ->
+                    withContext(Dispatchers.Main) {
+                        onProgress.invoke("Saving plugin", 0.75);
+                    }
+                    val iconResp = client.get(absIconUrl);
+                    if(iconResp.isOk)
+                        return@let iconResp.body?.byteStream()?.use { it.readBytes() };
+                    return@let null;
+                }
+                val installEx = StatePlugins.instance.createPlugin(config, script, icon, true);
+                if(installEx != null)
+                    throw installEx;
+                StatePlatform.instance.updateAvailableClients(context);
+
+                withContext(Dispatchers.Main) {
+                    onProgress.invoke("Finished", 1.0)
+                    onConcluded.invoke(null);
+                }
+            } catch (ex: Exception) {
+                Logger.e(TAG, ex.message ?: "null", ex);
+                withContext(Dispatchers.Main) {
+                    onConcluded.invoke(ex);
+                }
+            }
+        }
+    }
+
    fun getPlugin(id: String): SourcePluginDescriptor? {
        if(id == StateDeveloper.DEV_ID)
            throw IllegalStateException("Attempted to retrieve a persistent developer plugin, this is not allowed");
@@ -10,6 +10,7 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePlugins

 class DisabledSourceView : LinearLayout {
    private val _root: LinearLayout;
@@ -37,7 +38,7 @@ class DisabledSourceView : LinearLayout {

        _textSource.text = client.name;

-        if (client is JSClient && StatePlatform.instance.hasUpdateAvailable(client.config)) {
+        if (client is JSClient && StatePlugins.instance.hasUpdateAvailable(client.config)) {
            _textSourceSubtitle.text = context.getString(R.string.update_available_exclamation)
            _textSourceSubtitle.setTextColor(context.getColor(R.color.light_blue_400))
            _textSourceSubtitle.typeface = resources.getFont(R.font.inter_regular)
@@ -13,6 +13,7 @@ import com.futo.platformplayer.api.media.IPlatformClient
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePlugins

 class EnabledSourceViewHolder : ViewHolder {
    private val _imageSource: ImageView;
@@ -61,7 +62,7 @@ class EnabledSourceViewHolder : ViewHolder {

        _textSource.text = client.name

-        if (client is JSClient && StatePlatform.instance.hasUpdateAvailable(client.config)) {
+        if (client is JSClient && StatePlugins.instance.hasUpdateAvailable(client.config)) {
            _textSourceSubtitle.text = itemView.context.getString(R.string.update_available_exclamation)
            _textSourceSubtitle.setTextColor(itemView.context.getColor(R.color.light_blue_400))
            _textSourceSubtitle.typeface = itemView.resources.getFont(R.font.inter_regular)
@@ -16,6 +16,7 @@ import androidx.media3.datasource.DefaultDataSource
 import androidx.media3.datasource.DefaultHttpDataSource
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.dash.DashMediaSource
+import androidx.media3.exoplayer.drm.DefaultDrmSessionManagerProvider
 import androidx.media3.exoplayer.hls.HlsMediaSource
 import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.MergingMediaSource
@@ -27,6 +28,7 @@ import com.futo.platformplayer.api.media.models.chapters.IChapter
 import com.futo.platformplayer.api.media.models.streams.VideoMuxedSourceDescriptor
 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.IAudioUrlWidevineSource
 import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
@@ -389,6 +391,7 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
            is LocalAudioSource -> swapAudioSourceLocal(audioSource);
            is JSAudioUrlRangeSource -> swapAudioSourceUrlRange(audioSource);
            is JSHLSManifestAudioSource -> swapAudioSourceHLS(audioSource);
+            is IAudioUrlWidevineSource -> swapAudioSourceUrlWidevine(audioSource)
            is IAudioUrlSource -> swapAudioSourceUrl(audioSource);
            null -> _lastAudioMediaSource = null;
            else -> throw IllegalArgumentException("Unsupported video source [${audioSource.javaClass.simpleName}]");
@@ -508,6 +511,31 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
            .createMediaSource(MediaItem.fromUri(audioSource.url));
    }

+    @OptIn(UnstableApi::class)
+    private fun swapAudioSourceUrlWidevine(audioSource: IAudioUrlWidevineSource) {
+        Logger.i(TAG, "Loading AudioSource [UrlWidevine]")
+        val dataSource = if (audioSource is JSSource && audioSource.hasRequestModifier)
+            audioSource.getHttpDataSourceFactory()
+        else
+            DefaultHttpDataSource.Factory().setUserAgent(DEFAULT_USER_AGENT)
+
+        val httpRequestHeaders = mapOf("Authorization" to "Bearer " + audioSource.bearerToken)
+        val provider = DefaultDrmSessionManagerProvider()
+        provider.setDrmHttpDataSourceFactory(dataSource)
+        _lastAudioMediaSource = ProgressiveMediaSource.Factory(dataSource)
+            .setDrmSessionManagerProvider(provider)
+            .createMediaSource(
+                MediaItem.Builder()
+                    .setUri(audioSource.getAudioUrl()).setDrmConfiguration(
+                        MediaItem.DrmConfiguration.Builder(C.WIDEVINE_UUID)
+                            .setLicenseUri(audioSource.licenseUri)
+                            .setMultiSession(true)
+                            .setLicenseRequestHeaders(httpRequestHeaders)
+                            .build()
+                    ).build()
+            )
+    }
+

    //Prefered source selection
    fun getPreferredVideoSource(video: IPlatformVideoDetails, targetPixels: Int = -1): IVideoSource? {
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:background="@color/gray_1d">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:paddingTop="30dp"
+        android:paddingBottom="30dp">
+
+        <FrameLayout
+            android:id="@+id/dialog_ui_choice_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="visible">
+            <ImageView
+                android:id="@+id/icon_plugin"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_sources" />
+
+        </FrameLayout>
+        <FrameLayout
+            android:id="@+id/dialog_ui_risk_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+            <ImageView
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_warning_yellow" />
+
+        </FrameLayout>
+        <FrameLayout
+            android:id="@+id/dialog_ui_progress_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+
+            <ImageView
+                android:id="@+id/update_spinner"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_update_animated"
+                android:visibility="visible" />
+
+        </FrameLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Plugin Update"
+            android:textSize="15sp"
+            android:textColor="@color/white"
+            android:fontFamily="@font/inter_extra_light"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="30dp" />
+        <TextView
+            android:id="@+id/text_plugin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Some Plugin Name"
+            android:textSize="18sp"
+            android:textColor="@color/white"
+            android:fontFamily="@font/inter_regular"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="30dp" />
+
+        <LinearLayout
+            android:id="@+id/dialog_ui_bottom_choice"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:text="A new update is available.\nWould you like to update this plugin?"
+                android:textSize="14sp"
+                android:textColor="@color/white"
+                android:fontFamily="@font/inter_regular"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="30dp"
+                android:layout_marginEnd="30dp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:text="Updates may be critical to functionality"
+                android:textSize="13sp"
+                android:textColor="@color/pastel_red"
+                android:fontFamily="@font/inter_regular"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="30dp"
+                android:layout_marginEnd="30dp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:layout_marginTop="28dp">
+
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+
+                <Button
+                    android:id="@+id/button_cancel_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cancel"
+                    android:textSize="14dp"
+                    android:fontFamily="@font/inter_regular"
+                    android:textColor="@color/colorPrimary"
+                    android:background="@color/transparent" />
+
+                <LinearLayout
+                    android:id="@+id/button_update"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/background_button_primary"
+                    android:layout_marginEnd="28dp"
+                    android:clickable="true">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Update"
+                        android:textSize="14dp"
+                        android:textColor="@color/white"
+                        android:fontFamily="@font/inter_regular"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp"
+                        android:paddingStart="28dp"
+                        android:paddingEnd="28dp"/>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/dialog_ui_bottom_progress"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="match_parent"
+                android:id="@+id/text_progress"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:text="This plugin has modified its permissions"
+                android:textSize="14sp"
+                android:textColor="@color/white"
+                android:fontFamily="@font/inter_regular"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="30dp"
+                android:layout_marginEnd="30dp" />
+
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/dialog_ui_bottom_risk"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:text="This plugin has modified its permissions"
+                android:textSize="14sp"
+                android:textColor="@color/white"
+                android:fontFamily="@font/inter_regular"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="30dp"
+                android:layout_marginEnd="30dp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:text="Make sure you read the installation screen"
+                android:textSize="13sp"
+                android:textColor="@color/pastel_red"
+                android:fontFamily="@font/inter_regular"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="30dp"
+                android:layout_marginEnd="30dp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:layout_marginTop="28dp">
+
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+
+                <Button
+                    android:id="@+id/button_cancel_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cancel"
+                    android:textSize="14dp"
+                    android:fontFamily="@font/inter_regular"
+                    android:textColor="@color/colorPrimary"
+                    android:background="@color/transparent" />
+
+                <LinearLayout
+                    android:id="@+id/button_install"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/background_button_primary"
+                    android:layout_marginEnd="28dp"
+                    android:clickable="true">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Reinstall"
+                        android:textSize="14dp"
+                        android:textColor="@color/white"
+                        android:fontFamily="@font/inter_regular"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp"
+                        android:paddingStart="28dp"
+                        android:paddingEnd="28dp"/>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/dialog_ui_bottom_result"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/text_error"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:text=""
+                android:textSize="13sp"
+                android:textColor="@color/pastel_red"
+                android:fontFamily="@font/inter_regular"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="30dp"
+                android:layout_marginEnd="30dp" />
+
+            <TextView
+                android:id="@+id/text_result"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:text="Succesfully updated plugin."
+                android:textSize="13sp"
+                android:textColor="@color/white"
+                android:fontFamily="@font/inter_regular"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="30dp"
+                android:layout_marginEnd="30dp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:layout_marginTop="28dp">
+
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+
+                <LinearLayout
+                    android:id="@+id/button_ok"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/background_button_primary"
+                    android:layout_marginEnd="28dp"
+                    android:clickable="true">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Ok"
+                        android:textSize="14dp"
+                        android:textColor="@color/white"
+                        android:fontFamily="@font/inter_regular"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp"
+                        android:paddingStart="28dp"
+                        android:paddingEnd="28dp"/>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+
+    </LinearLayout>
+</LinearLayout>
@@ -489,6 +489,8 @@
    <string name="visibility">Visibility</string>
    <string name="check_for_updates_setting">Check for updates</string>
    <string name="check_for_updates_setting_description">If a plugin should be checked for updates on startup</string>
+    <string name="automatic_update_setting">Automatic Update</string>
+    <string name="automatic_update_setting_description">Update automatically on boot if no permissions changed and plugin is enabled</string>
    <string name="allow_developer_submit">Allow Developer Submissions</string>
    <string name="allow_developer_submit_description">Allows the developer to send data to their server, be careful as this might include sensitive data.</string>
    <string name="allow_developer_submit_warning">Make sure you trust the developer. They may gain access to sensitive data. Only enable this when you are trying to help the developer fix a bug.</string>
@@ -1,24 +0,0 @@
-{
-	"name": "Testing",
-	"description": "Just for testing.",
-	"author": "FUTO",
-	"authorUrl": "https://futo.org",
-
-	"platformUrl": "https://odysee.com",
-	"sourceUrl": "https://plugins.grayjay.app/Test/TestConfig.json",
-	"repositoryUrl": "https://futo.org",
-	"scriptUrl": "./TestScript.js",
-	"version": 31,
-	
-	"iconUrl": "./odysee.png",
-	"id": "1c05bfc3-08b9-42d0-93d3-6d52e0fd34d8",
-	
-	"scriptSignature": "",
-	"scriptPublicKey": "",
-	"packages": ["Http"],
-	
-	"allowEval": false,
-	"allowUrls": [],
-
-	"supportedClaimTypes": []
-}
@@ -1,45 +0,0 @@
-var config = {};
-
-//Source Methods
-source.enable = function(conf){
-	config = conf ?? {};
-	//log(config);
-}
-source.getHome = function() {
-    return new ContentPager([
-        source.getContentDetails("whatever")
-    ]);
-};
-
-//Video
-source.isContentDetailsUrl = function(url) {
-	return REGEX_DETAILS_URL.test(url)
-};
-source.getContentDetails = function(url) {
-	return new PlatformVideoDetails({
-		id: new PlatformID("Test", "Something", config.id),
-		name: "Test Video",
-		thumbnails: new Thumbnails([]),
-		author: new PlatformAuthorLink(new PlatformID("Test", "TestID", config.id),
-			"TestAuthor",
-			"None",
-			""),
-		datetime: parseInt(new Date().getTime() / 1000),
-		duration: 0,
-		viewCount: 0,
-		url: "",
-		isLive: false,
-		description: "",
-		rating: new RatingLikes(0),
-		video: new VideoSourceDescriptor([
-			new HLSSource({
-				name: "HLS",
-				url: "",
-				duration: 0,
-				priority: true
-			})
-		])
-	});
-};
-
-log("LOADED");
Author	SHA1	Message	Date
Kelvin	aceab7b476	Websocket fixes, onConcluded support	2024-05-21 22:31:04 +02:00
Kelvin	5f1c0209a8	Additional risk check	2024-05-20 22:38:18 +02:00
Kelvin	819e81b7a6	Proxy support, Additional http header access support	2024-05-20 22:28:51 +02:00
Kelvin	8193234c2f	Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay	2024-05-20 15:45:17 +02:00
Kelvin	6263a31f41	Minor devportal improvements	2024-05-20 15:44:43 +02:00
Kelvin	481a0cda99	Merge branch 'drm' into 'master' add initial widevine drm support for audio url sources See merge request videostreaming/grayjay!16	2024-05-20 13:33:59 +00:00
Kelvin	b39b89e908	Make type constant public	2024-05-20 13:33:06 +00:00
Kai DeLorenzo	ce0f98055f	added initial drm support for audio url sources	2024-05-17 18:45:44 -04:00
Koen	3dddf68766	Fully swap over to prod url.	2024-05-17 12:11:02 +02:00
Kelvin	88d687f26e	Update trigger on exception update button pressed	2024-05-16 22:27:53 +02:00
Kelvin	d44df42727	Plugin auto-update support and prompting	2024-05-15 21:26:44 +02:00
Kai DeLorenzo	88c8dbcb7c	added initial drm support for audio url sources	2024-04-29 13:58:00 -05:00
Kelvin	b4fddbe26a	Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay	2024-04-24 20:13:40 +02:00
Kelvin	ab6d7669d7	Delete dangling exports	2024-04-24 20:13:32 +02:00