@juzi/file-box 1.7.8 → 1.7.10

package/src/misc.ts

@@ -16,11 +16,6 @@ import {
   HTTP_REQUEST_TIMEOUT,
   HTTP_RESPONSE_TIMEOUT,
   NO_SLICE_DOWN,
-  PROXY_HOST,
-  PROXY_PASSWORD,
-  PROXY_PORT,
-  PROXY_TYPE,
-  PROXY_USERNAME,
 } from './config.js'
 
 const protocolMap: {
@@ -46,7 +41,7 @@ export function dataUrlToBase64 (dataUrl: string): string {
  *
  * @credit https://stackoverflow.com/a/43632171/1123955
  */
-export async function httpHeadHeader (url: string): Promise<http.IncomingHttpHeaders> {
+export async function httpHeadHeader (url: string, proxyUrl?: string): Promise<http.IncomingHttpHeaders> {
   const originUrl = url
   let REDIRECT_TTL = 7
 
@@ -57,7 +52,7 @@ export async function httpHeadHeader (url: string): Promise<http.IncomingHttpHea
 
     const res = await fetch(url, {
       method: 'HEAD',
-    })
+    }, proxyUrl)
     res.destroy()
 
     if (!/^3/.test(String(res.statusCode))) {
@@ -94,7 +89,7 @@ export function httpHeaderToFileName (headers: http.IncomingHttpHeaders): null |
   return null
 }
 
-export async function httpStream (url: string, headers: http.OutgoingHttpHeaders = {}): Promise<Readable> {
+export async function httpStream (url: string, headers: http.OutgoingHttpHeaders = {}, proxyUrl?: string): Promise<Readable> {
   const headHeaders = await httpHeadHeader(url)
   if (headHeaders.location) {
     url = headHeaders.location
@@ -110,21 +105,21 @@ export async function httpStream (url: string, headers: http.OutgoingHttpHeaders
   const fileSize = Number(headHeaders['content-length'])
 
   if (!NO_SLICE_DOWN && headHeaders['accept-ranges'] === 'bytes' && fileSize > HTTP_CHUNK_SIZE) {
-    return await downloadFileInChunks(url, options, fileSize, HTTP_CHUNK_SIZE)
+    return await downloadFileInChunks(url, options, fileSize, HTTP_CHUNK_SIZE, proxyUrl)
   } else {
-    return await fetch(url, options)
+    return await fetch(url, options, proxyUrl)
   }
 }
 
-async function fetch (url: string, options: http.RequestOptions): Promise<http.IncomingMessage> {
+async function fetch (url: string, options: http.RequestOptions, proxyUrl?: string): Promise<http.IncomingMessage> {
   const { protocol } = new URL(url)
   const { request, agent } = getProtocol(protocol)
   const opts: http.RequestOptions = {
     agent,
     ...options,
   }
-  setProxy(opts)
-  const req = request(url, opts).end()
+  setProxy(opts, proxyUrl)
+  const req = request(url, opts)
   req
     .on('error', () => {
       req.destroy()
@@ -132,15 +127,18 @@ async function fetch (url: string, options: http.RequestOptions): Promise<http.I
     .setTimeout(HTTP_REQUEST_TIMEOUT, () => {
       req.emit('error', new Error(`FileBox: Http request timeout (${HTTP_REQUEST_TIMEOUT})!`))
     })
+    .end()
   const responseEvents = await once(req, 'response')
   const res = responseEvents[0] as http.IncomingMessage
   res
     .on('error', () => {
       res.destroy()
     })
-    .setTimeout(HTTP_RESPONSE_TIMEOUT, () => {
+  if (res.socket) {
+    res.setTimeout(HTTP_RESPONSE_TIMEOUT, () => {
       res.emit('error', new Error(`FileBox: Http response timeout (${HTTP_RESPONSE_TIMEOUT})!`))
     })
+  }
   return res
 }
 
@@ -149,6 +147,7 @@ async function downloadFileInChunks (
   options: http.RequestOptions,
   fileSize: number,
   chunkSize = HTTP_CHUNK_SIZE,
+  proxyUrl?: string,
 ): Promise<Readable> {
   const tmpFile = join(tmpdir(), `filebox-${randomUUID()}`)
   const writeStream = createWriteStream(tmpFile)
@@ -171,7 +170,7 @@ async function downloadFileInChunks (
     requestOptions.headers['Range'] = range
 
     try {
-      const res = await fetch(url, requestOptions)
+      const res = await fetch(url, requestOptions, proxyUrl)
       assert(allowStatusCode.includes(res.statusCode ?? 0), `Request failed with status code ${res.statusCode}`)
       assert(Number(res.headers['content-length']) > 0, 'Server returned 0 bytes of data')
       for await (const chunk of res) {
@@ -210,22 +209,9 @@ export async function streamToBuffer (stream: Readable): Promise<Buffer> {
   return Buffer.concat(chunks)
 }
 
-function getProxyUrl () {
-  const proxyType = PROXY_TYPE
-  const proxyHost = PROXY_HOST
-  const proxyPort = PROXY_PORT
-  const proxyUsername = PROXY_USERNAME
-  const proxyPassword = PROXY_PASSWORD
-  if (proxyType === 'http') {
-    return `http://${proxyUsername}:${proxyPassword}@${proxyHost}:${proxyPort}`
-  }
-  return ''
-}
-
-function setProxy (options: RequestOptions): void {
-  const url = getProxyUrl()
-  if (url) {
-    const agent = new HttpsProxyAgent(url)
+function setProxy (options: RequestOptions, proxyUrl?: string): void {
+  if (proxyUrl) {
+    const agent = new HttpsProxyAgent(proxyUrl)
     options.agent = agent
   }
 }

package/src/version.ts

@@ -1,4 +1,4 @@
 /**
  * This file was auto generated from scripts/generate-version.sh
  */
-export const VERSION: string = '1.7.8'
+export const VERSION: string = '1.7.10'