mirrors/grayjay
0
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-09-05 09:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Substitute v8 object calls to wrapper function

Browse source
This commit is contained in:
Kelvin 2025-07-04 15:24:19 +02:00
commit 2bbe0e6133
10 changed files with 49 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/com/futo/platformplayer/Extensions_V8.kt
View file

@ -294,17 +294,32 @@ class V8Deferred<T>(val deferred: Deferred<T>, val estDuration: Int = -1): Defer
} }
fun <T: V8Value> V8ValueObject.invokeV8(method: String, vararg obj: Any): T { fun <T: V8Value> V8ValueObject.invokeV8(method: String, vararg obj: Any?): T {
var result = this.invoke<V8Value>(method, *obj); var result = this.invoke<V8Value>(method, *obj);
if(result is V8ValuePromise) { if(result is V8ValuePromise) {
return result.toV8ValueBlocking(this.getSourcePlugin()!!); return result.toV8ValueBlocking(this.getSourcePlugin()!!);
} }
return result as T; return result as T;
} }
fun <T: V8Value> V8ValueObject.invokeV8Async(method: String, vararg obj: Any): V8Deferred<T> { fun <T: V8Value> V8ValueObject.invokeV8Async(method: String, vararg obj: Any?): V8Deferred<T> {
var result = this.invoke<V8Value>(method, *obj); var result = this.invoke<V8Value>(method, *obj);
if(result is V8ValuePromise) { if(result is V8ValuePromise) {
return result.toV8ValueAsync(this.getSourcePlugin()!!); return result.toV8ValueAsync(this.getSourcePlugin()!!);
} }
return V8Deferred(CompletableDeferred(result as T)); return V8Deferred(CompletableDeferred(result as T));
}
fun V8ValueObject.invokeV8Void(method: String, vararg obj: Any?): V8Value {
var result = this.invoke<V8Value>(method, *obj);
if(result is V8ValuePromise) {
return result.toV8ValueBlocking(this.getSourcePlugin()!!);
}
return result;
}
fun V8ValueObject.invokeV8VoidAsync(method: String, vararg obj: Any?): V8Deferred<V8Value> {
var result = this.invoke<V8Value>(method, *obj);
if(result is V8ValuePromise) {
val result = result.toV8ValueAsync<V8Value>(this.getSourcePlugin()!!);
return result;
}
return V8Deferred(CompletableDeferred(result));
} }

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

