quilling.dev
An ATproto social media client -- with an independent Appview.
Use proxy for fetching link meta (#716)
* Use proxy for fetching link meta
* Remove link meta test due to hitting proxy
* setup different staging and prod proxy URLs
---------
Co-authored-by: Ansh Nanda <anshnanda10@gmail.com>
Co-authored-by: Paul Frazee <pfrazee@gmail.com>
authored by
Ollie H
Ansh Nanda
Paul Frazee
and committed by
GitHub
c0ca27b7
20185585
+1
-103
__tests__/lib/link-meta.test.ts
+1
-103
__tests__/lib/link-meta.test.ts
···
1
-
import {
2
-
LikelyType,
3
-
getLinkMeta,
4
-
getLikelyType,
5
-
} from '../../src/lib/link-meta/link-meta'
6
-
import {exampleComHtml} from './__mocks__/exampleComHtml'
7
-
import {BskyAgent} from '@atproto/api'
8
-
import {DEFAULT_SERVICE, RootStoreModel} from '../../src/state'
9
-
10
-
describe('getLinkMeta', () => {
11
-
let rootStore: RootStoreModel
12
-
13
-
beforeEach(() => {
14
-
rootStore = new RootStoreModel(new BskyAgent({service: DEFAULT_SERVICE}))
15
-
})
16
-
17
-
const inputs = [
18
-
'',
19
-
'httpbadurl',
20
-
'https://example.com',
21
-
'https://example.com/index.html',
22
-
'https://example.com/image.png',
23
-
'https://example.com/video.avi',
24
-
'https://example.com/audio.ogg',
25
-
'https://example.com/text.txt',
26
-
'https://example.com/javascript.js',
27
-
'https://bsky.app/',
28
-
'https://bsky.app/index.html',
29
-
]
30
-
const outputs = [
31
-
{
32
-
error: 'Invalid URL',
33
-
likelyType: LikelyType.Other,
34
-
url: '',
35
-
},
36
-
{
37
-
error: 'Invalid URL',
38
-
likelyType: LikelyType.Other,
39
-
url: 'httpbadurl',
40
-
},
41
-
{
42
-
likelyType: LikelyType.HTML,
43
-
url: 'https://example.com',
44
-
title: 'Example Domain',
45
-
description: 'An example website',
46
-
},
47
-
{
48
-
likelyType: LikelyType.HTML,
49
-
url: 'https://example.com/index.html',
50
-
title: 'Example Domain',
51
-
description: 'An example website',
52
-
},
53
-
{
54
-
likelyType: LikelyType.Image,
55
-
url: 'https://example.com/image.png',
56
-
},
57
-
{
58
-
likelyType: LikelyType.Video,
59
-
url: 'https://example.com/video.avi',
60
-
},
61
-
{
62
-
likelyType: LikelyType.Audio,
63
-
url: 'https://example.com/audio.ogg',
64
-
},
65
-
{
66
-
likelyType: LikelyType.Text,
67
-
url: 'https://example.com/text.txt',
68
-
},
69
-
{
70
-
likelyType: LikelyType.Other,
71
-
url: 'https://example.com/javascript.js',
72
-
},
73
-
{
74
-
likelyType: LikelyType.AtpData,
75
-
url: '/',
76
-
},
77
-
{
78
-
likelyType: LikelyType.AtpData,
79
-
url: '/index.html',
80
-
},
81
-
{
82
-
likelyType: LikelyType.Other,
83
-
url: '',
84
-
title: '',
85
-
},
86
-
]
87
-
it('correctly handles a set of text inputs', async () => {
88
-
for (let i = 0; i < inputs.length; i++) {
89
-
global.fetch = jest.fn().mockImplementationOnce(() => {
90
-
return new Promise((resolve, _reject) => {
91
-
resolve({
92
-
ok: true,
93
-
status: 200,
94
-
text: () => exampleComHtml,
95
-
})
96
-
})
97
-
})
98
-
const input = inputs[i]
99
-
const output = await getLinkMeta(rootStore, input)
100
-
expect(output).toEqual(outputs[i])
101
-
}
102
-
})
103
-
})
1
+
import {LikelyType, getLikelyType} from '../../src/lib/link-meta/link-meta'
104
2
105
3
describe('getLikelyType', () => {
106
4
it('correctly handles non-parsed url', async () => {
-1
package.json
-1
package.json
+15
src/lib/constants.ts
+15
src/lib/constants.ts
···
144
144
height: 2000,
145
145
size: 1000000,
146
146
}
147
+
148
+
export const STAGING_LINK_META_PROXY =
149
+
'https://cardyb.staging.bsky.dev/v1/extract?url='
150
+
151
+
export const PROD_LINK_META_PROXY = 'https://cardyb.bsky.app/v1/extract?url='
152
+
153
+
export function LINK_META_PROXY(serviceUrl: string) {
154
+
if (serviceUrl.includes('localhost')) {
155
+
return STAGING_LINK_META_PROXY
156
+
} else if (serviceUrl.includes('staging')) {
157
+
return STAGING_LINK_META_PROXY
158
+
} else {
159
+
return PROD_LINK_META_PROXY
160
+
}
161
+
}
+20
-18
src/lib/link-meta/link-meta.ts
+20
-18
src/lib/link-meta/link-meta.ts
···
1
-
import he from 'he'
2
1
import {isBskyAppUrl} from '../strings/url-helpers'
3
2
import {RootStoreModel} from 'state/index'
4
3
import {extractBskyMeta} from './bsky'
5
-
import {extractHtmlMeta} from './html'
4
+
import {LINK_META_PROXY} from 'lib/constants'
6
5
7
6
export enum LikelyType {
8
7
HTML,
···
54
53
try {
55
54
const controller = new AbortController()
56
55
const to = setTimeout(() => controller.abort(), timeout || 5e3)
57
-
const httpRes = await fetch(url, {
58
-
headers: {accept: 'text/html'},
59
-
signal: controller.signal,
60
-
})
61
-
const httpResBody = await httpRes.text()
56
+
57
+
const response = await fetch(
58
+
`${LINK_META_PROXY(
59
+
store.session.currentSession?.service || '',
60
+
)}${encodeURIComponent(url)}`,
61
+
)
62
+
63
+
const body = await response.json()
62
64
clearTimeout(to)
63
-
const httpResMeta = extractHtmlMeta({
64
-
html: httpResBody,
65
-
hostname: urlp?.hostname,
66
-
pathname: urlp?.pathname,
67
-
})
68
-
meta.title = httpResMeta.title ? he.decode(httpResMeta.title) : undefined
69
-
meta.description = httpResMeta.description
70
-
? he.decode(httpResMeta.description)
71
-
: undefined
72
-
meta.image = httpResMeta.image
65
+
66
+
const {description, error, image, title} = body
67
+
68
+
if (error !== '') {
69
+
throw new Error(error)
70
+
}
71
+
72
+
meta.description = description
73
+
meta.image = image
74
+
meta.title = title
73
75
} catch (e) {
74
76
// failed
75
77
console.error(e)
76
-
meta.error = 'Failed to fetch link'
78
+
meta.error = e instanceof Error ? e.toString() : 'Failed to fetch link'
77
79
}
78
80
79
81
return meta