Catch http error response

2026-02-14 10:51:17 +00:00 · 2023-10-25 19:02:57 +01:00
parent 6eac32b58c
commit c07bcd6032
16 changed files with 511 additions and 361 deletions
--- a/manga/src/all/batoto/batoto-v0.0.3.dart
+++ b/manga/src/all/batoto/batoto-v0.0.3.dart
@@ -2,9 +2,14 @@ import 'dart:convert';
 import 'package:bridge_lib/bridge_lib.dart';

 getPopularManga(MManga manga) async {
-  final url = "${manga.baseUrl}/browse?${lang(manga.lang)}&sort=views_a&page=${manga.page}";
+  final url =
+      "${manga.baseUrl}/browse?${lang(manga.lang)}&sort=views_a&page=${manga.page}";
  final data = {"url": url, "sourceId": manga.sourceId};
-  final res = await MBridge.http('GET', json.encode(data));
+  final response = await MBridge.http('GET', json.encode(data));
+  if (response.hasError) {
+    return response;
+  }
+  String res = response.body;
  return mangaElementM(res, manga);
 }

@@ -17,15 +22,27 @@ String lang(String lang) {
 }

 getLatestUpdatesManga(MManga manga) async {
-  final url = "${manga.baseUrl}/browse?${lang(manga.lang)}&sort=update&page=${manga.page}";
+  final url =
+      "${manga.baseUrl}/browse?${lang(manga.lang)}&sort=update&page=${manga.page}";
  final data = {"url": url, "sourceId": manga.sourceId};
-  final res = await MBridge.http('GET', json.encode(data));
+  final response = await MBridge.http('GET', json.encode(data));
+  if (response.hasError) {
+    return response;
+  }
+  String res = response.body;
  return mangaElementM(res, manga);
 }

 searchManga(MManga manga) async {
-  final data = {"url": "${manga.baseUrl}/search?word=${manga.query}&page=${manga.page}", "sourceId": manga.sourceId};
-  final res = await MBridge.http('GET', json.encode(data));
+  final data = {
+    "url": "${manga.baseUrl}/search?word=${manga.query}&page=${manga.page}",
+    "sourceId": manga.sourceId
+  };
+  final response = await MBridge.http('GET', json.encode(data));
+  if (response.hasError) {
+    return response;
+  }
+  String res = response.body;
  return mangaElementM(res, manga);
 }

