From 17cefff20c13d5ce8b5733eb434d3df347e41b0d Mon Sep 17 00:00:00 2001 From: Mitch Downey Date: Fri, 19 Apr 2024 11:37:04 -0500 Subject: [PATCH 1/2] Add error handling to getFinalRedirectedUrl --- src/lib/request.ts | 59 ++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/src/lib/request.ts b/src/lib/request.ts index fb33b968..c22bdf92 100644 --- a/src/lib/request.ts +++ b/src/lib/request.ts @@ -18,37 +18,46 @@ export const request = async (url: string, options?: any) => { } export const getFinalRedirectedUrl = (url: string) => { - return new Promise((resolve) => { + console.log('getFinalRedirectedUrl', url) + return new Promise((resolve, reject) => { const parsedOrginalUrl = new URL(url) if (url.startsWith('https://')) { - const frRequest = https.request( - { - method: 'HEAD', - hostname: parsedOrginalUrl.hostname, - path: parsedOrginalUrl.pathname + parsedOrginalUrl.search, - Headers: { - 'User-Agent': userAgent + const frRequest = https + .request( + { + method: 'HEAD', + hostname: parsedOrginalUrl.hostname, + path: parsedOrginalUrl.pathname + parsedOrginalUrl.search, + Headers: { + 'User-Agent': userAgent + } + }, + (response) => { + resolve(response.responseUrl) } - }, - (response) => { - resolve(response.responseUrl) - } - ) + ) + .on('error', (err) => { + reject(err) + }) frRequest.end() } else { - const frRequest = http.request( - { - method: 'HEAD', - hostname: parsedOrginalUrl.hostname, - path: parsedOrginalUrl.pathname + parsedOrginalUrl.search, - Headers: { - 'User-Agent': userAgent + const frRequest = http + .request( + { + method: 'HEAD', + hostname: parsedOrginalUrl.hostname, + path: parsedOrginalUrl.pathname + parsedOrginalUrl.search, + Headers: { + 'User-Agent': userAgent + } + }, + (response) => { + resolve(response.responseUrl) } - }, - (response) => { - resolve(response.responseUrl) - } - ) + ) + .on('error', (err) => { + reject(err) + }) frRequest.end() } }) From 825d1f4928d543a25962acee0e4fd893a9b5b49d Mon Sep 17 00:00:00 2001 From: Mitch Downey Date: Fri, 19 Apr 2024 11:37:25 -0500 Subject: [PATCH 2/2] Bump to version 4.16.11 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8d795d2e..7882e917 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "podverse-api", - "version": "4.16.10", + "version": "4.16.11", "description": "Data API, database migration scripts, and backend services for all Podverse models.", "contributors": [ "Mitch Downey"