Crawlee—A web scraping and browser automation library for Node.js to build reliable crawlers. In JavaScript and TypeScript. Extract data for AI, LLMs, RAG, or GPTs. Download HTML, PDF, JPG, PNG, and other files from websites. Works with Puppeteer, Playwright, Cheerio, JSDOM, and raw HTTP. Both headful and headless mode. With proxy rotation.
TypeScript apifyautomationcrawlercrawlingheadlessheadless-chromejavascriptnodejsnpmplaywrightpuppeteerscraperscrapingtypescriptweb-crawlerweb-crawlingweb-scraping
fix(core): preserve subclass overrides when binding methods to a scoped service locator (#3951)
Martin Adámek9667ab401731
diff --git a/packages/core/src/service_locator.ts b/packages/core/src/service_locator.tsindex 049a6fd90..bd5937e7d 100644--- a/packages/core/src/service_locator.ts+++ b/packages/core/src/service_locator.ts@@ -311,11 +311,17 @@ export function bindMethodsToServiceLocator(target: {},): { run: <T>(fn: () => T) => T; enterScope: () => void; exitScope: () => void } {let proto = Object.getPrototypeOf(target);+ const seenKeys = new Set<string | symbol>();while (proto !== null && proto !== Object.prototype) {const propertyKeys = [...Object.getOwnPropertyNames(proto), ...Object.getOwnPropertySymbols(proto)];for (const propertyKey of propertyKeys) {+ // The chain is walked derived-first, so the first occurrence of a key is the one dynamic+ // dispatch would pick — a subclass override must not be clobbered by its base version.+ if (seenKeys.has(propertyKey)) continue;+ seenKeys.add(propertyKey);+const descriptor = Object.getOwnPropertyDescriptor(proto, propertyKey);// We use property descriptors rather than accessing target[propertyKey] directly,diff --git a/packages/core/test/core/service_locator.test.ts b/packages/core/test/core/service_locator.test.tsindex 2fa60f3a6..e16590463 100644--- a/packages/core/test/core/service_locator.test.ts+++ b/packages/core/test/core/service_locator.test.ts@@ -1,6 +1,7 @@import type { CrawleeLogger } from '@crawlee/core';import {ApifyLogAdapter,+ bindMethodsToServiceLocator,Configuration,LocalEventManager,MemoryStorageBackend,@@ -378,6 +379,45 @@ describe('ServiceLocator', () => {});});+ describe('bindMethodsToServiceLocator', () => {+ test('wrapped methods resolve the scoped service locator', () => {+ const scopedLogger = makeMockLogger();+ const scopedLocator = new ServiceLocator(undefined, undefined, undefined, scopedLogger);++ class Service {+ getLogger() {+ return serviceLocator.getLogger();+ }+ }++ const service = new Service();+ bindMethodsToServiceLocator(scopedLocator, service);++ expect(service.getLogger()).toBe(scopedLogger);+ });++ test('subclass method overrides are not clobbered by their base class versions', () => {+ const scopedLocator = new ServiceLocator();++ class Base {+ whoAmI() {+ return 'base';+ }+ }++ class Derived extends Base {+ override whoAmI() {+ return `derived (super says ${super.whoAmI()})`;+ }+ }++ const instance = new Derived();+ bindMethodsToServiceLocator(scopedLocator, instance);++ expect(instance.whoAmI()).toBe('derived (super says base)');+ });+ });+describe('Per-crawler ServiceLocator', () => {test('creating separate service locator for crawler', () => {const crawlerConfig = new Configuration({ headless: false });