diff --git a/.github/workflows/scrape.yml b/.github/workflows/scrape.yml index cd31b4a1..aaef86a6 100644 --- a/.github/workflows/scrape.yml +++ b/.github/workflows/scrape.yml @@ -15,6 +15,10 @@ on: default: "auto_moneyman" required: false description: "The name of the worksheet to write to" + parallelScrapes: + default: "1" + required: false + description: "Number of parallel scrapes to run" schedule: - cron: "33 10 * * *" env: @@ -57,6 +61,7 @@ jobs: -e BUXFER_ACCOUNTS -e TRANSACTION_HASH_TYPE -e WEB_POST_URL + -e MAX_PARALLEL_SCRAPERS ${{ env.REGISTRY }}/${{ steps.normalize-repository-name.outputs.repository }}:latest env: DEBUG: "" @@ -85,3 +90,4 @@ jobs: BUXFER_ACCOUNTS: ${{ secrets.BUXFER_ACCOUNTS }} TRANSACTION_HASH_TYPE: ${{ secrets.TRANSACTION_HASH_TYPE }} WEB_POST_URL: ${{ secrets.WEB_POST_URL }} + MAX_PARALLEL_SCRAPERS: ${{ github.event.inputs.parallelScrapes }} diff --git a/README.md b/README.md index fbf494a8..4d442306 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,7 @@ Example: | `TRANSACTION_HASH_TYPE` | `` | The hash type to use for the transaction hash. Can be `moneyman` or empty. The default will be changed to `moneyman` in the upcoming versions | | `HIDDEN_DEPRECATIONS` | '' | A comma separated list of deprecations to hide | | `PUPPETEER_EXECUTABLE_PATH` | `undefined` | An ExecutablePath for the scraper. if undefined defaults to system. | +| `MAX_PARALLEL_SCRAPERS` | `1` | The maximum number of parallel scrapers to run | ### Get notified in telegram diff --git a/package-lock.json b/package-lock.json index 644c3e8d..d7b7b991 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "hasInstallScript": true, "license": "ISC", "dependencies": { + "async": "^3.2.6", "azure-kusto-data": "^6.0.2", "azure-kusto-ingest": "^6.0.2", "buxfer-ts-client": "^1.1.0", @@ -20,11 +21,12 @@ "google-auth-library": "^9.14.1", "google-spreadsheet": "^4.1.4", "hash-it": "^6.0.0", - "israeli-bank-scrapers": "^5.1.4", + "israeli-bank-scrapers": "^5.2.0", "telegraf": "^4.16.3", "ynab": "^2.5.0" }, "devDependencies": { + "@types/async": "^3.2.24", "@types/debug": "^4.1.12", "@types/jest": "^29.5.13", "husky": "^9.1.6", @@ -1580,6 +1582,12 @@ "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==" }, + "node_modules/@types/async": { + "version": "3.2.24", + "resolved": "https://registry.npmjs.org/@types/async/-/async-3.2.24.tgz", + "integrity": "sha512-8iHVLHsCCOBKjCF2KwFe0p9Z3rfM9mL+sSP8btyR5vTjJRAqpBYD28/ZLgXPf0pjG1VxOvtCV/BgXkQbpSe8Hw==", + "dev": true + }, "node_modules/@types/babel__core": { "version": "7.20.2", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.2.tgz", @@ -1876,10 +1884,9 @@ } }, "node_modules/async": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", - "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", - "dev": true + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==" }, "node_modules/asynckit": { "version": "0.4.0", @@ -1953,9 +1960,9 @@ } }, "node_modules/b4a": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", - "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==" + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==" }, "node_modules/babel-jest": { "version": "29.7.0", @@ -2070,15 +2077,15 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/bare-events": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", - "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.0.tgz", + "integrity": "sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==", "optional": true }, "node_modules/bare-fs": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz", - "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==", + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.5.tgz", + "integrity": "sha512-SlE9eTxifPDJrT6YgemQ1WGFleevzwY+XAP1Xqgl56HtcrisC2CHCZ2tq6dBpcH2TnNxwUEUGhweo+lrQtYuiw==", "optional": true, "dependencies": { "bare-events": "^2.0.0", @@ -2087,9 +2094,9 @@ } }, "node_modules/bare-os": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz", - "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.4.tgz", + "integrity": "sha512-z3UiI2yi1mK0sXeRdc4O1Kk8aOa/e+FNWZcTiPB/dfTWyLypuE99LibgRaQki914Jq//yAWylcAt+mknKdixRQ==", "optional": true }, "node_modules/bare-path": { @@ -2102,12 +2109,13 @@ } }, "node_modules/bare-stream": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz", - "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.3.0.tgz", + "integrity": "sha512-pVRWciewGUeCyKEuRxwv06M079r+fRjAQjBEK2P6OYGrO43O+Z0LrPZZEjlc4mB6C2RpZ9AxJ1s7NLEtOHO6eA==", "optional": true, "dependencies": { - "streamx": "^2.18.0" + "b4a": "^1.6.6", + "streamx": "^2.20.0" } }, "node_modules/base64-js": { @@ -2469,9 +2477,9 @@ "dev": true }, "node_modules/core-js": { - "version": "3.32.2", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz", - "integrity": "sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==", + "version": "3.38.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz", + "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==", "hasInstallScript": true, "funding": { "type": "opencollective", @@ -3665,9 +3673,9 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/israeli-bank-scrapers": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/israeli-bank-scrapers/-/israeli-bank-scrapers-5.1.4.tgz", - "integrity": "sha512-0ChR13o/VQNWSY8oGm3hVIsjS1LrwdS820wlG6hdLly9gJe+DEt2Do1sTQ4IRoie7pwXGFVdmNT4KOcdI2R4gA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/israeli-bank-scrapers/-/israeli-bank-scrapers-5.2.0.tgz", + "integrity": "sha512-ombgTVVy1RramVP7H4vRAVZaHFru6mWkYcaCoWr8VYuBLY/bVvm1s2Pb88j79SxDc0+VEoKOf08TpN6gUvDcYg==", "dependencies": { "build-url": "^2.0.0", "core-js": "^3.1.4", @@ -4873,17 +4881,17 @@ "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" }, "node_modules/moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", "engines": { "node": "*" } }, "node_modules/moment-timezone": { - "version": "0.5.43", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz", - "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==", + "version": "0.5.45", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz", + "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==", "dependencies": { "moment": "^2.29.4" }, @@ -5514,9 +5522,9 @@ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -5944,9 +5952,9 @@ } }, "node_modules/streamx": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz", - "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==", + "version": "2.20.1", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.1.tgz", + "integrity": "sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==", "dependencies": { "fast-fifo": "^1.3.2", "queue-tick": "^1.0.1", @@ -6163,9 +6171,9 @@ } }, "node_modules/text-decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz", - "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.0.tgz", + "integrity": "sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==", "dependencies": { "b4a": "^1.6.4" } @@ -7895,6 +7903,12 @@ "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==" }, + "@types/async": { + "version": "3.2.24", + "resolved": "https://registry.npmjs.org/@types/async/-/async-3.2.24.tgz", + "integrity": "sha512-8iHVLHsCCOBKjCF2KwFe0p9Z3rfM9mL+sSP8btyR5vTjJRAqpBYD28/ZLgXPf0pjG1VxOvtCV/BgXkQbpSe8Hw==", + "dev": true + }, "@types/babel__core": { "version": "7.20.2", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.2.tgz", @@ -8164,10 +8178,9 @@ } }, "async": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", - "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", - "dev": true + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==" }, "asynckit": { "version": "0.4.0", @@ -8232,9 +8245,9 @@ } }, "b4a": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", - "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==" + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==" }, "babel-jest": { "version": "29.7.0", @@ -8327,15 +8340,15 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "bare-events": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", - "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.0.tgz", + "integrity": "sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==", "optional": true }, "bare-fs": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz", - "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==", + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.5.tgz", + "integrity": "sha512-SlE9eTxifPDJrT6YgemQ1WGFleevzwY+XAP1Xqgl56HtcrisC2CHCZ2tq6dBpcH2TnNxwUEUGhweo+lrQtYuiw==", "optional": true, "requires": { "bare-events": "^2.0.0", @@ -8344,9 +8357,9 @@ } }, "bare-os": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz", - "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.4.tgz", + "integrity": "sha512-z3UiI2yi1mK0sXeRdc4O1Kk8aOa/e+FNWZcTiPB/dfTWyLypuE99LibgRaQki914Jq//yAWylcAt+mknKdixRQ==", "optional": true }, "bare-path": { @@ -8359,12 +8372,13 @@ } }, "bare-stream": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz", - "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.3.0.tgz", + "integrity": "sha512-pVRWciewGUeCyKEuRxwv06M079r+fRjAQjBEK2P6OYGrO43O+Z0LrPZZEjlc4mB6C2RpZ9AxJ1s7NLEtOHO6eA==", "optional": true, "requires": { - "streamx": "^2.18.0" + "b4a": "^1.6.6", + "streamx": "^2.20.0" } }, "base64-js": { @@ -8616,9 +8630,9 @@ "dev": true }, "core-js": { - "version": "3.32.2", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz", - "integrity": "sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==" + "version": "3.38.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz", + "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==" }, "core-util-is": { "version": "1.0.3", @@ -9447,9 +9461,9 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "israeli-bank-scrapers": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/israeli-bank-scrapers/-/israeli-bank-scrapers-5.1.4.tgz", - "integrity": "sha512-0ChR13o/VQNWSY8oGm3hVIsjS1LrwdS820wlG6hdLly9gJe+DEt2Do1sTQ4IRoie7pwXGFVdmNT4KOcdI2R4gA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/israeli-bank-scrapers/-/israeli-bank-scrapers-5.2.0.tgz", + "integrity": "sha512-ombgTVVy1RramVP7H4vRAVZaHFru6mWkYcaCoWr8VYuBLY/bVvm1s2Pb88j79SxDc0+VEoKOf08TpN6gUvDcYg==", "requires": { "build-url": "^2.0.0", "core-js": "^3.1.4", @@ -10374,14 +10388,14 @@ "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" }, "moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==" }, "moment-timezone": { - "version": "0.5.43", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz", - "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==", + "version": "0.5.45", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz", + "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==", "requires": { "moment": "^2.29.4" } @@ -10820,9 +10834,9 @@ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -11148,9 +11162,9 @@ } }, "streamx": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz", - "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==", + "version": "2.20.1", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.1.tgz", + "integrity": "sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==", "requires": { "bare-events": "^2.2.0", "fast-fifo": "^1.3.2", @@ -11311,9 +11325,9 @@ } }, "text-decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz", - "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.0.tgz", + "integrity": "sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==", "requires": { "b4a": "^1.6.4" } diff --git a/package.json b/package.json index 559ef734..7debd9b3 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ }, "homepage": "https://github.com/daniel-hauser/moneyman#readme", "dependencies": { + "async": "^3.2.6", "azure-kusto-data": "^6.0.2", "azure-kusto-ingest": "^6.0.2", "buxfer-ts-client": "^1.1.0", @@ -38,11 +39,12 @@ "google-auth-library": "^9.14.1", "google-spreadsheet": "^4.1.4", "hash-it": "^6.0.0", - "israeli-bank-scrapers": "^5.1.4", + "israeli-bank-scrapers": "^5.2.0", "telegraf": "^4.16.3", "ynab": "^2.5.0" }, "devDependencies": { + "@types/async": "^3.2.24", "@types/debug": "^4.1.12", "@types/jest": "^29.5.13", "husky": "^9.1.6", diff --git a/patches/israeli-bank-scrapers+5.2.0.patch b/patches/israeli-bank-scrapers+5.2.0.patch new file mode 100644 index 00000000..196fbf32 --- /dev/null +++ b/patches/israeli-bank-scrapers+5.2.0.patch @@ -0,0 +1,274 @@ +diff --git a/node_modules/israeli-bank-scrapers/lib/scrapers/base-scraper-with-browser.js b/node_modules/israeli-bank-scrapers/lib/scrapers/base-scraper-with-browser.js +index 1287e84..9f99cf9 100644 +--- a/node_modules/israeli-bank-scrapers/lib/scrapers/base-scraper-with-browser.js ++++ b/node_modules/israeli-bank-scrapers/lib/scrapers/base-scraper-with-browser.js +@@ -76,9 +76,7 @@ function createGeneralError() { + class BaseScraperWithBrowser extends _baseScraper.BaseScraper { + constructor(...args) { + super(...args); +- // NOTICE - it is discouraged to use bang (!) in general. It is used here because +- // all the classes that inherit from this base assume is it mandatory. +- _defineProperty(this, "browser", void 0); ++ _defineProperty(this, "cleanups", []); + // NOTICE - it is discouraged to use bang (!) in general. It is used here because + // all the classes that inherit from this base assume is it mandatory. + _defineProperty(this, "page", void 0); +@@ -89,51 +87,68 @@ class BaseScraperWithBrowser extends _baseScraper.BaseScraper { + height: VIEWPORT_HEIGHT + }; + } +- async initialize() { +- await super.initialize(); +- debug('initialize scraper'); +- this.emitProgress(_definitions.ScraperProgressTypes.Initializing); +- let env; +- if (this.options.verbose) { +- env = _objectSpread({ +- DEBUG: '*' +- }, process.env); ++ async initializePage() { ++ debug('initialize browser page'); ++ if ('browserContext' in this.options) { ++ debug('Using the browser context provided in options'); ++ return this.options.browserContext.newPage(); + } +- if (typeof this.options.browser !== 'undefined' && this.options.browser !== null) { +- debug('use custom browser instance provided in options'); +- this.browser = this.options.browser; +- } else { +- const executablePath = this.options.executablePath || undefined; +- const args = this.options.args || []; ++ if ('browser' in this.options) { ++ debug('Using the browser instance provided in options'); + const { +- timeout ++ browser + } = this.options; +- const headless = !this.options.showBrowser; +- debug(`launch a browser with headless mode = ${headless}`); +- this.browser = await _puppeteer.default.launch({ +- env, +- headless, +- executablePath, +- args, +- timeout +- }); ++ ++ /** ++ * For backward compatibility, we will close the browser even if we didn't create it ++ */ ++ if (!this.options.skipCloseBrowser) { ++ this.cleanups.push(async () => { ++ debug('closing the browser'); ++ await browser.close(); ++ }); ++ } ++ return browser.newPage(); + } ++ const { ++ timeout, ++ args, ++ executablePath, ++ showBrowser ++ } = this.options; ++ const headless = !showBrowser; ++ debug(`launch a browser with headless mode = ${headless}`); ++ const browser = await _puppeteer.default.launch({ ++ env: this.options.verbose ? _objectSpread({ ++ DEBUG: '*' ++ }, process.env) : undefined, ++ headless, ++ executablePath, ++ args, ++ timeout ++ }); ++ this.cleanups.push(async () => { ++ debug('closing the browser'); ++ await browser.close(); ++ }); + if (this.options.prepareBrowser) { + debug("execute 'prepareBrowser' interceptor provided in options"); +- await this.options.prepareBrowser(this.browser); ++ await this.options.prepareBrowser(browser); + } +- if (!this.browser) { +- debug('failed to initiate a browser, exit'); ++ debug('create a new browser page'); ++ return browser.newPage(); ++ } ++ async initialize() { ++ await super.initialize(); ++ debug('initialize scraper'); ++ this.emitProgress(_definitions.ScraperProgressTypes.Initializing); ++ const page = await this.initializePage(); ++ if (!page) { ++ debug('failed to initiate a browser page, exit'); + return; + } +- const pages = await this.browser.pages(); +- if (pages.length) { +- debug('browser has already pages open, use the first one'); +- [this.page] = pages; +- } else { +- debug('create a new browser page'); +- this.page = await this.browser.newPage(); +- } ++ this.page = page; ++ this.cleanups.push(() => page.close()); + if (this.options.defaultTimeout) { + this.page.setDefaultTimeout(this.options.defaultTimeout); + } +@@ -241,10 +256,8 @@ class BaseScraperWithBrowser extends _baseScraper.BaseScraper { + fullPage: true + }); + } +- if (!this.browser) { +- return; +- } +- await this.browser.close(); ++ await Promise.all(this.cleanups.reverse().map(cleanup => cleanup())); ++ this.cleanups = []; + } + handleLoginResult(loginResult) { + switch (loginResult) { +@@ -273,4 +286,4 @@ class BaseScraperWithBrowser extends _baseScraper.BaseScraper { + } + } + exports.BaseScraperWithBrowser = BaseScraperWithBrowser; +-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_puppeteer","_interopRequireDefault","require","_definitions","_debug","_elementsInteractions","_navigation","_baseScraper","_errors","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","_objectWithoutProperties","_objectWithoutPropertiesLoose","n","indexOf","propertyIsEnumerable","hasOwnProperty","VIEWPORT_WIDTH","VIEWPORT_HEIGHT","OK_STATUS","debug","getDebug","LoginBaseResults","Timeout","Generic","General","ScraperErrorTypes","rest","LoginResults","exports","getKeyByValue","object","page","key","conditions","condition","result","RegExp","test","toLowerCase","Promise","resolve","UnknownError","createGeneralError","success","errorType","BaseScraperWithBrowser","BaseScraper","constructor","args","getViewPort","width","height","initialize","emitProgress","ScraperProgressTypes","Initializing","env","options","verbose","DEBUG","process","browser","executablePath","undefined","timeout","headless","showBrowser","puppeteer","launch","prepareBrowser","pages","newPage","defaultTimeout","setDefaultTimeout","preparePage","viewport","setViewport","on","request","_request$failure","failure","errorText","url","navigateTo","waitUntil","pageToUse","response","goto","status","Error","getLoginOptions","_credentials","companyId","fillInputs","pageOrFrame","fields","modified","input","shift","fillInput","selector","login","credentials","loginOptions","userAgent","setUserAgent","loginUrl","checkReadiness","submitButtonSelector","waitUntilElementFound","loginFrameOrPage","preAction","clickButton","LoggingIn","postAction","waitForNavigation","current","getCurrentUrl","loginResult","possibleResults","handleLoginResult","terminate","_success","Terminating","storeFailureScreenShotPath","screenshot","path","fullPage","close","Success","LoginSuccess","InvalidPassword","LoginFailed","errorMessage","ChangePassword"],"sources":["../../src/scrapers/base-scraper-with-browser.ts"],"sourcesContent":["import puppeteer, {\n  type Browser, type Frame, type GoToOptions, type Page, type PuppeteerLifeCycleEvent,\n} from 'puppeteer';\n\nimport { ScraperProgressTypes } from '../definitions';\nimport { getDebug } from '../helpers/debug';\nimport { clickButton, fillInput, waitUntilElementFound } from '../helpers/elements-interactions';\nimport { getCurrentUrl, waitForNavigation } from '../helpers/navigation';\nimport { BaseScraper } from './base-scraper';\nimport { ScraperErrorTypes } from './errors';\nimport { type ScraperCredentials, type ScraperScrapingResult } from './interface';\n\nconst VIEWPORT_WIDTH = 1024;\nconst VIEWPORT_HEIGHT = 768;\nconst OK_STATUS = 200;\n\nconst debug = getDebug('base-scraper-with-browser');\n\nenum LoginBaseResults {\n  Success = 'SUCCESS',\n  UnknownError = 'UNKNOWN_ERROR',\n}\n\nconst {\n  Timeout, Generic, General, ...rest\n} = ScraperErrorTypes;\nexport const LoginResults = {\n  ...rest,\n  ...LoginBaseResults,\n};\n\n// eslint-disable-next-line @typescript-eslint/no-redeclare\nexport type LoginResults =\n  | Exclude<ScraperErrorTypes, ScraperErrorTypes.Timeout | ScraperErrorTypes.Generic | ScraperErrorTypes.General>\n  | LoginBaseResults;\n\nexport type PossibleLoginResults = {\n  [key in LoginResults]?: (string | RegExp | ((options?: { page?: Page }) => Promise<boolean>))[];\n};\n\nexport interface LoginOptions {\n  loginUrl: string;\n  checkReadiness?: () => Promise<void>;\n  fields: { selector: string, value: string }[];\n  submitButtonSelector: string | (() => Promise<void>);\n  preAction?: () => Promise<Frame | void>;\n  postAction?: () => Promise<void>;\n  possibleResults: PossibleLoginResults;\n  userAgent?: string;\n  waitUntil?: PuppeteerLifeCycleEvent;\n}\n\nasync function getKeyByValue(object: PossibleLoginResults, value: string, page: Page): Promise<LoginResults> {\n  const keys = Object.keys(object);\n  for (const key of keys) {\n    // @ts-ignore\n    const conditions = object[key];\n\n    for (const condition of conditions) {\n      let result = false;\n\n      if (condition instanceof RegExp) {\n        result = condition.test(value);\n      } else if (typeof condition === 'function') {\n        result = await condition({ page, value });\n      } else {\n        result = value.toLowerCase() === condition.toLowerCase();\n      }\n\n      if (result) {\n        // @ts-ignore\n        return Promise.resolve(key);\n      }\n    }\n  }\n\n  return Promise.resolve(LoginResults.UnknownError);\n}\n\nfunction createGeneralError(): ScraperScrapingResult {\n  return {\n    success: false,\n    errorType: ScraperErrorTypes.General,\n  };\n}\n\nclass BaseScraperWithBrowser<TCredentials extends ScraperCredentials> extends BaseScraper<TCredentials> {\n  // NOTICE - it is discouraged to use bang (!) in general. It is used here because\n  // all the classes that inherit from this base assume is it mandatory.\n  protected browser!: Browser;\n\n  // NOTICE - it is discouraged to use bang (!) in general. It is used here because\n  // all the classes that inherit from this base assume is it mandatory.\n  protected page!: Page;\n\n  protected getViewPort() {\n    return {\n      width: VIEWPORT_WIDTH,\n      height: VIEWPORT_HEIGHT,\n    };\n  }\n\n  async initialize() {\n    await super.initialize();\n    debug('initialize scraper');\n    this.emitProgress(ScraperProgressTypes.Initializing);\n\n    let env: Record<string, any> | undefined;\n    if (this.options.verbose) {\n      env = { DEBUG: '*', ...process.env };\n    }\n\n    if (typeof this.options.browser !== 'undefined' && this.options.browser !== null) {\n      debug('use custom browser instance provided in options');\n      this.browser = this.options.browser;\n    } else {\n      const executablePath = this.options.executablePath || undefined;\n      const args = this.options.args || [];\n      const { timeout } = this.options;\n\n      const headless = !this.options.showBrowser;\n      debug(`launch a browser with headless mode = ${headless}`);\n      this.browser = await puppeteer.launch({\n        env,\n        headless,\n        executablePath,\n        args,\n        timeout,\n      });\n    }\n\n    if (this.options.prepareBrowser) {\n      debug(\"execute 'prepareBrowser' interceptor provided in options\");\n      await this.options.prepareBrowser(this.browser);\n    }\n\n    if (!this.browser) {\n      debug('failed to initiate a browser, exit');\n      return;\n    }\n\n    const pages = await this.browser.pages();\n    if (pages.length) {\n      debug('browser has already pages open, use the first one');\n      [this.page] = pages;\n    } else {\n      debug('create a new browser page');\n      this.page = await this.browser.newPage();\n    }\n\n    if (this.options.defaultTimeout) {\n      this.page.setDefaultTimeout(this.options.defaultTimeout);\n    }\n\n    if (this.options.preparePage) {\n      debug(\"execute 'preparePage' interceptor provided in options\");\n      await this.options.preparePage(this.page);\n    }\n\n    const viewport = this.getViewPort();\n    debug(`set viewport to width ${viewport.width}, height ${viewport.height}`);\n    await this.page.setViewport({\n      width: viewport.width,\n      height: viewport.height,\n    });\n\n    this.page.on('requestfailed', (request) => {\n      debug('Request failed: %s %s', request.failure()?.errorText, request.url());\n    });\n  }\n\n  async navigateTo(\n    url: string,\n    page?: Page,\n    timeout?: number,\n    waitUntil: PuppeteerLifeCycleEvent | undefined = 'load',\n  ): Promise<void> {\n    const pageToUse = page || this.page;\n\n    if (!pageToUse) {\n      return;\n    }\n\n    const options: GoToOptions = { ...(timeout === null ? null : { timeout }), waitUntil };\n    const response = await pageToUse.goto(url, options);\n\n    // note: response will be null when navigating to same url while changing the hash part. the condition below will always accept null as valid result.\n    if (response !== null && (response === undefined || response.status() !== OK_STATUS)) {\n      throw new Error(`Error while trying to navigate to url ${url}`);\n    }\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  getLoginOptions(_credentials: ScraperCredentials): LoginOptions {\n    throw new Error(`getLoginOptions() is not created in ${this.options.companyId}`);\n  }\n\n  async fillInputs(pageOrFrame: Page | Frame, fields: { selector: string, value: string }[]): Promise<void> {\n    const modified = [...fields];\n    const input = modified.shift();\n\n    if (!input) {\n      return;\n    }\n    await fillInput(pageOrFrame, input.selector, input.value);\n    if (modified.length) {\n      await this.fillInputs(pageOrFrame, modified);\n    }\n  }\n\n  async login(credentials: ScraperCredentials): Promise<ScraperScrapingResult> {\n    if (!credentials || !this.page) {\n      return createGeneralError();\n    }\n\n    debug('execute login process');\n    const loginOptions = this.getLoginOptions(credentials);\n\n    if (loginOptions.userAgent) {\n      debug('set custom user agent provided in options');\n      await this.page.setUserAgent(loginOptions.userAgent);\n    }\n\n    debug('navigate to login url');\n    await this.navigateTo(loginOptions.loginUrl, undefined, undefined, loginOptions.waitUntil);\n    if (loginOptions.checkReadiness) {\n      debug(\"execute 'checkReadiness' interceptor provided in login options\");\n      await loginOptions.checkReadiness();\n    } else if (typeof loginOptions.submitButtonSelector === 'string') {\n      debug('wait until submit button is available');\n      await waitUntilElementFound(this.page, loginOptions.submitButtonSelector);\n    }\n\n    let loginFrameOrPage: Page | Frame | null = this.page;\n    if (loginOptions.preAction) {\n      debug(\"execute 'preAction' interceptor provided in login options\");\n      loginFrameOrPage = (await loginOptions.preAction()) || this.page;\n    }\n\n    debug('fill login components input with relevant values');\n    await this.fillInputs(loginFrameOrPage, loginOptions.fields);\n    debug('click on login submit button');\n    if (typeof loginOptions.submitButtonSelector === 'string') {\n      await clickButton(loginFrameOrPage, loginOptions.submitButtonSelector);\n    } else {\n      await loginOptions.submitButtonSelector();\n    }\n    this.emitProgress(ScraperProgressTypes.LoggingIn);\n\n    if (loginOptions.postAction) {\n      debug(\"execute 'postAction' interceptor provided in login options\");\n      await loginOptions.postAction();\n    } else {\n      debug('wait for page navigation');\n      await waitForNavigation(this.page);\n    }\n\n    debug('check login result');\n    const current = await getCurrentUrl(this.page, true);\n    const loginResult = await getKeyByValue(loginOptions.possibleResults, current, this.page);\n    debug(`handle login results ${loginResult}`);\n    return this.handleLoginResult(loginResult);\n  }\n\n  async terminate(_success: boolean) {\n    debug(`terminating browser with success = ${_success}`);\n    this.emitProgress(ScraperProgressTypes.Terminating);\n\n    if (!_success && !!this.options.storeFailureScreenShotPath) {\n      debug(`create a snapshot before terminated in ${this.options.storeFailureScreenShotPath}`);\n      await this.page.screenshot({\n        path: this.options.storeFailureScreenShotPath,\n        fullPage: true,\n      });\n    }\n\n    if (!this.browser) {\n      return;\n    }\n\n    await this.browser.close();\n  }\n\n  private handleLoginResult(loginResult: LoginResults) {\n    switch (loginResult) {\n      case LoginResults.Success:\n        this.emitProgress(ScraperProgressTypes.LoginSuccess);\n        return { success: true };\n      case LoginResults.InvalidPassword:\n      case LoginResults.UnknownError:\n        this.emitProgress(ScraperProgressTypes.LoginFailed);\n        return {\n          success: false,\n          errorType:\n            loginResult === LoginResults.InvalidPassword ?\n              ScraperErrorTypes.InvalidPassword :\n              ScraperErrorTypes.General,\n          errorMessage: `Login failed with ${loginResult} error`,\n        };\n      case LoginResults.ChangePassword:\n        this.emitProgress(ScraperProgressTypes.ChangePassword);\n        return {\n          success: false,\n          errorType: ScraperErrorTypes.ChangePassword,\n        };\n      default:\n        throw new Error(`unexpected login result \"${loginResult}\"`);\n    }\n  }\n}\n\nexport { BaseScraperWithBrowser };\n"],"mappings":"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","ignoreList":[]} +\ No newline at end of file ++//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_puppeteer","_interopRequireDefault","require","_definitions","_debug","_elementsInteractions","_navigation","_baseScraper","_errors","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","_objectWithoutProperties","_objectWithoutPropertiesLoose","n","indexOf","propertyIsEnumerable","hasOwnProperty","VIEWPORT_WIDTH","VIEWPORT_HEIGHT","OK_STATUS","debug","getDebug","LoginBaseResults","Timeout","Generic","General","ScraperErrorTypes","rest","LoginResults","exports","getKeyByValue","object","page","key","conditions","condition","result","RegExp","test","toLowerCase","Promise","resolve","UnknownError","createGeneralError","success","errorType","BaseScraperWithBrowser","BaseScraper","constructor","args","getViewPort","width","height","initializePage","options","browserContext","newPage","browser","skipCloseBrowser","cleanups","close","timeout","executablePath","showBrowser","headless","puppeteer","launch","env","verbose","DEBUG","process","undefined","prepareBrowser","initialize","emitProgress","ScraperProgressTypes","Initializing","defaultTimeout","setDefaultTimeout","preparePage","viewport","setViewport","on","request","_request$failure","failure","errorText","url","navigateTo","waitUntil","pageToUse","response","goto","status","Error","getLoginOptions","_credentials","companyId","fillInputs","pageOrFrame","fields","modified","input","shift","fillInput","selector","login","credentials","loginOptions","userAgent","setUserAgent","loginUrl","checkReadiness","submitButtonSelector","waitUntilElementFound","loginFrameOrPage","preAction","clickButton","LoggingIn","postAction","waitForNavigation","current","getCurrentUrl","loginResult","possibleResults","handleLoginResult","terminate","_success","Terminating","storeFailureScreenShotPath","screenshot","path","fullPage","all","reverse","map","cleanup","Success","LoginSuccess","InvalidPassword","LoginFailed","errorMessage","ChangePassword"],"sources":["../../src/scrapers/base-scraper-with-browser.ts"],"sourcesContent":["import puppeteer, { type Frame, type GoToOptions, type Page, type PuppeteerLifeCycleEvent } from 'puppeteer';\r\nimport { ScraperProgressTypes } from '../definitions';\r\nimport { getDebug } from '../helpers/debug';\r\nimport { clickButton, fillInput, waitUntilElementFound } from '../helpers/elements-interactions';\r\nimport { getCurrentUrl, waitForNavigation } from '../helpers/navigation';\r\nimport { BaseScraper } from './base-scraper';\r\nimport { ScraperErrorTypes } from './errors';\r\nimport { type ScraperCredentials, type ScraperScrapingResult } from './interface';\r\n\r\nconst VIEWPORT_WIDTH = 1024;\r\nconst VIEWPORT_HEIGHT = 768;\r\nconst OK_STATUS = 200;\r\n\r\nconst debug = getDebug('base-scraper-with-browser');\r\n\r\nenum LoginBaseResults {\r\n  Success = 'SUCCESS',\r\n  UnknownError = 'UNKNOWN_ERROR',\r\n}\r\n\r\nconst {\r\n  Timeout, Generic, General, ...rest\r\n} = ScraperErrorTypes;\r\nexport const LoginResults = {\r\n  ...rest,\r\n  ...LoginBaseResults,\r\n};\r\n\r\n// eslint-disable-next-line @typescript-eslint/no-redeclare\r\nexport type LoginResults =\r\n  | Exclude<ScraperErrorTypes, ScraperErrorTypes.Timeout | ScraperErrorTypes.Generic | ScraperErrorTypes.General>\r\n  | LoginBaseResults;\r\n\r\nexport type PossibleLoginResults = {\r\n  [key in LoginResults]?: (string | RegExp | ((options?: { page?: Page }) => Promise<boolean>))[];\r\n};\r\n\r\nexport interface LoginOptions {\r\n  loginUrl: string;\r\n  checkReadiness?: () => Promise<void>;\r\n  fields: { selector: string, value: string }[];\r\n  submitButtonSelector: string | (() => Promise<void>);\r\n  preAction?: () => Promise<Frame | void>;\r\n  postAction?: () => Promise<void>;\r\n  possibleResults: PossibleLoginResults;\r\n  userAgent?: string;\r\n  waitUntil?: PuppeteerLifeCycleEvent;\r\n}\r\n\r\nasync function getKeyByValue(object: PossibleLoginResults, value: string, page: Page): Promise<LoginResults> {\r\n  const keys = Object.keys(object);\r\n  for (const key of keys) {\r\n    // @ts-ignore\r\n    const conditions = object[key];\r\n\r\n    for (const condition of conditions) {\r\n      let result = false;\r\n\r\n      if (condition instanceof RegExp) {\r\n        result = condition.test(value);\r\n      } else if (typeof condition === 'function') {\r\n        result = await condition({ page, value });\r\n      } else {\r\n        result = value.toLowerCase() === condition.toLowerCase();\r\n      }\r\n\r\n      if (result) {\r\n        // @ts-ignore\r\n        return Promise.resolve(key);\r\n      }\r\n    }\r\n  }\r\n\r\n  return Promise.resolve(LoginResults.UnknownError);\r\n}\r\n\r\nfunction createGeneralError(): ScraperScrapingResult {\r\n  return {\r\n    success: false,\r\n    errorType: ScraperErrorTypes.General,\r\n  };\r\n}\r\n\r\nclass BaseScraperWithBrowser<TCredentials extends ScraperCredentials> extends BaseScraper<TCredentials> {\r\n  private cleanups: Array<() => Promise<void>> = [];\r\n\r\n  // NOTICE - it is discouraged to use bang (!) in general. It is used here because\r\n  // all the classes that inherit from this base assume is it mandatory.\r\n  protected page!: Page;\r\n\r\n  protected getViewPort() {\r\n    return {\r\n      width: VIEWPORT_WIDTH,\r\n      height: VIEWPORT_HEIGHT,\r\n    };\r\n  }\r\n\r\n  private async initializePage() {\r\n    debug('initialize browser page');\r\n    if ('browserContext' in this.options) {\r\n      debug('Using the browser context provided in options');\r\n      return this.options.browserContext.newPage();\r\n    }\r\n\r\n    if ('browser' in this.options) {\r\n      debug('Using the browser instance provided in options');\r\n      const { browser } = this.options;\r\n\r\n      /**\r\n       * For backward compatibility, we will close the browser even if we didn't create it\r\n       */\r\n      if (!this.options.skipCloseBrowser) {\r\n        this.cleanups.push(async () => {\r\n          debug('closing the browser');\r\n          await browser.close();\r\n        });\r\n      }\r\n\r\n      return browser.newPage();\r\n    } \r\n\r\n    const { timeout, args, executablePath, showBrowser } = this.options;\r\n\r\n    const headless = !showBrowser;\r\n    debug(`launch a browser with headless mode = ${headless}`);\r\n\r\n    const browser = await puppeteer.launch({\r\n      env: this.options.verbose ? { DEBUG: '*', ...process.env } : undefined,\r\n      headless,\r\n      executablePath,\r\n      args,\r\n      timeout,\r\n    });\r\n\r\n    this.cleanups.push(async () => {\r\n      debug('closing the browser');\r\n      await browser.close();\r\n    });\r\n\r\n    if (this.options.prepareBrowser) {\r\n      debug(\"execute 'prepareBrowser' interceptor provided in options\");\r\n      await this.options.prepareBrowser(browser);\r\n    }\r\n\r\n    debug('create a new browser page');\r\n    return browser.newPage();\r\n  }\r\n\r\n  async initialize() {\r\n    await super.initialize();\r\n    debug('initialize scraper');\r\n    this.emitProgress(ScraperProgressTypes.Initializing);\r\n\r\n    const page = await this.initializePage();\r\n    if (!page) {\r\n      debug('failed to initiate a browser page, exit');\r\n      return;\r\n    }\r\n\r\n    this.page = page;\r\n\r\n    this.cleanups.push( () => page.close());\r\n\r\n    if (this.options.defaultTimeout) {\r\n      this.page.setDefaultTimeout(this.options.defaultTimeout);\r\n    }\r\n\r\n    if (this.options.preparePage) {\r\n      debug(\"execute 'preparePage' interceptor provided in options\");\r\n      await this.options.preparePage(this.page);\r\n    }\r\n\r\n    const viewport = this.getViewPort();\r\n    debug(`set viewport to width ${viewport.width}, height ${viewport.height}`);\r\n    await this.page.setViewport({\r\n      width: viewport.width,\r\n      height: viewport.height,\r\n    });\r\n\r\n    this.page.on('requestfailed', (request) => {\r\n      debug('Request failed: %s %s', request.failure()?.errorText, request.url());\r\n    });\r\n  }\r\n\r\n  async navigateTo(\r\n    url: string,\r\n    page?: Page,\r\n    timeout?: number,\r\n    waitUntil: PuppeteerLifeCycleEvent | undefined = 'load',\r\n  ): Promise<void> {\r\n    const pageToUse = page || this.page;\r\n\r\n    if (!pageToUse) {\r\n      return;\r\n    }\r\n\r\n    const options: GoToOptions = { ...(timeout === null ? null : { timeout }), waitUntil };\r\n    const response = await pageToUse.goto(url, options);\r\n\r\n    // note: response will be null when navigating to same url while changing the hash part. the condition below will always accept null as valid result.\r\n    if (response !== null && (response === undefined || response.status() !== OK_STATUS)) {\r\n      throw new Error(`Error while trying to navigate to url ${url}`);\r\n    }\r\n  }\r\n\r\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\r\n  getLoginOptions(_credentials: ScraperCredentials): LoginOptions {\r\n    throw new Error(`getLoginOptions() is not created in ${this.options.companyId}`);\r\n  }\r\n\r\n  async fillInputs(pageOrFrame: Page | Frame, fields: { selector: string, value: string }[]): Promise<void> {\r\n    const modified = [...fields];\r\n    const input = modified.shift();\r\n\r\n    if (!input) {\r\n      return;\r\n    }\r\n    await fillInput(pageOrFrame, input.selector, input.value);\r\n    if (modified.length) {\r\n      await this.fillInputs(pageOrFrame, modified);\r\n    }\r\n  }\r\n\r\n  async login(credentials: ScraperCredentials): Promise<ScraperScrapingResult> {\r\n    if (!credentials || !this.page) {\r\n      return createGeneralError();\r\n    }\r\n\r\n    debug('execute login process');\r\n    const loginOptions = this.getLoginOptions(credentials);\r\n\r\n    if (loginOptions.userAgent) {\r\n      debug('set custom user agent provided in options');\r\n      await this.page.setUserAgent(loginOptions.userAgent);\r\n    }\r\n\r\n    debug('navigate to login url');\r\n    await this.navigateTo(loginOptions.loginUrl, undefined, undefined, loginOptions.waitUntil);\r\n    if (loginOptions.checkReadiness) {\r\n      debug(\"execute 'checkReadiness' interceptor provided in login options\");\r\n      await loginOptions.checkReadiness();\r\n    } else if (typeof loginOptions.submitButtonSelector === 'string') {\r\n      debug('wait until submit button is available');\r\n      await waitUntilElementFound(this.page, loginOptions.submitButtonSelector);\r\n    }\r\n\r\n    let loginFrameOrPage: Page | Frame | null = this.page;\r\n    if (loginOptions.preAction) {\r\n      debug(\"execute 'preAction' interceptor provided in login options\");\r\n      loginFrameOrPage = (await loginOptions.preAction()) || this.page;\r\n    }\r\n\r\n    debug('fill login components input with relevant values');\r\n    await this.fillInputs(loginFrameOrPage, loginOptions.fields);\r\n    debug('click on login submit button');\r\n    if (typeof loginOptions.submitButtonSelector === 'string') {\r\n      await clickButton(loginFrameOrPage, loginOptions.submitButtonSelector);\r\n    } else {\r\n      await loginOptions.submitButtonSelector();\r\n    }\r\n    this.emitProgress(ScraperProgressTypes.LoggingIn);\r\n\r\n    if (loginOptions.postAction) {\r\n      debug(\"execute 'postAction' interceptor provided in login options\");\r\n      await loginOptions.postAction();\r\n    } else {\r\n      debug('wait for page navigation');\r\n      await waitForNavigation(this.page);\r\n    }\r\n\r\n    debug('check login result');\r\n    const current = await getCurrentUrl(this.page, true);\r\n    const loginResult = await getKeyByValue(loginOptions.possibleResults, current, this.page);\r\n    debug(`handle login results ${loginResult}`);\r\n    return this.handleLoginResult(loginResult);\r\n  }\r\n\r\n  async terminate(_success: boolean) {\r\n    debug(`terminating browser with success = ${_success}`);\r\n    this.emitProgress(ScraperProgressTypes.Terminating);\r\n\r\n    if (!_success && !!this.options.storeFailureScreenShotPath) {\r\n      debug(`create a snapshot before terminated in ${this.options.storeFailureScreenShotPath}`);\r\n      await this.page.screenshot({\r\n        path: this.options.storeFailureScreenShotPath,\r\n        fullPage: true,\r\n      });\r\n    }\r\n\r\n    await Promise.all(this.cleanups.reverse().map((cleanup) => cleanup()));\r\n    this.cleanups = [];\r\n  }\r\n\r\n  private handleLoginResult(loginResult: LoginResults) {\r\n    switch (loginResult) {\r\n      case LoginResults.Success:\r\n        this.emitProgress(ScraperProgressTypes.LoginSuccess);\r\n        return { success: true };\r\n      case LoginResults.InvalidPassword:\r\n      case LoginResults.UnknownError:\r\n        this.emitProgress(ScraperProgressTypes.LoginFailed);\r\n        return {\r\n          success: false,\r\n          errorType:\r\n            loginResult === LoginResults.InvalidPassword ?\r\n              ScraperErrorTypes.InvalidPassword :\r\n              ScraperErrorTypes.General,\r\n          errorMessage: `Login failed with ${loginResult} error`,\r\n        };\r\n      case LoginResults.ChangePassword:\r\n        this.emitProgress(ScraperProgressTypes.ChangePassword);\r\n        return {\r\n          success: false,\r\n          errorType: ScraperErrorTypes.ChangePassword,\r\n        };\r\n      default:\r\n        throw new Error(`unexpected login result \"${loginResult}\"`);\r\n    }\r\n  }\r\n}\r\n\r\nexport { BaseScraperWithBrowser };\r\n"],"mappings":"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","ignoreList":[]} +\ No newline at end of file +diff --git a/node_modules/israeli-bank-scrapers/lib/scrapers/interface.d.ts b/node_modules/israeli-bank-scrapers/lib/scrapers/interface.d.ts +index f871354..9278821 100644 +--- a/node_modules/israeli-bank-scrapers/lib/scrapers/interface.d.ts ++++ b/node_modules/israeli-bank-scrapers/lib/scrapers/interface.d.ts +@@ -1,4 +1,4 @@ +-import { type Browser, type Page } from 'puppeteer'; ++import { type BrowserContext, type Browser, type Page } from 'puppeteer'; + import { type CompanyTypes, type ScraperProgressTypes } from '../definitions'; + import { type TransactionsAccount } from '../transactions'; + import { type ErrorResult, type ScraperErrorTypes } from './errors'; +@@ -38,7 +38,7 @@ export interface FutureDebit { + chargeDate?: string; + bankAccountNumber?: string; + } +-export interface ScraperOptions { ++export type ScraperOptions = ScraperBrowserOptions & { + /** + * The company you want to scrape + */ +@@ -51,28 +51,65 @@ export interface ScraperOptions { + * the date to fetch transactions from (can't be before the minimum allowed time difference for the scraper) + */ + startDate: Date; +- /** +- * shows the browser while scraping, good for debugging (default false) +- */ +- showBrowser?: boolean; + /** + * scrape transactions to be processed X months in the future + */ + futureMonthsToScrape?: number; + /** +- * option from init puppeteer browser instance outside the libary scope. you can get +- * browser diretly from puppeteer via `puppeteer.launch()` ++ * if set to true, all installment transactions will be combine into the first one ++ */ ++ combineInstallments?: boolean; ++ /** ++ * if set, store a screenshot if failed to scrape. Used for debug purposes ++ */ ++ storeFailureScreenShotPath?: string; ++ /** ++ * if set, will set the timeout in milliseconds of puppeteer's `page.setDefaultTimeout`. ++ */ ++ defaultTimeout?: number; ++ /** ++ * Options for manipulation of output data ++ */ ++ outputData?: OutputDataOptions; ++ /** ++ * Perform additional operation for each transaction to get more information (Like category) about it. ++ * Please note: It will take more time to finish the process. ++ */ ++ additionalTransactionInformation?: boolean; ++ /** ++ * adjust the page instance before it is being used. ++ * ++ * @param page ++ */ ++ preparePage?: (page: Page) => Promise; ++}; ++type ScraperBrowserOptions = { ++ /** ++ * An externally created browser instance. ++ * you can get a browser directly from puppeteer via `puppeteer.launch()` ++ * ++ * Note: The browser will be closed by the library after the scraper finishes unless `skipCloseBrowser` is set to true ++ */ ++ browser: Browser; ++ /** ++ * If true, the browser will not be closed by the library after the scraper finishes ++ */ ++ skipCloseBrowser?: boolean; ++} | { ++ /** ++ * An externally managed browser context. This is useful when you want to manage the browser + */ +- browser?: any; ++ browserContext: BrowserContext; ++} | { ++ /** ++ * shows the browser while scraping, good for debugging (default false) ++ */ ++ showBrowser?: boolean; + /** + * provide a patch to local chromium to be used by puppeteer. Relevant when using + * `israeli-bank-scrapers-core` library + */ + executablePath?: string; +- /** +- * if set to true, all installment transactions will be combine into the first one +- */ +- combineInstallments?: boolean; + /** + * additional arguments to pass to the browser instance. The list of flags can be found in + * +@@ -91,30 +128,7 @@ export interface ScraperOptions { + * @param browser + */ + prepareBrowser?: (browser: Browser) => Promise; +- /** +- * adjust the page instance before it is being used. +- * +- * @param page +- */ +- preparePage?: (page: Page) => Promise; +- /** +- * if set, store a screenshot if failed to scrape. Used for debug purposes +- */ +- storeFailureScreenShotPath?: string; +- /** +- * if set, will set the timeout in milliseconds of puppeteer's `page.setDefaultTimeout`. +- */ +- defaultTimeout?: number; +- /** +- * Options for manipulation of output data +- */ +- outputData?: OutputDataOptions; +- /** +- * Perform additional operation for each transaction to get more information (Like category) about it. +- * Please note: It will take more time to finish the process. +- */ +- additionalTransactionInformation?: boolean; +-} ++}; + export interface OutputDataOptions { + /** + * if true, the result wouldn't be filtered out by date, and you will return unfiltered scrapped data. +@@ -149,3 +163,4 @@ export interface ScraperLoginResult { + errorMessage?: string; + persistentOtpToken?: string; + } ++export {}; diff --git a/src/browser.ts b/src/browser.ts new file mode 100644 index 00000000..75218bf2 --- /dev/null +++ b/src/browser.ts @@ -0,0 +1,21 @@ +import puppeteer, { + type Browser, + type PuppeteerLaunchOptions, +} from "puppeteer"; +import { createLogger } from "./utils/logger.js"; + +export const browserArgs = ["--disable-dev-shm-usage", "--no-sandbox"]; +export const browserExecutablePath = + process.env.PUPPETEER_EXECUTABLE_PATH || undefined; + +const logger = createLogger("browser"); + +export async function createBrowser(): Promise { + const options = { + args: browserArgs, + executablePath: browserExecutablePath, + } satisfies PuppeteerLaunchOptions; + + logger("Creating browser", options); + return puppeteer.launch(options); +} diff --git a/src/config.ts b/src/config.ts index 437f9d8e..bf91488f 100644 --- a/src/config.ts +++ b/src/config.ts @@ -25,6 +25,7 @@ const { BUXFER_ACCOUNTS = "", TRANSACTION_HASH_TYPE = "", WEB_POST_URL = "", + MAX_PARALLEL_SCRAPERS = "", } = process.env; /** @@ -34,6 +35,7 @@ export const daysBackToScrape = DAYS_BACK || 10; export const worksheetName = WORKSHEET_NAME || "_moneyman"; export const futureMonthsToScrape = parseInt(FUTURE_MONTHS, 10); export const systemTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone; +export const parallelScrapers = MAX_PARALLEL_SCRAPERS || 1; const accountsToScrape = ACCOUNTS_TO_SCRAPE.split(",") .filter(Boolean) diff --git a/src/data/index.ts b/src/data/index.ts index 131770a5..5fc07682 100644 --- a/src/data/index.ts +++ b/src/data/index.ts @@ -2,8 +2,15 @@ import { performance } from "perf_hooks"; import { getAccountTransactions } from "./scrape.js"; import { AccountConfig, AccountScrapeResult } from "../types.js"; import { createLogger } from "../utils/logger.js"; +import { createBrowser } from "../browser.js"; +import { send, sendError } from "../notifier.js"; +import { getFailureScreenShotPath } from "../utils/failureScreenshot.js"; +import { ScraperOptions } from "israeli-bank-scrapers"; +import { parallelScrapers } from "../config.js"; +import { parallelLimit } from "async"; +import os from "node:os"; -const logger = createLogger("data"); +const logger = createLogger("scraper"); export async function scrapeAccounts( accounts: Array, @@ -18,67 +25,74 @@ export async function scrapeAccounts( logger(`scraping %d accounts`, accounts.length); logger(`start date %s`, startDate.toISOString()); + + let futureMonths: number | undefined = undefined; if (!Number.isNaN(futureMonthsToScrape)) { logger(`months to scrap: %d`, futureMonthsToScrape); + futureMonths = futureMonthsToScrape; } const status: Array = []; - const results: Array = []; - - for (let i = 0; i < accounts.length; i++) { - const account = accounts[i]; - - logger(`scraping account #${i} (type=${account.companyId})`); - const result = await scrapeAccount( - account, - startDate, - futureMonthsToScrape, - async (message) => { - status[i] = message; - await scrapeStatusChanged?.(status); - }, - ); - results.push({ - companyId: account.companyId, - result, - }); - logger(`scraping account #${i} ended`); + logger("Creating a browser"); + const browser = await createBrowser(); + logger(`Browser created, starting to scrape ${accounts.length} accounts`); + + if (Number(parallelScrapers) > 1) { + logger(`Running with ${parallelScrapers} parallel scrapers`); + send( + `System info: ${JSON.stringify( + { + parallelScrapers: Number(parallelScrapers), + availableParallelism: os.availableParallelism(), + totalMemoryGB: (os.totalmem() / 1000000000).toFixed(2), + freeMemoryGB: (os.freemem() / 1000000000).toFixed(2), + cpus: os.cpus().length, + }, + null, + 2, + )}`, + ); } - logger(`scraping ended`); - const stats = getStats(results); - logger( - `Got ${stats.transactions} transactions from ${stats.accounts} accounts`, + const results = await parallelLimit( + accounts.map( + (account, i) => async () => + scrapeAccount( + logger.extend(`#${i} (${account.companyId})`), + account, + { + browserContext: await browser.createBrowserContext(), + startDate, + companyId: account.companyId, + futureMonthsToScrape: futureMonths, + storeFailureScreenShotPath: getFailureScreenShotPath( + account.companyId, + ), + }, + async (message, append = false) => { + status[i] = append ? `${status[i]} ${message}` : message; + return scrapeStatusChanged?.(status); + }, + ), + ), + Number(parallelScrapers), ); const duration = (performance.now() - start) / 1000; - logger(`total duration: ${duration}s`); - + logger(`scraping ended, total duration: ${duration.toFixed(1)}s`); await scrapeStatusChanged?.(status, duration); - return results; -} - -export async function scrapeAccount( - account: AccountConfig, - startDate: Date, - futureMonthsToScrape: number, - setStatusMessage: (message: string) => Promise, -) { - let message = ""; - const start = performance.now(); - const result = await getAccountTransactions( - account, - startDate, - futureMonthsToScrape, - (cid, step) => setStatusMessage((message = `[${cid}] ${step}`)), - ); + try { + logger(`closing browser`); + await browser?.close(); + } catch (e) { + sendError(e, "browser.close"); + logger(`failed to close browser`, e); + } - const duration = (performance.now() - start) / 1000; - logger(`scraping took ${duration.toFixed(1)}s`); - await setStatusMessage(`${message}, took ${duration.toFixed(1)}s`); - return result; + logger(getStats(results)); + return results; } function getStats(results: Array) { @@ -99,3 +113,28 @@ function getStats(results: Array) { transactions, }; } + +async function scrapeAccount( + logger: debug.IDebugger, + account: AccountConfig, + scraperOptions: ScraperOptions, + setStatusMessage: (message: string, append?: boolean) => Promise, +) { + logger(`scraping`); + + const scraperStart = performance.now(); + const result = await getAccountTransactions( + account, + scraperOptions, + (cid, step) => setStatusMessage(`[${cid}] ${step}`), + ); + + const duration = (performance.now() - scraperStart) / 1000; + logger(`scraping ended, took ${duration.toFixed(1)}s`); + await setStatusMessage(`, took ${duration.toFixed(1)}s`, true); + + return { + companyId: account.companyId, + result, + }; +} diff --git a/src/data/scrape.ts b/src/data/scrape.ts index e71cdffe..affda685 100644 --- a/src/data/scrape.ts +++ b/src/data/scrape.ts @@ -1,29 +1,22 @@ -import { createScraper, ScraperScrapingResult } from "israeli-bank-scrapers"; +import { + createScraper, + ScraperOptions, + ScraperScrapingResult, +} from "israeli-bank-scrapers"; import { AccountConfig } from "../types.js"; import { ScraperErrorTypes } from "israeli-bank-scrapers/lib/scrapers/errors.js"; import { createLogger } from "../utils/logger.js"; -import { getFailureScreenShotPath } from "../utils/failureScreenshot.js"; const logger = createLogger("scrape"); export async function getAccountTransactions( account: AccountConfig, - startDate: Date, - futureMonthsToScrape: number, + options: ScraperOptions, onProgress: (companyId: string, status: string) => void, ): Promise { logger(`started`); try { - const scraper = createScraper({ - executablePath: process.env.PUPPETEER_EXECUTABLE_PATH || undefined, - startDate, - companyId: account.companyId, - args: ["--disable-dev-shm-usage", "--no-sandbox"], - futureMonthsToScrape: Number.isNaN(futureMonthsToScrape) - ? undefined - : futureMonthsToScrape, - storeFailureScreenShotPath: getFailureScreenShotPath(account.companyId), - }); + const scraper = createScraper(options); scraper.onProgress((companyId, { type }) => { logger(`[${companyId}] ${type}`); diff --git a/src/utils/failureScreenshot.ts b/src/utils/failureScreenshot.ts index a571f452..004eb505 100644 --- a/src/utils/failureScreenshot.ts +++ b/src/utils/failureScreenshot.ts @@ -15,7 +15,7 @@ export function getFailureScreenShotPath(companyId: string) { } const filePath = path.join(companyDir, `${companyId}-${Date.now()}.png`); - logger("getFailureScreenShotPath", { filePath }); + logger("getFailureScreenShotPath %o", filePath); return filePath; }