@ -10,6 +10,7 @@ import com.futo.platformplayer.api.media.structures.IPager
import com.futo.platformplayer.engine.V8Plugin import com.futo.platformplayer.engine.V8Plugin
import com.futo.platformplayer.getOrDefault import com.futo.platformplayer.getOrDefault
import com.futo.platformplayer.getOrThrow import com.futo.platformplayer.getOrThrow
import com.futo.platformplayer.invokeV8
import com.futo.platformplayer.warnIfMainThread import com.futo.platformplayer.warnIfMainThread
abstract class JSPager<T> : IPager<T> { abstract class JSPager<T> : IPager<T> {
@ -49,7 +50,7 @@ abstract class JSPager<T> : IPager<T> {
val pluginV8 = plugin.getUnderlyingPlugin(); val pluginV8 = plugin.getUnderlyingPlugin();
pluginV8.busy { pluginV8.busy {
pager = pluginV8.catchScriptErrors("[${plugin.config.name}] JSPager", "pager.nextPage()") { pager = pluginV8.catchScriptErrors("[${plugin.config.name}] JSPager", "pager.nextPage()") {
pager.invoke("nextPage", arrayOf<Any>()); pager.invokeV8("nextPage", arrayOf<Any>());
}; };
_hasMorePages = pager.getOrDefault(config, "hasMore", "Pager", false) ?: false; _hasMorePages = pager.getOrDefault(config, "hasMore", "Pager", false) ?: false;
_resultChanged = true; _resultChanged = true;

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

@ -6,6 +6,7 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
import com.futo.platformplayer.engine.IV8PluginConfig import com.futo.platformplayer.engine.IV8PluginConfig
import com.futo.platformplayer.engine.exceptions.ScriptImplementationException import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
import com.futo.platformplayer.getOrThrow import com.futo.platformplayer.getOrThrow
import com.futo.platformplayer.invokeV8Void
import com.futo.platformplayer.logging.Logger import com.futo.platformplayer.logging.Logger
import com.futo.platformplayer.states.StatePlatform import com.futo.platformplayer.states.StatePlatform
import com.futo.platformplayer.warnIfMainThread import com.futo.platformplayer.warnIfMainThread
@ -57,7 +58,7 @@ class JSPlaybackTracker: IPlaybackTracker {
_client.busy { _client.busy {
if (_hasInit) { if (_hasInit) {
Logger.i("JSPlaybackTracker", "onInit (${seconds})"); Logger.i("JSPlaybackTracker", "onInit (${seconds})");
_obj.invokeVoid("onInit", seconds); _obj.invokeV8Void("onInit", seconds);
} }
nextRequest = Math.max(100, _obj.getOrThrow(_config, "nextRequest", "PlaybackTracker", false)); nextRequest = Math.max(100, _obj.getOrThrow(_config, "nextRequest", "PlaybackTracker", false));
_hasCalledInit = true; _hasCalledInit = true;
@ -73,7 +74,7 @@ class JSPlaybackTracker: IPlaybackTracker {
else { else {
_client.busy { _client.busy {
Logger.i("JSPlaybackTracker", "onProgress (${seconds}, ${isPlaying})"); Logger.i("JSPlaybackTracker", "onProgress (${seconds}, ${isPlaying})");
_obj.invokeVoid("onProgress", Math.floor(seconds), isPlaying); _obj.invokeV8Void("onProgress", Math.floor(seconds), isPlaying);
nextRequest = Math.max(100, _obj.getOrThrow(_config, "nextRequest", "PlaybackTracker", false)); nextRequest = Math.max(100, _obj.getOrThrow(_config, "nextRequest", "PlaybackTracker", false));
_lastRequest = System.currentTimeMillis(); _lastRequest = System.currentTimeMillis();
} }
@ -86,7 +87,7 @@ class JSPlaybackTracker: IPlaybackTracker {
synchronized(_obj) { synchronized(_obj) {
Logger.i("JSPlaybackTracker", "onConcluded"); Logger.i("JSPlaybackTracker", "onConcluded");
_client.busy { _client.busy {
_obj.invokeVoid("onConcluded", -1); _obj.invokeV8Void("onConcluded", -1);
} }
} }
} }

10
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSRequestExecutor.kt
View file

@ -14,6 +14,8 @@ import com.futo.platformplayer.engine.exceptions.ScriptException
import com.futo.platformplayer.engine.exceptions.ScriptImplementationException import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
import com.futo.platformplayer.getOrDefault import com.futo.platformplayer.getOrDefault
import com.futo.platformplayer.getOrThrow import com.futo.platformplayer.getOrThrow
import com.futo.platformplayer.invokeV8
import com.futo.platformplayer.invokeV8Void
import com.futo.platformplayer.logging.Logger import com.futo.platformplayer.logging.Logger
import com.futo.platformplayer.states.StateDeveloper import com.futo.platformplayer.states.StateDeveloper
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@ -55,7 +57,7 @@ class JSRequestExecutor {
"[${_config.name}] JSRequestExecutor", "[${_config.name}] JSRequestExecutor",
"builder.modifyRequest()" "builder.modifyRequest()"
) { ) {
_executor.invoke("executeRequest", url, headers, method, body); _executor.invokeV8("executeRequest", url, headers, method, body);
} as V8Value; } as V8Value;
} }
else V8Plugin.catchScriptErrors<Any>( else V8Plugin.catchScriptErrors<Any>(
@ -63,7 +65,7 @@ class JSRequestExecutor {
"[${_config.name}] JSRequestExecutor", "[${_config.name}] JSRequestExecutor",
"builder.modifyRequest()" "builder.modifyRequest()"
) { ) {
_executor.invoke("executeRequest", url, headers, method, body); _executor.invokeV8("executeRequest", url, headers, method, body);
} as V8Value; } as V8Value;
try { try {
@ -110,7 +112,7 @@ class JSRequestExecutor {
"[${_config.name}] JSRequestExecutor", "[${_config.name}] JSRequestExecutor",
"builder.modifyRequest()" "builder.modifyRequest()"
) { ) {
_executor.invokeVoid("cleanup", null); _executor.invokeV8("cleanup", null);
}; };
} }
else V8Plugin.catchScriptErrors<Any>( else V8Plugin.catchScriptErrors<Any>(
@ -118,7 +120,7 @@ class JSRequestExecutor {
"[${_config.name}] JSRequestExecutor", "[${_config.name}] JSRequestExecutor",
"builder.modifyRequest()" "builder.modifyRequest()"
) { ) {
_executor.invokeVoid("cleanup", null); _executor.invokeV8("cleanup", null);
}; };
} }
} }

4
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSRequestModifier.kt
View file

@ -11,6 +11,8 @@ import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
import com.futo.platformplayer.getOrDefault import com.futo.platformplayer.getOrDefault
import com.futo.platformplayer.getOrNull import com.futo.platformplayer.getOrNull
import com.futo.platformplayer.getOrThrow import com.futo.platformplayer.getOrThrow
import com.futo.platformplayer.invokeV8
import com.futo.platformplayer.invokeV8Void
class JSRequestModifier: IRequestModifier { class JSRequestModifier: IRequestModifier {
private val _plugin: JSClient; private val _plugin: JSClient;
@ -40,7 +42,7 @@ class JSRequestModifier: IRequestModifier {
return _plugin.busy { return _plugin.busy {
val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSRequestModifier", "builder.modifyRequest()") { val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSRequestModifier", "builder.modifyRequest()") {
_modifier.invoke("modifyRequest", url, headers); _modifier.invokeV8("modifyRequest", url, headers);
} as V8ValueObject; } as V8ValueObject;
val req = JSRequest(_plugin, result, url, headers); val req = JSRequest(_plugin, result, url, headers);

4
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSAudioUrlWidevineSource.kt
View file

@ -6,6 +6,8 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
import com.futo.platformplayer.engine.V8Plugin import com.futo.platformplayer.engine.V8Plugin
import com.futo.platformplayer.getOrThrow import com.futo.platformplayer.getOrThrow
import com.futo.platformplayer.invokeV8
import com.futo.platformplayer.invokeV8Void
class JSAudioUrlWidevineSource : JSAudioUrlSource, IAudioUrlWidevineSource { class JSAudioUrlWidevineSource : JSAudioUrlSource, IAudioUrlWidevineSource {
override val licenseUri: String override val licenseUri: String
@ -25,7 +27,7 @@ class JSAudioUrlWidevineSource : JSAudioUrlSource, IAudioUrlWidevineSource {
return null return null
val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSAudioUrlWidevineSource", "obj.getLicenseRequestExecutor()") { val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSAudioUrlWidevineSource", "obj.getLicenseRequestExecutor()") {
_obj.invoke("getLicenseRequestExecutor", arrayOf<Any>()) _obj.invokeV8("getLicenseRequestExecutor", arrayOf<Any>())
} }
if (result !is V8ValueObject) if (result !is V8ValueObject)

4
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestWidevineSource.kt
View file

@ -9,6 +9,8 @@ import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
import com.futo.platformplayer.engine.V8Plugin import com.futo.platformplayer.engine.V8Plugin
import com.futo.platformplayer.getOrNull import com.futo.platformplayer.getOrNull
import com.futo.platformplayer.getOrThrow import com.futo.platformplayer.getOrThrow
import com.futo.platformplayer.invokeV8
import com.futo.platformplayer.invokeV8Void
class JSDashManifestWidevineSource : IVideoUrlSource, IDashManifestSource, class JSDashManifestWidevineSource : IVideoUrlSource, IDashManifestSource,
IDashManifestWidevineSource, JSSource { IDashManifestWidevineSource, JSSource {
@ -45,7 +47,7 @@ class JSDashManifestWidevineSource : IVideoUrlSource, IDashManifestSource,
return null return null
val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSDashManifestWidevineSource", "obj.getLicenseRequestExecutor()") { val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSDashManifestWidevineSource", "obj.getLicenseRequestExecutor()") {
_obj.invoke("getLicenseRequestExecutor", arrayOf<Any>()) _obj.invokeV8("getLicenseRequestExecutor", arrayOf<Any>())
} }
if (result !is V8ValueObject) if (result !is V8ValueObject)

5
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSSource.kt
View file

@ -16,6 +16,7 @@ import com.futo.platformplayer.engine.IV8PluginConfig
import com.futo.platformplayer.engine.V8Plugin import com.futo.platformplayer.engine.V8Plugin
import com.futo.platformplayer.ensureIsBusy import com.futo.platformplayer.ensureIsBusy
import com.futo.platformplayer.getOrDefault import com.futo.platformplayer.getOrDefault
import com.futo.platformplayer.invokeV8
import com.futo.platformplayer.logging.Logger import com.futo.platformplayer.logging.Logger
import com.futo.platformplayer.orNull import com.futo.platformplayer.orNull
import com.futo.platformplayer.views.video.datasources.JSHttpDataSource import com.futo.platformplayer.views.video.datasources.JSHttpDataSource
@ -64,7 +65,7 @@ abstract class JSSource {
return@isBusyWith null; return@isBusyWith null;
val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSVideoUrlSource", "obj.getRequestModifier()") { val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSVideoUrlSource", "obj.getRequestModifier()") {
_obj.invoke("getRequestModifier", arrayOf<Any>()); _obj.invokeV8("getRequestModifier", arrayOf<Any>());
}; };
if (result !is V8ValueObject) if (result !is V8ValueObject)
@ -78,7 +79,7 @@ abstract class JSSource {
Logger.v("JSSource", "Request executor for [${type}] requesting"); Logger.v("JSSource", "Request executor for [${type}] requesting");
val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSSource", "obj.getRequestExecutor()") { val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSSource", "obj.getRequestExecutor()") {
_obj.invoke("getRequestExecutor", arrayOf<Any>()); _obj.invokeV8("getRequestExecutor", arrayOf<Any>());
}; };
Logger.v("JSSource", "Request executor for [${type}] received"); Logger.v("JSSource", "Request executor for [${type}] received");

3
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSVideoUrlWidevineSource.kt
View file

@ -6,6 +6,7 @@ import com.futo.platformplayer.api.media.platforms.js.JSClient
import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor import com.futo.platformplayer.api.media.platforms.js.models.JSRequestExecutor
import com.futo.platformplayer.engine.V8Plugin import com.futo.platformplayer.engine.V8Plugin
import com.futo.platformplayer.getOrThrow import com.futo.platformplayer.getOrThrow
import com.futo.platformplayer.invokeV8
class JSVideoUrlWidevineSource : JSVideoUrlSource, IVideoUrlWidevineSource { class JSVideoUrlWidevineSource : JSVideoUrlSource, IVideoUrlWidevineSource {
override val licenseUri: String override val licenseUri: String
@ -25,7 +26,7 @@ class JSVideoUrlWidevineSource : JSVideoUrlSource, IVideoUrlWidevineSource {
return null return null
val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSAudioUrlWidevineSource", "obj.getLicenseRequestExecutor()") { val result = V8Plugin.catchScriptErrors<Any>(_config, "[${_config.name}] JSAudioUrlWidevineSource", "obj.getLicenseRequestExecutor()") {
_obj.invoke("getLicenseRequestExecutor", arrayOf<Any>()) _obj.invokeV8("getLicenseRequestExecutor", arrayOf<Any>())
} }
if (result !is V8ValueObject) if (result !is V8ValueObject)

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

@ -17,6 +17,7 @@ import com.futo.platformplayer.engine.IV8PluginConfig
import com.futo.platformplayer.engine.V8Plugin import com.futo.platformplayer.engine.V8Plugin
import com.futo.platformplayer.engine.internal.IV8Convertable import com.futo.platformplayer.engine.internal.IV8Convertable
import com.futo.platformplayer.engine.internal.V8BindObject import com.futo.platformplayer.engine.internal.V8BindObject
import com.futo.platformplayer.invokeV8Void
import com.futo.platformplayer.logging.Logger import com.futo.platformplayer.logging.Logger
import java.net.SocketTimeoutException import java.net.SocketTimeoutException
import java.util.concurrent.ForkJoinPool import java.util.concurrent.ForkJoinPool
@ -668,7 +669,7 @@ class PackageHttp: V8Package {
if(hasOpen && _listeners?.isClosed != true) { if(hasOpen && _listeners?.isClosed != true) {
try { try {
_package._plugin.busy { _package._plugin.busy {
_listeners?.invokeVoid("open", arrayOf<Any>()); _listeners?.invokeV8Void("open", arrayOf<Any>());
} }
} }
catch(ex: Throwable){ catch(ex: Throwable){
@ -680,7 +681,7 @@ class PackageHttp: V8Package {
if(hasMessage && _listeners?.isClosed != true) { if(hasMessage && _listeners?.isClosed != true) {
try { try {
_package._plugin.busy { _package._plugin.busy {
_listeners?.invokeVoid("message", msg); _listeners?.invokeV8Void("message", msg);
} }
} }
catch(ex: Throwable) {} catch(ex: Throwable) {}
@ -691,7 +692,7 @@ class PackageHttp: V8Package {
{ {
try { try {
_package._plugin.busy { _package._plugin.busy {
_listeners?.invokeVoid("closing", code, reason); _listeners?.invokeV8Void("closing", code, reason);
} }
} }
catch(ex: Throwable){ catch(ex: Throwable){
@ -704,7 +705,7 @@ class PackageHttp: V8Package {
if(hasClosed && _listeners?.isClosed != true) { if(hasClosed && _listeners?.isClosed != true) {
try { try {
_package._plugin.busy { _package._plugin.busy {
_listeners?.invokeVoid("closed", code, reason); _listeners?.invokeV8Void("closed", code, reason);
} }
} }
catch(ex: Throwable){ catch(ex: Throwable){
@ -722,7 +723,7 @@ class PackageHttp: V8Package {
if(hasFailure && _listeners?.isClosed != true) { if(hasFailure && _listeners?.isClosed != true) {
try { try {
_package._plugin.busy { _package._plugin.busy {
_listeners?.invokeVoid("failure", exception.message); _listeners?.invokeV8Void("failure", exception.message);
} }
} }
catch(ex: Throwable){ catch(ex: Throwable){