@@ -41,39 +58,46 @@ getMangaDetail(MManga manga) async {

  final url = "${manga.baseUrl}${manga.link}";
  final data = {"url": url, "sourceId": manga.sourceId};
-  final res = await MBridge.http('GET', json.encode(data));
-
-  if (res.isEmpty) {
-    return manga;
+  final response = await MBridge.http('GET', json.encode(data));
+  if (response.hasError) {
+    return response;
  }
+  String res = response.body;

-  final workStatus = MBridge.xpath(
-          res, '//*[@class="attr-item"]/b[contains(text(),"Original work")]/following-sibling::span[1]/text()')
+  final workStatus = MBridge.xpath(res,
+          '//*[@class="attr-item"]/b[contains(text(),"Original work")]/following-sibling::span[1]/text()')
      .first;
  manga.status = MBridge.parseStatus(workStatus, statusList);

-  manga.author =
-      MBridge.xpath(res, '//*[@class="attr-item"]/b[contains(text(),"Authors")]/following-sibling::span[1]/text()')
-          .first;
-  manga.genre =
-      MBridge.xpath(res, '//*[@class="attr-item"]/b[contains(text(),"Genres")]/following-sibling::span[1]/text()')
-          .first
-          .split(",");
-  manga.description = MBridge.xpath(res, '//*[@class="limit-html"]/text()').first;
+  manga.author = MBridge.xpath(res,
+          '//*[@class="attr-item"]/b[contains(text(),"Authors")]/following-sibling::span[1]/text()')
+      .first;
+  manga.genre = MBridge.xpath(res,
+          '//*[@class="attr-item"]/b[contains(text(),"Genres")]/following-sibling::span[1]/text()')
+      .first
+      .split(",");
+  manga.description =
+      MBridge.xpath(res, '//*[@class="limit-html"]/text()').first;

-  List<String> chapsElement =
-      MBridge.querySelectorAll(res, selector: "div.main div.p-2", typeElement: 2, attributes: "", typeRegExp: 0);
+  List<String> chapsElement = MBridge.querySelectorAll(res,
+      selector: "div.main div.p-2",
+      typeElement: 2,
+      attributes: "",
+      typeRegExp: 0);
  List<String> times = [];
  List<String> chapsUrls = [];
  List<String> chapsNames = [];
  List<String> scanlators = [];
  for (var element in chapsElement) {
-    final urlElement =
-        MBridge.querySelectorAll(element, selector: "a.chapt", typeElement: 2, attributes: "", typeRegExp: 0).first;
+    final urlElement = MBridge.querySelectorAll(element,
+            selector: "a.chapt", typeElement: 2, attributes: "", typeRegExp: 0)
+        .first;
    final group = MBridge.xpath(element, '//*[@class="extra"]/a/text()').first;
    final name = MBridge.xpath(urlElement, '//a/text()').first;
    final url = MBridge.xpath(urlElement, '//a/@href').first;
-    final time = MBridge.xpath(element, '//*[@class="extra"]/i[@class="ps-3"]/text()').first;
+    final time =
+        MBridge.xpath(element, '//*[@class="extra"]/i[@class="ps-3"]/text()')
+            .first;
    times.add(time);
    chapsUrls.add(url);
    scanlators.add(group);
@@ -83,26 +107,35 @@ getMangaDetail(MManga manga) async {
  manga.urls = chapsUrls;
  manga.names = chapsNames;
  manga.chaptersScanlators = scanlators;
-  manga.chaptersDateUploads = MBridge.listParseDateTime(times, "MMM dd,yyyy", "en");
+  manga.chaptersDateUploads =
+      MBridge.listParseDateTime(times, "MMM dd,yyyy", "en");

  return manga;
 }

 getChapterPages(MManga manga) async {
-  final datas = {"url": "${manga.baseUrl}${manga.link}", "sourceId": manga.sourceId};
-  final res = await MBridge.http('GET', json.encode(datas));
-  if (res.isEmpty) {
-    return [];
+  final datas = {
+    "url": "${manga.baseUrl}${manga.link}",
+    "sourceId": manga.sourceId
+  };
+  final response = await MBridge.http('GET', json.encode(datas));
+  if (response.hasError) {
+    return response;
  }
+  String res = response.body;
  final script = MBridge.xpath(res,
          '//script[contains(text(), "imgHttpLis") and contains(text(), "batoWord") and contains(text(), "batoPass")]/text()')
      .first;
-  final imgHttpLisString = MBridge.substringBefore(MBridge.substringAfterLast(script, 'const imgHttpLis ='), ';');
+  final imgHttpLisString = MBridge.substringBefore(
+      MBridge.substringAfterLast(script, 'const imgHttpLis ='), ';');
  var imgHttpLis = json.decode(imgHttpLisString);
-  final batoWord = MBridge.substringBefore(MBridge.substringAfterLast(script, 'const batoWord ='), ';');
-  final batoPass = MBridge.substringBefore(MBridge.substringAfterLast(script, 'const batoPass ='), ';');
+  final batoWord = MBridge.substringBefore(
+      MBridge.substringAfterLast(script, 'const batoWord ='), ';');
+  final batoPass = MBridge.substringBefore(
+      MBridge.substringAfterLast(script, 'const batoPass ='), ';');
  final evaluatedPass = MBridge.deobfuscateJsPassword(batoPass);
-  final imgAccListString = MBridge.decryptAESCryptoJS(batoWord.replaceAll('"', ""), evaluatedPass);
+  final imgAccListString =
+      MBridge.decryptAESCryptoJS(batoWord.replaceAll('"', ""), evaluatedPass);
  var imgAccList = json.decode(imgAccListString);
  List<String> pagesUrl = [];
  for (int i = 0; i < imgHttpLis.length; i++) {
@@ -115,12 +148,14 @@ getChapterPages(MManga manga) async {
 }

 MManga mangaElementM(String res, MManga manga) async {
-  if (res.isEmpty) {
-    return manga;
-  }
  final lang = manga.lang.replaceAll("-", "_");
-  var resB =
-      MBridge.querySelectorAll(res, selector: "div#series-list div.col", typeElement: 2, attributes: "", typeRegExp: 0);
+
+  var resB = MBridge.querySelectorAll(res,
+      selector: "div#series-list div.col",
+      typeElement: 2,
+      attributes: "",
+      typeRegExp: 0);
+
  List<String> images = [];
  List<String> urls = [];
  List<String> names = [];
@@ -129,30 +164,36 @@ MManga mangaElementM(String res, MManga manga) async {
    if (manga.lang == "all" ||
        manga.lang == "en" && element.contains('no-flag') ||
        element.contains('data-lang="$lang"')) {
-      final item =
-          MBridge.querySelectorAll(element, selector: "a.item-cover", typeElement: 2, attributes: "", typeRegExp: 0)
-              .first;
-      final img =
-          MBridge.querySelectorAll(item, selector: "img", typeElement: 3, attributes: "src", typeRegExp: 0).first;
-      final url =
-          MBridge.querySelectorAll(item, selector: "a", typeElement: 3, attributes: "href", typeRegExp: 0).first;
+      final item = MBridge.querySelectorAll(element,
+              selector: "a.item-cover",
+              typeElement: 2,
+              attributes: "",
+              typeRegExp: 0)
+          .first;
+      final img = MBridge.querySelectorAll(item,
+              selector: "img", typeElement: 3, attributes: "src", typeRegExp: 0)
+          .first;
+      final url = MBridge.querySelectorAll(item,
+              selector: "a", typeElement: 3, attributes: "href", typeRegExp: 0)
+          .first;
      images.add(img);
      urls.add(url);
-      final title =
-          MBridge.querySelectorAll(element, selector: "a.item-title", typeElement: 0, attributes: "", typeRegExp: 0)
-              .first;
+      final title = MBridge.querySelectorAll(element,
+              selector: "a.item-title",
+              typeElement: 0,
+              attributes: "",
+              typeRegExp: 0)
+          .first;
      names.add(title);
    }
  }
  manga.urls = urls;
  manga.names = names;
  manga.images = images;
-  final nextPage = MBridge.xpath(res, '//li[@class="page-item disabled"]/a/span[contains(text(),"»")]/text()').first;
-  if (nextPage.isEmpty) {
-    manga.hasNextPage = true;
-  } else {
-    manga.hasNextPage = false;
-  }
+  final nextPage = MBridge.xpath(res,
+      '//li[@class="page-item disabled"]/a/span[contains(text(),"»")]/text()');
+  manga.hasNextPage = true;
+
  return manga;
 }

--- a/manga/src/all/comick/comick-v0.0.3.dart
+++ b/manga/src/all/comick/comick-v0.0.3.dart
@@ -5,11 +5,11 @@ getLatestUpdatesManga(MManga manga) async {
  final url =
      "${manga.apiUrl}/v1.0/search?sort=uploaded&page=${manga.page}&tachiyomi=true";
  final data = {"url": url, "headers": getHeader(manga.baseUrl)};
-  final res = await MBridge.http('GET', json.encode(data));
-  if (res.isEmpty) {
-    return manga;
+  final response = await MBridge.http('GET', json.encode(data));
+  if (response.hasError) {
+    return response;
  }
-
+  String res = response.body;
  manga.names = MBridge.jsonPathToList(res, r'$.title', 0);
  List<String> ids = MBridge.jsonPathToList(res, r'$.hid', 0);
  List<String> mangaUrls = [];
@@ -36,10 +36,11 @@ getMangaDetail(MManga manga) async {
  final urll =
      "${manga.apiUrl}${manga.link.replaceAll("#", '')}?tachiyomi=true";
  final data = {"url": urll, "headers": headers};
-  final res = await MBridge.http('GET', json.encode(data));
-  if (res.isEmpty) {
-    return manga;
+  final response = await MBridge.http('GET', json.encode(data));
+  if (response.hasError) {
+    return response;
  }
+  String res = response.body;
  manga.author = MBridge.jsonPathToString(res, r'$.authors[*].name', '');
  manga.genre =
      MBridge.jsonPathToString(res, r'$.genres[*].name', "_.").split("_.");
@@ -50,32 +51,38 @@ getMangaDetail(MManga manga) async {
      "${manga.apiUrl}${manga.link.replaceAll("#", '')}chapters?lang=${manga.lang}&tachiyomi=true&page=1";
  final dataReq = {"url": chapUrlReq, "headers": headers};
  final request = await MBridge.http('GET', json.encode(dataReq));
-  var total = MBridge.jsonPathToString(request, r'$.total', '');
+  if (request.hasError) {
+    return response;
+  }
+  var total = MBridge.jsonPathToString(request.body, r'$.total', '');
  final chapterLimit = MBridge.intParse("$total");
  final newChapUrlReq =
      "${manga.apiUrl}${manga.link.replaceAll("#", '')}chapters?limit=$chapterLimit&lang=${manga.lang}&tachiyomi=true&page=1";

  final newDataReq = {"url": newChapUrlReq, "headers": headers};
  final newRequest = await MBridge.http('GET', json.encode(newDataReq));
-
-  manga.urls = MBridge.jsonPathToString(newRequest, r'$.chapters[*].hid', "_.")
-      .split("_.");
-  final chapDate =
-      MBridge.jsonPathToString(newRequest, r'$.chapters[*].created_at', "_.")
+  if (newRequest.hasError) {
+    return response;
+  }
+  manga.urls =
+      MBridge.jsonPathToString(newRequest.body, r'$.chapters[*].hid', "_.")
          .split("_.");
+  final chapDate = MBridge.jsonPathToString(
+          newRequest.body, r'$.chapters[*].created_at', "_.")
+      .split("_.");
  manga.chaptersDateUploads =
      MBridge.listParseDateTime(chapDate, "yyyy-MM-dd'T'HH:mm:ss'Z'", "en");
  manga.chaptersVolumes =
-      MBridge.jsonPathToString(newRequest, r'$.chapters[*].vol', "_.")
-          .split("_.");
-  manga.chaptersScanlators =
-      MBridge.jsonPathToString(newRequest, r'$.chapters[*].group_name', "_.")
+      MBridge.jsonPathToString(newRequest.body, r'$.chapters[*].vol', "_.")
          .split("_.");
+  manga.chaptersScanlators = MBridge.jsonPathToString(
+          newRequest.body, r'$.chapters[*].group_name', "_.")
+      .split("_.");
  manga.names =
-      MBridge.jsonPathToString(newRequest, r'$.chapters[*].title', "_.")
+      MBridge.jsonPathToString(newRequest.body, r'$.chapters[*].title', "_.")
          .split("_.");
  manga.chaptersChaps =
-      MBridge.jsonPathToString(newRequest, r'$.chapters[*].chap', "_.")
+      MBridge.jsonPathToString(newRequest.body, r'$.chapters[*].chap', "_.")
          .split("_.");

  return manga;
@@ -85,10 +92,11 @@ getPopularManga(MManga manga) async {
  final urll =
      "${manga.apiUrl}/v1.0/search?sort=follow&page=${manga.page}&tachiyomi=true";
  final data = {"url": urll, "headers": getHeader(manga.baseUrl)};
-  final res = await MBridge.http('GET', json.encode(data));
-  if (res.isEmpty) {
-    return manga;
+  final response = await MBridge.http('GET', json.encode(data));
+  if (response.hasError) {
+    return response;
  }
+  String res = response.body;
  manga.names = MBridge.jsonPathToList(res, r'$.title', 0);
  List<String> ids = MBridge.jsonPathToList(res, r'$.hid', 0);
  List<String> mangaUrls = [];
@@ -103,10 +111,11 @@ getPopularManga(MManga manga) async {
 searchManga(MManga manga) async {
  final urll = "${manga.apiUrl}/v1.0/search?q=${manga.query}&tachiyomi=true";
  final data = {"url": urll, "headers": getHeader(manga.baseUrl)};
-  final res = await MBridge.http('GET', json.encode(data));
-  if (res.isEmpty) {
-    return manga;
+  final response = await MBridge.http('GET', json.encode(data));
+  if (response.hasError) {
+    return response;
  }
+  String res = response.body;
  manga.names = MBridge.jsonPathToList(res, r'$.title', 0);
  List<String> ids = MBridge.jsonPathToList(res, r'$.hid', 0);
  List<String> mangaUrls = [];
@@ -121,10 +130,11 @@ searchManga(MManga manga) async {
 getChapterPages(MManga manga) async {
  final url = "${manga.apiUrl}/chapter/${manga.link}?tachiyomi=true";
  final data = {"url": url, "headers": getHeader(url)};
-  final res = await MBridge.http('GET', json.encode(data));
-  if (res.isEmpty) {
-    return [];
+  final response = await MBridge.http('GET', json.encode(data));
+  if (response.hasError) {
+    return response;
  }
+  String res = response.body;
  return MBridge.jsonPathToString(res, r'$.chapter.images[*].url', '_.')
      .split('_.');
 }
--- a/manga/src/all/mangadex/mangadex-v0.0.3.dart
+++ b/manga/src/all/mangadex/mangadex-v0.0.3.dart
@@ -6,9 +6,11 @@ getPopularManga(MManga manga) async {
  final url =
      "https://api.mangadex.org/manga?limit=20&offset=$page&availableTranslatedLanguage[]=en&includes[]=cover_art${getMDXContentRating()}&order[followedCount]=desc";
  final datas = {"url": url};
-  final res = await MBridge.http('GET', json.encode(datas));
-
-  return parseManga(res, manga);
+  final response = await MBridge.http('GET', json.encode(datas));
+  if (response.hasError) {
+    return response;
+  }
+  return parseManga(response.body, manga);
 }

 getLatestUpdatesManga(MManga manga) async {
@@ -16,10 +18,11 @@ getLatestUpdatesManga(MManga manga) async {
  final urll =
      "https://api.mangadex.org/chapter?limit=20&offset=$page&translatedLanguage[]=${manga.lang}&includeFutureUpdates=0&order[publishAt]=desc&includeFuturePublishAt=0&includeEmptyPages=0";
  final datas = {"url": urll};
-  final ress = await MBridge.http('GET', json.encode(datas));
-  if (ress.isEmpty) {
-    return manga;
+  final response = await MBridge.http('GET', json.encode(datas));
+  if (response.hasError) {
+    return response;
  }
+  String ress = response.body;

  final mangaIds = MBridge.listParse(
      MBridge.jsonPathToString(ress, r'$.data[*].relationships[*].id', '.--')
@@ -33,7 +36,10 @@ getLatestUpdatesManga(MManga manga) async {
      "https://api.mangadex.org/manga?includes[]=cover_art&limit=${mangaIds.length}${getMDXContentRating()}$mangaa";
  final datass = {"url": newUrl};
  final res = await MBridge.http('GET', json.encode(datass));
-  return parseManga(res, manga);
+  if (res.hasError) {
+    return res;
+  }
+  return parseManga(res.body, manga);
 }

 searchManga(MManga manga) async {
@@ -41,10 +47,10 @@ searchManga(MManga manga) async {
      "https://api.mangadex.org/manga?includes[]=cover_art&offset=0&limit=20&title=${manga.query}${getMDXContentRating()}&order[followedCount]=desc&availableTranslatedLanguage[]=${manga.lang}";
  final datas = {"url": url};
  final res = await MBridge.http('GET', json.encode(datas));
-  if (res.isEmpty) {
-    return manga;
+  if (res.hasError) {
+    return res;
  }
-  return parseManga(res, manga);
+  return parseManga(res.body, manga);
 }

 getMangaDetail(MManga manga) async {
@@ -59,11 +65,11 @@ getMangaDetail(MManga manga) async {
  final url =
      "https://api.mangadex.org${manga.link}?includes[]=cover_art&includes[]=author&includes[]=artist";
  final datas = {"url": url};
-  final res = await MBridge.http('GET', json.encode(datas));
-  if (res.isEmpty) {
-    return manga;
+  final response = await MBridge.http('GET', json.encode(datas));
+  if (response.hasError) {
+    return response;
  }
-
+  String res = response.body;
  manga.author = MBridge.jsonPathToString(
      res, r'$..data.relationships[*].attributes.name', ', ');

@@ -175,11 +181,11 @@ getMangaDetail(MManga manga) async {
 getChapterPages(MManga manga) async {
  final url = "https://api.mangadex.org/at-home/server/${manga.link}";
  final data = {"url": url};
-  final res = await MBridge.http('GET', json.encode(data));
-  if (res.isEmpty) {
-    return [];
+  final response = await MBridge.http('GET', json.encode(data));
+  if (response.hasError) {
+    return response;
  }
-  final dataRes = json.decode(res);
+  final dataRes = json.decode(response.body);
  final host = dataRes["baseUrl"];
  final hash = dataRes["chapter"]["hash"];
  final chapterDatas = dataRes["chapter"]["data"] as List;
@@ -280,7 +286,8 @@ Future<String> paginatedChapterListRequest(
  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${getMDXContentRating()}';
  final datas = {"url": url};
-  return await MBridge.http('GET', json.encode(datas));
+  final response = await MBridge.http('GET', json.encode(datas));
+  return response.body;
 }

 String findTitle(Map<String, dynamic> dataRes, String lang) {