Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(embeds): keep a custom embed when its media host is down (#3805)

Hampus752b76135371
diff --git a/fluxer_api/src/api/infrastructure/EmbedService.test.ts b/fluxer_api/src/api/infrastructure/EmbedService.test.ts
new file mode 100644
index 000000000..33810d3bf
--- /dev/null
+++ b/fluxer_api/src/api/infrastructure/EmbedService.test.ts
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {EmbedService} from '@app/api/infrastructure/EmbedService';
+import type {MediaProxyNsfwMode} from '@app/api/infrastructure/IMediaService';
+import type {UnfurlOptions, UnfurlResult} from '@app/api/infrastructure/IUnfurlerService';
+import {MockStorageService} from '@app/api/test/mocks/MockStorageService';
+import {NoopUnfurlerService} from '@app/api/test/mocks/NoopUnfurlerService';
+import {TestMediaService} from '@app/api/test/TestMediaService';
+import type {WorkerTaskName} from '@app/api/worker/WorkerLaneConfig';
+import {ServiceUnavailableError} from '@fluxer/errors/src/domains/core/ServiceUnavailableError';
+import type {IWorkerService} from '@pkgs/worker/src/contracts/IWorkerService';
+import {describe, expect, it} from 'vitest';
+
+class UnreachableHostMediaService extends TestMediaService {
+ override async getMetadata() {
+ return null;
+ }
+}
+
+class UnavailableUnfurlerService extends NoopUnfurlerService {
+ override async unfurlWithCachePolicy(
+ _url: string,
+ _nsfwMode?: MediaProxyNsfwMode,
+ _options?: UnfurlOptions,
+ ): Promise<UnfurlResult> {
+ throw new ServiceUnavailableError({message: '[nats-unfurl] shard_unavailable'});
+ }
+}
+
+describe('EmbedService custom embeds', () => {
+ it('keeps an embed image whose host is down instead of failing the message', async () => {
+ const service = new EmbedService(
+ new UnavailableUnfurlerService(),
+ new UnreachableHostMediaService(new MockStorageService()),
+ {} as IWorkerService<WorkerTaskName>,
+ );
+ const imageUrl = 'https://media.example.invalid/Items/1/Images/Primary';
+
+ const result = await service.getInitialEmbeds({
+ content: null,
+ customEmbeds: [{title: 'Now playing', image: {url: imageUrl}}],
+ nsfwMode: 'block',
+ });
+
+ expect(result.embeds).toHaveLength(1);
+ expect(result.embeds?.[0]?.title).toBe('Now playing');
+ expect(result.embeds?.[0]?.image?.url).toBe(imageUrl);
+ });
+});
diff --git a/fluxer_api/src/api/infrastructure/EmbedService.ts b/fluxer_api/src/api/infrastructure/EmbedService.ts
index d6cc24925..e5bf3febb 100644
--- a/fluxer_api/src/api/infrastructure/EmbedService.ts
+++ b/fluxer_api/src/api/infrastructure/EmbedService.ts
@@ -366,7 +366,10 @@ export class EmbedService {
if (this.isRenderableMediaType(directMetadata?.content_type)) {
return {url: stored, metadata: directMetadata};
}
- const unfurled = await this.unfurlerService.unfurl(url, nsfwMode);
+ const unfurled = await this.unfurlerService.unfurl(url, nsfwMode).catch((error: unknown) => {
+ Logger.warn({error, url}, 'Failed to unfurl embed media URL, keeping it without metadata');
+ return [];
+ });
for (const embed of unfurled) {
const candidates = [embed.video?.url, embed.audio?.url, embed.image?.url, embed.thumbnail?.url];
for (const candidate of candidates) {