Increase request retry interval

[github/Chocobozzz/PeerTube.git] / server / helpers / requests.ts

diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index a9869e987cdff4aa85d8174312416de456e1ab37..1a3cc1b5b6f38492aeae086b1e42d0d01315f7bf 100644 (file)
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -1,11 +1,8 @@
 import { createWriteStream, remove } from 'fs-extra'
 import got, { CancelableRequest, NormalizedOptions, Options as GotOptions, RequestError, Response } from 'got'
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent'
-import { join } from 'path'
-import { CONFIG } from '../initializers/config'
 import { ACTIVITY_PUB, BINARY_CONTENT_TYPES, PEERTUBE_VERSION, REQUEST_TIMEOUTS, WEBSERVER } from '../initializers/constants'
 import { pipelinePromise } from './core-utils'
-import { processImage } from './image-utils'
 import { logger, loggerTagsFactory } from './logger'
 import { getProxy, isProxyEnabled } from './proxy'
 
@@ -88,11 +85,14 @@ const peertubeGot = got.extend({
           }
 
           httpSignature.signRequest({
-            getHeader: function (header) {
-              return options.headers[header]
+            getHeader: function (header: string) {
+              const value = options.headers[header.toLowerCase()]
+
+              if (!value) logger.warn('Unknown header requested by http-signature.', { headers: options.headers, header })
+              return value
             },
 
-            setHeader: function (header, value) {
+            setHeader: function (header: string, value: string) {
               options.headers[header] = value
             },
 
@@ -147,21 +147,6 @@ async function doRequestAndSaveToFile (
   }
 }
 
-async function downloadImage (url: string, destDir: string, destName: string, size: { width: number, height: number }) {
-  const tmpPath = join(CONFIG.STORAGE.TMP_DIR, 'pending-' + destName)
-  await doRequestAndSaveToFile(url, tmpPath)
-
-  const destPath = join(destDir, destName)
-
-  try {
-    await processImage(tmpPath, destPath, size)
-  } catch (err) {
-    await remove(tmpPath)
-
-    throw err
-  }
-}
-
 function getAgent () {
   if (!isProxyEnabled()) return {}
 
@@ -207,11 +192,12 @@ async function findLatestRedirection (url: string, options: PeerTubeRequestOptio
 // ---------------------------------------------------------------------------
 
 export {
+  PeerTubeRequestOptions,
+
   doRequest,
   doJSONRequest,
   doRequestAndSaveToFile,
   isBinaryResponse,
-  downloadImage,
   getAgent,
   findLatestRedirection,
   peertubeGot