fix: промисы переписаны на asymc/await

Author: daria-z

src/js/fetchRssData.js

@@ -1,16 +1,15 @@
 import axios from 'axios'
 import { model } from './model/index.js'
 
-export const fetchRssData = (link) => {
+export const fetchRssData = async (link) => {
   const proxyUrl = `https://allorigins.hexlet.app/get?disableCache=true&url=${encodeURIComponent(link)}`
-  return axios
-    .get(proxyUrl)
-    .then((response) => {
-      const data = response.data
-      return data.contents
-    })
-    .catch((error) => {
-      model.error.handle(error, 'fetch')
-      throw error
-    })
+
+  try {
+    const response = await axios.get(proxyUrl)
+    return response.data.contents
+  }
+  catch (error) {
+    model.error.handle(error, 'fetch')
+    throw error
+  }
 }

src/js/model/feed.js

@@ -25,15 +25,14 @@ export const updateState = ({ channel, items }) => {
   state.form.inputValue = ''
 }
 
-export const add = () => {
+export const add = async () => {
   const url = state.form.inputValue
-  return fetchAndParse(url)
-    .then(({ channel, items }) => {
-      updateState({ channel, items })
-    })
-    .catch((error) => {
-      // и тут корректное ли это решение
-      handle(error, state.ui.error === 'noRss' ? 'parse' : 'fetch')
-      throw error
-    })
+  try {
+    const { channel, items } = await fetchAndParse(url)
+    updateState({ channel, items })
+  }
+  catch (error) {
+    handle(error, state.ui.error === 'noRss' ? 'parse' : 'fetch')
+    throw error
+  }
 }

src/js/model/form.js

@@ -8,18 +8,17 @@ const schema = yup
   .required('required')
   .test('no-duplicate', 'exists', value => !state.feedsList.includes(value))
 
-export const validateInput = () => {
-  return schema
-    .validate(state.form.inputValue)
-    .then(() => {
-      state.ui.status = 'success'
-      return state.form.inputValue
-    })
-    .catch((error) => {
-      state.ui.status = 'error'
-      state.ui.error = error.errors.join()
-      throw error
-    })
+export const validateInput = async () => {
+  try {
+    await schema.validate(state.form.inputValue)
+    state.ui.status = 'success'
+    return state.form.inputValue
+  }
+  catch (error) {
+    state.ui.status = 'error'
+    state.ui.error = error.errors.join()
+    throw error
+  }
 }
 
 export const updateInputValue = (value) => {

src/js/model/update.js

@@ -3,36 +3,37 @@ import { fetchAndParse } from './feed.js'
 import { addNew } from './post.js'
 import { handle } from './error.js'
 
-export const checkFeeds = () => {
-  const promises = state.feedsList.map((feed) => {
+export const checkFeeds = async () => {
+  const promises = state.feedsList.map(async (feed) => {
     state.ui.status = 'pending'
-    return fetchAndParse(feed)
-      .then(({ items }) => {
-        return items
-      })
-      .catch((error) => {
-        state.ui.status = 'error'
-        handle(error, 'fetch')
-        return []
-      })
-  })
 
-  return Promise.all(promises).then((results) => {
-    const newPosts = results.flat()
-    addNew(newPosts)
+    try {
+      const { items } = await fetchAndParse(feed)
+      return items
+    }
+    catch (error) {
+      state.ui.status = 'error'
+      handle(error, 'fetch')
+      return []
+    }
   })
+
+  const results = await Promise.all(promises)
+  const newPosts = results.flat()
+  addNew(newPosts)
 }
 
-export const startFeedChecks = () => {
+export const startFeedChecks = async () => {
   if (state.feeds.length === 0) {
     return
   }
-  checkFeeds()
-    .then(() => {
-      setTimeout(startFeedChecks, 10000)
-    })
-    .catch((error) => {
-      console.error(error.message)
-      setTimeout(startFeedChecks, 10000)
-    })
+
+  try {
+    await checkFeeds()
+    setTimeout(startFeedChecks, 10000)
+  }
+  catch (error) {
+    console.error(error.message)
+    setTimeout(startFeedChecks, 10000)
+  }
 }