+

lib/eval/javascript/dom_selector.dart

@@ -9,7 +9,7 @@ class JsDomSelector {
   JsDomSelector(this.runtime);
   final Map<int, Element?> _elements = {};
   int _elementKey = 0;
-  init() {
+  void init() {
     runtime.onMessage('get_doc_element', (dynamic args) {
       final input = args[0];
       final type = args[1];

lib/eval/javascript/extractors.dart

@@ -8,7 +8,7 @@ class JsVideosExtractors {
   late JavascriptRuntime runtime;
   JsVideosExtractors(this.runtime);
 
-  init() {
+  void init() {
     runtime.onMessage('sibnetExtractor', (dynamic args) async {
       return (await MBridge.sibnetExtractor(args[0], args[1] ?? ""))
           .encodeToJson();

lib/eval/javascript/http.dart

@@ -7,50 +7,39 @@ class JsHttpClient {
   late JavascriptRuntime runtime;
   JsHttpClient(this.runtime);
 
-  init() {
+  void init() {
+    InterceptedClient client(dynamic reqcopyWith) {
+      return MClient.init(
+          reqcopyWith: (reqcopyWith as Map?)?.toMapStringDynamic);
+    }
+
     runtime.onMessage('http_get', (dynamic args) async {
-      return jsonEncode((await MClient.init(
-                  source: null,
-                  reqcopyWith: (args[1] as Map?)?.toMapStringDynamic)
-              .get(Uri.parse(args[2]),
-                  headers: (args[3] as Map?)?.toMapStringString))
+      return jsonEncode((await client(args[1]).get(Uri.parse(args[2]),
+              headers: (args[3] as Map?)?.toMapStringString))
           .toJson());
     });
     runtime.onMessage('http_post', (dynamic args) async {
-      return jsonEncode((await MClient.init(
-                  source: null,
-                  reqcopyWith: (args[1] as Map?)?.toMapStringDynamic)
-              .post(Uri.parse(args[2]),
-                  headers: (args[3] as Map?)?.toMapStringString,
-                  body: (args[4] as Map?)?.toMapStringString))
+      return jsonEncode((await client(args[1]).post(Uri.parse(args[2]),
+              headers: (args[3] as Map?)?.toMapStringString,
+              body: (args[4] as Map?)?.toMapStringString))
           .toJson());
     });
     runtime.onMessage('http_put', (dynamic args) async {
-      return (await MClient.init(
-                  source: null,
-                  reqcopyWith: (args[1] as Map?)?.toMapStringDynamic)
-              .put(Uri.parse(args[2]),
-                  headers: (args[3] as Map?)?.toMapStringString, body: args[4]))
+      return (await client(args[1]).put(Uri.parse(args[2]),
+              headers: (args[3] as Map?)?.toMapStringString, body: args[4]))
           .toJson();
     });
     runtime.onMessage('http_delete', (dynamic args) async {
-      return jsonEncode((await MClient.init(
-              source: null,
-              reqcopyWith: (args[1] as Map?)?.map(
-                  (key, value) => MapEntry(key.toString(), value))).delete(
-              Uri.parse(args[2]),
+      return jsonEncode((await client(args[1]).delete(Uri.parse(args[2]),
               headers: (args[3] as Map?)?.map(
                   (key, value) => MapEntry(key.toString(), value.toString())),
               body: (args[4] as Map?)?.toMapStringString))
           .toJson());
     });
     runtime.onMessage('http_patch', (dynamic args) async {
-      return jsonEncode((await MClient.init(
-                  source: null,
-                  reqcopyWith: (args[1] as Map?)?.toMapStringDynamic)
-              .patch(Uri.parse(args[2]),
-                  headers: (args[3] as Map?)?.toMapStringString,
-                  body: (args[4] as Map?)?.toMapStringString))
+      return jsonEncode((await client(args[1]).patch(Uri.parse(args[2]),
+              headers: (args[3] as Map?)?.toMapStringString,
+              body: (args[4] as Map?)?.toMapStringString))
           .toJson());
     });
     runtime.evaluate('''

lib/eval/javascript/preferences.dart

@@ -7,14 +7,14 @@ class JsPreferences {
   late Source? source;
   JsPreferences(this.runtime, this.source);
 
-  init() {
-    runtime.onMessage('get', (dynamic args)  {
-      return  getPreferenceValue(source!.id!, args[0]);
+  void init() {
+    runtime.onMessage('get', (dynamic args) {
+      return getPreferenceValue(source!.id!, args[0]);
     });
-    runtime.onMessage('getString', (dynamic args)  {
+    runtime.onMessage('getString', (dynamic args) {
       return getSourcePreferenceStringValue(source!.id!, args[0], args[1]);
     });
-    runtime.onMessage('setString', (dynamic args)  {
+    runtime.onMessage('setString', (dynamic args) {
       return setSourcePreferenceStringValue(source!.id!, args[0], args[1]);
     });
 

lib/eval/javascript/utils.dart

@@ -8,7 +8,7 @@ class JsUtils {
   late JavascriptRuntime runtime;
   JsUtils(this.runtime);
 
-  init() {
+  void init() {
     runtime.onMessage('log', (dynamic args) {
       Logger.add(LoggerLevel.warning, "${args[0]}");
       return null;