From 738873a66573adb467cd1fd83581311d2e4a51a8 Mon Sep 17 00:00:00 2001 From: Daniil Poletaev <44584010+danpoletaev@users.noreply.github.com> Date: Mon, 31 Mar 2025 14:20:34 +0200 Subject: [PATCH 1/4] fix: CI --- .../puppeteer-scraper/src/internals/crawler_setup.ts | 2 +- .../actor-scraper/web-scraper/src/internals/crawler_setup.ts | 2 +- packages/apify/src/proxy_configuration.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/actor-scraper/puppeteer-scraper/src/internals/crawler_setup.ts b/packages/actor-scraper/puppeteer-scraper/src/internals/crawler_setup.ts index 757eb7fd90..aed8c04899 100644 --- a/packages/actor-scraper/puppeteer-scraper/src/internals/crawler_setup.ts +++ b/packages/actor-scraper/puppeteer-scraper/src/internals/crawler_setup.ts @@ -185,7 +185,7 @@ export class CrawlerSetup implements CrawlerSetupOptions { launchContext: { useChrome: this.input.useChrome, launchOptions: { - ignoreHTTPSErrors: this.input.ignoreSslErrors, + acceptInsecureCerts: this.input.ignoreSslErrors, defaultViewport: DEFAULT_VIEWPORT, devtools: this.devtools, args, diff --git a/packages/actor-scraper/web-scraper/src/internals/crawler_setup.ts b/packages/actor-scraper/web-scraper/src/internals/crawler_setup.ts index b1e44362c4..99813e9540 100644 --- a/packages/actor-scraper/web-scraper/src/internals/crawler_setup.ts +++ b/packages/actor-scraper/web-scraper/src/internals/crawler_setup.ts @@ -228,7 +228,7 @@ export class CrawlerSetup implements CrawlerSetupOptions { launchContext: { useChrome: this.input.useChrome, launchOptions: { - ignoreHTTPSErrors: this.input.ignoreSslErrors, + acceptInsecureCerts: this.input.ignoreSslErrors, defaultViewport: DEFAULT_VIEWPORT, args, headless: this.input.headless, diff --git a/packages/apify/src/proxy_configuration.ts b/packages/apify/src/proxy_configuration.ts index 3292a53421..ebb063d37e 100644 --- a/packages/apify/src/proxy_configuration.ts +++ b/packages/apify/src/proxy_configuration.ts @@ -305,7 +305,7 @@ export class ProxyConfiguration extends CoreProxyConfiguration { return this._handleTieredUrl( sessionId ?? cryptoRandomObjectId(6), options, - ).proxyUrl; + ).proxyUrl ?? undefined; } return this.composeDefaultUrl(sessionId); From bace882c83dccdd1ed3a274c01c934998ee36a80 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Mon, 31 Mar 2025 21:46:57 +0200 Subject: [PATCH 2/4] Fix PlatformEventManager test --- test/apify/events.test.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/test/apify/events.test.ts b/test/apify/events.test.ts index 63973f3427..ba67e50c73 100644 --- a/test/apify/events.test.ts +++ b/test/apify/events.test.ts @@ -8,11 +8,13 @@ import { WebSocketServer } from 'ws'; describe('events', () => { let wss: WebSocketServer = null; const config = Configuration.getGlobalConfig(); - const events = new PlatformEventManager(config); - config.useEventManager(events); + let events: PlatformEventManager = null; beforeEach(() => { wss = new WebSocketServer({ port: 9099 }); + events = new PlatformEventManager(config); + config.useEventManager(events); + vitest.useFakeTimers(); process.env[ACTOR_ENV_VARS.EVENTS_WEBSOCKET_URL] = 'ws://localhost:9099/someRunId'; process.env[APIFY_ENV_VARS.TOKEN] = 'dummy'; @@ -112,11 +114,13 @@ describe('events', () => { test('should send persist state events in regular interval', async () => { const eventsReceived = []; + const interval = config.get('persistStateIntervalMillis') + events.on(EventType.PERSIST_STATE, (data) => eventsReceived.push(data)); await events.init(); - vitest.advanceTimersByTime(60001); - vitest.advanceTimersByTime(60001); - vitest.advanceTimersByTime(60001); + await vitest.advanceTimersByTimeAsync(1.1 * interval); + await vitest.advanceTimersByTimeAsync(1.1 * interval); + await vitest.advanceTimersByTimeAsync(1.1 * interval); await events.close(); expect(eventsReceived.length).toBe(5); }); From c3b27a9e3ffb78609e051056d875f3f02123cee2 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Mon, 31 Mar 2025 21:56:06 +0200 Subject: [PATCH 3/4] Lint --- test/apify/events.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/apify/events.test.ts b/test/apify/events.test.ts index ba67e50c73..9f06e88ad4 100644 --- a/test/apify/events.test.ts +++ b/test/apify/events.test.ts @@ -114,7 +114,7 @@ describe('events', () => { test('should send persist state events in regular interval', async () => { const eventsReceived = []; - const interval = config.get('persistStateIntervalMillis') + const interval = config.get('persistStateIntervalMillis'); events.on(EventType.PERSIST_STATE, (data) => eventsReceived.push(data)); await events.init(); From 8fb10caa79466df7678f0e8e44812985b60acd2a Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Tue, 1 Apr 2025 11:34:41 +0200 Subject: [PATCH 4/4] Update test/apify/events.test.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Martin Adámek --- test/apify/events.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/apify/events.test.ts b/test/apify/events.test.ts index 9f06e88ad4..1fa474053c 100644 --- a/test/apify/events.test.ts +++ b/test/apify/events.test.ts @@ -8,7 +8,7 @@ import { WebSocketServer } from 'ws'; describe('events', () => { let wss: WebSocketServer = null; const config = Configuration.getGlobalConfig(); - let events: PlatformEventManager = null; + let events: PlatformEventManager | null = null; beforeEach(() => { wss = new WebSocketServer({ port: 9099 });