From c81f17a19ae2f6faf56a794cddf8e45f984737cf Mon Sep 17 00:00:00 2001 From: WebStreamr <210764791+webstreamr@users.noreply.github.com> Date: Mon, 4 Aug 2025 09:29:35 +0000 Subject: [PATCH] chore: use source baseUrl for source errors --- src/utils/StreamResolver.ts | 14 +++++++------- .../__snapshots__/StreamResolver.test.ts.snap | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/utils/StreamResolver.ts b/src/utils/StreamResolver.ts index e97bf59..463877b 100644 --- a/src/utils/StreamResolver.ts +++ b/src/utils/StreamResolver.ts @@ -41,17 +41,17 @@ export class StreamResolver { let handlerErrorOccurred = false; const urlResults: UrlResult[] = []; - const handlerPromises = sources.map(async (handler) => { - if (!handler.contentTypes.includes(type)) { + const handlerPromises = sources.map(async (source) => { + if (!source.contentTypes.includes(type)) { return; } try { - const handleResults = await handler.handle(ctx, type, id); - this.logger.info(`${handler.id} returned ${handleResults.length} urls`, ctx); + const sourceResults = await source.handle(ctx, type, id); + this.logger.info(`${source.id} returned ${sourceResults.length} urls`, ctx); const handlerUrlResults = await Promise.all( - handleResults.map(({ countryCode, title, url }) => this.extractorRegistry.handle(ctx, url, countryCode, title)), + sourceResults.map(({ countryCode, title, url }) => this.extractorRegistry.handle(ctx, url, countryCode, title)), ); urlResults.push(...handlerUrlResults.flat()); @@ -64,8 +64,8 @@ export class StreamResolver { streams.push({ name: envGetAppName(), - title: [`🔗 ${handler.label}`, logErrorAndReturnNiceString(ctx, this.logger, handler.id, error)].join('\n'), - externalUrl: ctx.hostUrl.href, + title: [`🔗 ${source.label}`, logErrorAndReturnNiceString(ctx, this.logger, source.id, error)].join('\n'), + externalUrl: source.baseUrl, }); } }); diff --git a/src/utils/__snapshots__/StreamResolver.test.ts.snap b/src/utils/__snapshots__/StreamResolver.test.ts.snap index a262aef..ecac763 100644 --- a/src/utils/__snapshots__/StreamResolver.test.ts.snap +++ b/src/utils/__snapshots__/StreamResolver.test.ts.snap @@ -463,7 +463,7 @@ exports[`resolve returns source errors as stream 1`] = ` { "streams": [ { - "externalUrl": "http://localhost/", + "externalUrl": "https://meinecloud.click", "name": "WebStreamr", "title": "🔗 MeineCloud ❌ Request failed. Request-id: test.",