Fixing of error processing

Author: AxeRicin

.eslintrc.yml

@@ -11,3 +11,4 @@ parserOptions:
 
 rules:
   no-param-reassign: 0
+  no-console: 0

src/js/RSSparse.js

@@ -1,3 +1,5 @@
+import ValidationRSSError from './ValidationRSSError';
+
 const getFeed = (dom) => {
   const titleFeed = dom.querySelector('channel>title').textContent;
   const descriptionFeed = dom.querySelector('channel>description').textContent;
@@ -25,7 +27,7 @@ const parseRSS = (data) => {
   };
   const parser = new DOMParser();
   const responseDom = parser.parseFromString(data, 'text/xml');
-  if (responseDom.querySelector('parsererror')) throw new Error('invalid_RSS');
+  if (responseDom.querySelector('parsererror')) throw new ValidationRSSError('invalid_RSS');
   newData.feed = getFeed(responseDom);
   newData.posts = getPosts(responseDom);
   return newData;

src/js/ValidationRSSError.js

@@ -0,0 +1,8 @@
+class ValidationRSSError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'ValidationRSSError';
+  }
+}
+
+export default ValidationRSSError;

src/js/app.js

@@ -111,13 +111,13 @@ const app = () => {
         watcherState.validationUrl.state = 'updated';
         const formData = new FormData(e.target);
         const existingURLs = watcherState.content.feeds.map((feed) => feed.url);
-        validate(existingURLs, formData.get('url'))
+        const currentURL = formData.get('url');
+        validate(existingURLs, currentURL)
           .then((newUrl) => getAxiosResponse(newUrl))
           .then((response) => {
             const data = parseRSS(response.data.contents);
-            const { url } = response.data.status;
             const feedId = Number(uniqueId());
-            data.feed.url = url;
+            data.feed.url = currentURL;
             data.feed.feedId = feedId;
             data.posts = data.posts.map((post) => ({
               ...post,
@@ -130,12 +130,21 @@ const app = () => {
             updateFeeds(watcherState);
           })
           .catch((err) => {
-            if (err.message === 'URL_invalid' || err.message === 'invalid_RSS') {
-              watcherState.validationUrl.error = err.message;
-              watcherState.validationUrl.state = 'invalid';
-            } else {
-              console.log('Выпала неизвесная ошибка:');
-              console.dir(err);
+            switch (err.name) {
+              case 'ValidationError':
+              case 'ValidationRSSError':
+                watcherState.validationUrl.error = err.message;
+                watcherState.validationUrl.state = 'invalid';
+                break;
+              case 'AxiosError':
+                watcherState.validationUrl.error = err.code;
+                watcherState.validationUrl.state = 'invalid';
+                break;
+
+              default:
+                console.log('Выпала неизвесная ошибка:');
+                console.dir(err);
+                break;
             }
           });
       });

src/js/locales/en.js

@@ -7,5 +7,6 @@ export default {
     title_feeds: 'Feeds',
     posts: 'Posts',
     button_in_post: 'Show',
+    ERR_NETWORK: 'Network error',
   },
 };

src/js/locales/ru.js

@@ -3,9 +3,10 @@ export default {
     URL_invalid: 'Ссылка должна быть валидным URL',
     existing_RSS: 'RSS уже существует',
     RSS_uploaded: 'RSS успешно загружен',
-    invalid_RSS: 'Не содержит валидный RSS',
+    invalid_RSS: 'Ресурс не содержит валидный RSS',
     title_feeds: 'Фиды',
     posts: 'Посты',
     button_in_post: 'Просмотр',
+    ERR_NETWORK: 'Ошибка сети',
   },
 };

webpack.config.js

@@ -5,9 +5,9 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const WorkboxWebpackPlugin = require('workbox-webpack-plugin');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const autoprefixer = require('autoprefixer');
-const miniCssExtractPlugin = require('mini-css-extract-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
-const isProduction = process.env.NODE_ENV == 'production';
+const isProduction = process.env.NODE_ENV === 'production';
 
 const config = {
   target: 'web',
@@ -23,6 +23,9 @@ const config = {
     host: 'localhost',
     hot: true,
   },
+  watchOptions: {
+    poll: true,
+  },
   plugins: [
     new HtmlWebpackPlugin({
       template: './index.html',
@@ -43,7 +46,7 @@ const config = {
         use: [
           {
             // Extracts CSS for each JS file that includes CSS
-            loader: miniCssExtractPlugin.loader,
+            loader: MiniCssExtractPlugin.loader,
           },
           {
             // Interprets `@import` and `url()` like `import/require()` and will resolve them