From 13fc52132d781d95f400563ea5014a682e0315f2 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Sat, 25 Nov 2023 11:54:48 +0300 Subject: [PATCH] Upgrade epg-grabber package --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- scripts/core/grabber.ts | 6 +++--- yarn.lock | 16 ++++++++-------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b60ef42..30dda1e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,8 +30,8 @@ "cron": "^2.4.3", "csv-parser": "^3.0.0", "cwait": "^1.1.2", - "dayjs": "^1.11.7", - "epg-grabber": "^0.35.0", + "dayjs": "^1.11.10", + "epg-grabber": "^0.36.0", "epg-parser": "^0.2.0", "eslint": "^8.17.0", "eslint-config-prettier": "^9.0.0", @@ -3657,9 +3657,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.7", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz", - "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==" + "version": "1.11.10", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", + "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" }, "node_modules/debug": { "version": "4.3.4", @@ -3936,9 +3936,9 @@ } }, "node_modules/epg-grabber": { - "version": "0.35.0", - "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.35.0.tgz", - "integrity": "sha512-DhvciNp3xCTG9VzYR9GU5uDjujW/rG3CgBCy1eP2BEI6I0V5okGWPmEGf73V/IK+hZnbpskjmbeziaK4RXOtBg==", + "version": "0.36.0", + "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.36.0.tgz", + "integrity": "sha512-N8bqGP7ofr5ckhFvHtbZHZaIlJbJwIOqYG213/pWG/qvOjQQ7sVYgrQtMt0r/7LGJtvaBDyqNVWbiVaUtEkZSw==", "dependencies": { "axios": "^1.6.1", "axios-cache-interceptor": "^0.10.3", @@ -11128,9 +11128,9 @@ } }, "dayjs": { - "version": "1.11.7", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz", - "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==" + "version": "1.11.10", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", + "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" }, "debug": { "version": "4.3.4", @@ -11321,9 +11321,9 @@ "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==" }, "epg-grabber": { - "version": "0.35.0", - "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.35.0.tgz", - "integrity": "sha512-DhvciNp3xCTG9VzYR9GU5uDjujW/rG3CgBCy1eP2BEI6I0V5okGWPmEGf73V/IK+hZnbpskjmbeziaK4RXOtBg==", + "version": "0.36.0", + "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.36.0.tgz", + "integrity": "sha512-N8bqGP7ofr5ckhFvHtbZHZaIlJbJwIOqYG213/pWG/qvOjQQ7sVYgrQtMt0r/7LGJtvaBDyqNVWbiVaUtEkZSw==", "requires": { "axios": "^1.6.1", "axios-cache-interceptor": "^0.10.3", diff --git a/package.json b/package.json index ce719e4a..d6829c64 100644 --- a/package.json +++ b/package.json @@ -49,8 +49,8 @@ "cron": "^2.4.3", "csv-parser": "^3.0.0", "cwait": "^1.1.2", - "dayjs": "^1.11.7", - "epg-grabber": "^0.35.0", + "dayjs": "^1.11.10", + "epg-grabber": "^0.36.0", "epg-parser": "^0.2.0", "eslint": "^8.17.0", "eslint-config-prettier": "^9.0.0", diff --git a/scripts/core/grabber.ts b/scripts/core/grabber.ts index 5729d11b..4bed77a3 100644 --- a/scripts/core/grabber.ts +++ b/scripts/core/grabber.ts @@ -19,6 +19,7 @@ export class Grabber { this.logger = logger this.queue = queue this.options = options + this.grabber = process.env.NODE_ENV === 'test' ? new EPGGrabberMock() : new EPGGrabber() } async grab(): Promise<{ channels: Collection; programs: Collection }> { @@ -48,11 +49,10 @@ export class Grabber { config.delay = delay } - const grabber = - process.env.NODE_ENV === 'test' ? new EPGGrabberMock(config) : new EPGGrabber(config) - const _programs = await grabber.grab( + const _programs = await this.grabber.grab( channel, date, + config, (data: GrabCallbackData, error: Error | null) => { const { programs, date } = data diff --git a/yarn.lock b/yarn.lock index 1f1cebeb..4012868d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1951,10 +1951,10 @@ cwait@^1.1.2: dependencies: cdata "^0.1.1" -dayjs@^1.10.4, dayjs@^1.11.6, dayjs@^1.11.7: - version "1.11.7" - resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz" - integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== +dayjs@^1.10.4, dayjs@^1.11.10, dayjs@^1.11.6: + version "1.11.10" + resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz" + integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ== debug@^3.1.0: version "3.2.7" @@ -2137,10 +2137,10 @@ entities@^4.2.0, entities@^4.3.0, entities@^4.4.0: resolved "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz" integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== -epg-grabber@^0.35.0: - version "0.35.0" - resolved "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.35.0.tgz" - integrity sha512-DhvciNp3xCTG9VzYR9GU5uDjujW/rG3CgBCy1eP2BEI6I0V5okGWPmEGf73V/IK+hZnbpskjmbeziaK4RXOtBg== +epg-grabber@^0.36.0: + version "0.36.0" + resolved "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.36.0.tgz" + integrity sha512-N8bqGP7ofr5ckhFvHtbZHZaIlJbJwIOqYG213/pWG/qvOjQQ7sVYgrQtMt0r/7LGJtvaBDyqNVWbiVaUtEkZSw== dependencies: axios "^1.6.1" axios-cache-interceptor "^0.10.3"