Merge pull request #14 from kodjodevf/Refactor

Refactor
2026-02-14 02:41:39 +00:00 · 2024-01-08 17:00:18 +01:00
parent 1c26ac649c 2a085b47b8
commit beb2f08aec
68 changed files with 966 additions and 2600 deletions
--- a/anime/multisrc/datalifeengine/datalifeengine.dart
+++ b/anime/multisrc/datalifeengine/datalifeengine.dart
@@ -4,13 +4,16 @@ import 'dart:convert';
 class DataLifeEngine extends MProvider {
  DataLifeEngine();

+  final Client client = Client();
+
  @override
  bool get supportsLatest => false;

  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}${getPath(source)}page/$page"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client
+            .get(Uri.parse("${source.baseUrl}${getPath(source)}page/$page")))
+        .body;
    return animeFromElement(res, source.baseUrl);
  }

@@ -34,20 +37,17 @@ class DataLifeEngine extends MProvider {
      };
      final cleanQuery = query.replaceAll(" ", "+");
      if (page == 1) {
-        res = await http(
-            'POST',
-            json.encode({
-              "url": "$baseUrl?do=search&subaction=search&story=$cleanQuery",
-              "headers": headers
-            }));
+        res = (await client.post(
+                Uri.parse(
+                    "$baseUrl?do=search&subaction=search&story=$cleanQuery"),
+                headers: headers))
+            .body;
      } else {
-        res = await http(
-            'POST',
-            json.encode({
-              "url":
-                  "$baseUrl?do=search&subaction=search&search_start=$page&full_search=0&result_from=11&story=$cleanQuery",
-              "headers": headers
-            }));
+        res = (await client.post(
+                Uri.parse(
+                    "$baseUrl?do=search&subaction=search&search_start=$page&full_search=0&result_from=11&story=$cleanQuery"),
+                headers: headers))
+            .body;
      }
    } else {
      String url = "";
@@ -62,7 +62,7 @@ class DataLifeEngine extends MProvider {
          }
        }
      }
-      res = await http('GET', json.encode({"url": url}));
+      res = (await client.get(Uri.parse(url))).body;
    }

    return animeFromElement(res, baseUrl);
