Fixed premature end of work

safonovpro · Sep 18, 2018 · e8ca4b3 · e8ca4b3
1 parent c19b24c
commit e8ca4b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/crawler.js b/crawler.js
@@ -37,11 +37,11 @@ class Crawler extends EventEmitter {
                         if(result.statusCode === 200 && /^text\/html/.test(result.headers['content-type'])) {
                             this._getDataByUrl(currentUrl, 'GET')
                                 .then(result => {
-                                    this._generateEvents('data', {currentUrl, result});
-
                                     for(let link of result.links) {
                                         if(link.url) this.crawl(link.url);
                                     }
+
+                                    this._generateEvents('data', {currentUrl, result});
                                 }).catch(error => {
                                     this._generateEvents('error', {currentUrl, error});
                                 });
@@ -51,11 +51,11 @@ class Crawler extends EventEmitter {
 
                             result.links.push({href: location, url: nextUrl});
 
-                            this._generateEvents('data', {currentUrl, result});
-
                             if(nextUrl) {
                                 this.crawl(nextUrl, ++countOfRedirects);
                             }
+
+                            this._generateEvents('data', {currentUrl, result});
                         } else {
                             this._generateEvents('data', {currentUrl, result});
                         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-html-crawler",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Crawler (spider) of site web pages by domain name",
   "main": "crawler.js",
   "scripts": {