Plugins fixed (#903)

* test

* fast fix

* fix

* fix

* Update ranobelib.ts

plugins/russian/bookriver.ts

@@ -2,14 +2,16 @@ import { Plugin } from '@typings/plugin';
 import { FilterTypes, Filters } from '@libs/filterInputs';
 import { fetchApi, fetchFile } from '@libs/fetch';
 import { NovelStatus } from '@libs/novelStatus';
-import { load as parseHTML } from 'cheerio';
 import dayjs from 'dayjs';
 
+const regex =
+  /<script id="__NEXT_DATA__" type="application\/json">(\{.*?\})<\/script>/;
+
 class Bookriver implements Plugin.PluginBase {
   id = 'bookriver';
   name = 'Bookriver';
   site = 'https://bookriver.ru';
-  version = '1.0.0';
+  version = '1.0.1';
   icon = 'src/ru/bookriver/icon.png';
 
   async popularNovels(
@@ -29,12 +31,12 @@ class Bookriver implements Plugin.PluginBase {
     }
 
     const result = await fetchApi(url).then(res => res.text());
-    const loadedCheerio = parseHTML(result);
     const novels: Plugin.NovelItem[] = [];
 
-    const jsonRaw = loadedCheerio('#__NEXT_DATA__').html();
-    if (jsonRaw) {
-      const json: response = JSON.parse(jsonRaw);
+    const jsonRaw = result.match(regex);
+    if (jsonRaw instanceof Array && jsonRaw[1]) {
+      const json: response = JSON.parse(jsonRaw[1]);
+
       json.props.pageProps.state.pagesFilter?.genre?.books?.forEach(novel =>
         novels.push({
           name: novel.name,
@@ -43,6 +45,7 @@ class Bookriver implements Plugin.PluginBase {
         }),
       );
     }
+
     return novels;
   }
 
@@ -50,50 +53,60 @@ class Bookriver implements Plugin.PluginBase {
     const result = await fetchApi(this.resolveUrl(novelPath, true)).then(res =>
       res.text(),
     );
-    const loadedCheerio = parseHTML(result);
-
-    const jsonRaw = loadedCheerio('#__NEXT_DATA__').html();
-    const json: response = JSON.parse(jsonRaw || '{}');
-    const book = json.props.pageProps.state.book?.bookPage;
-
     const novel: Plugin.SourceNovel = {
       path: novelPath,
-      name: book?.name || '',
-      cover: book?.coverImages[0].url,
-      summary: book?.annotation,
-      author: book?.author?.name,
-      genres: book?.tags?.map(tag => tag.name).join(', '),
-      status:
-        book?.statusComplete === 'writing'
-          ? NovelStatus.Ongoing
-          : NovelStatus.Completed,
+      name: '',
     };
 
-    const chapters: Plugin.ChapterItem[] = [];
-    book?.ebook?.chapters?.forEach((chapter, chapterIndex) => {
-      if (chapter.available) {
-        chapters.push({
-          name: chapter.name,
-          path: book?.slug + '/' + chapter.chapterId,
-          releaseTime: dayjs(
-            chapter.firstPublishedAt || chapter.createdAt || undefined,
-          ).format('LLL'),
-          chapterNumber: chapterIndex + 1,
+    const jsonRaw = result.match(regex);
+    if (jsonRaw instanceof Array && jsonRaw[1]) {
+      const book: BooksEntity = JSON.parse(jsonRaw[1]).props.pageProps.state
+        .book.bookPage;
+
+      novel.name = book.name || '';
+      novel.cover = book.coverImages[0].url;
+      novel.summary = book.annotation;
+      novel.author = book.author?.name;
+
+      novel.status =
+        book?.statusComplete === 'writing'
+          ? NovelStatus.Ongoing
+          : NovelStatus.Completed;
+
+      if (book.tags?.length)
+        novel.genres = book.tags?.map(tag => tag.name).join(',');
+
+      if (book?.ebook?.chapters?.length) {
+        const chapters: Plugin.ChapterItem[] = [];
+
+        book.ebook.chapters.forEach((chapter, chapterIndex) => {
+          if (chapter.available) {
+            chapters.push({
+              name: chapter.name,
+              path: novelPath + '/' + chapter.chapterId,
+              releaseTime: dayjs(
+                chapter.firstPublishedAt || chapter.createdAt || undefined,
+              ).format('LLL'),
+              chapterNumber: chapterIndex + 1,
+            });
+          }
         });
+
+        novel.chapters = chapters;
       }
-    });
-    novel.chapters = chapters;
+    }
     return novel;
   }
 
   async parseChapter(chapterPath: string): Promise<string> {
     const url = 'https://api.bookriver.ru/api/v1/books/chapter/text/';
-    const result = await fetchApi(url + chapterPath.split('/').pop());
-    const json = (await result.json()) as responseChapter;
+    const { data }: responseChapter = await fetchApi(
+      url + chapterPath.split('/').pop(),
+    ).then(res => res.json());
 
-    let chapterText = json.data.content || 'Конец произведения';
-    if (json.data?.audio?.available) {
-      chapterText += '\n' + json.data.audio.url;
+    let chapterText = data.content || 'Конец произведения';
+    if (data?.audio?.available) {
+      chapterText += '\n' + data.audio.url;
     }
 
     return chapterText;
@@ -109,11 +122,12 @@ class Bookriver implements Plugin.PluginBase {
       '&page=' +
       pageNo +
       '&perPage=10';
-    const result = await fetchApi(url);
-    const json = (await result.json()) as responseSearch;
+    const { data }: responseSearch = await fetchApi(url).then(res =>
+      res.json(),
+    );
 
     const novels: Plugin.NovelItem[] = [];
-    json.data?.books?.forEach(novel =>
+    data?.books?.forEach(novel =>
       novels.push({
         name: novel.name,
         cover: novel.coverImages[0].url,