@@ -70,8 +70,7 @@ class DataLifeEngine extends MProvider {

  @override
  Future<MManga> getDetail(MSource source, String url) async {
-    final data = {"url": url};
-    String res = await http('GET', json.encode(data));
+    String res = (await client.get(Uri.parse(url))).body;
    MManga anime = MManga();
    final description = xpath(res, '//span[@itemprop="description"]/text()');
    anime.description = description.isNotEmpty ? description.first : "";
@@ -165,14 +164,14 @@ class DataLifeEngine extends MProvider {
  }

  Future<List<MVideo>> streamHideExtractor(String url) async {
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    final masterUrl = substringBefore(
        substringAfter(
-            substringAfter(substringAfter(unpackJs(res), "sources:"), "file:\""),
+            substringAfter(
+                substringAfter(unpackJs(res), "sources:"), "file:\""),
            "src:\""),
        '"');
-    final masterPlaylistRes =
-        await http('GET', json.encode({"url": masterUrl}));
+    final masterPlaylistRes = (await client.get(Uri.parse(masterUrl))).body;
    List<MVideo> videos = [];
    for (var it in substringAfter(masterPlaylistRes, "#EXT-X-STREAM-INF:")
        .split("#EXT-X-STREAM-INF:")) {
@@ -197,15 +196,14 @@ class DataLifeEngine extends MProvider {
  }

  Future<List<MVideo>> upstreamExtractor(String url) async {
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    final js = xpath(res, '//script[contains(text(), "m3u8")]/text()');
    if (js.isEmpty) {
      return [];
    }
    final masterUrl =
        substringBefore(substringAfter(unpackJs(js.first), "{file:\""), "\"}");
-    final masterPlaylistRes =
-        await http('GET', json.encode({"url": masterUrl}));
+    final masterPlaylistRes = (await client.get(Uri.parse(masterUrl))).body;
    List<MVideo> videos = [];
    for (var it in substringAfter(masterPlaylistRes, "#EXT-X-STREAM-INF:")
        .split("#EXT-X-STREAM-INF:")) {
@@ -230,7 +228,7 @@ class DataLifeEngine extends MProvider {
  }

  Future<List<MVideo>> uqloadExtractor(String url) async {
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    final js = xpath(res, '//script[contains(text(), "sources:")]/text()');
    if (js.isEmpty) {
      return [];
--- a/anime/multisrc/datalifeengine/sources.dart
+++ b/anime/multisrc/datalifeengine/sources.dart
@@ -2,7 +2,7 @@ import '../../../model/source.dart';
 import 'src/frenchanime/frenchanime.dart';
 import 'src/wiflix/wiflix.dart';

-const _datalifeengineVersion = "0.0.2";
+const _datalifeengineVersion = "0.0.25";
 const _datalifeengineSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/multisrc/datalifeengine/datalifeengine.dart";

--- a/anime/multisrc/dopeflix/dopeflix.dart
+++ b/anime/multisrc/dopeflix/dopeflix.dart
@@ -4,20 +4,21 @@ import 'dart:convert';
 class DopeFlix extends MProvider {
  DopeFlix();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {
-      "url":
-          "${preferenceBaseUrl(source.id)}/${getPreferenceValue(source.id, "preferred_popular_page")}?page=$page"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${preferenceBaseUrl(source.id)}/${getPreferenceValue(source.id, "preferred_popular_page")}?page=$page")))
+        .body;
    return parseAnimeList(res);
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {"url": "${preferenceBaseUrl(source.id)}/home"};
-    final res = await http('GET', json.encode(data));
+    final res =
+        (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}/home")))
+            .body;
    List<MManga> animeList = [];
    final path =
        '//section[contains(text(),"${getPreferenceValue(source.id, "preferred_latest_page")}")]/div/div[@class="film_list-wrap"]/div[@class="flw-item"]/div[@class="film-poster"]';
@@ -74,16 +75,17 @@ class DopeFlix extends MProvider {
        }
      }
    }
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse(url))).body;
    return parseAnimeList(res);
  }

  @override
  Future<MManga> getDetail(MSource source, String url) async {
-    url = Uri.parse(url).path;
-    final data = {"url": "${preferenceBaseUrl(source.id)}$url"};
-    final res = await http('GET', json.encode(data));
+    url = getUrlWithoutDomain(url);
+    final res =
+        (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url")))
+            .body;
    MManga anime = MManga();
    final description = xpath(res, '//div[@class="description"]/text()');
    if (description.isNotEmpty) {
@@ -104,10 +106,9 @@ class DopeFlix extends MProvider {
      episode.url = "${preferenceBaseUrl(source.id)}/ajax/movie/episodes/$id";
      episodesList.add(episode);
    } else {
-      final dataS = {
-        "url": "${preferenceBaseUrl(source.id)}/ajax/v2/tv/seasons/$id"
-      };
-      final resS = await http('GET', json.encode(dataS));
+      final resS = (await client.get(Uri.parse(
+              "${preferenceBaseUrl(source.id)}/ajax/v2/tv/seasons/$id")))
+          .body;

      final seasonIds =
          xpath(resS, '//a[@class="dropdown-item ss-item"]/@data-id');
@@ -116,11 +117,10 @@ class DopeFlix extends MProvider {
      for (int i = 0; i < seasonIds.length; i++) {
        final seasonId = seasonIds[i];
        final seasonName = seasonNames[i];
-        final dataE = {
-          "url":
-              "${preferenceBaseUrl(source.id)}/ajax/v2/season/episodes/$seasonId"
-        };
-        final html = await http('GET', json.encode(dataE));
+
+        final html = (await client.get(Uri.parse(
+                "${preferenceBaseUrl(source.id)}/ajax/v2/season/episodes/$seasonId")))
+            .body;

        final epsHtmls = parseHtml(html).select("div.eps-item");

@@ -146,9 +146,11 @@ class DopeFlix extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    url = Uri.parse(url).path;
-    final res = await http(
-        'GET', json.encode({"url": "${preferenceBaseUrl(source.id)}/$url"}));
+    url = getUrlWithoutDomain(url);
+    final res =
+        (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}/$url")))
+            .body;
+
    final vidsHtmls = parseHtml(res).select("ul.fss-list a.btn-play");

    List<MVideo> videos = [];
@@ -156,10 +158,10 @@ class DopeFlix extends MProvider {
      final vidHtml = vidH.outerHtml;
      final id = xpath(vidHtml, '//a/@data-id').first;
      final name = xpath(vidHtml, '//span/text()').first;
-      final resSource = await http(
-          'GET',
-          json.encode(
-              {"url": "${preferenceBaseUrl(source.id)}/ajax/sources/$id"}));
+      final resSource = (await client.get(
+              Uri.parse("${preferenceBaseUrl(source.id)}/ajax/sources/$id")))
+          .body;
+
      final vidUrl =
          substringBefore(substringAfter(resSource, "\"link\":\""), "\"");
      List<MVideo> a = [];
@@ -168,12 +170,11 @@ class DopeFlix extends MProvider {
      } else if (["Vidcloud", "UpCloud"].contains(name)) {
        final id = substringBefore(substringAfter(vidUrl, "/embed-4/"), "?");
        final serverUrl = substringBefore(vidUrl, "/embed");
-        final datasServer = {
-          "url": "$serverUrl/ajax/embed-4/getSources?id=$id",
-          "headers": {"X-Requested-With": "XMLHttpRequest"}
-        };

-        final resServer = await http('GET', json.encode(datasServer));
+        final resServer = (await client.get(
+                Uri.parse("$serverUrl/ajax/embed-4/getSources?id=$id"),
+                headers: {"X-Requested-With": "XMLHttpRequest"}))
+            .body;
        final encrypted = getMapValue(resServer, "encrypted");
        String videoResJson = "";
        if (encrypted == "true") {
@@ -220,7 +221,8 @@ class DopeFlix extends MProvider {
        subtitles = sortSubs(subtitles, source.id);
        if (type == "hls") {
          final masterPlaylistRes =
-              await http('GET', json.encode({"url": masterUrl}));
+              (await client.get(Uri.parse(masterUrl))).body;
+
          for (var it in substringAfter(masterPlaylistRes, "#EXT-X-STREAM-INF:")
              .split("#EXT-X-STREAM-INF:")) {
            final quality =
@@ -258,11 +260,10 @@ class DopeFlix extends MProvider {
  }

  Future<List<List<int>>> generateIndexPairs() async {
-    final res = await http(
-        'GET',
-        json.encode({
-          "url": "https://rabbitstream.net/js/player/prod/e4-player.min.js"
-        }));
+    final res = (await client.get(Uri.parse(
+            "https://rabbitstream.net/js/player/prod/e4-player.min.js")))
+        .body;
+
    String script = substringBefore(substringAfter(res, "const "), "()");
    script = script.substring(0, script.lastIndexOf(','));
    final list = script
--- a/anime/multisrc/dopeflix/sources.dart
+++ b/anime/multisrc/dopeflix/sources.dart
@@ -2,7 +2,7 @@ import '../../../model/source.dart';
 import 'src/dopebox/dopebox.dart';
 import 'src/sflix/sflix.dart';

-const _dopeflixVersion = "0.0.3";
+const _dopeflixVersion = "0.0.35";
 const _dopeflixSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/multisrc/dopeflix/dopeflix.dart";

--- a/anime/multisrc/zorotheme/sources.dart
+++ b/anime/multisrc/zorotheme/sources.dart
@@ -2,7 +2,7 @@ import '../../../model/source.dart';
 import 'src/aniwatch/aniwatch.dart';
 import 'src/kaido/kaido.dart';

-const _zorothemeVersion = "0.0.7";
+const _zorothemeVersion = "0.0.75";
 const _zorothemeSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/multisrc/zorotheme/zorotheme.dart";

--- a/anime/multisrc/zorotheme/zorotheme.dart
+++ b/anime/multisrc/zorotheme/zorotheme.dart
@@ -4,18 +4,22 @@ import 'dart:convert';
 class ZoroTheme extends MProvider {
  ZoroTheme();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/most-popular?page=$page"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client
+            .get(Uri.parse("${source.baseUrl}/most-popular?page=$page")))
+        .body;

    return animeElementM(res);
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/recently-updated?page=$page"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client
+            .get(Uri.parse("${source.baseUrl}/recently-updated?page=$page")))
+        .body;

    return animeElementM(res);
  }
@@ -109,8 +113,7 @@ class ZoroTheme extends MProvider {
      }
    }
    url += "${ll(url)}page=$page";
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(url))).body;

    return animeElementM(res);
  }
@@ -118,13 +121,9 @@ class ZoroTheme extends MProvider {
  @override
  Future<MManga> getDetail(MSource source, String url) async {
    final statusList = [
-      {
-        "Currently Airing": 0,
-        "Finished Airing": 1,
-      }
+      {"Currently Airing": 0, "Finished Airing": 1}
    ];
-    final data = {"url": "${source.baseUrl}$url"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse("${source.baseUrl}$url"))).body;
    MManga anime = MManga();
    final status = xpath(res,
            '//*[@class="anisc-info"]/div[contains(text(),"Status:")]/span[2]/text()')
@@ -148,11 +147,8 @@ class ZoroTheme extends MProvider {
    final urlEp =
        "${source.baseUrl}/ajax${ajaxRoute('${source.baseUrl}')}/episode/list/$id";

-    final dataEp = {
-      "url": urlEp,
-      "headers": {"referer": url}
-    };
-    final resEp = await http('GET', json.encode(dataEp));
+    final resEp =
+        (await client.get(Uri.parse(urlEp), headers: {"referer": url})).body;

    final html = json.decode(resEp)["html"];
    final epElements = parseHtml(html).select("a.ep-item");
@@ -177,12 +173,11 @@ class ZoroTheme extends MProvider {
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
    final id = substringAfterLast(url, '?ep=');

-    final datas = {
-      "url":
-          "${source.baseUrl}/ajax${ajaxRoute('${source.baseUrl}')}/episode/servers?episodeId=$id",
-      "headers": {"referer": "${source.baseUrl}/$url"}
-    };
-    final res = await http('GET', json.encode(datas));
+    final res = (await client.get(
+            Uri.parse(
+                "${source.baseUrl}/ajax${ajaxRoute('${source.baseUrl}')}/episode/servers?episodeId=$id"),
+            headers: {"referer": "${source.baseUrl}/$url"}))
+        .body;
    final html = json.decode(res)["html"];

    final serverElements = parseHtml(html).select("div.server-item");
@@ -194,16 +189,14 @@ class ZoroTheme extends MProvider {
      final name = serverElement.text;
      final id = serverElement.attr("data-id");
      final subDub = serverElement.attr("data-type");
-      final datasE = {
-        "url":
-            "${source.baseUrl}/ajax${ajaxRoute('${source.baseUrl}')}/episode/sources?id=$id",
-        "headers": {"referer": "${source.baseUrl}/$url"}
-      };

-      final resE = await http('GET', json.encode(datasE));
+      final resE = (await client.get(
+              Uri.parse(
+                  "${source.baseUrl}/ajax${ajaxRoute('${source.baseUrl}')}/episode/sources?id=$id"),
+              headers: {"referer": "${source.baseUrl}/$url"}))
+          .body;
      String epUrl = substringBefore(substringAfter(resE, "\"link\":\""), "\"");
      List<MVideo> a = [];
-
      if (hosterSelection.contains(name) && typeSelection.contains(subDub)) {
        if (name.contains("Vidstreaming")) {
          a = await rapidCloudExtractor(epUrl, "Vidstreaming - $subDub");
@@ -219,6 +212,141 @@ class ZoroTheme extends MProvider {
    return sortVideos(videos, source.id);
  }

+  Future<List<MVideo>> rapidCloudExtractor(String url, String name) async {
+    final serverUrl = ['https://megacloud.tv', 'https://rapid-cloud.co'];
+
+    final serverType = url.startsWith('https://megacloud.tv') ? 0 : 1;
+    final sourceUrl = [
+      '/embed-2/ajax/e-1/getSources?id=',
+      '/ajax/embed-6-v2/getSources?id='
+    ];
+    final sourceSpliter = ['/e-1/', '/embed-6-v2/'];
+    final id = url.split(sourceSpliter[serverType]).last.split('?').first;
+    final resServer = (await client.get(
+            Uri.parse('${serverUrl[serverType]}${sourceUrl[serverType]}$id'),
+            headers: {"X-Requested-With": "XMLHttpRequest"}))
+        .body;
+    final encrypted = getMapValue(resServer, "encrypted");
+    String videoResJson = "";
+    List<MVideo> videos = [];
+    if (encrypted == "true") {
+      final ciphered = getMapValue(resServer, "sources");
+      List<List<int>> indexPairs = await generateIndexPairs(serverType);
+      var password = '';
+      String ciphertext = ciphered;
+      int index = 0;
+      for (List<int> item in json.decode(json.encode(indexPairs))) {
+        int start = item.first + index;
+        int end = start + item.last;
+        String passSubstr = ciphered.substring(start, end);
+        password += passSubstr;
+        ciphertext = ciphertext.replaceFirst(passSubstr, "");
+        index += item.last;
+      }
+      videoResJson = decryptAESCryptoJS(ciphertext, password);
+    } else {
+      videoResJson = resServer;
+    }
+
+    String masterUrl =
+        ((json.decode(videoResJson) as List<Map<String, dynamic>>)
+            .first)['file'];
+    String type = ((json.decode(videoResJson) as List<Map<String, dynamic>>)
+        .first)['type'];
+
+    final tracks = (json.decode(resServer)['tracks'] as List)
+        .where((e) => e['kind'] == 'captions' ? true : false)
+        .toList();
+    List<MTrack> subtitles = [];
+
+    for (var sub in tracks) {
+      try {
+        MTrack subtitle = MTrack();
+        subtitle
+          ..label = sub["label"]
+          ..file = sub["file"];
+        subtitles.add(subtitle);
+      } catch (_) {}
+    }
+
+    if (type == "hls") {
+      final masterPlaylistRes = (await client.get(Uri.parse(masterUrl))).body;
+
+      for (var it in substringAfter(masterPlaylistRes, "#EXT-X-STREAM-INF:")
+          .split("#EXT-X-STREAM-INF:")) {
+        final quality =
+            "${substringBefore(substringBefore(substringAfter(substringAfter(it, "RESOLUTION="), "x"), ","), "\n")}p";
+
+        String videoUrl = substringBefore(substringAfter(it, "\n"), "\n");
+
+        if (!videoUrl.startsWith("http")) {
+          videoUrl =
+              "${masterUrl.split("/").sublist(0, masterUrl.split("/").length - 1).join("/")}/$videoUrl";
+        }
+
+        MVideo video = MVideo();
+        video
+          ..url = videoUrl
+          ..originalUrl = videoUrl
+          ..quality = "$name - $quality"
+          ..subtitles = subtitles;
+        videos.add(video);
+      }
+    } else {
+      MVideo video = MVideo();
+      video
+        ..url = masterUrl
+        ..originalUrl = masterUrl
+        ..quality = "$name - Default"
+        ..subtitles = subtitles;
+      videos.add(video);
+    }
+    return videos;
+  }
+
+  Future<List<List<int>>> generateIndexPairs(int serverType) async {
+    final jsPlayerUrl = [
+      "https://megacloud.tv/js/player/a/prod/e1-player.min.js",
+      "https://rapid-cloud.co/js/player/prod/e6-player-v2.min.js"
+    ];
+    final scriptText =
+        (await client.get(Uri.parse(jsPlayerUrl[serverType]))).body;
+
+    final switchCode = scriptText.substring(
+        scriptText.lastIndexOf('switch'), scriptText.indexOf('=partKey'));
+
+    List<int> indexes = [];
+    for (var variableMatch
+        in RegExp(r'=(\w+)').allMatches(switchCode).toList()) {
+      final regex = RegExp(
+          ',${(variableMatch as RegExpMatch).group(1)}=((?:0x)?([0-9a-fA-F]+))');
+      Match? match = regex.firstMatch(scriptText);
+
+      if (match != null) {
+        String value = match.group(1);
+        if (value.contains("0x")) {
+          indexes.add(int.parse(substringAfter(value, "0x"), radix: 16));
+        } else {
+          indexes.add(int.parse(value));
+        }
+      }
+    }
+
+    return chunked(indexes, 2);
+  }
+
+  List<List<int>> chunked(List<int> list, int size) {
+    List<List<int>> chunks = [];
+    for (int i = 0; i < list.length; i += size) {
+      int end = list.length;
+      if (i + size < list.length) {
+        end = i + size;
+      }
+      chunks.add(list.sublist(i, end));
+    }
+    return chunks;
+  }
+
  MPages animeElementM(String res) {
    List<MManga> animeList = [];

--- a/anime/src/all/animeworldindia/animeworldindia.dart
+++ b/anime/src/all/animeworldindia/animeworldindia.dart
@@ -4,24 +4,23 @@ import 'dart:convert';
 class AnimeWorldIndia extends MProvider {
  AnimeWorldIndia();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {
-      "url":
-          "${source.baseUrl}/advanced-search/page/$page/?s_lang=${source.lang}&s_orderby=viewed"
-    };
+    final res = (await client.get(Uri.parse(
+            "${source.baseUrl}/advanced-search/page/$page/?s_lang=${source.lang}&s_orderby=viewed")))
+        .body;

-    final res = await http('GET', json.encode(data));
    return parseAnimeList(res, source.baseUrl);
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {
-      "url":
-          "${source.baseUrl}/advanced-search/page/$page/?s_lang=${source.lang}&s_orderby=update"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${source.baseUrl}/advanced-search/page/$page/?s_lang=${source.lang}&s_orderby=update")))
+        .body;
+
    return parseAnimeList(res, source.baseUrl);
  }

@@ -63,15 +62,14 @@ class AnimeWorldIndia extends MProvider {
        }
      }
    }
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse(url))).body;
    return parseAnimeList(res, source.baseUrl);
  }

  @override
  Future<MManga> getDetail(MSource source, String url) async {
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(url))).body;
    MManga anime = MManga();
    final document = parseHtml(res);
    final isMovie =
@@ -146,15 +144,13 @@ class AnimeWorldIndia extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    final res =
-        await http('GET', json.encode({"url": "${source.baseUrl}$url"}));
-
+    final res = (await client.get(Uri.parse("${source.baseUrl}$url"))).body;
    var resJson = substringBefore(
        substringAfterLast(res, "\"players\":"), ",\"noplayer\":");
    var streams = (json.decode(resJson) as List<Map<String, dynamic>>)
-        .where((e) => e["type"] == "stream"
-            ? true
-            : false && (e["url"] as String).isNotEmpty)
+        .where((e) =>
+            (e["type"] == "stream" ? true : false) &&
+            (e["url"] as String).isNotEmpty)
        .toList()
        .where((e) => language(source.lang).isEmpty ||
                language(source.lang) == e["language"]
@@ -172,18 +168,6 @@ class AnimeWorldIndia extends MProvider {
    return sortVideos(videos, source.id);
  }

-  String getUrlWithoutDomain(String orig) {
-    final uri = Uri.parse(orig.replaceAll(' ', '%20'));
-    String out = uri.path;
-    if (uri.query.isNotEmpty) {
-      out += '?${uri.query}';
-    }
-    if (uri.fragment.isNotEmpty) {
-      out += '#${uri.fragment}';
-    }
-    return out;
-  }
-
  MPages parseAnimeList(String res, String baseUrl) {
    List<MManga> animeList = [];
    final document = parseHtml(res);
@@ -220,15 +204,14 @@ class AnimeWorldIndia extends MProvider {

  Future<List<MVideo>> mystreamExtractor(String url, String language) async {
    List<MVideo> videos = [];
-
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    final streamCode = substringBefore(
        substringAfter(substringAfter(res, "sniff("), ", \""), '"');

    final streamUrl =
        "${substringBefore(url, "/watch")}/m3u8/$streamCode/master.txt?s=1&cache=1";
-    final masterPlaylistRes =
-        await http('GET', json.encode({"url": streamUrl}));
+    final masterPlaylistRes = (await client.get(Uri.parse(streamUrl))).body;
+
    List<MTrack> audios = [];
    for (var it in substringAfter(masterPlaylistRes, "#EXT-X-MEDIA:TYPE=AUDIO")
        .split("#EXT-X-MEDIA:TYPE=AUDIO")) {
--- a/anime/src/all/animeworldindia/sources.dart
+++ b/anime/src/all/animeworldindia/sources.dart
@@ -1,6 +1,6 @@
 import '../../../../model/source.dart';

-const _animeworldindiaVersion = "0.0.1";
+const _animeworldindiaVersion = "0.0.15";
 const _animeworldindiaSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/all/animeworldindia/animeworldindia.dart";

--- a/anime/src/ar/okanime/okanime.dart
+++ b/anime/src/ar/okanime/okanime.dart
@@ -4,11 +4,11 @@ import 'dart:convert';
 class OkAnime extends MProvider {
  OkAnime();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {"url": source.baseUrl};
-    final res = await http('GET', json.encode(data));
-
+    final res = (await client.get(Uri.parse(source.baseUrl))).body;
    List<MManga> animeList = [];
    String path =
        '//div[@class="section" and contains(text(),"افضل انميات")]/div[@class="section-content"]/div/div/div[contains(@class,"anime-card")]';
@@ -28,9 +28,9 @@ class OkAnime extends MProvider {

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/espisode-list?page=$page"};
-    final res = await http('GET', json.encode(data));
-
+    final res = (await client
+            .get(Uri.parse("${source.baseUrl}/espisode-list?page=$page")))
+        .body;
    List<MManga> animeList = [];
    String path = '//*[contains(@class,"anime-card")]';
    final urls = xpath(res, '$path/div[@class="anime-title")]/h4/a/@href');
@@ -56,8 +56,8 @@ class OkAnime extends MProvider {
    if (page > 1) {
      url += "&page=$page";
    }
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse(url))).body;

    List<MManga> animeList = [];
    String path = '//*[contains(@class,"anime-card")]';
@@ -82,8 +82,7 @@ class OkAnime extends MProvider {
    final statusList = [
      {"يعرض الان": 0, "مكتمل": 1}
    ];
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(url))).body;
    MManga anime = MManga();
    final status = xpath(res,
        '//*[@class="full-list-info" and contains(text(),"حالة الأنمي")]/small/a/text()');
@@ -116,8 +115,7 @@ class OkAnime extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    final res = await http('GET', json.encode({"url": url}));
-
+    final res = (await client.get(Uri.parse(url))).body;
    final urls = xpath(res, '//*[@id="streamlinks"]/a/@data-src');
    final qualities = xpath(res, '//*[@id="streamlinks"]/a/span/text()');
    final hosterSelection = preferenceHosterSelection(source.id);
--- a/anime/src/ar/okanime/source.dart
+++ b/anime/src/ar/okanime/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get okanimeSource => _okanimeSource;
-const _okanimeVersion = "0.0.4";
+const _okanimeVersion = "0.0.45";
 const _okanimeSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/ar/okanime/okanime.dart";
 Source _okanimeSource = Source(
--- a/anime/src/de/aniflix/aniflix.dart
+++ b/anime/src/de/aniflix/aniflix.dart
@@ -4,14 +4,15 @@ import 'dart:convert';
 class AniFlix extends MProvider {
  AniFlix();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
    final headers = getHeader(source.baseUrl);
-    final data = {
-      "url": "${source.baseUrl}/api/show/new/${page - 1}",
-      "headers": headers
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse("${source.baseUrl}/api/show/new/${page - 1}"),
+            headers: headers))
+        .body;

    return parseAnimeList(res, source.baseUrl, true);
  }
@@ -19,11 +20,10 @@ class AniFlix extends MProvider {
  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
    final headers = getHeader(source.baseUrl);
-    final data = {
-      "url": "${source.baseUrl}/api/show/airing/${page - 1}",
-      "headers": headers
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse("${source.baseUrl}/api/show/airing/${page - 1}"),
+            headers: headers))
+        .body;
    final datas = json.decode(res);
    List<MManga> animeList = [];
    List<String> ids = [];
@@ -52,24 +52,16 @@ class AniFlix extends MProvider {
  @override
  Future<MPages> search(
      MSource source, String query, int page, FilterList filterList) async {
-    final data = {
-      "url": "${source.baseUrl}/api/show/search",
-      "body": {"search": query},
-      "headers": {
-        'Referer': source.baseUrl,
-        'Accept': 'application/json',
-        'Content-Type': 'application/json'
-      }
-    };
-    final res = await http('POST', json.encode(data));
-    return parseAnimeList(res, source.baseUrl, false);
+    final res = await client.post(
+        Uri.parse("${source.baseUrl}/api/show/search"),
+        headers: {'Referer': source.baseUrl},
+        body: {"search": query});
+    return parseAnimeList(res.body, source.baseUrl, false);
  }

  @override
  Future<MManga> getDetail(MSource source, String url) async {
-    final data = {"url": "${source.baseUrl}$url"};
-
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse("${source.baseUrl}$url"))).body;
    MManga anime = MManga();
    final jsonRes = json.decode(res);
    anime.name = jsonRes["name"];
@@ -86,22 +78,18 @@ class AniFlix extends MProvider {
    for (var season in seasons) {
      List<Map<String, dynamic>> episodes = season["episodes"];
      int page = 1;
-      final res = await http(
-          'GET',
-          json.encode({
-            "url": "${source.baseUrl}/api/show/$animeUrl/${season["id"]}/$page"
-          }));
+      final res = (await client.get(Uri.parse(
+              "${source.baseUrl}/api/show/$animeUrl/${season["id"]}/$page")))
+          .body;
+
      bool hasMoreResult =
          (json.decode(res)["episodes"] as List<Map<String, dynamic>>)
              .isNotEmpty;

      while (hasMoreResult) {
-        final res = await http(
-            'GET',
-            json.encode({
-              "url":
-                  "${source.baseUrl}/api/show/$animeUrl/${season["id"]}/$page"
-            }));
+        final res = (await client.get(Uri.parse(
+                "${source.baseUrl}/api/show/$animeUrl/${season["id"]}/$page")))
+            .body;
        final epList =
            json.decode(res)["episodes"] as List<Map<String, dynamic>>;
        page++;
@@ -130,9 +118,9 @@ class AniFlix extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    final headers = getHeader(source.baseUrl);
-    final data = {"url": "${source.baseUrl}$url", "headers": headers};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse("${source.baseUrl}$url"),
+            headers: getHeader(source.baseUrl)))
+        .body;
    final jsonRes = json.decode(res)["streams"];
    List<MVideo> videos = [];
    final hosterSelection = preferenceHosterSelection(source.id);
@@ -140,8 +128,7 @@ class AniFlix extends MProvider {
      List<MVideo> a = [];
      String quality = '${stream["hoster"]["name"]} - ${stream["lang"]}';
      String link = stream["link"];
-      print(link);
-      if (link.contains("https://dood") &&
+      if ((link.contains("https://dood") || link.contains("https://d0")) &&
          hosterSelection.contains("doodstream")) {
        a = await doodExtractor(link, quality);
      } else if (link.contains("https://streamtape") &&
@@ -160,18 +147,6 @@ class AniFlix extends MProvider {
    return sortVideos(videos, source.id);
  }

-  String getUrlWithoutDomain(String orig) {
-    final uri = Uri.parse(orig.replaceAll(' ', '%20'));
-    String out = uri.path;
-    if (uri.query.isNotEmpty) {
-      out += '?${uri.query}';
-    }
-    if (uri.fragment.isNotEmpty) {
-      out += '#${uri.fragment}';
-    }
-    return out;
-  }
-
  MPages parseAnimeList(String res, String baseUrl, bool hasNextPage) {
    final datas = json.decode(res);
    List<MManga> animeList = [];
@@ -193,7 +168,6 @@ class AniFlix extends MProvider {
  }

  List<MVideo> sortVideos(List<MVideo> videos, int sourceId) {
-    print(videos.length);
    String hoster = getPreferenceValue(sourceId, "preferred_hoster");
    String sub = getPreferenceValue(sourceId, "preferred_sub");
    videos.sort((MVideo a, MVideo b) {
--- a/anime/src/de/aniflix/source.dart
+++ b/anime/src/de/aniflix/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get aniflix => _aniflix;
-const _aniflixVersion = "0.0.15";
+const _aniflixVersion = "0.0.2";
 const _aniflixCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/de/aniflix/aniflix.dart";
 Source _aniflix = Source(
--- a/anime/src/en/aniwave/aniwave.dart
+++ b/anime/src/en/aniwave/aniwave.dart
@@ -4,22 +4,21 @@ import 'dart:convert';
 class Aniwave extends MProvider {
  Aniwave();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {
-      "url": "${preferenceBaseUrl(source.id)}/filter?sort=trending&page=$page"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${preferenceBaseUrl(source.id)}/filter?sort=trending&page=$page")))
+        .body;
    return parseAnimeList(res);
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {
-      "url":
-          "${preferenceBaseUrl(source.id)}/filter?sort=recently_updated&page=$page"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${preferenceBaseUrl(source.id)}/filter?sort=recently_updated&page=$page")))
+        .body;
    return parseAnimeList(res);
  }

@@ -91,8 +90,8 @@ class Aniwave extends MProvider {
        }
      }
    }
-    final data = {"url": "$url&page=$page"};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse("$url&page=$page"))).body;
    return parseAnimeList(res);
  }

@@ -101,8 +100,9 @@ class Aniwave extends MProvider {
    final statusList = [
      {"Releasing": 0, "Completed": 1}
    ];
-    final data = {"url": "${preferenceBaseUrl(source.id)}${url}"};
-    final res = await http('GET', json.encode(data));
+    final res =
+        (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url")))
+            .body;
    MManga anime = MManga();
    final status = xpath(res, '//div[contains(text(),"Status")]/span/text()');
    if (status.isNotEmpty) {
@@ -122,11 +122,11 @@ class Aniwave extends MProvider {
    final id = parseHtml(res).selectFirst("div[data-id]").attr("data-id");
    final encrypt = vrfEncrypt(id);
    final vrf = "vrf=${Uri.encodeComponent(encrypt)}";
-    final dataEp = {
-      "url": "${preferenceBaseUrl(source.id)}/ajax/episode/list/$id?$vrf"
-    };

-    final resEp = await http('GET', json.encode(dataEp));
+    final resEp = (await client.get(Uri.parse(
+            "${preferenceBaseUrl(source.id)}/ajax/episode/list/$id?$vrf")))
+        .body;
+
    final html = json.decode(resEp)["result"];
    List<MChapter>? episodesList = [];

@@ -172,11 +172,9 @@ class Aniwave extends MProvider {
    final ids = substringBefore(url, "&");
    final encrypt = vrfEncrypt(ids);
    final vrf = "vrf=${Uri.encodeComponent(encrypt)}";
-    final res = await http(
-        'GET',
-        json.encode({
-          "url": "${preferenceBaseUrl(source.id)}/ajax/server/list/$ids?$vrf"
-        }));
+    final res = (await client.get(Uri.parse(
+            "${preferenceBaseUrl(source.id)}/ajax/server/list/$ids?$vrf")))
+        .body;
    final html = json.decode(res)["result"];

    final vidsHtmls = parseHtml(html).select("div.servers > div");
@@ -191,12 +189,9 @@ class Aniwave extends MProvider {

        final encrypt = vrfEncrypt(serverId);
        final vrf = "vrf=${Uri.encodeComponent(encrypt)}";
-        final res = await http(
-            'GET',
-            json.encode({
-              "url":
-                  "${preferenceBaseUrl(source.id)}/ajax/server/$serverId?$vrf"
-            }));
+        final res = (await client.get(Uri.parse(
+                "${preferenceBaseUrl(source.id)}/ajax/server/$serverId?$vrf")))
+            .body;
        final status = json.decode(res)["status"];
        if (status == 200) {
          List<MVideo> a = [];
@@ -313,27 +308,24 @@ class Aniwave extends MProvider {

  Future<List<MVideo>> vidsrcExtractor(
      String url, String name, String type) async {
-    List<String> keys = json.decode(await http(
-        'GET',
-        json.encode({
-          "url":
-              "https://raw.githubusercontent.com/Claudemirovsky/worstsource-keys/keys/keys.json"
-        })));
+    List<String> keys = json.decode((await client.get(Uri.parse(
+            "https://raw.githubusercontent.com/Claudemirovsky/worstsource-keys/keys/keys.json")))
+        .body);
+    List<MVideo> videoList = [];
    final host = Uri.parse(url).host;
    final apiUrl = await getApiUrl(url, keys);
-    final headers = {
-      "Accept": "application/json, text/javascript, */*; q=0.01",
+
+    final res = await client.get(Uri.parse(apiUrl), headers: {
      "Host": host,
      "Referer": Uri.decodeComponent(url),
      "X-Requested-With": "XMLHttpRequest"
-    };
-    final res =
-        await http('GET', json.encode({"url": apiUrl, "headers": headers}));
-    if (res == "error") return [];
+    });
+    final result = json.decode(res.body)['result'];
+
+    if (result != 404) {
      String masterUrl =
-        ((json.decode(res)['result']['sources'] as List<Map<String, dynamic>>)
-            .first)['file'];
-    final tracks = (json.decode(res)['result']['tracks'] as List)
+          ((result['sources'] as List<Map<String, dynamic>>).first)['file'];
+      final tracks = (result['tracks'] as List)
          .where((e) => e['kind'] == 'captions' ? true : false)
          .toList();
      List<MTrack> subtitles = [];
@@ -347,9 +339,9 @@ class Aniwave extends MProvider {
          subtitles.add(subtitle);
        } catch (_) {}
      }
-    List<MVideo> videoList = [];
-    final masterPlaylistRes =
-        await http('GET', json.encode({"url": masterUrl}));
+
+      final masterPlaylistRes = (await client.get(Uri.parse(masterUrl))).body;
+
      for (var it in substringAfter(masterPlaylistRes, "#EXT-X-STREAM-INF:")
          .split("#EXT-X-STREAM-INF:")) {
        final quality =
@@ -371,6 +363,8 @@ class Aniwave extends MProvider {
          ..subtitles = subtitles;
        videoList.add(video);
      }
+    }
+
    return videoList;
  }

@@ -403,7 +397,8 @@ class Aniwave extends MProvider {

  Future<String> callFromFuToken(String host, String data) async {
    final fuTokenScript =
-        await http('GET', json.encode({"url": "https://$host/futoken"}));
+        (await client.get(Uri.parse("https://$host/futoken"))).body;
+
    String js = "";
    js += "(function";
    js += substringBefore(
@@ -559,14 +554,12 @@ class Aniwave extends MProvider {
          valueIndex: 0,
          entries: [
            "aniwave.to",
-            "aniwave.bz",
            "aniwave.ws",
            "aniwave.li",
            "aniwave.vc"
          ],
          entryValues: [
            "https://aniwave.to",
-            "https://aniwave.bz",
            "https://aniwave.ws",
            "https://aniwave.li",
            "https://aniwave.vc"
--- a/anime/src/en/aniwave/source.dart
+++ b/anime/src/en/aniwave/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get aniwave => _aniwave;
-const _aniwaveVersion = "0.0.45";
+const _aniwaveVersion = "0.0.5";
 const _aniwaveCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/en/aniwave/aniwave.dart";
 Source _aniwave = Source(
@@ -13,5 +13,4 @@ Source _aniwave = Source(
        "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/en/aniwave/icon.png",
    sourceCodeUrl: _aniwaveCodeUrl,
    version: _aniwaveVersion,
-    appMinVerReq: "0.1.5",
    isManga: false);
--- a/anime/src/en/dramacool/dramacool.dart
+++ b/anime/src/en/dramacool/dramacool.dart
@@ -3,12 +3,14 @@ import 'dart:convert';

 class DramaCool extends MProvider {
  DramaCool();
+
+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {
-      "url": "${preferenceBaseUrl(source.id)}/most-popular-drama?page=$page"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${preferenceBaseUrl(source.id)}/most-popular-drama?page=$page")))
+        .body;
    final document = parseHtml(res);
    return animeFromElement(document.select("ul.list-episode-item li a"),
        document.selectFirst("li.next a")?.attr("href") != null);
@@ -16,10 +18,9 @@ class DramaCool extends MProvider {

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {
-      "url": "${preferenceBaseUrl(source.id)}/recently-added?page=$page"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${preferenceBaseUrl(source.id)}/recently-added?page=$page")))
+        .body;
    final document = parseHtml(res);
    return animeFromElement(document.select("ul.switch-block a"),
        document.selectFirst("li.next a")?.attr("href") != null);
@@ -28,10 +29,9 @@ class DramaCool extends MProvider {
  @override
  Future<MPages> search(
      MSource source, String query, int page, FilterList filterList) async {
-    final data = {
-      "url": "${preferenceBaseUrl(source.id)}/search?keyword=$query&page=$page"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${preferenceBaseUrl(source.id)}/search?keyword=$query&page=$page")))
+        .body;
    final document = parseHtml(res);
    return animeFromElement(document.select("ul.list-episode-item li a"),
        document.selectFirst("li.next a")?.attr("href") != null);
@@ -42,16 +42,18 @@ class DramaCool extends MProvider {
    final statusList = [
      {"Ongoing": 0, "Completed": 1}
    ];
-    url = Uri.parse(url).path;
+    url = getUrlWithoutDomain(url);
    if (url.contains("-episode-") && url.endsWith(".html")) {
-      final data = {"url": "${preferenceBaseUrl(source.id)}$url"};
-      final res = await http('GET', json.encode(data));
+      final res =
+          (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url")))
+              .body;
      url = parseHtml(res).selectFirst("div.category a").attr("href");
    }
-    url = Uri.parse(url).path;
+    url = getUrlWithoutDomain(url);

-    final data = {"url": "${preferenceBaseUrl(source.id)}$url"};
-    final res = await http('GET', json.encode(data));
+    final res =
+        (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url")))
+            .body;
    final document = parseHtml(res);
    MManga anime = MManga();
    anime.description = document
@@ -99,17 +101,18 @@ class DramaCool extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    url = Uri.parse(url).path;
-    final data = {"url": "${preferenceBaseUrl(source.id)}$url"};
-    final res = await http('GET', json.encode(data));
+    url = getUrlWithoutDomain(url);
+
+    final res =
+        (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url")))
+            .body;
    final document = parseHtml(res);
    String iframeUrl = document.selectFirst("iframe")?.getSrc ?? "";
    if (iframeUrl.isEmpty) return [];
    if (iframeUrl.startsWith("//")) {
      iframeUrl = "https:$iframeUrl";
    }
-    var iframeDoc =
-        parseHtml(await http('GET', json.encode({"url": iframeUrl})));
+    var iframeDoc = parseHtml((await client.get(Uri.parse(iframeUrl))).body);
    final serverElements = iframeDoc.select("ul.list-server-items li");
    List<MVideo> videos = [];
    for (var serverElement in serverElements) {
--- a/anime/src/en/dramacool/source.dart
+++ b/anime/src/en/dramacool/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get dramacoolSource => _dramacoolSource;
-const _dramacoolVersion = "0.0.1";
+const _dramacoolVersion = "0.0.15";
 const _dramacoolSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/en/dramacool/dramacool.dart";
 Source _dramacoolSource = Source(
--- a/anime/src/en/gogoanime/gogoanime.dart
+++ b/anime/src/en/gogoanime/gogoanime.dart
@@ -4,12 +4,13 @@ import 'dart:convert';
 class GogoAnime extends MProvider {
  GogoAnime();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {
-      "url": "${preferenceBaseUrl(source.id)}/popular.html?page=$page"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${preferenceBaseUrl(source.id)}/popular.html?page=$page")))
+        .body;

    List<MManga> animeList = [];
    final urls = xpath(res, '//*[@class="img"]/a/@href');
@@ -29,11 +30,9 @@ class GogoAnime extends MProvider {

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {
-      "url":
-          "https://ajax.gogo-load.com/ajax/page-recent-release-ongoing.html?page=$page&type=1"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "https://ajax.gogo-load.com/ajax/page-recent-release-ongoing.html?page=$page&type=1")))
+        .body;

    List<MManga> animeList = [];
    final urls =
@@ -143,8 +142,7 @@ class GogoAnime extends MProvider {
          "${preferenceBaseUrl(source.id)}/filter.html?keyword=$query$filterStr&page=$page";
    }

-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(url))).body;

    List<MManga> animeList = [];
    final urls = xpath(res, '//*[@class="img"]/a/@href');
@@ -165,13 +163,12 @@ class GogoAnime extends MProvider {
  @override
  Future<MManga> getDetail(MSource source, String url) async {
    final statusList = [
-      {
-        "Ongoing": 0,
-        "Completed": 1,
-      }
+      {"Ongoing": 0, "Completed": 1}
    ];
-    final data = {"url": "${preferenceBaseUrl(source.id)}$url"};
-    final res = await http('GET', json.encode(data));
+
+    final res =
+        (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url")))
+            .body;
    MManga anime = MManga();
    final status = xpath(
            res, '//*[@class="anime_info_body_bg"]/p[@class="type"][5]/text()')
@@ -191,8 +188,8 @@ class GogoAnime extends MProvider {
    final id = xpath(res, '//*[@id="movie_id"]/@value').first;
    final urlEp =
        "https://ajax.gogo-load.com/ajax/load-list-episode?ep_start=0&ep_end=4000&id=$id";
-    final dataEp = {"url": urlEp};
-    final resEp = await http('GET', json.encode(dataEp));
+
+    final resEp = (await client.get(Uri.parse(urlEp))).body;

    final epUrls = xpath(resEp, '//*[@id="episode_related"]/li/a/@href');
    final names = xpath(
@@ -216,9 +213,9 @@ class GogoAnime extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    final datas = {"url": "${preferenceBaseUrl(source.id)}$url"};
-
-    final res = await http('GET', json.encode(datas));
+    final res =
+        (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url")))
+            .body;
    final serverUrls =
        xpath(res, '//*[@class="anime_muti_link"]/ul/li/a/@data-video');
    final serverNames =
--- a/anime/src/en/gogoanime/source.dart
+++ b/anime/src/en/gogoanime/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get gogoanimeSource => _gogoanimeSource;
-const _gogoanimeVersion = "0.0.65";
+const _gogoanimeVersion = "0.0.7";
 const _gogoanimeSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/en/gogoanime/gogoanime.dart";
 Source _gogoanimeSource = Source(
--- a/anime/src/en/kisskh/kisskh.dart
+++ b/anime/src/en/kisskh/kisskh.dart
@@ -4,13 +4,13 @@ import 'dart:convert';
 class KissKh extends MProvider {
  KissKh();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {
-      "url":
-          "${source.baseUrl}/api/DramaList/List?page=$page&type=0&sub=0&country=0&status=0&order=1&pageSize=40"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${source.baseUrl}/api/DramaList/List?page=$page&type=0&sub=0&country=0&status=0&order=1&pageSize=40")))
+        .body;
    final jsonRes = json.decode(res);
    final datas = jsonRes["data"];
    List<MManga> animeList = [];
@@ -31,12 +31,9 @@ class KissKh extends MProvider {

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {
-      "url":
-          "${source.baseUrl}/api/DramaList/List?page=$page&type=0&sub=0&country=0&status=0&order=12&pageSize=40",
-      "header": {"ee": "eee"}
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${source.baseUrl}/api/DramaList/List?page=$page&type=0&sub=0&country=0&status=0&order=12&pageSize=40")))
+        .body;
    final jsonRes = json.decode(res);
    final datas = jsonRes["data"];

@@ -59,10 +56,9 @@ class KissKh extends MProvider {
  @override
  Future<MPages> search(
      MSource source, String query, int page, FilterList filterList) async {
-    final data = {
-      "url": "${source.baseUrl}/api/DramaList/Search?q=$query&type=0"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${source.baseUrl}/api/DramaList/Search?q=$query&type=0")))
+        .body;
    final jsonRes = json.decode(res);
    List<MManga> animeList = [];
    for (var data in jsonRes) {
@@ -81,8 +77,7 @@ class KissKh extends MProvider {
    final statusList = [
      {"Ongoing": 0, "Completed": 1}
    ];
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(url))).body;
    MManga anime = MManga();
    final jsonRes = json.decode(res);
    final status = jsonRes["status"] ?? "";
@@ -120,14 +115,12 @@ class KissKh extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    final datas = {"url": url};
-
-    final res = await http('GET', json.encode(datas));
+    final res = (await client.get(Uri.parse(url))).body;
    final id = substringAfter(substringBefore(url, ".png"), "Episode/");
    final jsonRes = json.decode(res);

-    final subRes = await http(
-        'GET', json.encode({"url": "${source.baseUrl}/api/Sub/$id"}));
+    final subRes =
+        (await client.get(Uri.parse("${source.baseUrl}/api/Sub/$id"))).body;
    var jsonSubRes = json.decode(subRes);

    List<MTrack> subtitles = [];
--- a/anime/src/en/kisskh/source.dart
+++ b/anime/src/en/kisskh/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get kisskhSource => _kisskhSource;
-const _kisskhVersion = "0.0.45";
+const _kisskhVersion = "0.0.5";
 const _kisskhSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/en/kisskh/kisskh.dart";
 Source _kisskhSource = Source(
--- a/anime/src/en/nineanimetv/nineanimetv.dart
+++ b/anime/src/en/nineanimetv/nineanimetv.dart
@@ -4,19 +4,21 @@ import 'dart:convert';
 class NineAnimeTv extends MProvider {
  NineAnimeTv();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/filter?sort=all&page=$page"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client
+            .get(Uri.parse("${source.baseUrl}/filter?sort=all&page=$page")))
+        .body;
    return parseAnimeList(res);
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {
-      "url": "${source.baseUrl}/filter?sort=recently_updated&page=$page"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${source.baseUrl}/filter?sort=recently_updated&page=$page")))
+        .body;
    return parseAnimeList(res);
  }

@@ -105,8 +107,8 @@ class NineAnimeTv extends MProvider {
        url += "${ll(url)}sort=$sort";
      }
    }
-    final data = {"url": "$url&page=$page"};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse("$url&page=$page"))).body;
    return parseAnimeList(res);
  }

@@ -115,8 +117,8 @@ class NineAnimeTv extends MProvider {
    final statusList = [
      {"Currently Airing": 0, "Finished Airing": 1}
    ];
-    final data = {"url": "${source.baseUrl}${url}"};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse("${source.baseUrl}$url"))).body;
    MManga anime = MManga();
    final document = parseHtml(res);
    final infoElement = document.selectFirst("div.film-infor");
@@ -125,7 +127,7 @@ class NineAnimeTv extends MProvider {
        "";
    anime.status = parseStatus(status, statusList);
    anime.description =
-        infoElement.selectFirst("div.film-description > p").text ?? "";
+        infoElement.selectFirst("div.film-description > p")?.text ?? "";
    anime.author = infoElement.xpathFirst(
            '//div[contains(text(),"Studios:")]/following-sibling::div/a/text()') ??
        "";
@@ -134,9 +136,9 @@ class NineAnimeTv extends MProvider {
        '//div[contains(text(),"Genre:")]/following-sibling::div/a/text()');
    final id = parseHtml(res).selectFirst("div[data-id]").attr("data-id");

-    final dataEp = {"url": "${source.baseUrl}/ajax/episode/list/$id"};
-
-    final resEp = await http('GET', json.encode(dataEp));
+    final resEp =
+        (await client.get(Uri.parse("${source.baseUrl}/ajax/episode/list/$id")))
+            .body;
    final html = json.decode(resEp)["html"];

    List<MChapter>? episodesList = [];
@@ -160,10 +162,10 @@ class NineAnimeTv extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    final res = await http(
-        'GET',
-        json.encode(
-            {"url": "${source.baseUrl}/ajax/episode/servers?episodeId=$url"}));
+    final res = (await client.get(
+            Uri.parse("${source.baseUrl}/ajax/episode/servers?episodeId=$url")))
+        .body;
+
    final html = json.decode(res)["html"];

    final serverElements = parseHtml(html).select("div.server-item");
@@ -175,10 +177,9 @@ class NineAnimeTv extends MProvider {
      final name = serverElement.text;
      final id = serverElement.attr("data-id");
      final subDub = serverElement.attr("data-type");
-      final res = await http(
-          'GET',
-          json.encode(
-              {"url": "${source.baseUrl}/ajax/episode/sources?id=$id"}));
+      final res = (await client
+              .get(Uri.parse("${source.baseUrl}/ajax/episode/sources?id=$id")))
+          .body;
      final epUrl = json.decode(res)["link"];
      List<MVideo> a = [];

@@ -209,6 +210,141 @@ class NineAnimeTv extends MProvider {
    return MPages(animeList, true);
  }

+  Future<List<MVideo>> rapidCloudExtractor(String url, String name) async {
+    final serverUrl = ['https://megacloud.tv', 'https://rapid-cloud.co'];
+
+    final serverType = url.startsWith('https://megacloud.tv') ? 0 : 1;
+    final sourceUrl = [
+      '/embed-2/ajax/e-1/getSources?id=',
+      '/ajax/embed-6-v2/getSources?id='
+    ];
+    final sourceSpliter = ['/e-1/', '/embed-6-v2/'];
+    final id = url.split(sourceSpliter[serverType]).last.split('?').first;
+    final resServer = (await client.get(
+            Uri.parse('${serverUrl[serverType]}${sourceUrl[serverType]}$id'),
+            headers: {"X-Requested-With": "XMLHttpRequest"}))
+        .body;
+    final encrypted = getMapValue(resServer, "encrypted");
+    String videoResJson = "";
+    List<MVideo> videos = [];
+    if (encrypted == "true") {
+      final ciphered = getMapValue(resServer, "sources");
+      List<List<int>> indexPairs = await generateIndexPairs(serverType);
+      var password = '';
+      String ciphertext = ciphered;
+      int index = 0;
+      for (List<int> item in json.decode(json.encode(indexPairs))) {
+        int start = item.first + index;
+        int end = start + item.last;
+        String passSubstr = ciphered.substring(start, end);
+        password += passSubstr;
+        ciphertext = ciphertext.replaceFirst(passSubstr, "");
+        index += item.last;
+      }
+      videoResJson = decryptAESCryptoJS(ciphertext, password);
+    } else {
+      videoResJson = resServer;
+    }
+
+    String masterUrl =
+        ((json.decode(videoResJson) as List<Map<String, dynamic>>)
+            .first)['file'];
+    String type = ((json.decode(videoResJson) as List<Map<String, dynamic>>)
+        .first)['type'];
+
+    final tracks = (json.decode(resServer)['tracks'] as List)
+        .where((e) => e['kind'] == 'captions' ? true : false)
+        .toList();
+    List<MTrack> subtitles = [];
+
+    for (var sub in tracks) {
+      try {
+        MTrack subtitle = MTrack();
+        subtitle
+          ..label = sub["label"]
+          ..file = sub["file"];
+        subtitles.add(subtitle);
+      } catch (_) {}
+    }
+
+    if (type == "hls") {
+      final masterPlaylistRes = (await client.get(Uri.parse(masterUrl))).body;
+
+      for (var it in substringAfter(masterPlaylistRes, "#EXT-X-STREAM-INF:")
+          .split("#EXT-X-STREAM-INF:")) {
+        final quality =
+            "${substringBefore(substringBefore(substringAfter(substringAfter(it, "RESOLUTION="), "x"), ","), "\n")}p";
+
+        String videoUrl = substringBefore(substringAfter(it, "\n"), "\n");
+
+        if (!videoUrl.startsWith("http")) {
+          videoUrl =
+              "${masterUrl.split("/").sublist(0, masterUrl.split("/").length - 1).join("/")}/$videoUrl";
+        }
+
+        MVideo video = MVideo();
+        video
+          ..url = videoUrl
+          ..originalUrl = videoUrl
+          ..quality = "$name - $quality"
+          ..subtitles = subtitles;
+        videos.add(video);
+      }
+    } else {
+      MVideo video = MVideo();
+      video
+        ..url = masterUrl
+        ..originalUrl = masterUrl
+        ..quality = "$name - Default"
+        ..subtitles = subtitles;
+      videos.add(video);
+    }
+    return videos;
+  }
+
+  Future<List<List<int>>> generateIndexPairs(int serverType) async {
+    final jsPlayerUrl = [
+      "https://megacloud.tv/js/player/a/prod/e1-player.min.js",
+      "https://rapid-cloud.co/js/player/prod/e6-player-v2.min.js"
+    ];
+    final scriptText =
+        (await client.get(Uri.parse(jsPlayerUrl[serverType]))).body;
+
+    final switchCode = scriptText.substring(
+        scriptText.lastIndexOf('switch'), scriptText.indexOf('=partKey'));
+
+    List<int> indexes = [];
+    for (var variableMatch
+        in RegExp(r'=(\w+)').allMatches(switchCode).toList()) {
+      final regex = RegExp(
+          ',${(variableMatch as RegExpMatch).group(1)}=((?:0x)?([0-9a-fA-F]+))');
+      Match? match = regex.firstMatch(scriptText);
+
+      if (match != null) {
+        String value = match.group(1);
+        if (value.contains("0x")) {
+          indexes.add(int.parse(substringAfter(value, "0x"), radix: 16));
+        } else {
+          indexes.add(int.parse(value));
+        }
+      }
+    }
+
+    return chunked(indexes, 2);
+  }
+
+  List<List<int>> chunked(List<int> list, int size) {
+    List<List<int>> chunks = [];
+    for (int i = 0; i < list.length; i += size) {
+      int end = list.length;
+      if (i + size < list.length) {
+        end = i + size;
+      }
+      chunks.add(list.sublist(i, end));
+    }
+    return chunks;
+  }
+
  @override
  List<dynamic> getFilterList(MSource source) {
    return [
--- a/anime/src/en/nineanimetv/source.dart
+++ b/anime/src/en/nineanimetv/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get nineanimetv => _nineanimetv;
-const _nineanimetvVersion = "0.0.15";
+const _nineanimetvVersion = "0.0.2";
 const _nineanimetvCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/en/nineanimetv/nineanimetv.dart";
 Source _nineanimetv = Source(
--- a/anime/src/en/uhdmovies/source.dart
+++ b/anime/src/en/uhdmovies/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get uhdmoviesSource => _uhdmoviesSource;
-const _uhdmoviesVersion = "0.0.2";
+const _uhdmoviesVersion = "0.0.25";
 const _uhdmoviesSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/en/uhdmovies/uhdmovies.dart";
 Source _uhdmoviesSource = Source(
--- a/anime/src/en/uhdmovies/uhdmovies.dart
+++ b/anime/src/en/uhdmovies/uhdmovies.dart
@@ -4,13 +4,16 @@ import 'dart:convert';
 class UHDMovies extends MProvider {
  UHDMovies();

+  final Client client = Client();
+
  @override
  bool get supportsLatest => false;

  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {"url": "${preferenceBaseUrl(source.id)}/page/$page"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client
+            .get(Uri.parse("${preferenceBaseUrl(source.id)}/page/$page")))
+        .body;
    return animeFromElement(res);
  }

@@ -22,18 +25,18 @@ class UHDMovies extends MProvider {
  @override
  Future<MPages> search(
      MSource source, String query, int page, FilterList filterList) async {
-    final url =
-        '${preferenceBaseUrl(source.id)}/page/$page/?s=${query.replaceAll(" ", "+")}';
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${preferenceBaseUrl(source.id)}/page/$page/?s=${query.replaceAll(" ", "+")}")))
+        .body;
    return animeFromElement(res);
  }

  @override
  Future<MManga> getDetail(MSource source, String url) async {
-    url = Uri.parse(url).path;
-    final data = {"url": "${preferenceBaseUrl(source.id)}${url}"};
-    String res = await http('GET', json.encode(data));
+    url = getUrlWithoutDomain(url);
+    final res =
+        (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}${url}")))
+            .body;
    MManga anime = MManga();
    final description = xpath(res, '//pre/span/text()');
    if (description.isNotEmpty) {
@@ -141,7 +144,7 @@ class UHDMovies extends MProvider {
    List<MVideo> videos = [];
    for (int type = 1; type < 3; type++) {
      url = url.replaceAll("/file/", "/wfile/") + "?type=$type";
-      final res = await http('GET', json.encode({"url": url}));
+      final res = (await client.get(Uri.parse(url))).body;
      final links = xpath(res, '//div[@class="mb-4"]/a/@href');
      for (int i = 0; i < links.length; i++) {
        final link = links[i];
@@ -167,9 +170,9 @@ class UHDMovies extends MProvider {
    if (url.contains("?sid=")) {
      final finalUrl = await redirectorBypasser(url);
      host = Uri.parse(finalUrl).host;
-      res = await http('GET', json.encode({"url": finalUrl}));
+      res = (await client.get(Uri.parse(finalUrl))).body;
    } else if (url.contains("r?key=")) {
-      res = await http('GET', json.encode({"url": url}));
+      res = (await client.get(Uri.parse(url))).body;
      host = Uri.parse(url).host;
    } else {
      return "";
@@ -180,7 +183,7 @@ class UHDMovies extends MProvider {
  }

  Future<String> redirectorBypasser(String url) async {
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    String lastDoc = await recursiveDoc(url, res);
    final js = xpath(lastDoc, '//script[contains(text(), "/?go=")]/text()');
    if (js.isEmpty) return "";
@@ -191,12 +194,9 @@ class UHDMovies extends MProvider {
    String cookieName = substringAfter(nextUrl, "go=");
    String cookieValue =
        substringBefore(substringAfter(script, "'$cookieName', '"), "'");
-    final response = await http(
-        'GET',
-        json.encode({
-          "url": nextUrl,
-          "headers": {"referer": url, "Cookie": "$cookieName=$cookieValue"}
-        }));
+    final response = (await client.get(Uri.parse(nextUrl),
+            headers: {"referer": url, "Cookie": "$cookieName=$cookieValue"}))
+        .body;

    final lastRes =
        parseHtml(response).selectFirst("meta[http-equiv]").attr("content");
@@ -226,14 +226,9 @@ class UHDMovies extends MProvider {
    final name = xpath(html, '//input/@name').first;
    final value = xpath(html, '//input/@value').first;
    final body = {"$name": value};
-    final response = await http(
-        'POST',
-        json.encode({
-          "useFormBuilder": true,
-          "body": body,
-          "url": urlR.first,
-          "headers": {"referer": url}
-        }));
+    final response = (await client.post(Uri.parse(urlR.first),
+            headers: {"referer": url}, body: body))
+        .body;
    return recursiveDoc(url, response);
  }
 }
--- a/anime/src/fr/animesama/animesama.dart
+++ b/anime/src/fr/animesama/animesama.dart
@@ -4,10 +4,11 @@ import 'dart:convert';
 class AnimeSama extends MProvider {
  AnimeSama();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/#$page"};
-    final doc = await http('GET', json.encode(data));
+    final doc = (await client.get(Uri.parse("${source.baseUrl}/#$page"))).body;
    final regex = RegExp(r"""^\s*carteClassique\(\s*.*?\s*,\s*"(.*?)".*\)""",
        multiLine: true);
    var matches = regex.allMatches(doc).toList();
@@ -24,7 +25,7 @@ class AnimeSama extends MProvider {

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final res = await http('GET', json.encode({"url": source.baseUrl}));
+    final res = (await client.get(Uri.parse(source.baseUrl))).body;
    var document = parseHtml(res);
    final latest = document
        .select("h2")
@@ -46,8 +47,9 @@ class AnimeSama extends MProvider {
  Future<MPages> search(
      MSource source, String query, int page, FilterList filterList) async {
    final filters = filterList.filters;
-    final res = await http('GET',
-        json.encode({"url": "${source.baseUrl}/catalogue/listing_all.php"}));
+    final res = (await client
+            .get(Uri.parse("${source.baseUrl}/catalogue/listing_all.php")))
+        .body;
    var databaseElements = parseHtml(res).select(".cardListAnime");
    List<MElement> elements = [];
    elements = databaseElements
@@ -104,7 +106,7 @@ class AnimeSama extends MProvider {
  @override
  Future<MManga> getDetail(MSource source, String url) async {
    var animeUrl =
-        "${source.baseUrl}${substringBeforeLast(Uri.parse(url).path, "/")}";
+        "${source.baseUrl}${substringBeforeLast(getUrlWithoutDomain(url), "/")}";
    var movie =
        int.tryParse(url.split("#").length >= 2 ? url.split("#")[1] : "");
    List<Map<String, dynamic>> playersList = [];
@@ -236,7 +238,8 @@ class AnimeSama extends MProvider {
  }

  Future<List<MManga>> fetchAnimeSeasons(String url) async {
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
+
    var document = parseHtml(res);
    String animeName = document.getElementById("titreOeuvre")?.text ?? "";

@@ -259,7 +262,7 @@ class AnimeSama extends MProvider {
        if (movies.isNotEmpty) {
          var movieNameRegex =
              RegExp("^\\s*newSPF\\(\"(.*)\"\\);", multiLine: true);
-          var moviesDoc = await http('GET', json.encode({"url": moviesUrl}));
+          var moviesDoc = (await client.get(Uri.parse(moviesUrl))).body;
          List<RegExpMatch> matches =
              movieNameRegex.allMatches(moviesDoc).toList();

@@ -312,7 +315,7 @@ class AnimeSama extends MProvider {
  Future<List<List<String>>> fetchPlayers(String url) async {
    var docUrl = "$url/episodes.js";
    List<List<String>> players = [];
-    var response = await http('GET', json.encode({"url": docUrl}));
+    var response = (await client.get(Uri.parse(docUrl))).body;

    if (response == "error") {
      return [];
--- a/anime/src/fr/animesama/source.dart
+++ b/anime/src/fr/animesama/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get animesamaSource => _animesama;
-const animesamaVersion = "0.0.1";
+const animesamaVersion = "0.0.15";
 const animesamaCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/fr/animesama/animesama.dart";
 Source _animesama = Source(
@@ -12,6 +12,5 @@ Source _animesama = Source(
    iconUrl:
        "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/fr/animesama/icon.png",
    sourceCodeUrl: animesamaCodeUrl,
-    appMinVerReq: "0.1.5",
    version: animesamaVersion,
    isManga: false);
--- a/anime/src/fr/animesultra/animesultra.dart
+++ b/anime/src/fr/animesultra/animesultra.dart
@@ -4,10 +4,11 @@ import 'dart:convert';
 class AnimesUltra extends MProvider {
  AnimesUltra();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(source.baseUrl))).body;

    List<MManga> animeList = [];
    final urls = xpath(res,
@@ -30,8 +31,7 @@ class AnimesUltra extends MProvider {

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(source.baseUrl))).body;

    List<MManga> animeList = [];
    final urls = xpath(res,
@@ -55,8 +55,7 @@ class AnimesUltra extends MProvider {
  @override
  Future<MPages> search(
      MSource source, String query, int page, FilterList filterList) async {
-    final data = {"url": "${source.baseUrl}/"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(source.baseUrl))).body;

    List<MManga> animeList = [];
    final urls = xpath(res, '//*[@class="film-poster"]/a/@href');
@@ -77,13 +76,10 @@ class AnimesUltra extends MProvider {
  @override
  Future<MManga> getDetail(MSource source, String url) async {
    final statusList = [
-      {
-        "En cours": 0,
-        "Terminé": 1,
-      }
+      {"En cours": 0, "Terminé": 1}
    ];
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse(url))).body;
    MManga anime = MManga();
    anime.description =
        xpath(res, '//*[@class="film-description m-hide"]/text()').first;
--- a/anime/src/fr/animesultra/source.dart
+++ b/anime/src/fr/animesultra/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get animesultraSource => _animesultraSource;
-const _animesultraVersion = "0.0.5";
+const _animesultraVersion = "0.0.55";
 const _animesultraSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/fr/animesultra/animesultra.dart";
 Source _animesultraSource = Source(
--- a/anime/src/fr/franime/franime.dart
+++ b/anime/src/fr/franime/franime.dart
@@ -4,13 +4,11 @@ import 'dart:convert';
 class FrAnime extends MProvider {
  FrAnime();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {
-      "url": "https://api.franime.fr/api/animes/",
-      "headers": {"Referer": "https://franime.fr/"}
-    };
-    final res = await http('GET', json.encode(data));
+    final res = await dataBase();

    return animeResList(res);
  }
@@ -87,8 +85,8 @@ class FrAnime extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    String language = "vo".toString();
-    String videoBaseUrl = "https://api.franime.fr/api/anime".toString();
+    String language = "vo";
+    String videoBaseUrl = "https://api.franime.fr/api/anime";
    if (url.contains("lang=")) {
      language = substringBefore(substringAfter(url, "lang="), "&");
    }
@@ -106,7 +104,6 @@ class FrAnime extends MProvider {
    if (url.contains("s=")) {
      int seasonNumber =
          int.parse(substringBefore(substringAfter(url, "s="), "&"));
-      print(seasonNumber);
      videoBaseUrl += "${seasonNumber - 1}/";
      seasonsJson = seasons[seasonNumber - 1];
    } else {
@@ -116,7 +113,6 @@ class FrAnime extends MProvider {
    var episode = episodesJson.first;
    if (url.contains("ep=")) {
      int episodeNumber = int.parse(substringAfter(url, "ep="));
-      print(episodeNumber);
      episode = episodesJson[episodeNumber - 1];
      videoBaseUrl += "${episodeNumber - 1}";
    } else {
@@ -136,7 +132,7 @@ class FrAnime extends MProvider {
    } else if (language == "vf" && hasVf) {
      players = vfPlayers;
    }
-    print(players);
+
    List<MVideo> videos = [];
    for (var i = 0; i < players.length; i++) {
      String apiUrl = "$videoBaseUrl/$language/$i";
@@ -144,11 +140,9 @@ class FrAnime extends MProvider {

      MVideo video = MVideo();

-      final data = {
-        "url": apiUrl,
-        "headers": {"Referer": "https://franime.fr/"}
-      };
-      final playerUrl = await http('GET', json.encode(data));
+      final playerUrl = (await client.get(Uri.parse(apiUrl),
+              headers: {"Referer": "https://franime.fr/"}))
+          .body;

      List<MVideo> a = [];
      if (playerName.contains("vido")) {
@@ -324,16 +318,12 @@ class FrAnime extends MProvider {
  }

  Future<String> dataBase() async {
-    final data = {
-      "url": "https://api.franime.fr/api/animes/",
-      "headers": {"Referer": "https://franime.fr/"}
-    };
-
-    return await http('GET', json.encode(data));
+    return (await client.get(Uri.parse("https://api.franime.fr/api/animes/"),
+            headers: {"Referer": "https://franime.fr/"}))
+        .body;
  }

  String databaseAnimeByTitleO(String res, String titleO) {
-    print(titleO);
    final datas = json.decode(res) as List<Map<String, dynamic>>;
    for (var data in datas) {
      String title =
--- a/anime/src/fr/franime/source.dart
+++ b/anime/src/fr/franime/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get franimeSource => _franimeSource;
-const _franimeVersion = "0.0.55";
+const _franimeVersion = "0.0.6";
 const _franimeSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/fr/franime/franime.dart";
 Source _franimeSource = Source(
--- a/anime/src/fr/otakufr/otakufr.dart
+++ b/anime/src/fr/otakufr/otakufr.dart
@@ -4,10 +4,13 @@ import 'dart:convert';
 class OtakuFr extends MProvider {
  OtakuFr();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/en-cours/page/$page"};
-    final res = await http('GET', json.encode(data));
+    final res =
+        (await client.get(Uri.parse("${source.baseUrl}/en-cours/page/$page")))
+            .body;
    List<MManga> animeList = [];
    final urls =
        xpath(res, '//*[@class="list"]/article/div/div/figure/a/@href');
@@ -29,8 +32,8 @@ class OtakuFr extends MProvider {

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/page/$page/"};
-    final res = await http('GET', json.encode(data));
+    final res =
+        (await client.get(Uri.parse("${source.baseUrl}/page/$page/"))).body;

    List<MManga> animeList = [];
    final urls = xpath(res, '//*[@class="episode"]/div/a/@href');
@@ -91,8 +94,8 @@ class OtakuFr extends MProvider {
        }
      }
    }
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse(url))).body;

    List<MManga> animeList = [];
    final urls =
@@ -118,14 +121,12 @@ class OtakuFr extends MProvider {
    final statusList = [
      {"En cours": 0, "Terminé": 1}
    ];
-    final data = {"url": url};
-    String res = await http('GET', json.encode(data));
+    String res = (await client.get(Uri.parse(url))).body;
    MManga anime = MManga();
    final originalUrl = xpath(res,
        '//*[@class="breadcrumb"]/li[@class="breadcrumb-item"][2]/a/@href');
    if (originalUrl.isNotEmpty) {
-      final newData = {"url": originalUrl.first};
-      res = await http('GET', json.encode(newData));
+      res = (await client.get(Uri.parse(originalUrl.first))).body;
    }
    final description =
        xpath(res, '//*[@class="episode fz-sm synop"]/p/text()');
@@ -171,18 +172,15 @@ class OtakuFr extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;

    final servers = xpath(res, '//*[@id="nav-tabContent"]/div/iframe/@src');
    List<MVideo> videos = [];
    final hosterSelection = preferenceHosterSelection(source.id);
    for (var url in servers) {
-      final datasServer = {
-        "url": fixUrl(url),
-        "headers": {"X-Requested-With": "XMLHttpRequest"}
-      };
-
-      final resServer = await http('GET', json.encode(datasServer));
+      final resServer = (await client.get(Uri.parse(fixUrl(url)),
+              headers: {"X-Requested-With": "XMLHttpRequest"}))
+          .body;
      final serverUrl =
          fixUrl(regExp(resServer, r"data-url='([^']+)'", '', 1, 1));
      List<MVideo> a = [];
@@ -356,15 +354,14 @@ class OtakuFr extends MProvider {
  }

  Future<List<MVideo>> upstreamExtractor(String url) async {
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    final js = xpath(res, '//script[contains(text(), "m3u8")]/text()');
    if (js.isEmpty) {
      return [];
    }
    final masterUrl =
        substringBefore(substringAfter(unpackJs(js.first), "{file:\""), "\"}");
-    final masterPlaylistRes =
-        await http('GET', json.encode({"url": masterUrl}));
+    final masterPlaylistRes = (await client.get(Uri.parse(masterUrl))).body;
    List<MVideo> videos = [];
    for (var it in substringAfter(masterPlaylistRes, "#EXT-X-STREAM-INF:")
        .split("#EXT-X-STREAM-INF:")) {
@@ -389,7 +386,7 @@ class OtakuFr extends MProvider {
  }

  Future<List<MVideo>> vidbmExtractor(String url) async {
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    final js = xpath(res,
        '//script[contains(text(), "m3u8") or contains(text(), "mp4")]/text()');
    if (js.isEmpty) {
@@ -405,8 +402,7 @@ class OtakuFr extends MProvider {
        "\"");
    List<MVideo> videos = [];
    if (masterUrl.contains("m3u8")) {
-      final masterPlaylistRes =
-          await http('GET', json.encode({"url": masterUrl}));
+      final masterPlaylistRes = (await client.get(Uri.parse(masterUrl))).body;

      for (var it in substringAfter(masterPlaylistRes, "#EXT-X-STREAM-INF:")
          .split("#EXT-X-STREAM-INF:")) {
--- a/anime/src/fr/otakufr/source.dart
+++ b/anime/src/fr/otakufr/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get otakufr => _otakufr;
-const otakufrVersion = "0.0.65";
+const otakufrVersion = "0.0.7";
 const otakufrCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/fr/otakufr/otakufr.dart";
 Source _otakufr = Source(
--- a/anime/src/hi/yomovies/source.dart
+++ b/anime/src/hi/yomovies/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get yomoviesSource => _yomoviesSource;
-const _yomoviesVersion = "0.0.1";
+const _yomoviesVersion = "0.0.15";
 const _yomoviesSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/hi/yomovies/yomovies.dart";
 Source _yomoviesSource = Source(
--- a/anime/src/hi/yomovies/yomovies.dart
+++ b/anime/src/hi/yomovies/yomovies.dart
@@ -4,17 +4,18 @@ import 'dart:convert';
 class YoMovies extends MProvider {
  YoMovies();

+  final Client client = Client();
+
  @override
  bool get supportsLatest => false;

  @override
  Future<MPages> getPopular(MSource source, int page) async {
    String pageNu = page == 1 ? "" : "page/$page/";
-    final data = {
-      "url": "${preferenceBaseUrl(source.id)}/most-favorites/$pageNu"
-    };

-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${preferenceBaseUrl(source.id)}/most-favorites/$pageNu")))
+        .body;
    final document = parseHtml(res);
    return animeFromElement(
        document.select("div.movies-list > div.ml-item"),
@@ -46,7 +47,7 @@ class YoMovies extends MProvider {
      }
      url = "${preferenceBaseUrl(source.id)}$url$pageNu";
    }
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    final document = parseHtml(res);
    return animeFromElement(
        document.select("div.movies-list > div.ml-item"),
@@ -56,10 +57,11 @@ class YoMovies extends MProvider {

  @override
  Future<MManga> getDetail(MSource source, String url) async {
-    url = Uri.parse(url).path;
+    url = getUrlWithoutDomain(url);

-    final data = {"url": "${preferenceBaseUrl(source.id)}$url"};
-    final res = await http('GET', json.encode(data));
+    final res =
+        (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url")))
+            .body;
    final document = parseHtml(res);
    MManga anime = MManga();
    var infoElement = document.selectFirst("div.mvi-content");
@@ -95,9 +97,10 @@ class YoMovies extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    url = Uri.parse(url).path;
-    final data = {"url": "${preferenceBaseUrl(source.id)}$url"};
-    final res = await http('GET', json.encode(data));
+    url = getUrlWithoutDomain(url);
+    final res =
+        (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url")))
+            .body;
    final document = parseHtml(res);
    final serverElements = document.select("div.movieplay > iframe");
    List<MVideo> videos = [];
@@ -135,18 +138,14 @@ class YoMovies extends MProvider {

  Future<List<MVideo>> minoplresExtractor(String url) async {
    List<MVideo> videos = [];
-    final res = await http(
-        'GET',
-        json.encode({
-          "url": url,
-          "headers": {"Referer": url}
-        }));
+
+    final res =
+        (await client.get(Uri.parse(url), headers: {"Referer": url})).body;
    final script = xpath(res, '//script[contains(text(),"sources:")]/text()');
    if (script.isEmpty) return [];
    final masterUrl =
        substringBefore(substringAfter(script.first, "file:\""), '"');
-    final masterPlaylistRes =
-        await http('GET', json.encode({"url": masterUrl}));
+    final masterPlaylistRes = (await client.get(Uri.parse(masterUrl))).body;
    for (var it in substringAfter(masterPlaylistRes, "#EXT-X-STREAM-INF:")
        .split("#EXT-X-STREAM-INF:")) {
      final quality =
--- a/anime/src/id/nimegami/nimegami.dart
+++ b/anime/src/id/nimegami/nimegami.dart
@@ -4,10 +4,12 @@ import 'dart:convert';
 class NimeGami extends MProvider {
  NimeGami();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/page/$page"};
-    final res = await http('GET', json.encode(data));
+    final res =
+        (await client.get(Uri.parse("${source.baseUrl}/page/$page"))).body;
    List<MManga> animeList = [];
    final urls = xpath(res, '//div[@class="wrapper-2-a"]/article/a/@href');
    final names = xpath(res, '//div[@class="wrapper-2-a"]/article/a/@title');
@@ -26,8 +28,8 @@ class NimeGami extends MProvider {

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/page/$page"};
-    final res = await http('GET', json.encode(data));
+    final res =
+        (await client.get(Uri.parse("${source.baseUrl}/page/$page"))).body;
    List<MManga> animeList = [];
    final urls = xpath(res, '//div[@class="post-article"]/article/div/a/@href');
    final names =
@@ -48,10 +50,9 @@ class NimeGami extends MProvider {
  @override
  Future<MPages> search(
      MSource source, String query, int page, FilterList filterList) async {
-    final data = {
-      "url": "${source.baseUrl}/page/$page/?s=$query&post_type=post"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse("${source.baseUrl}/page/$page/?s=$query&post_type=post")))
+        .body;
    List<MManga> animeList = [];
    final urls = xpath(res, '//div[@class="archive-a"]/article/div/a/@href');
    final names = xpath(res, '//div[@class="archive-a"]/article/h2/a/@title');
@@ -70,8 +71,7 @@ class NimeGami extends MProvider {

  @override
  Future<MManga> getDetail(MSource source, String url) async {
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(url))).body;
    MManga anime = MManga();
    final description = xpath(res, '//*[@id="Sinopsis"]/p/text()');
    if (description.isNotEmpty) {
@@ -123,14 +123,13 @@ class NimeGami extends MProvider {

  Future<List<MVideo>> extractVideos(String quality, String url) async {
    List<MVideo> videos = [];
-    List<MVideo> a = [];
    if (url.contains("video.nimegami.id")) {
      final realUrl = utf8.decode(
          base64Url.decode(substringBefore(substringAfter(url, "url="), "&")));
      final a = await extractHXFileVideos(realUrl, quality);
      videos.addAll(a);
    } else if (url.contains("berkasdrive") || url.contains("drive.nimegami")) {
-      final res = await http('GET', json.encode({"url": url}));
+      final res = (await client.get(Uri.parse(url))).body;
      final source = xpath(res, '//source/@src');
      if (source.isNotEmpty) {
        videos.add(toVideo(source.first, "Berkasdrive - $quality"));
@@ -147,13 +146,15 @@ class NimeGami extends MProvider {
    if (!url.contains("embed-")) {
      url = url.replaceAll(".co/", ".co/embed-") + ".html";
    }
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    final script = xpath(res,
        '//script[contains(text(), "eval") and contains(text(), "p,a,c,k,e,d")]/text()');
    if (script.isNotEmpty) {
      final videoUrl = substringBefore(
-          substringAfter(substringAfter(unpackJs(script.first), "sources:[", ""),
-              "file\":\"", ""),
+          substringAfter(
+              substringAfter(unpackJs(script.first), "sources:[", ""),
+              "file\":\"",
+              ""),
          '"');
      if (videoUrl.isNotEmpty) {
        return [toVideo(videoUrl, "HXFile - $quality")];
--- a/anime/src/id/nimegami/source.dart
+++ b/anime/src/id/nimegami/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get nimegami => _nimegami;
-const _nimegamiVersion = "0.0.4";
+const _nimegamiVersion = "0.0.45";
 const _nimegamiCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/id/nimegami/nimegami.dart";
 Source _nimegami = Source(
--- a/anime/src/id/oploverz/oploverz.dart
+++ b/anime/src/id/oploverz/oploverz.dart
@@ -4,31 +4,30 @@ import 'dart:convert';
 class OploVerz extends MProvider {
  OploVerz();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {
-      "url": "${source.baseUrl}/anime-list/page/$page/?order=popular"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${source.baseUrl}/anime-list/page/$page/?order=popular")))
+        .body;
    return parseAnimeList(res);
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {
-      "url": "${source.baseUrl}/anime-list/page/$page/?order=latest"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse("${source.baseUrl}/anime-list/page/$page/?order=latest")))
+        .body;
    return parseAnimeList(res);
  }

  @override
  Future<MPages> search(
      MSource source, String query, int page, FilterList filterList) async {
-    final data = {
-      "url": "${source.baseUrl}/anime-list/page/$page/?title=$query"
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse("${source.baseUrl}/anime-list/page/$page/?title=$query")))
+        .body;
    return parseAnimeList(res);
  }

@@ -37,11 +36,10 @@ class OploVerz extends MProvider {
    final statusList = [
      {"ongoing": 0, "completed": 1}
    ];
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse(url))).body;
    MManga anime = MManga();
    final status = xpath(res, '//*[@class="alternati"]/span[2]/text()');
-    print(status);
    if (status.isNotEmpty) {
      anime.status = parseStatus(status.first, statusList);
    }
@@ -70,7 +68,7 @@ class OploVerz extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    final dataPost = xpath(res,
            '//*[@id="server"]/ul/li/div[contains(@id,"player-option")]/@data-post')
        .first;
@@ -80,23 +78,21 @@ class OploVerz extends MProvider {
    final dataType = xpath(res,
            '//*[@id="server"]/ul/li/div[contains(@id,"player-option")]/@data-type')
        .first;
-    final body = {
+
+    final ress = (await client.post(
+            Uri.parse("${source.baseUrl}/wp-admin/admin-ajax.php"),
+            headers: null,
+            body: {
          "action": "player_ajax",
          "post": dataPost,
          "nume": dataNume,
          "type": dataType
-    };
+        }))
+        .body;

-    final ress = await http(
-        'POST',
-        json.encode({
-          "useFormBuilder": true,
-          "body": body,
-          "url": "${source.baseUrl}/wp-admin/admin-ajax.php"
-        }));
    final playerLink =
        xpath(ress, '//iframe[@class="playeriframe"]/@src').first;
-    final resPlayer = await http('GET', json.encode({"url": playerLink}));
+    final resPlayer = (await client.get(Uri.parse(playerLink))).body;
    var resJson = substringBefore(substringAfter(resPlayer, "= "), "<");
    var streams = json.decode(resJson)["streams"] as List<Map<String, dynamic>>;
    List<MVideo> videos = [];
--- a/anime/src/id/oploverz/source.dart
+++ b/anime/src/id/oploverz/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get oploverz => _oploverz;
-const _oploverzVersion = "0.0.3";
+const _oploverzVersion = "0.0.35";
 const _oploverzCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/id/oploverz/oploverz.dart";
 Source _oploverz = Source(
--- a/anime/src/id/otakudesu/otakudesu.dart
+++ b/anime/src/id/otakudesu/otakudesu.dart
@@ -4,25 +4,30 @@ import 'dart:convert';
 class OtakuDesu extends MProvider {
  OtakuDesu();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/complete-anime/page/$page"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client
+            .get(Uri.parse("${source.baseUrl}/complete-anime/page/$page")))
+        .body;
    return parseAnimeList(res);
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/ongoing-anime/page/$page"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client
+            .get(Uri.parse("${source.baseUrl}/ongoing-anime/page/$page")))
+        .body;
    return parseAnimeList(res);
  }

  @override
  Future<MPages> search(
      MSource source, String query, int page, FilterList filterList) async {
-    final data = {"url": "${source.baseUrl}/?s=$query&post_type=anime"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client
+            .get(Uri.parse("${source.baseUrl}/?s=$query&post_type=anime")))
+        .body;
    List<MManga> animeList = [];
    final images = xpath(res, '//ul[@class="chivsrc"]/li/img/@src');
    final names = xpath(res, '//ul[@class="chivsrc"]/li/h2/a/text()');
@@ -43,8 +48,7 @@ class OtakuDesu extends MProvider {
    final statusList = [
      {"Ongoing": 0, "Completed": 1}
    ];
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(url))).body;
    MManga anime = MManga();
    final status = xpath(
        res, '//*[@class="infozingle"]/p[contains(text(), "Status")]/text()');
@@ -83,20 +87,18 @@ class OtakuDesu extends MProvider {
  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
    List<MVideo> videos = [];
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    final script =
        xpath(res, '//script[contains(text(), "{action:")]/text()').first;
    final nonceAction =
        substringBefore(substringAfter(script, "{action:\""), '"');
    final action = substringBefore(substringAfter(script, "action:\""), '"');

-    final resNonceAction = await http(
-        'POST',
-        json.encode({
-          "useFormBuilder": true,
-          "body": {"action": nonceAction},
-          "url": "${source.baseUrl}/wp-admin/admin-ajax.php"
-        }));
+    final resNonceAction = (await client.post(
+            Uri.parse("${source.baseUrl}/wp-admin/admin-ajax.php"),
+            headers: null,
+            body: {"action": nonceAction}))
+        .body;
    final nonce = substringBefore(substringAfter(resNonceAction, ":\""), '"');
    final mirrorstream =
        xpath(res, '//*[@class="mirrorstream"]/ul/li/a/@data-content');
@@ -106,18 +108,21 @@ class OtakuDesu extends MProvider {
      final q = decodedData["q"];
      final id = decodedData["id"];
      final i = decodedData["i"];
-      final body = {"i": i, "id": id, "q": q, "nonce": nonce, "action": action};

-      final res = await http(
-          'POST',
-          json.encode({
-            "useFormBuilder": true,
-            "body": body,
-            "url": "${source.baseUrl}/wp-admin/admin-ajax.php"
-          }));
+      final res = (await client.post(
+              Uri.parse("${source.baseUrl}/wp-admin/admin-ajax.php"),
+              headers: null,
+              body: {
+            "i": i,
+            "id": id,
+            "q": q,
+            "nonce": nonce,
+            "action": action
+          }))
+          .body;
      final html = utf8.decode(
          base64Url.decode(substringBefore(substringAfter(res, ":\""), '"')));
-      final url = xpath(html, '//iframe/@src').first;
+      String url = xpath(html, '//iframe/@src').first;

      if (url.contains("yourupload")) {
        final id = substringBefore(substringAfter(url, "id="), "&");
@@ -126,7 +131,7 @@ class OtakuDesu extends MProvider {
      } else if (url.contains("filelions")) {
        a = await streamWishExtractor(url, "FileLions");
      } else if (url.contains("desustream")) {
-        final res = await http('GET', json.encode({"url": url}));
+        final res = (await client.get(Uri.parse(url))).body;
        final script =
            xpath(res, '//script[contains(text(), "sources")]/text()').first;
        final videoUrl = substringBefore(
@@ -140,7 +145,7 @@ class OtakuDesu extends MProvider {
          ..subtitles = [];
        videos.add(video);
      } else if (url.contains("mp4upload")) {
-        final res = await http('GET', json.encode({"url": url}));
+        final res = (await client.get(Uri.parse(url))).body;
        final script =
            xpath(res, '//script[contains(text(), "player.src")]/text()').first;
        final videoUrl =
--- a/anime/src/id/otakudesu/source.dart
+++ b/anime/src/id/otakudesu/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get otakudesu => _otakudesu;
-const _otakudesuVersion = "0.0.35";
+const _otakudesuVersion = "0.0.4";
 const _otakudesuCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/id/otakudesu/otakudesu.dart";
 Source _otakudesu = Source(
--- a/anime/src/it/animesaturn/animesaturn.dart
+++ b/anime/src/it/animesaturn/animesaturn.dart
@@ -4,10 +4,13 @@ import 'dart:convert';
 class AnimeSaturn extends MProvider {
  AnimeSaturn();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/animeincorso?page=$page"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client
+            .get(Uri.parse("${source.baseUrl}/animeincorso?page=$page")))
+        .body;

    List<MManga> animeList = [];

@@ -32,8 +35,9 @@ class AnimeSaturn extends MProvider {

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/newest?page=$page"};
-    final res = await http('GET', json.encode(data));
+    final res =
+        (await client.get(Uri.parse("${source.baseUrl}/newest?page=$page")))
+            .body;

    List<MManga> animeList = [];

@@ -101,8 +105,8 @@ class AnimeSaturn extends MProvider {
      }
      url += "&page=$page";
    }
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse(url))).body;

    List<MManga> animeList = [];
    List<String> urls = [];
@@ -141,8 +145,8 @@ class AnimeSaturn extends MProvider {
    final statusList = [
      {"In corso": 0, "Finito": 1}
    ];
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse(url))).body;
    MManga anime = MManga();
    final details = xpath(res,
            '//div[@class="container shadow rounded bg-dark-as-box mb-3 p-3 w-100 text-white"]/text()')
@@ -189,10 +193,10 @@ class AnimeSaturn extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;

    final urlVid = xpath(res, '//a[contains(@href,"/watch")]/@href').first;
-    final resVid = await http('GET', json.encode({"url": urlVid}));
+    final resVid = (await client.get(Uri.parse(urlVid))).body;
    String masterUrl = "";
    if (resVid.contains("jwplayer(")) {
      masterUrl = substringBefore(substringAfter(resVid, "file: \""), "\"");
@@ -202,8 +206,7 @@ class AnimeSaturn extends MProvider {

    List<MVideo> videos = [];
    if (masterUrl.endsWith("playlist.m3u8")) {
-      final masterPlaylistRes =
-          await http('GET', json.encode({"url": masterUrl}));
+      final masterPlaylistRes = (await client.get(Uri.parse(masterUrl))).body;
      for (var it in substringAfter(masterPlaylistRes, "#EXT-X-STREAM-INF:")
          .split("#EXT-X-STREAM-INF:")) {
        final quality =
--- a/anime/src/it/animesaturn/source.dart
+++ b/anime/src/it/animesaturn/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get animesaturn => _animesaturn;
-const _animesaturnVersion = "0.0.2";
+const _animesaturnVersion = "0.0.25";
 const _animesaturnCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/it/animesaturn/animesaturn.dart";
 Source _animesaturn = Source(
--- a/anime/src/sq/filma24/filma24.dart
+++ b/anime/src/sq/filma24/filma24.dart
@@ -3,19 +3,24 @@ import 'dart:convert';

 class Filma24 extends MProvider {
  Filma24();
+
+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
    String pageNu = page == 1 ? "" : "/page/$page/";
-    final data = {"url": "${preferenceBaseUrl(source.id)}$pageNu"};
-    final res = await http('GET', json.encode(data));
+    final res =
+        (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$pageNu")))
+            .body;
    return animeFromRes(res);
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
    String pageNu = page == 1 ? "" : "page/$page/";
-    final data = {"url": "${preferenceBaseUrl(source.id)}/$pageNu?sort=trendy"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse("${preferenceBaseUrl(source.id)}/$pageNu?sort=trendy")))
+        .body;
    return animeFromRes(res);
  }

@@ -46,8 +51,7 @@ class Filma24 extends MProvider {

    url += pageNu;

-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(url))).body;
    return animeFromRes(res);
  }

@@ -60,8 +64,7 @@ class Filma24 extends MProvider {
      episode.url = url;
      episodesList.add(episode);
    } else {
-      final data = {"url": url};
-      final res = await http('GET', json.encode(data));
+      final res = (await client.get(Uri.parse(url))).body;
      final document = parseHtml(res);
      final resultElements = document.select("div.row");

@@ -84,14 +87,12 @@ class Filma24 extends MProvider {

  @override
  Future<List<MVideo>> getVideoList(MSource source, String url) async {
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(url))).body;
    List<MVideo> videos = [];
    final serverUrls = xpath(res, '//*[@class="player"]/div[1]/a/@href');
    for (var serverUrl in serverUrls) {
      List<MVideo> a = [];
-      final serVdata = {"url": "$url/$serverUrl"};
-      final serVres = await http('GET', json.encode(serVdata));
+      final serVres = (await client.get(Uri.parse("$url/$serverUrl"))).body;
      List<String> iframe = xpath(serVres, '//*[@id="plx"]/p/iframe/@src');
      if (iframe.isNotEmpty) {
        String i = iframe.first;
@@ -196,14 +197,17 @@ class Filma24 extends MProvider {
      'Referer': 'https://vidmoly.to',
    };
    List<MVideo> videos = [];
-    final playListUrlResponse = await http('GET', json.encode({"url": url}));
+    final playListUrlResponse = (await client.get(Uri.parse(url))).body;
    final playlistUrl =
        RegExp(r'file:"(\S+?)"').firstMatch(playListUrlResponse)?.group(1) ??
            "";
-    final masterPlaylistRes = await http(
-        'GET', json.encode({"url": playlistUrl, "headers": headers}));
-    if (masterPlaylistRes != "error") {
-      for (var it in substringAfter(masterPlaylistRes, "#EXT-X-STREAM-INF:")
+    if (playlistUrl.isEmpty) return [];
+    final masterPlaylistRes =
+        await client.get(Uri.parse(playlistUrl), headers: headers);
+
+    if (masterPlaylistRes.statusCode == 200) {
+      for (var it
+          in substringAfter(masterPlaylistRes.body, "#EXT-X-STREAM-INF:")
              .split("#EXT-X-STREAM-INF:")) {
        final quality =
            "${substringBefore(substringBefore(substringAfter(substringAfter(it, "RESOLUTION="), "x"), ","), "\n")}p";
@@ -225,12 +229,12 @@ class Filma24 extends MProvider {

  Future<List<MVideo>> oneuploadExtractor(String url) async {
    List<MVideo> videos = [];
-    final playListUrlResponse = await http('GET', json.encode({"url": url}));
+    final playListUrlResponse = (await client.get(Uri.parse(url))).body;
    final playlistUrl =
        RegExp(r'file:"(\S+?)"').firstMatch(playListUrlResponse)?.group(1) ??
            "";
-    final masterPlaylistRes =
-        await http('GET', json.encode({"url": playlistUrl}));
+    if (playlistUrl.isEmpty) return [];
+    final masterPlaylistRes = (await client.get(Uri.parse(playlistUrl))).body;
    for (var it in substringAfter(masterPlaylistRes, "#EXT-X-STREAM-INF:")
        .split("#EXT-X-STREAM-INF:")) {
      final quality =
@@ -249,7 +253,7 @@ class Filma24 extends MProvider {
  }

  Future<List<MVideo>> uqloadExtractor(String url) async {
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    final js = xpath(res, '//script[contains(text(), "sources:")]/text()');
    if (js.isEmpty) {
      return [];
--- a/anime/src/sq/filma24/source.dart
+++ b/anime/src/sq/filma24/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get filma24 => _filma24;
-const _filma24Version = "0.0.1";
+const _filma24Version = "0.0.15";
 const _filma24CodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/anime/src/sq/filma24/filma24.dart";
 Source _filma24 = Source(
--- a/index.json
+++ b/index.json
--- a/manga/multisrc/heancms/heancms.dart
+++ b/manga/multisrc/heancms/heancms.dart
@@ -4,6 +4,8 @@ import 'dart:convert';
 class HeanCms extends MProvider {
  HeanCms();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
    final headers = getHeader(source.baseUrl);
@@ -18,14 +20,13 @@ class HeanCms extends MProvider {
        "series_status": "Ongoing",
        "series_type": "Comic"
      };
-      final data = {"url": url, "headers": headers, "body": body};
-      res = await http('POST', json.encode(data));
+      res = (await client.post(Uri.parse(url), headers: headers, body: body))
+          .body;
    } else {
      final newEndpointUrl =
          "${source.apiUrl}/query/?page=$page&query_string=&series_status=All&order=desc&orderBy=total_views&perPage=12&tags_ids=[]&series_type=Comic";
-
-      final newEndpointData = {"url": newEndpointUrl, "headers": headers};
-      res = await http('GET', json.encode(newEndpointData));
+      res =
+          (await client.get(Uri.parse(newEndpointUrl), headers: headers)).body;
    }
    return mMangaRes(res, source);
  }
@@ -43,14 +44,13 @@ class HeanCms extends MProvider {
        "series_status": "Ongoing",
        "series_type": "Comic"
      };
-      final data = {"url": url, "headers": headers, "body": body};
-      res = await http('POST', json.encode(data));
+      res = (await client.post(Uri.parse(url), headers: headers, body: body))
+          .body;
    } else {
      final newEndpointUrl =
          "${source.apiUrl}/query/?page=$page&query_string=&series_status=All&order=desc&orderBy=latest&perPage=12&tags_ids=[]&series_type=Comic";
-
-      final newEndpointData = {"url": newEndpointUrl, "headers": headers};
-      res = await http('GET', json.encode(newEndpointData));
+      res =
+          (await client.get(Uri.parse(newEndpointUrl), headers: headers)).body;
    }
    return mMangaRes(res, source);
  }
@@ -63,14 +63,13 @@ class HeanCms extends MProvider {
    if (!useNewQueryEndpoint(source.source)) {
      final url = "${source.apiUrl}/series/search";
      final body = {"term": query};
-      final data = {"url": url, "headers": headers, "body": body};
-      res = await http('POST', json.encode(data));
+      res = (await client.post(Uri.parse(url), headers: headers, body: body))
+          .body;
    } else {
      final newEndpointUrl =
          "${source.apiUrl}/query/?page=$page&query_string=$query&series_status=All&order=desc&orderBy=total_views&perPage=12&tags_ids=[]&series_type=Comic";
-
-      final newEndpointData = {"url": newEndpointUrl, "headers": headers};
-      res = await http('GET', json.encode(newEndpointData));
+      res =
+          (await client.get(Uri.parse(newEndpointUrl), headers: headers)).body;
    }
    return mMangaRes(res, source);
  }
@@ -80,11 +79,10 @@ class HeanCms extends MProvider {
    MManga manga = MManga();
    String currentSlug = substringAfterLast(url, "/");
    final headers = getHeader(source.baseUrl);
-    final data = {
-      "url": "${source.apiUrl}/series/$currentSlug",
-      "headers": headers
-    };
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse("${source.apiUrl}/series/$currentSlug"),
+            headers: headers))
+        .body;
    manga.author = getMapValue(res, "author");
    manga.description = getMapValue(res, "description");
    manga.genre = jsonPathToString(res, r"$.tags[*].name", "._").split("._");
@@ -138,14 +136,14 @@ class HeanCms extends MProvider {
    String res = "".toString();
    if (!useslugStrategy(source.name)) {
      String chapterId = substringAfter(url, '#');
-      final data = {
-        "url": "${source.apiUrl}/series/chapter/$chapterId",
-        "headers": headers
-      };
-      res = await http('GET', json.encode(data));
+      res = (await client.get(
+              Uri.parse("${source.apiUrl}/series/chapter/$chapterId"),
+              headers: headers))
+          .body;
    } else {
-      final data = {"url": "${source.baseUrl}$url", "headers": headers};
-      res = await http('GET', json.encode(data));
+      res = (await client.get(Uri.parse("${source.baseUrl}$url"),
+              headers: headers))
+          .body;

      List<String> pageUrls = [];
      var imagesRes = parseHtml(res)
--- a/manga/multisrc/heancms/sources.dart
+++ b/manga/multisrc/heancms/sources.dart
@@ -3,7 +3,7 @@ import 'src/yugenmangas/yugenmangas.dart';
 import 'src/omegascans/omegascans.dart';
 import 'src/perfscan/perfscan.dart';

-const heancmsVersion = "0.0.5";
+const heancmsVersion = "0.0.55";
 const heancmsSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/manga/multisrc/heancms/heancms.dart";

--- a/manga/multisrc/madara/madara.dart
+++ b/manga/multisrc/madara/madara.dart
@@ -4,20 +4,22 @@ import 'dart:convert';
 class Madara extends MProvider {
  Madara();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final url = "${source.baseUrl}/manga/page/$page/?m_orderby=views";
-    final data = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse("${source.baseUrl}/manga/page/$page/?m_orderby=views")))
+        .body;
    final document = parseHtml(res);
    return mangaFromElements(document.select("div.page-item-detail"));
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final url = "${source.baseUrl}/manga/page/$page/?m_orderby=latest";
-    final data = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse("${source.baseUrl}/manga/page/$page/?m_orderby=latest")))
+        .body;
    final document = parseHtml(res);
    return mangaFromElements(document.select("div.page-item-detail"));
  }
@@ -68,8 +70,8 @@ class Madara extends MProvider {
        }
      }
    }
-    final data = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse(url))).body;
    final document = parseHtml(res);
    return mangaFromElements(document.select("div.c-tabs-item__content"));
  }
@@ -122,8 +124,7 @@ class Madara extends MProvider {
    ];
    MManga manga = MManga();
    String res = "";
-    final datas = {"url": url, "sourceId": source.id};
-    res = await http('GET', json.encode(datas));
+    res = (await client.get(Uri.parse(url))).body;
    final document = parseHtml(res);
    manga.author = document.selectFirst("div.author-content > a")?.text ?? "";

@@ -162,14 +163,17 @@ class Madara extends MProvider {
      "Content-Type": "application/x-www-form-urlencoded",
      "X-Requested-With": "XMLHttpRequest"
    };
-    final urll =
-        "${baseUrl}wp-admin/admin-ajax.php?action=manga_get_chapters&manga=$mangaId";
-    final datasP = {"url": urll, "headers": headers, "sourceId": source.id};
-    res = await http('POST', json.encode(datasP));
-    if (res == "error" || mangaId.isEmpty) {
-      final urlP = "${url}ajax/chapters";
-      final datasP = {"url": urlP, "headers": headers, "sourceId": source.id};
-      res = await http('POST', json.encode(datasP));
+
+    final resP = await client.post(
+        Uri.parse(
+            "${baseUrl}wp-admin/admin-ajax.php?action=manga_get_chapters&manga=$mangaId"),
+        headers: headers);
+    if (resP != 200 || mangaId.isEmpty) {
+      res = (await client.post(Uri.parse("${url}ajax/chapters"),
+              headers: headers))
+          .body;
+    } else {
+      res = resP.body;
    }

    var chapUrls = xpath(res, '//li[@class^="wp-manga-chapter"]/a/@href');
@@ -222,8 +226,7 @@ class Madara extends MProvider {

  @override
  Future<List<String>> getPageList(MSource source, String url) async {
-    final datas = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(datas));
+    final res = (await client.get(Uri.parse(url))).body;
    final document = parseHtml(res);
    final pageElement = document.selectFirst(
        "div.page-break, li.blocks-gallery-item, .reading-content, .text-left img");
--- a/manga/multisrc/madara/sources.dart
+++ b/manga/multisrc/madara/sources.dart
@@ -164,7 +164,7 @@ import 'src/comicarab/comicarab.dart';
 import 'src/manga3asq/manga3asq.dart';
 import 'src/bakamh/bakamh.dart';

-const madaraVersion = "0.0.6";
+const madaraVersion = "0.0.65";
 const madaraSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/manga/multisrc/madara/madara.dart";

--- a/manga/multisrc/mangabox/mangabox.dart
+++ b/manga/multisrc/mangabox/mangabox.dart
@@ -4,21 +4,21 @@ import 'dart:convert';
 class MangaBox extends MProvider {
  MangaBox();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final url = "${source.baseUrl}/${popularUrlPath(source.name, page)}";
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
-
+    final res = (await client.get(Uri.parse(
+            "${source.baseUrl}/${popularUrlPath(source.name, page)}")))
+        .body;
    return mangaRes(res);
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final url = "${source.baseUrl}/${latestUrlPath(source.name, page)}";
-    final data = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(data));
-
+    final res = (await client.get(
+            Uri.parse("${source.baseUrl}/${latestUrlPath(source.name, page)}")))
+        .body;
    return mangaRes(res);
  }

@@ -84,8 +84,8 @@ class MangaBox extends MProvider {
        }
      }
    }
-    final data = {"url": url};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse(url))).body;

    List<MManga> mangaList = [];
    List<String> urls = [];
@@ -125,8 +125,7 @@ class MangaBox extends MProvider {
      {"Ongoing": 0, "Completed": 1}
    ];
    MManga manga = MManga();
-    final datas = {"url": url};
-    final res = await http('GET', json.encode(datas));
+    final res = (await client.get(Uri.parse(url))).body;

    List<String> author = xpath(res,
        '//*[@class="table-label" and contains(text(), "Author")]/parent::tr/td[2]/text()');
@@ -204,8 +203,7 @@ class MangaBox extends MProvider {

  @override
  Future<List<String>> getPageList(MSource source, String url) async {
-    final datas = {"url": url};
-    final res = await http('GET', json.encode(datas));
+    final res = (await client.get(Uri.parse(url))).body;
    List<String> pageUrls = [];
    final urls = xpath(res,
        '//div[@class="container-chapter-reader" or @class="panel-read-story"]/img/@src');
--- a/manga/multisrc/mangabox/sources.dart
+++ b/manga/multisrc/mangabox/sources.dart
@@ -4,7 +4,7 @@ import 'src/mangairo/mangaeiro.dart';
 import 'src/mangakakalot/mangakakalot.dart';
 import 'src/manganato/manganato.dart';

-const mangaboxVersion = "0.0.15";
+const mangaboxVersion = "0.0.2";
 const mangaboxSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/manga/multisrc/mangabox/mangabox.dart";

--- a/manga/multisrc/mangareader/mangareader.dart
+++ b/manga/multisrc/mangareader/mangareader.dart
@@ -4,23 +4,21 @@ import 'dart:convert';
 class MangaReader extends MProvider {
  MangaReader();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final url =
-        "${source.baseUrl}${getMangaUrlDirectory(source.name)}/?page=$page&order=popular";
-    final data = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(data));
-
+    final res = (await client.get(Uri.parse(
+            "${source.baseUrl}${getMangaUrlDirectory(source.name)}/?page=$page&order=popular")))
+        .body;
    return mangaRes(res);
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final url =
-        "${source.baseUrl}${getMangaUrlDirectory(source.name)}/?page=$page&order=update";
-    final data = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(data));
-
+    final res = (await client.get(Uri.parse(
+            "${source.baseUrl}${getMangaUrlDirectory(source.name)}/?page=$page&order=update")))
+        .body;
    return mangaRes(res);
  }

@@ -68,9 +66,7 @@ class MangaReader extends MProvider {
      }
    }

-    final data = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(data));
-
+    final res = (await client.get(Uri.parse(url))).body;
    return mangaRes(res);
  }

@@ -129,9 +125,8 @@ class MangaReader extends MProvider {
    ];
    url = getUrlWithoutDomain(url);
    MManga manga = MManga();
-    final datas = {"url": "${source.baseUrl}$url", "sourceId": source.id};
-    final res = await http('GET', json.encode(datas));

+    final res = (await client.get(Uri.parse("${source.baseUrl}$url"))).body;
    List<String> author = xpath(
        res,
        "//table[contains(@class, 'infotable')]//tr[contains(text(), 'Author')]/td[last()]/text() | //div[contains(@class, 'tsinfo')]//div[contains(@class, 'imptdt') and contains(text(), 'Author')]//i/text() | //div[contains(@class, 'fmed')]//b[contains(text(), 'Author')]/following-sibling::span[1]/text() | //span[contains(text(), 'Author')]/text()",
@@ -195,8 +190,7 @@ class MangaReader extends MProvider {
  @override
  Future<List<String>> getPageList(MSource source, String url) async {
    url = getUrlWithoutDomain(url);
-    final datas = {"url": '${source.baseUrl}$url', "sourceId": source.id};
-    final res = await http('GET', json.encode(datas));
+    final res = (await client.get(Uri.parse('${source.baseUrl}$url'))).body;

    List<String> pages = [];
    List<String> pagesUrl = [];
@@ -320,18 +314,6 @@ class MangaReader extends MProvider {
    }
    return "/manga";
  }
-
-  String getUrlWithoutDomain(String orig) {
-    final uri = Uri.parse(orig.replaceAll(' ', '%20'));
-    String out = uri.path;
-    if (uri.query.isNotEmpty) {
-      out += '?${uri.query}';
-    }
-    if (uri.fragment.isNotEmpty) {
-      out += '#${uri.fragment}';
-    }
-    return out;
-  }
 }

 MangaReader main() {
--- a/manga/multisrc/mangareader/sources.dart
+++ b/manga/multisrc/mangareader/sources.dart
@@ -39,7 +39,7 @@ import 'src/turktoon/turktoon.dart';
 import 'src/uzaymanga/uzaymanga.dart';
 import 'src/xcalibrscans/xcalibrscans.dart';

-const mangareaderVersion = "0.0.75";
+const mangareaderVersion = "0.0.8";
 const mangareaderSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/manga/multisrc/mangareader/mangareader.dart";

--- a/manga/multisrc/mmrcms/mmrcms.dart
+++ b/manga/multisrc/mmrcms/mmrcms.dart
@@ -4,12 +4,13 @@ import 'dart:convert';
 class MMRCMS extends MProvider {
  MMRCMS();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final url =
-        "${source.baseUrl}/filterList?page=$page&sortBy=views&asc=false";
-    final data = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(
+            "${source.baseUrl}/filterList?page=$page&sortBy=views&asc=false")))
+        .body;

    List<MManga> mangaList = [];
    final urls = xpath(res, '//*[ @class="chart-title"]/@href');
@@ -38,9 +39,9 @@ class MMRCMS extends MProvider {

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final url = "${source.baseUrl}/latest-release?page=$page";
-    final data = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(data));
+    final res = (await client
+            .get(Uri.parse("${source.baseUrl}/latest-release?page=$page")))
+        .body;

    List<MManga> mangaList = [];
    final urls = xpath(res, '//*[@class="manga-item"]/h3/a/@href');
@@ -96,8 +97,8 @@ class MMRCMS extends MProvider {
        }
      }
    }
-    final data = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(data));
+
+    final res = (await client.get(Uri.parse(url))).body;

    List<MManga> mangaList = [];

@@ -170,8 +171,7 @@ class MMRCMS extends MProvider {
      }
    ];
    MManga manga = MManga();
-    final datas = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(datas));
+    final res = (await client.get(Uri.parse(url))).body;

    final author = xpath(res,
        '//*[@class="dl-horizontal"]/dt[contains(text(), "Auteur(s)") or contains(text(), "Author(s)") or contains(text(), "Autor(es)") or contains(text(), "Yazar(lar) or contains(text(), "Mangaka(lar)")]//following-sibling::dd[1]/text()');
@@ -215,8 +215,7 @@ class MMRCMS extends MProvider {

  @override
  Future<List<String>> getPageList(MSource source, String url) async {
-    final datas = {"url": url, "sourceId": source.id};
-    final res = await http('GET', json.encode(datas));
+    final res = (await client.get(Uri.parse(url))).body;

    List<String> pagesUrl = [];
    final pages =
--- a/manga/multisrc/mmrcms/sources.dart
+++ b/manga/multisrc/mmrcms/sources.dart
@@ -8,7 +8,7 @@ import 'src/readcomicsonline/readcomicsonline.dart';
 import 'src/lelscanvf/lelscanvf.dart';
 import 'src/mangafr/mangafr.dart';

-const mmrcmsVersion = "0.0.5";
+const mmrcmsVersion = "0.0.55";
 const mmrcmsSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/manga/multisrc/mmrcms/mmrcms.dart";

--- a/manga/multisrc/nepnep/nepnep.dart
+++ b/manga/multisrc/nepnep/nepnep.dart
@@ -4,11 +4,11 @@ import 'dart:convert';
 class NepNep extends MProvider {
  NepNep();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/search/"};
-    final res = await http('GET', json.encode(data));
-
+    final res = (await client.get(Uri.parse("${source.baseUrl}/search/"))).body;
    final directory = directoryFromDocument(res);
    final resSort = sortMapList(json.decode(directory), "vm", 1);

@@ -17,9 +17,7 @@ class NepNep extends MProvider {

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final data = {"url": "${source.baseUrl}/search/"};
-    final res = await http('GET', json.encode(data));
-
+    final res = (await client.get(Uri.parse("${source.baseUrl}/search/"))).body;
    final directory = directoryFromDocument(res);
    final resSort = sortMapList(json.decode(directory), "lt", 1);

@@ -31,8 +29,7 @@ class NepNep extends MProvider {
      MSource source, String query, int page, FilterList filterList) async {
    final filters = filterList.filters;
    List<dynamic> queryRes = [];
-    final data = {"url": "${source.baseUrl}/search/"};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse("${source.baseUrl}/search/"))).body;

    final directory = directoryFromDocument(res);
    final resSort = sortMapList(json.decode(directory), "lt", 1);
@@ -145,8 +142,9 @@ class NepNep extends MProvider {
      {"Ongoing": 0, "Completed": 1, "Cancelled": 3, "Hiatus": 2}
    ];
    final headers = getHeader(source.baseUrl);
-    final data = {"url": '${source.baseUrl}/manga/$url', "headers": headers};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse('${source.baseUrl}/manga/$url'),
+            headers: headers))
+        .body;
    MManga manga = MManga();
    manga.author = xpath(res,
            '//li[contains(@class,"list-group-item") and contains(text(),"Author")]/a/text()')
@@ -194,9 +192,9 @@ class NepNep extends MProvider {
  Future<List<String>> getPageList(MSource source, String url) async {
    final headers = getHeader(source.baseUrl);
    List<String> pages = [];
-    final data = {"url": '${source.baseUrl}$url', "headers": headers};
-    print(data);
-    final res = await http('GET', json.encode(data));
+    final res =
+        (await client.get(Uri.parse('${source.baseUrl}$url'), headers: headers))
+            .body;
    final script =
        xpath(res, '//script[contains(text(), "MainFunction")]/text()').first;
    final chapScript =
--- a/manga/multisrc/nepnep/sources.dart
+++ b/manga/multisrc/nepnep/sources.dart
@@ -3,7 +3,7 @@ import '../../../model/source.dart';
 import 'src/mangasee/mangasee.dart';
 import 'src/mangalife/mangalife.dart';

-const nepnepVersion = "0.0.5";
+const nepnepVersion = "0.0.55";
 const nepnepSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/manga/multisrc/nepnep/nepnep.dart";

--- a/manga/sources_generator.dart
+++ b/manga/sources_generator.dart
@@ -8,7 +8,6 @@ import 'multisrc/mangabox/sources.dart';
 import 'multisrc/mangareader/sources.dart';
 import 'multisrc/mmrcms/sources.dart';
 import 'multisrc/nepnep/sources.dart';
-import 'src/all/batoto/sources.dart';
 import 'src/all/comick/sources.dart';
 import 'src/all/mangadex/sources.dart';
 import 'src/en/mangahere/source.dart';
@@ -22,7 +21,6 @@ void main() {
    ...mmrcmsSourcesList,
    ...heancmsSourcesList,
    mangahereSource,
-    ...batotoSourcesList,
    ...nepnepSourcesList,
    ...mangaboxSourcesList
  ];
--- a/manga/src/all/batoto/batoto.dart
+++ b/manga/src/all/batoto/batoto.dart
--- a/manga/src/all/batoto/icon.png
+++ b/manga/src/all/batoto/icon.png
--- a/manga/src/all/batoto/sources.dart
+++ b/manga/src/all/batoto/sources.dart
@@ -1,132 +0,0 @@
-import '../../../../model/source.dart';
-
-const _batotoVersion = "0.0.55";
-const _batotoSourceCodeUrl =
-    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/manga/src/all/batoto/batoto.dart";
-
-String _iconUrl =
-    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/manga/src/all/batoto/icon.png";
-const _baseUrl = 'https://bato.to';
-const _isNsfw = true;
-
-List<String> _languages = [
-  "all",
-  "en",
-  "ar",
-  "bg",
-  "zh",
-  "cs",
-  "da",
-  "nl",
-  "fil",
-  "fi",
-  "fr",
-  "de",
-  "el",
-  "he",
-  "hi",
-  "hu",
-  "id",
-  "it",
-  "ja",
-  "ko",
-  "ms",
-  "pl",
-  "pt",
-  "pt-br",
-  "ro",
-  "ru",
-  "es",
-  "es-419",
-  "sv",
-  "th",
-  "tr",
-  "uk",
-  "vi",
-  "af",
-  "sq",
-  "am",
-  "hy",
-  "az",
-  "be",
-  "bn",
-  "bs",
-  "my",
-  "km",
-  "ca",
-  "ceb",
-  "zh-hk",
-  "zh-tw",
-  "hr",
-  "en-us",
-  "eo",
-  "et",
-  "fo",
-  "ka",
-  "gn",
-  "gu",
-  "ht",
-  "ha",
-  "is",
-  "ig",
-  "ga",
-  "jv",
-  "kn",
-  "kk",
-  "ku",
-  "ky",
-  "lo",
-  "lv",
-  "lt",
-  "lb",
-  "mk",
-  "mg",
-  "ml",
-  "mt",
-  "mi",
-  "mr",
-  "mn",
-  "ne",
-  "no",
-  "ny",
-  "ps",
-  "fa",
-  "rm",
-  "sm",
-  "sr",
-  "sh",
-  "st",
-  "sn",
-  "sd",
-  "si",
-  "sk",
-  "sl",
-  "so",
-  "sw",
-  "tg",
-  "ta",
-  "ti",
-  "to",
-  "tk",
-  "ur",
-  "uz",
-  "yo",
-  "zu",
-  "eu",
-  "pt-PT",
-];
-
-List<Source> get batotoSourcesList => _batotoSourcesList;
-List<Source> _batotoSourcesList = _languages
-    .map((e) => Source(
-        name: 'Bato.to',
-        baseUrl: _baseUrl,
-        lang: e,
-        typeSource: "bato.to",
-        iconUrl: _iconUrl,
-        dateFormat: "MMM dd,yyyy",
-        isNsfw: _isNsfw,
-        dateFormatLocale: "en",
-        version: _batotoVersion,
-        sourceCodeUrl: _batotoSourceCodeUrl))
-    .toList();
--- a/manga/src/all/comick/comick.dart
+++ b/manga/src/all/comick/comick.dart
@@ -4,21 +4,25 @@ import 'dart:convert';
 class ComickFun extends MProvider {
  ComickFun();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final url =
-        "${source.apiUrl}/v1.0/search?sort=follow&page=$page&tachiyomi=true";
-    final data = {"url": url, "headers": getHeader(source.baseUrl)};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse(
+                "${source.apiUrl}/v1.0/search?sort=follow&page=$page&tachiyomi=true"),
+            headers: getHeader(source.baseUrl)))
+        .body;
    return mangaRes(res);
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final url =
-        "${source.apiUrl}/v1.0/search?sort=uploaded&page=$page&tachiyomi=true";
-    final data = {"url": url, "headers": getHeader(source.baseUrl)};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse(
+                "${source.apiUrl}/v1.0/search?sort=uploaded&page=$page&tachiyomi=true"),
+            headers: getHeader(source.baseUrl)))
+        .body;
    return mangaRes(res);
  }

@@ -100,8 +104,10 @@ class ComickFun extends MProvider {
      }
      url += "${ll(url)}page=$page&tachiyomi=true";
    }
-    final data = {"url": url, "headers": getHeader(source.baseUrl)};
-    final res = await http('GET', json.encode(data));
+
+    final res =
+        (await client.get(Uri.parse(url), headers: getHeader(source.baseUrl)))
+            .body;
    return mangaRes(res);
  }

@@ -110,12 +116,12 @@ class ComickFun extends MProvider {
    final statusList = [
      {"1": 0, "2": 1, "3": 3, "4": 2}
    ];
-
    final headers = getHeader(source.baseUrl);
-
-    final urll = "${source.apiUrl}${url.replaceAll("#", '')}?tachiyomi=true";
-    final data = {"url": urll, "headers": headers};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse(
+                "${source.apiUrl}${url.replaceAll("#", '')}?tachiyomi=true"),
+            headers: headers))
+        .body;
    MManga manga = MManga();
    manga.author = jsonPathToString(res, r'$.authors[*].name', '');
    manga.genre = jsonPathToString(res, r'$.genres[*].name', "_.").split("_.");
@@ -124,15 +130,15 @@ class ComickFun extends MProvider {
        parseStatus(jsonPathToString(res, r'$..comic.status', ''), statusList);
    final chapUrlReq =
        "${source.apiUrl}${url.replaceAll("#", '')}chapters?lang=${source.lang}&tachiyomi=true&page=1";
-    final dataReq = {"url": chapUrlReq, "headers": headers};
-    final request = await http('GET', json.encode(dataReq));
+    final request =
+        (await client.get(Uri.parse(chapUrlReq), headers: headers)).body;
    var total = jsonPathToString(request, r'$.total', '');
    final chapterLimit = int.parse(total);
    final newChapUrlReq =
        "${source.apiUrl}${url.replaceAll("#", '')}chapters?limit=$chapterLimit&lang=${source.lang}&tachiyomi=true&page=1";

-    final newDataReq = {"url": newChapUrlReq, "headers": headers};
-    final newRequest = await http('GET', json.encode(newDataReq));
+    final newRequest =
+        (await client.get(Uri.parse(newChapUrlReq), headers: headers)).body;

    final chapsUrls =
        jsonPathToString(newRequest, r'$.chapters[*].hid', "_.").split("_.");
@@ -180,9 +186,10 @@ class ComickFun extends MProvider {

  @override
  Future<List<String>> getPageList(MSource source, String url) async {
-    final urll = "${source.apiUrl}/chapter/$url?tachiyomi=true";
-    final data = {"url": urll, "headers": getHeader(url)};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(
+            Uri.parse("${source.apiUrl}/chapter/$url?tachiyomi=true"),
+            headers: getHeader(url)))
+        .body;
    return jsonPathToString(res, r'$.chapter.images[*].url', '_.').split('_.');
  }

--- a/manga/src/all/comick/sources.dart
+++ b/manga/src/all/comick/sources.dart
@@ -1,6 +1,6 @@
 import '../../../../model/source.dart';

-const _comickVersion = "0.0.5";
+const _comickVersion = "0.0.55";
 const _comickSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/manga/src/all/comick/comick.dart";

--- a/manga/src/all/mangadex/mangadex.dart
+++ b/manga/src/all/mangadex/mangadex.dart
@@ -4,23 +4,23 @@ import 'dart:convert';
 class MangaDex extends MProvider {
  MangaDex();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
    page = (20 * (page - 1));
    final url =
        "https://api.mangadex.org/manga?limit=20&offset=$page&availableTranslatedLanguage[]=${source.lang}&includes[]=cover_art${preferenceContentRating(source.id)}${preferenceOriginalLanguages(source.id)}&order[followedCount]=desc";
-    final datas = {"url": url};
-    final res = await http('GET', json.encode(datas));
+    final res = (await client.get(Uri.parse(url))).body;
    return mangaRes(res, source);
  }

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
    page = (20 * (page - 1));
-    final urll =
+    final url =
        "https://api.mangadex.org/chapter?limit=20&offset=$page&translatedLanguage[]=${source.lang}&includeFutureUpdates=0&order[publishAt]=desc&includeFuturePublishAt=0&includeEmptyPages=0";
-    final datas = {"url": urll};
-    final ress = await http('GET', json.encode(datas));
+    final ress = (await client.get(Uri.parse(url))).body;
    final mangaIds =
        jsonPathToString(ress, r'$.data[*].relationships[*].id', '.--')
            .split('.--');
@@ -30,7 +30,7 @@ class MangaDex extends MProvider {
    }
    final newUrl =
        "https://api.mangadex.org/manga?includes[]=cover_art&limit=${mangaIds.length}${preferenceContentRating(source.id)}${preferenceOriginalLanguages(source.id)}$mangaIdss";
-    final res = await http('GET', json.encode({"url": newUrl}));
+    final res = (await client.get(Uri.parse(newUrl))).body;
    return mangaRes(res, source);
  }

@@ -139,7 +139,7 @@ class MangaDex extends MProvider {
      }
    }

-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    return mangaRes(res, source);
  }

@@ -149,9 +149,9 @@ class MangaDex extends MProvider {
      {"ongoing": 0, "completed": 1, "hiatus": 2, "cancelled": 3}
    ];

-    final urll =
-        "https://api.mangadex.org$url?includes[]=cover_art&includes[]=author&includes[]=artist";
-    final res = await http('GET', json.encode({"url": urll}));
+    final res = (await client.get(Uri.parse(
+            "https://api.mangadex.org$url?includes[]=cover_art&includes[]=author&includes[]=artist")))
+        .body;
    MManga manga = MManga();
    manga.author = jsonPathToString(
        res, r'$..data.relationships[*].attributes.name', ', ');
@@ -223,11 +223,10 @@ class MangaDex extends MProvider {

  @override
  Future<List<String>> getPageList(MSource source, String url) async {
-    final urll = "https://api.mangadex.org/at-home/server/$url";
+    final res = (await client
+            .get(Uri.parse("https://api.mangadex.org/at-home/server/$url")))
+        .body;

-    final res = await http('GET', json.encode({"url": urll}));
-
-    // final dataRes = json.decode(res);
    final host = getMapValue(res, "baseUrl");
    final chapter = getMapValue(res, "chapter", encode: true);
    final hash = getMapValue(chapter, "hash");
@@ -322,7 +321,7 @@ class MangaDex extends MProvider {
      String mangaId, int offset, String lang, int sourceId) async {
    final url =
        'https://api.mangadex.org/manga/$mangaId/feed?limit=500&offset=$offset&includes[]=user&includes[]=scanlation_group&order[volume]=desc&order[chapter]=desc&translatedLanguage[]=$lang&includeFuturePublishAt=0&includeEmptyPages=0${preferenceContentRating(sourceId)}';
-    final res = await http('GET', json.encode({"url": url}));
+    final res = (await client.get(Uri.parse(url))).body;
    return res;
  }

--- a/manga/src/all/mangadex/sources.dart
+++ b/manga/src/all/mangadex/sources.dart
@@ -3,7 +3,7 @@ import '../../../../model/source.dart';
 const _apiUrl = 'https://api.mangadex.org';
 const _baseUrl = 'https://mangadex.org';
 const _isNsfw = true;
-const _mangadexVersion = "0.0.6";
+const _mangadexVersion = "0.0.65";
 const _mangadexSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/manga/src/all/mangadex/mangadex.dart";
 String _iconUrl =
@@ -33,7 +33,6 @@ final _languages = [
  "it",
  "ja",
  "kk",
-  "ko",
  "la",
  "lt",
  "ms",
--- a/manga/src/en/mangahere/mangahere.dart
+++ b/manga/src/en/mangahere/mangahere.dart
@@ -4,13 +4,14 @@ import 'dart:convert';
 class MangaHere extends MProvider {
  MangaHere();

+  final Client client = Client();
+
  @override
  Future<MPages> getPopular(MSource source, int page) async {
-    final headers = getHeader(source.baseUrl);
-    final url = "${source.baseUrl}/directory/$page.htm";
-
-    final data = {"url": url, "headers": headers};
-    final res = await http('POST', json.encode(data));
+    final res = (await client.get(
+            Uri.parse("${source.baseUrl}/directory/$page.htm"),
+            headers: getHeader(source.baseUrl)))
+        .body;

    List<MManga> mangaList = [];
    final names =
@@ -33,11 +34,10 @@ class MangaHere extends MProvider {

  @override
  Future<MPages> getLatestUpdates(MSource source, int page) async {
-    final headers = getHeader(source.baseUrl);
-    final url = "${source.baseUrl}/directory/$page.htm?latest";
-
-    final data = {"url": url, "headers": headers};
-    final res = await http('POST', json.encode(data));
+    final res = (await client.get(
+            Uri.parse("${source.baseUrl}/directory/$page.htm?latest"),
+            headers: getHeader(source.baseUrl)))
+        .body;

    List<MManga> mangaList = [];
    final names =
@@ -61,8 +61,6 @@ class MangaHere extends MProvider {
  @override
  Future<MPages> search(
      MSource source, String query, int page, FilterList filterList) async {
-    final headers = getHeader(source.baseUrl);
-
    final filters = filterList.filters;
    String url = "${source.baseUrl}/search";

@@ -108,8 +106,9 @@ class MangaHere extends MProvider {
      }
    }
    url += "${ll(url)}title=$query&page=$page";
-    final data = {"url": url, "headers": headers};
-    final res = await http('POST', json.encode(data));
+    final res =
+        (await client.get(Uri.parse(url), headers: getHeader(source.baseUrl)))
+            .body;

    List<MManga> mangaList = [];
    final names =
@@ -135,9 +134,9 @@ class MangaHere extends MProvider {
    final statusList = [
      {"Ongoing": 0, "Completed": 1}
    ];
-    final headers = getHeader(source.baseUrl);
-    final data = {"url": "${source.baseUrl}/$url", "headers": headers};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse("${source.baseUrl}/$url"),
+            headers: getHeader(source.baseUrl)))
+        .body;
    MManga manga = MManga();
    manga.author =
        xpath(res, '//*[@class="detail-info-right-say"]/a/text()').first;
@@ -172,8 +171,7 @@ class MangaHere extends MProvider {
  Future<List<String>> getPageList(MSource source, String url) async {
    final headers = getHeader(source.baseUrl);
    final urll = "${source.baseUrl}$url";
-    final data = {"url": urll, "headers": headers};
-    final res = await http('GET', json.encode(data));
+    final res = (await client.get(Uri.parse(urll), headers: headers)).body;
    final pages = xpath(res, "//body/div/div/span/a/text()");
    List<String> pageUrls = [];
    if (pages.isEmpty) {
@@ -221,8 +219,9 @@ class MangaHere extends MProvider {
              "Host": "www.mangahere.cc",
              "X-Requested-With": "XMLHttpRequest"
            };
-            final data = {"url": pageLink, "headers": headers};
-            final ress = await http('GET', json.encode(data));
+
+            final ress =
+                (await client.get(Uri.parse(pageLink), headers: headers)).body;

            responseText = ress;

@@ -231,7 +230,8 @@ class MangaHere extends MProvider {
            }
          }
        }
-        String deobfuscatedScript = unpackJs(responseText.replaceAll("eval", ""));
+        String deobfuscatedScript =
+            unpackJs(responseText.replaceAll("eval", ""));

        int baseLinkStartPos = deobfuscatedScript.indexOf("pix=") + 5;
        int baseLinkEndPos =
--- a/manga/src/en/mangahere/source.dart
+++ b/manga/src/en/mangahere/source.dart
@@ -1,7 +1,7 @@
 import '../../../../model/source.dart';

 Source get mangahereSource => _mangahereSource;
-const _mangahereVersion = "0.0.55";
+const _mangahereVersion = "0.0.6";
 const _mangahereSourceCodeUrl =
    "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/manga/src/en/mangahere/mangahere.dart";
 Source _mangahereSource = Source(
--- a/model/source.dart
+++ b/model/source.dart
@@ -49,7 +49,7 @@ class Source {
      this.version = "",
      this.isManga = true,
      this.isFullData = false,
-      this.appMinVerReq = "0.1.45",
+      this.appMinVerReq = "0.1.6",
      this.additionalParams = ""});

  Map<String, dynamic> toJson() {