X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Frequests.ts;h=799034b90dc0c1f2a24e16a9a8df215c1c58c99d;hb=5037e0e474044d7fc04092158784395a001e5c25;hp=5354780170da2852f6287bbc6e23ebcdc8c5909b;hpb=ddd677e4fdef4544773f6f426b4853d494df615e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index 535478017..799034b90 100644
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -1,15 +1,15 @@
 import { createWriteStream, remove } from 'fs-extra'
-import got, { CancelableRequest, Options as GotOptions, RequestError } from 'got'
+import got, { CancelableRequest, Options as GotOptions, RequestError, Response } from 'got'
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent'
 import { join } from 'path'
 import { CONFIG } from '../initializers/config'
-import { ACTIVITY_PUB, PEERTUBE_VERSION, REQUEST_TIMEOUT, WEBSERVER } from '../initializers/constants'
+import { ACTIVITY_PUB, BINARY_CONTENT_TYPES, PEERTUBE_VERSION, REQUEST_TIMEOUT, WEBSERVER } from '../initializers/constants'
 import { pipelinePromise } from './core-utils'
 import { processImage } from './image-utils'
 import { logger } from './logger'
 import { getProxy, isProxyEnabled } from './proxy'
 
-const httpSignature = require('http-signature')
+const httpSignature = require('@peertube/http-signature')
 
 export interface PeerTubeRequestError extends Error {
   statusCode?: number
@@ -96,10 +96,6 @@ const peertubeGot = got.extend({
             path
           }, httpSignatureOptions)
         }
-      },
-
-      (options: GotOptions) => {
-        options.timeout = REQUEST_TIMEOUT
       }
     ]
   }
@@ -184,13 +180,19 @@ function getUserAgent () {
   return `PeerTube/${PEERTUBE_VERSION} (+${WEBSERVER.URL})`
 }
 
+function isBinaryResponse (result: Response<any>) {
+  return BINARY_CONTENT_TYPES.has(result.headers['content-type'])
+}
+
 // ---------------------------------------------------------------------------
 
 export {
   doRequest,
   doJSONRequest,
   doRequestAndSaveToFile,
-  downloadImage
+  isBinaryResponse,
+  downloadImage,
+  peertubeGot
 }
 
 // ---------------------------------------------------------------------------
@@ -213,6 +215,7 @@ function buildGotOptions (options: PeerTubeRequestOptions) {
   return {
     method: options.method,
     dnsCache: true,
+    timeout: REQUEST_TIMEOUT,
     json: options.json,
     searchParams: options.searchParams,
     headers,