From d00f1d7343654a15f26e2e60359780cdb7e1f5a1 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Dec 2020 22:27:54 +0100 Subject: [PATCH 01/10] add licence file --- LICENCE | 373 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 373 insertions(+) create mode 100644 LICENCE diff --git a/LICENCE b/LICENCE new file mode 100644 index 0000000..a612ad9 --- /dev/null +++ b/LICENCE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. From 0a01f05fea88731db52b0c8be8678a0cfac442e1 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Dec 2020 22:34:53 +0100 Subject: [PATCH 02/10] remove debug log --- nzz.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nzz.js b/nzz.js index 98efc28..26a63ca 100755 --- a/nzz.js +++ b/nzz.js @@ -84,7 +84,6 @@ async function moveDownload(tmpDir, outDir, date) { * @param {Date} date Date of the issue. */ async function enterDate(driver, date) { - console.log(driver); let dateString = date.nzzDate(); let startDate = await driver.wait(until.elementLocated(By.css('.fup-s-date-start')), WAIT_TIMEOUT, TIMEOUT_MSG, RETRY_DELAY); @@ -156,7 +155,7 @@ async function findIssues(driver, from, to, tmpDir, outDir) { try { let articles = await driver.wait(until.elementsLocated(By.css('.fup-archive-result-item-article-title')), SEARCH_WAIT_TIMEOUT, SEARCH_TIMEOUT_MSG, RETRY_DELAY); - await articles[0].click(); + await articles[0].click();s await download(driver); console.log(`downloading ${from.isoDate()}...`); From 17c4589b512c9eae42a20d8ff816b2b22cd37a72 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Dec 2020 22:36:50 +0100 Subject: [PATCH 03/10] release v0.1.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index a82bc26..1775778 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nzz-downloader", - "version": "0.1.0", + "version": "0.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f00728f..f628e7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nzz-downloader", - "version": "0.1.0", + "version": "0.1.1", "description": "", "main": "nzz.js", "author": "Sebastian Hugentobler", From 1993e0b049c4c3e8084c747057ae7df80390f77d Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Dec 2020 22:58:47 +0100 Subject: [PATCH 04/10] set loading strategy explicitly --- README.md | 3 +++ nzz.js | 20 ++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 717297c..9f46795 100644 --- a/README.md +++ b/README.md @@ -53,5 +53,8 @@ directory "./nzz" You need a good internet connection, as the program only waits 5 seconds until a download of an issue can start. This is something that is hard to solve unfortunately. +If you get strange errors about elements not being visible, wait a bit and try again, +it's usually a network problem. + ## Licence Licenced as [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). diff --git a/nzz.js b/nzz.js index 26a63ca..52d1c5a 100755 --- a/nzz.js +++ b/nzz.js @@ -8,7 +8,7 @@ const tmp = require('tmp'); var path = require('path'); const fs = require('fs'); -const { Builder, By, Key, until } = require('selenium-webdriver'); +const { Builder, By, Capabilities, Key, until } = require('selenium-webdriver'); const fx = require('selenium-webdriver/firefox'); const yargs = require('yargs/yargs') const { hideBin } = require('yargs/helpers'); @@ -59,7 +59,7 @@ async function moveDownload(tmpDir, outDir, date) { } let srcFile = path.join(tmpDir, `Gesamtausgabe_NZZ_-_Neue_Zürcher_Zeitung_${date.isoDate()}.pdf`); - + fs.watchFile(srcFile, () => { if (fs.existsSync(srcFile)) { @@ -67,10 +67,10 @@ async function moveDownload(tmpDir, outDir, date) { if (needsOffset) { date = date.addDays(1); } - + let destFile = path.join(outDir, `${date.isoDate()}.pdf`); fs.copyFileSync(srcFile, destFile); - + resolve(); } }); @@ -86,11 +86,11 @@ async function moveDownload(tmpDir, outDir, date) { async function enterDate(driver, date) { let dateString = date.nzzDate(); - let startDate = await driver.wait(until.elementLocated(By.css('.fup-s-date-start')), WAIT_TIMEOUT, TIMEOUT_MSG, RETRY_DELAY); + let startDate = await driver.wait(until.elementLocated(By.css('input.fup-s-date-start')), WAIT_TIMEOUT, TIMEOUT_MSG, RETRY_DELAY); await startDate.clear(); await startDate.sendKeys(dateString); - let endDate = await driver.wait(until.elementLocated(By.css('.fup-s-date-end')), WAIT_TIMEOUT, TIMEOUT_MSG, RETRY_DELAY); + let endDate = await driver.wait(until.elementLocated(By.css('input.fup-s-date-end')), WAIT_TIMEOUT, TIMEOUT_MSG, RETRY_DELAY); await endDate.clear(); await endDate.sendKeys(dateString + Key.ENTER); } @@ -155,8 +155,8 @@ async function findIssues(driver, from, to, tmpDir, outDir) { try { let articles = await driver.wait(until.elementsLocated(By.css('.fup-archive-result-item-article-title')), SEARCH_WAIT_TIMEOUT, SEARCH_TIMEOUT_MSG, RETRY_DELAY); - await articles[0].click();s - + await articles[0].click(); + await download(driver); console.log(`downloading ${from.isoDate()}...`); @@ -198,7 +198,11 @@ async function run(from, to, user, password, outDir) { .setPreference('browser.download.dir', tmpDir.name) .setPreference('browser.helperApps.neverAsk.saveToDisk', 'application/pdf'); + const caps = new Capabilities(); + caps.setPageLoadStrategy("normal"); + let driver = await new Builder() + .withCapabilities(caps) .forBrowser('firefox') .setFirefoxOptions(fxOptions) .build(); From d0abf032876c7c64ff037767c27cfde05d504fba Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Dec 2020 23:00:48 +0100 Subject: [PATCH 05/10] release v0.1.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1775778..05a13d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nzz-downloader", - "version": "0.1.1", + "version": "0.1.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f628e7f..fdc3d79 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nzz-downloader", - "version": "0.1.1", + "version": "0.1.2", "description": "", "main": "nzz.js", "author": "Sebastian Hugentobler", From 1cf8e486ceb27ecd98d0ba6334f61ce831c95034 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Dec 2020 23:07:53 +0100 Subject: [PATCH 06/10] add screenshot --- README.md | 2 ++ screenshot.jpg | Bin 0 -> 40688 bytes 2 files changed, 2 insertions(+) create mode 100644 screenshot.jpg diff --git a/README.md b/README.md index 9f46795..c25950f 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,8 @@ this case). This is also why it is not all that fast but that is ok. Please only use this with your own credentials, the journalists deserve to be paid for their work. +![screenshot](screenshot.jpg) + ## Installation You need to be comfortable with the command line to use the nzz downloader and it has only been tested on linux systems though it should work fine on Windows diff --git a/screenshot.jpg b/screenshot.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2b74f5c8370b1a8e3d6626f7d0f968f708da5561 GIT binary patch literal 40688 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 Z`N*kw<2RMZJUNbxz7N9yDGcc6|Jeihbou}Q literal 0 HcmV?d00001 From d3f6aeb62f2a037fb2f4a611ec2920f5090336af Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Dec 2020 23:09:26 +0100 Subject: [PATCH 07/10] typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c25950f..c089b27 100644 --- a/README.md +++ b/README.md @@ -59,4 +59,4 @@ If you get strange errors about elements not being visible, wait a bit and try a it's usually a network problem. ## Licence -Licenced as [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). +Licensed as [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). From 5104bf7e2defa67c9649eab2dea54d8b6947f87e Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Dec 2020 23:35:45 +0100 Subject: [PATCH 08/10] more sleeps... --- nzz.js | 25 ++++++++++++------------- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/nzz.js b/nzz.js index 52d1c5a..730647a 100755 --- a/nzz.js +++ b/nzz.js @@ -48,7 +48,7 @@ function sleep(ms) { * @param {fs.PathLike} outDir Final destination directory. * @param {Date} date Date of the issue. */ -async function moveDownload(tmpDir, outDir, date) { +function moveDownload(tmpDir, outDir, date) { return new Promise(resolve => { let needsOffset = false; @@ -60,20 +60,16 @@ async function moveDownload(tmpDir, outDir, date) { let srcFile = path.join(tmpDir, `Gesamtausgabe_NZZ_-_Neue_Zürcher_Zeitung_${date.isoDate()}.pdf`); + if (needsOffset) { + date = date.addDays(1); + } - fs.watchFile(srcFile, () => { - if (fs.existsSync(srcFile)) { - fs.unwatchFile(srcFile); - if (needsOffset) { - date = date.addDays(1); - } + if (!fs.existsSync(srcFile)) { + setTimeout(() => moveDownload(tmpDir, outDir, date), 5000); + } - let destFile = path.join(outDir, `${date.isoDate()}.pdf`); - fs.copyFileSync(srcFile, destFile); - - resolve(); - } - }); + let destFile = path.join(outDir, `${date.isoDate()}.pdf`); + fs.copyFileSync(srcFile, destFile); }); } @@ -93,6 +89,7 @@ async function enterDate(driver, date) { let endDate = await driver.wait(until.elementLocated(By.css('input.fup-s-date-end')), WAIT_TIMEOUT, TIMEOUT_MSG, RETRY_DELAY); await endDate.clear(); await endDate.sendKeys(dateString + Key.ENTER); + await sleep(500); } /** @@ -156,9 +153,11 @@ async function findIssues(driver, from, to, tmpDir, outDir) { try { let articles = await driver.wait(until.elementsLocated(By.css('.fup-archive-result-item-article-title')), SEARCH_WAIT_TIMEOUT, SEARCH_TIMEOUT_MSG, RETRY_DELAY); await articles[0].click(); + await sleep(500) await download(driver); console.log(`downloading ${from.isoDate()}...`); + await sleep(500) // do this in the background moveDownload(tmpDir, outDir, from); diff --git a/package-lock.json b/package-lock.json index 05a13d2..1d3c30e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nzz-downloader", - "version": "0.1.2", + "version": "0.1.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index fdc3d79..b311fa7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nzz-downloader", - "version": "0.1.2", + "version": "0.1.3", "description": "", "main": "nzz.js", "author": "Sebastian Hugentobler", From 3a7fbafaeb3881b831145431fd46b2562581501e Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Dec 2020 23:46:30 +0100 Subject: [PATCH 09/10] typo in comment --- nzz.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nzz.js b/nzz.js index 730647a..8a91fbc 100755 --- a/nzz.js +++ b/nzz.js @@ -69,7 +69,11 @@ function moveDownload(tmpDir, outDir, date) { } let destFile = path.join(outDir, `${date.isoDate()}.pdf`); - fs.copyFileSync(srcFile, destFile); + try { + fs.copyFileSync(srcFile, destFile); + } catch { + // this means it was tried to download a wrong issue + } }); } From 2e684ee877ea6a9ec1ebe05290852359f8729f13 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 16 Feb 2022 09:54:11 +0100 Subject: [PATCH 10/10] wait for buttons to become visible --- nzz.js | 12 +- package-lock.json | 461 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 451 insertions(+), 22 deletions(-) diff --git a/nzz.js b/nzz.js index 8a91fbc..7707cf2 100755 --- a/nzz.js +++ b/nzz.js @@ -65,7 +65,7 @@ function moveDownload(tmpDir, outDir, date) { } if (!fs.existsSync(srcFile)) { - setTimeout(() => moveDownload(tmpDir, outDir, date), 5000); + setTimeout(() => moveDownload(tmpDir, outDir, date), 2000); } let destFile = path.join(outDir, `${date.isoDate()}.pdf`); @@ -74,6 +74,7 @@ function moveDownload(tmpDir, outDir, date) { } catch { // this means it was tried to download a wrong issue } + resolve(); }); } @@ -115,6 +116,7 @@ async function login(driver, user, password) { await loginButton.click(); let emailField = await driver.wait(until.elementLocated(By.id('c1-login-field')), WAIT_TIMEOUT, TIMEOUT_MSG, RETRY_DELAY); + await driver.wait(until.elementIsVisible(emailField), WAIT_TIMEOUT); await emailField.sendKeys(user + Key.ENTER); let pwField = await driver.wait(until.elementLocated(By.id('c1-password-field')), WAIT_TIMEOUT, TIMEOUT_MSG, RETRY_DELAY); @@ -152,6 +154,8 @@ async function findIssues(driver, from, to, tmpDir, outDir) { while (from.toDateString() !== to.toDateString()) { from = from.addDays(1); + console.log(`checking ${from.isoDate()}...`); + await enterDate(driver, from); try { @@ -160,7 +164,7 @@ async function findIssues(driver, from, to, tmpDir, outDir) { await sleep(500) await download(driver); - console.log(`downloading ${from.isoDate()}...`); + console.log(`\tdownloading...`); await sleep(500) // do this in the background @@ -205,7 +209,7 @@ async function run(from, to, user, password, outDir) { caps.setPageLoadStrategy("normal"); let driver = await new Builder() - .withCapabilities(caps) + .withCapabilities(caps) .forBrowser('firefox') .setFirefoxOptions(fxOptions) .build(); @@ -222,7 +226,7 @@ async function run(from, to, user, password, outDir) { } /** - * Parse arguments and start the downloading off the issues. + * Parse arguments and start the downloading of the issues. */ (async function init() { let now = new Date(); diff --git a/package-lock.json b/package-lock.json index 1d3c30e..70f9fe2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,437 @@ { "name": "nzz-downloader", "version": "0.1.3", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "nzz-downloader", + "version": "0.1.3", + "license": "MPL-2.0", + "dependencies": { + "selenium-webdriver": "^4.0.0-alpha.8", + "tmp": "^0.2.1", + "yargs": "^16.2.0" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "engines": { + "node": ">=6" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/jszip": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz", + "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==", + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "set-immediate-shim": "~1.0.1" + } + }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dependencies": { + "immediate": "~3.0.5" + } + }, + "node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "node_modules/readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "node_modules/selenium-webdriver": { + "version": "4.0.0-alpha.8", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.8.tgz", + "integrity": "sha512-yPSaiWySZTEbxuuWQMDqdXh3H3N4Aiw/bSUjpkKMPWWCysfPqUncrq6FewBqdxWD1wQKzy5yWaQMGsgTY/0rCQ==", + "dependencies": { + "jszip": "^3.5.0", + "rimraf": "^2.7.1", + "tmp": "^0.1.0", + "ws": "^7.3.1" + }, + "engines": { + "node": ">= 10.15.0" + } + }, + "node_modules/selenium-webdriver/node_modules/tmp": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz", + "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", + "dependencies": { + "rimraf": "^2.6.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/set-immediate-shim": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dependencies": { + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dependencies": { + "rimraf": "^3.0.0" + }, + "engines": { + "node": ">=8.17.0" + } + }, + "node_modules/tmp/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "node_modules/ws": { + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", + "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/y18n": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz", + "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "engines": { + "node": ">=10" + } + } + }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "ansi-styles": { "version": "4.3.0", @@ -127,9 +551,9 @@ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "jszip": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz", - "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz", + "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==", "requires": { "lie": "~3.3.0", "pako": "~1.0.2", @@ -234,6 +658,14 @@ "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, "string-width": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", @@ -244,14 +676,6 @@ "strip-ansi": "^6.0.0" } }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - }, "strip-ansi": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", @@ -299,9 +723,10 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "ws": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz", - "integrity": "sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==" + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", + "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", + "requires": {} }, "y18n": { "version": "5.0.5",