Fix:Add timeout to provider matching default to 30s #3000

server/providers/FantLab.js

@@ -2,6 +2,7 @@ const axios = require('axios')
 const Logger = require('../Logger')
 
 class FantLab {
+  #responseTimeout = 30000
   // 7 - other
   // 11 - essay
   // 12 - article
@@ -22,28 +23,47 @@ class FantLab {
   _filterWorkType = [7, 11, 12, 22, 23, 24, 25, 26, 46, 47, 49, 51, 52, 55, 56, 57]
   _baseUrl = 'https://api.fantlab.ru'
 
-  constructor() { }
+  constructor() {}
+
+  /**
+   * @param {string} title
+   * @param {string} author'
+   * @param {number} [timeout] response timeout in ms
+   * @returns {Promise<Object[]>}
+   **/
+  async search(title, author, timeout = this.#responseTimeout) {
+    if (!timeout || isNaN(timeout)) timeout = this.#responseTimeout
 
-  async search(title, author) {
     let searchString = encodeURIComponent(title)
     if (author) {
       searchString += encodeURIComponent(' ' + author)
     }
     const url = `${this._baseUrl}/search-works?q=${searchString}&page=1&onlymatches=1`
     Logger.debug(`[FantLab] Search url: ${url}`)
-    const items = await axios.get(url).then((res) => {
-      return res.data || []
-    }).catch(error => {
-      Logger.error('[FantLab] search error', error)
-      return []
-    })
+    const items = await axios
+      .get(url, {
+        timeout
+      })
+      .then((res) => {
+        return res.data || []
+      })
+      .catch((error) => {
+        Logger.error('[FantLab] search error', error)
+        return []
+      })
 
-    return Promise.all(items.map(async item => await this.getWork(item))).then(resArray => {
-      return resArray.filter(res => res)
+    return Promise.all(items.map(async (item) => await this.getWork(item, timeout))).then((resArray) => {
+      return resArray.filter((res) => res)
     })
   }
 
-  async getWork(item) {
+  /**
+   * @param {Object} item
+   * @param {number} [timeout] response timeout in ms
+   * @returns {Promise<Object>}
+   **/
+  async getWork(item, timeout = this.#responseTimeout) {
+    if (!timeout || isNaN(timeout)) timeout = this.#responseTimeout
     const { work_id, work_type_id } = item
 
     if (this._filterWorkType.includes(work_type_id)) {
@@ -51,23 +71,34 @@ class FantLab {
     }
 
     const url = `${this._baseUrl}/work/${work_id}/extended`
-    const bookData = await axios.get(url).then((resp) => {
-      return resp.data || null
-    }).catch((error) => {
-      Logger.error(`[FantLab] work info request for url "${url}" error`, error)
-      return null
-    })
+    const bookData = await axios
+      .get(url, {
+        timeout
+      })
+      .then((resp) => {
+        return resp.data || null
+      })
+      .catch((error) => {
+        Logger.error(`[FantLab] work info request for url "${url}" error`, error)
+        return null
+      })
 
-    return this.cleanBookData(bookData)
+    return this.cleanBookData(bookData, timeout)
   }
 
-  async cleanBookData(bookData) {
+  /**
+   *
+   * @param {Object} bookData
+   * @param {number} [timeout]
+   * @returns {Promise<Object>}
+   */
+  async cleanBookData(bookData, timeout = this.#responseTimeout) {
     let { authors, work_name_alts, work_id, work_name, work_year, work_description, image, classificatory, editions_blocks } = bookData
 
     const subtitle = Array.isArray(work_name_alts) ? work_name_alts[0] : null
-    const authorNames = authors.map(au => (au.name || '').trim()).filter(au => au)
+    const authorNames = authors.map((au) => (au.name || '').trim()).filter((au) => au)
 
-    const imageAndIsbn = await this.tryGetCoverFromEditions(editions_blocks)
+    const imageAndIsbn = await this.tryGetCoverFromEditions(editions_blocks, timeout)
 
     const imageToUse = imageAndIsbn?.imageUrl || image
 
@@ -88,7 +119,7 @@ class FantLab {
   tryGetGenres(classificatory) {
     if (!classificatory || !classificatory.genre_group) return []
 
-    const genresGroup = classificatory.genre_group.find(group => group.genre_group_id == 1) // genres and subgenres
+    const genresGroup = classificatory.genre_group.find((group) => group.genre_group_id == 1) // genres and subgenres
 
     // genre_group_id=2 - General Characteristics
     // genre_group_id=3 - Arena
@@ -108,10 +139,16 @@ class FantLab {
 
   tryGetSubGenres(rootGenre) {
     if (!rootGenre.genre || !rootGenre.genre.length) return []
-    return rootGenre.genre.map(g => g.label).filter(g => g)
+    return rootGenre.genre.map((g) => g.label).filter((g) => g)
   }
 
-  async tryGetCoverFromEditions(editions) {
+  /**
+   *
+   * @param {Object} editions
+   * @param {number} [timeout]
+   * @returns {Promise<{imageUrl: string, isbn: string}>
+   */
+  async tryGetCoverFromEditions(editions, timeout = this.#responseTimeout) {
     if (!editions) {
       return null
     }
@@ -129,24 +166,37 @@ class FantLab {
     const isbn = lastEdition['isbn'] || null // get only from paper edition
 
     return {
-      imageUrl: await this.getCoverFromEdition(editionId),
+      imageUrl: await this.getCoverFromEdition(editionId, timeout),
       isbn
     }
   }
 
-  async getCoverFromEdition(editionId) {
+  /**
+   *
+   * @param {number} editionId
+   * @param {number} [timeout]
+   * @returns {Promise<string>}
+   */
+  async getCoverFromEdition(editionId, timeout = this.#responseTimeout) {
     if (!editionId) return null
+    if (!timeout || isNaN(timeout)) timeout = this.#responseTimeout
+
     const url = `${this._baseUrl}/edition/${editionId}`
 
-    const editionInfo = await axios.get(url).then((resp) => {
-      return resp.data || null
-    }).catch(error => {
-      Logger.error(`[FantLab] search cover from edition with url "${url}" error`, error)
-      return null
-    })
+    const editionInfo = await axios
+      .get(url, {
+        timeout
+      })
+      .then((resp) => {
+        return resp.data || null
+      })
+      .catch((error) => {
+        Logger.error(`[FantLab] search cover from edition with url "${url}" error`, error)
+        return null
+      })
 
     return editionInfo?.image || null
   }
 }
 
-module.exports = FantLab
+module.exports = FantLab