Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-16 11:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(rest): use http agent when protocol is not https (#7309)

Browse Source
This commit is contained in:
ckohen
2022-01-20 03:14:12 -08:00
committed by GitHub
parent 1c6c9449ad
commit d8ea572fb8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/rest/src/lib/RequestManager.ts
View File

@@ -2,15 +2,14 @@ import Collection from '@discordjs/collection';
import FormData from 'form-data'; import FormData from 'form-data';
import { DiscordSnowflake } from '@sapphire/snowflake'; import { DiscordSnowflake } from '@sapphire/snowflake';
import { EventEmitter } from 'node:events'; import { EventEmitter } from 'node:events';
import { Agent } from 'node:https'; import { Agent as httpsAgent } from 'node:https';
import { Agent as httpAgent } from 'node:http';
import type { RequestInit, BodyInit } from 'node-fetch'; import type { RequestInit, BodyInit } from 'node-fetch';
import type { IHandler } from './handlers/IHandler'; import type { IHandler } from './handlers/IHandler';
import { SequentialHandler } from './handlers/SequentialHandler'; import { SequentialHandler } from './handlers/SequentialHandler';
import type { RESTOptions, RestEvents } from './REST'; import type { RESTOptions, RestEvents } from './REST';
import { DefaultRestOptions, DefaultUserAgent, RESTEvents } from './utils/constants'; import { DefaultRestOptions, DefaultUserAgent, RESTEvents } from './utils/constants';
let agent: Agent | null = null;
/** /**
* Represents a file to be added to the request * Represents a file to be added to the request
*/ */
@@ -186,6 +185,7 @@ export class RequestManager extends EventEmitter {
private hashTimer!: NodeJS.Timer; private hashTimer!: NodeJS.Timer;
private handlerTimer!: NodeJS.Timer; private handlerTimer!: NodeJS.Timer;
private agent: httpsAgent | httpAgent | null = null;
public readonly options: RESTOptions; public readonly options: RESTOptions;
@@ -318,7 +318,9 @@ export class RequestManager extends EventEmitter {
private resolveRequest(request: InternalRequest): { url: string; fetchOptions: RequestInit } { private resolveRequest(request: InternalRequest): { url: string; fetchOptions: RequestInit } {
const { options } = this; const { options } = this;
agent ??= new Agent({ ...options.agent, keepAlive: true }); this.agent ??= options.api.startsWith('https')
? new httpsAgent({ ...options.agent, keepAlive: true })
: new httpAgent({ ...options.agent, keepAlive: true });
let query = ''; let query = '';
@@ -394,7 +396,7 @@ export class RequestManager extends EventEmitter {
} }
const fetchOptions = { const fetchOptions = {
agent, agent: this.agent,
body: finalBody, body: finalBody,
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
headers: { ...(request.headers ?? {}), ...additionalHeaders, ...headers } as Record<string, string>, headers: { ...(request.headers ?? {}), ...additionalHeaders, ...headers } as Record<string, string>,