From 84a2e0bb7885c331c64eebdb0fb3e72064989c64 Mon Sep 17 00:00:00 2001 From: kodjomoustapha <107993382+kodjodevf@users.noreply.github.com> Date: Wed, 2 Aug 2023 12:23:47 +0100 Subject: [PATCH] + --- lib/eval/m_bridge.dart | 14 ++++++++------ .../anime_extractors/mp4upload_extractor.dart | 13 +++++-------- linux/flutter/generated_plugin_registrant.cc | 4 ---- linux/flutter/generated_plugins.cmake | 1 - macos/Flutter/GeneratedPluginRegistrant.swift | 2 -- pubspec.lock | 16 ---------------- pubspec.yaml | 2 +- windows/flutter/generated_plugin_registrant.cc | 3 --- windows/flutter/generated_plugins.cmake | 1 - 9 files changed, 14 insertions(+), 42 deletions(-) diff --git a/lib/eval/m_bridge.dart b/lib/eval/m_bridge.dart index cd04a41b..cc0526c8 100644 --- a/lib/eval/m_bridge.dart +++ b/lib/eval/m_bridge.dart @@ -7,9 +7,9 @@ import 'package:dart_eval/stdlib/core.dart'; import 'package:desktop_webview_window/desktop_webview_window.dart'; import 'package:flutter/material.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; -import 'package:flutter_js/flutter_js.dart'; import 'package:intl/date_symbol_data_local.dart'; import 'package:intl/intl.dart'; +import 'package:js_packer/js_packer.dart'; import 'package:json_path/json_path.dart'; import 'package:mangayomi/eval/bridge_class/model.dart'; import 'package:mangayomi/eval/bridge_class/video_model.dart'; @@ -308,11 +308,13 @@ class MBridge { static String evalJs(String code) { try { - JavascriptRuntime? flutterJs; - flutterJs = getJavascriptRuntime(); - final res = flutterJs.evaluate(code).stringResult; - flutterJs.dispose(); - return res; + // JavascriptRuntime? flutterJs; + // flutterJs = getJavascriptRuntime(); + // final res = flutterJs.evaluate(code).stringResult; + // flutterJs.dispose(); + // return res; + final jsPacker = JSPacker(code); + return jsPacker.unpack() ?? ""; } catch (e) { _botToast(e.toString()); throw Exception(e); diff --git a/lib/services/anime_extractors/mp4upload_extractor.dart b/lib/services/anime_extractors/mp4upload_extractor.dart index 00bd8ef5..2c780eb6 100644 --- a/lib/services/anime_extractors/mp4upload_extractor.dart +++ b/lib/services/anime_extractors/mp4upload_extractor.dart @@ -1,5 +1,5 @@ -import 'package:flutter_js/flutter_js.dart'; import 'package:http/http.dart' as http; +import 'package:js_packer/js_packer.dart'; import 'package:mangayomi/models/video.dart'; import 'package:mangayomi/utils/extensions.dart'; import 'package:mangayomi/utils/xpath_selector.dart'; @@ -22,7 +22,7 @@ class Mp4uploadExtractor { .attrs; if (scriptElementWithEval.isNotEmpty) { - script = _evalJs(script); + script = _evalJs(script)!; } else { final scriptElementWithSrc = xpathSelector(response.body) .queryXPath('//script[contains(text(), "player.src")]/text()') @@ -50,10 +50,7 @@ class Mp4uploadExtractor { } } -String _evalJs(String script) { - JavascriptRuntime? flutterJs; - flutterJs = getJavascriptRuntime(); - final res = flutterJs.evaluate(script).stringResult; - flutterJs.dispose(); - return res; +String? _evalJs(String script) { + final jsPacker = JSPacker(script); + return jsPacker.unpack(); } diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 261a7d28..da8d8807 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -7,7 +7,6 @@ #include "generated_plugin_registrant.h" #include -#include #include #include #include @@ -21,9 +20,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) desktop_webview_window_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "DesktopWebviewWindowPlugin"); desktop_webview_window_plugin_register_with_registrar(desktop_webview_window_registrar); - g_autoptr(FlPluginRegistrar) flutter_js_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterJsPlugin"); - flutter_js_plugin_register_with_registrar(flutter_js_registrar); g_autoptr(FlPluginRegistrar) flutter_meedu_videoplayer_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterMeeduVideoplayerPlugin"); flutter_meedu_videoplayer_plugin_register_with_registrar(flutter_meedu_videoplayer_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 700d189c..39980afa 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -4,7 +4,6 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_webview_window - flutter_js flutter_meedu_videoplayer isar_flutter_libs media_kit_libs_linux diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index f478efef..79837541 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,7 +7,6 @@ import Foundation import desktop_webview_window import flutter_inappwebview -import flutter_js import flutter_meedu_videoplayer import flutter_web_auth_2 import isar_flutter_libs @@ -28,7 +27,6 @@ import window_to_front func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DesktopWebviewWindowPlugin.register(with: registry.registrar(forPlugin: "DesktopWebviewWindowPlugin")) InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin")) - FlutterJsPlugin.register(with: registry.registrar(forPlugin: "FlutterJsPlugin")) FlutterMeeduVideoplayerPlugin.register(with: registry.registrar(forPlugin: "FlutterMeeduVideoplayerPlugin")) FlutterWebAuth2Plugin.register(with: registry.registrar(forPlugin: "FlutterWebAuth2Plugin")) IsarFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "IsarFlutterLibsPlugin")) diff --git a/pubspec.lock b/pubspec.lock index cf91edff..0cf5bcba 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -494,14 +494,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" - flutter_js: - dependency: "direct main" - description: - name: flutter_js - sha256: "5bf5db354fe78fe24cb90a5fa6b4423d38712440c88e3445c3dc88bc134c452f" - url: "https://pub.dev" - source: hosted - version: "0.8.0" flutter_lints: dependency: "direct dev" description: @@ -1458,14 +1450,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" - sync_http: - dependency: transitive - description: - name: sync_http - sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961" - url: "https://pub.dev" - source: hosted - version: "0.3.1" synchronized: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7d31893b..3a5ed23e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: http: ^1.1.0 riverpod_annotation: ^2.1.1 html: ^0.15.4 - flutter_js: ^0.8.0 + # flutter_js: ^0.8.0 font_awesome_flutter: ^10.5.0 expandable_text: ^2.3.0 flex_color_scheme: ^7.2.0 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 2998c37e..dbb900a2 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -7,7 +7,6 @@ #include "generated_plugin_registrant.h" #include -#include #include #include #include @@ -24,8 +23,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { DesktopWebviewWindowPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("DesktopWebviewWindowPlugin")); - FlutterJsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("FlutterJsPlugin")); FlutterMeeduVideoplayerPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterMeeduVideoplayerPluginCApi")); FullscreenWindowPluginCApiRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 7ffeb77b..ad30d860 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -4,7 +4,6 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_webview_window - flutter_js flutter_meedu_videoplayer fullscreen_window isar_flutter_libs