Mirror — see github.com/blacksky-algorithms/blacksky.community
Fix link card preview failures and web download timeout
Propagate errors from getLinkMeta through resolveExternal so React Query
treats failed CardyB fetches as errors instead of caching empty data as
a successful result for 1 hour. This ensures automatic retries and shows
error messages instead of blank grey previews.
Fix AbortController in web downloadAndResize - signal was created but
never passed to fetch(), making the timeout a no-op.
+13
-12
+6
-2
src/lib/api/resolve.ts
+6
-2
src/lib/api/resolve.ts
···
1
1
import {
2
2
type AppBskyFeedDefs,
3
3
type AppBskyGraphDefs,
4
+
type BskyAgent,
4
5
type ComAtprotoRepoStrongRef,
5
6
} from '@atproto/api'
6
7
import {AtUri} from '@atproto/api'
7
-
import {type BskyAgent} from '@atproto/api'
8
8
9
9
import {POST_IMG_MAX} from '#/lib/constants'
10
10
import {getLinkMeta} from '#/lib/link-meta/link-meta'
···
15
15
parseStarterPackUri,
16
16
} from '#/lib/strings/starter-pack'
17
17
import {
18
+
convertBskyAppUrlIfNeeded,
18
19
isBskyCustomFeedUrl,
19
20
isBskyListUrl,
20
21
isBskyPostUrl,
21
22
isBskyStarterPackUrl,
22
23
isBskyStartUrl,
23
24
isShortLink,
25
+
makeRecordUri,
24
26
} from '#/lib/strings/url-helpers'
25
27
import {type ComposerImage} from '#/state/gallery'
26
28
import {createComposerImage} from '#/state/gallery'
27
29
import {type Gif} from '#/state/queries/tenor'
28
30
import {createGIFDescription} from '../gif-alt-text'
29
-
import {convertBskyAppUrlIfNeeded, makeRecordUri} from '../strings/url-helpers'
30
31
31
32
type ResolvedExternalLink = {
32
33
type: 'external'
···
205
206
uri: string,
206
207
): Promise<ResolvedExternalLink> {
207
208
const result = await getLinkMeta(agent, uri)
209
+
if (result.error) {
210
+
throw new Error(result.error)
211
+
}
208
212
return {
209
213
type: 'external',
210
214
uri: result.url,
+5
-8
src/lib/link-meta/link-meta.ts
+5
-8
src/lib/link-meta/link-meta.ts
···
73
73
const to = setTimeout(() => controller.abort(), timeout || 5e3)
74
74
75
75
try {
76
-
const response = await fetch(
77
-
`${LINK_META_PROXY(agent.serviceUrl.toString() || '')}${encodeURIComponent(
78
-
url,
79
-
)}`,
80
-
{signal: controller.signal},
81
-
)
76
+
const serviceUrl = agent.serviceUrl?.toString() || ''
77
+
const proxyBase = LINK_META_PROXY(serviceUrl)
78
+
const fetchUrl = `${proxyBase}${encodeURIComponent(url)}`
79
+
80
+
const response = await fetch(fetchUrl, {signal: controller.signal})
82
81
83
82
const body = await response.json()
84
83
···
93
92
meta.url = body.url
94
93
}
95
94
} catch (e) {
96
-
// failed
97
-
console.error(e)
98
95
meta.error = e instanceof Error ? e.toString() : 'Failed to fetch link'
99
96
} finally {
100
97
clearTimeout(to)
+1
-1
src/lib/media/manip.web.ts
+1
-1
src/lib/media/manip.web.ts
···
32
32
export async function downloadAndResize(opts: DownloadAndResizeOpts) {
33
33
const controller = new AbortController()
34
34
const to = setTimeout(() => controller.abort(), opts.timeout || 5e3)
35
-
const res = await fetch(opts.uri)
35
+
const res = await fetch(opts.uri, {signal: controller.signal})
36
36
const resBody = await res.blob()
37
37
clearTimeout(to)
38
38