Merge branch 'master' into invalid-qr-patch

src/Socket/messages-send.ts

@@ -485,7 +485,10 @@ export const makeMessagesSocket = (config: SocketConfig) => {
 						logger,
 						userJid,
 						// multi-device does not have this yet
-						getUrlInfo: text => getUrlInfo(text, { thumbnailWidth: linkPreviewImageThumbnailWidth }),
+						getUrlInfo: text => getUrlInfo(
+							text,
+							{ thumbnailWidth: linkPreviewImageThumbnailWidth, timeoutMs: 3_000 }
+						),
 						upload: waUploadToServer,
 						mediaCache: config.mediaCache,
 						...options,

src/Utils/link-preview.ts

@@ -4,14 +4,15 @@ import { extractImageThumb, getHttpStream } from './messages-media'
 const THUMBNAIL_WIDTH_PX = 192
 
 /** Fetches an image and generates a thumbnail for it */
-const getCompressedJpegThumbnail = async(url: string, thumbnailWidth: number) => {
+const getCompressedJpegThumbnail = async(url: string, { thumbnailWidth, timeoutMs }: URLGenerationOptions) => {
-	const stream = await getHttpStream(url)
+	const stream = await getHttpStream(url, { timeout: timeoutMs })
 	const result = await extractImageThumb(stream, thumbnailWidth)
 	return result
 }
 
 export type URLGenerationOptions = {
 	thumbnailWidth: number
+	timeoutMs: number
 }
 
 /**
@@ -22,17 +23,17 @@ export type URLGenerationOptions = {
  */
 export const getUrlInfo = async(
 	text: string,
-	opts: URLGenerationOptions = { thumbnailWidth: THUMBNAIL_WIDTH_PX }
+	opts: URLGenerationOptions = { thumbnailWidth: THUMBNAIL_WIDTH_PX, timeoutMs: 3000 }
 ): Promise<WAUrlInfo | undefined> => {
 	try {
 		const { getLinkPreview } = await import('link-preview-js')
 
-		const info = await getLinkPreview(text)
+		const info = await getLinkPreview(text, { timeout: opts.timeoutMs })
 		if(info && 'title' in info) {
 			const [image] = info.images
 
 			const jpegThumbnail = image
-				? await getCompressedJpegThumbnail(image, opts.thumbnailWidth)
+				? await getCompressedJpegThumbnail(image, opts)
 				: undefined
 
 			return {