Merge pull request #740 from podverse/develop

Release v4.16.10

Author: mitchdowney

package.json

@@ -1,6 +1,6 @@
 {
   "name": "podverse-api",
-  "version": "4.16.9",
+  "version": "4.16.10",
   "description": "Data API, database migration scripts, and backend services for all Podverse models.",
   "contributors": [
     "Mitch Downey"
@@ -175,6 +175,7 @@
     "eslint-plugin-jsx-a11y": "6.x",
     "eslint-plugin-react": "7.x",
     "eslint-plugin-react-hooks": "1.x",
+    "follow-redirects": "^1.15.6",
     "googleapis": "45.0.0",
     "http-errors": "1.7.3",
     "husky": "3.1.0",

src/lib/request.ts

@@ -1,6 +1,7 @@
 import * as requestPromiseNative from 'request-promise-native'
 import { config } from '~/config'
 const { userAgent } = config
+const { http, https } = require('follow-redirects')
 
 export const request = async (url: string, options?: any) => {
   const headers = (options && options.headers) || {}
@@ -15,3 +16,40 @@ export const request = async (url: string, options?: any) => {
 
   return response
 }
+
+export const getFinalRedirectedUrl = (url: string) => {
+  return new Promise<string>((resolve) => {
+    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
+          }
+        },
+        (response) => {
+          resolve(response.responseUrl)
+        }
+      )
+      frRequest.end()
+    } else {
+      const frRequest = http.request(
+        {
+          method: 'HEAD',
+          hostname: parsedOrginalUrl.hostname,
+          path: parsedOrginalUrl.pathname + parsedOrginalUrl.search,
+          Headers: {
+            'User-Agent': userAgent
+          }
+        },
+        (response) => {
+          resolve(response.responseUrl)
+        }
+      )
+      frRequest.end()
+    }
+  })
+}

src/routes/tools.ts

@@ -1,8 +1,7 @@
 import * as Router from 'koa-router'
 import { config } from '~/config'
 import { emitRouterError } from '~/lib/errors'
-import { request } from '~/lib/request'
-const createError = require('http-errors')
+import { getFinalRedirectedUrl } from '~/lib/request'
 
 const router = new Router({ prefix: `${config.apiPrefix}${config.apiVersion}/tools` })
 
@@ -25,24 +24,11 @@ router.post('/findHTTPS', async (ctx) => {
 
 const extractHTTPSFromURL = async (url, tries) => {
   try {
-    const res = await request(url, { followRedirect: true, method: 'head' })
     if (tries > 5) {
-      throw new createError.NotFound('Secure URL for ' + url + ' was not found. Too many redirects')
-    } else if (!res.location) {
-      if (url.startsWith('https://')) {
-        return url
-      } else {
-        try {
-          const attemptHttpsUrl = url.replace('http://', 'https://')
-          // If no error is thrown,then assume it is a valid url.
-          await request(attemptHttpsUrl, { followRedirect: true, method: 'head' })
-          return attemptHttpsUrl
-        } catch (error) {
-          throw new createError.NotFound('Secure URL for ' + url + ' was not found.')
-        }
-      }
+      return url
     } else {
-      return extractHTTPSFromURL(res.location, tries + 1)
+      const redirectedUrl = await getFinalRedirectedUrl(url)
+      return redirectedUrl
     }
   } catch (error) {
     if (['301', '302', '303', '307', '308'].includes(String(error.statusCode))) {

yarn.lock

@@ -4360,7 +4360,7 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@^1.15.0:
+follow-redirects@^1.15.0, follow-redirects@^1.15.6:
   version "1.15.6"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==