From b687ba11ccac0dfb5a5c61e5db2604ffa8b5dec0 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Fri, 27 May 2022 19:26:08 +0300
Subject: [PATCH] fix(Discord Node): Fix broken rate limit handling (#3311)

* :hammer: fix and additional option to return response headers

* :zap: Remove "return response headers" parameter

Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
---
 .../nodes-base/nodes/Discord/Discord.node.ts  | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/packages/nodes-base/nodes/Discord/Discord.node.ts b/packages/nodes-base/nodes/Discord/Discord.node.ts
index 03b3a3ec88528..378088096d68e 100644
--- a/packages/nodes-base/nodes/Discord/Discord.node.ts
+++ b/packages/nodes-base/nodes/Discord/Discord.node.ts
@@ -117,8 +117,6 @@ export class Discord implements INodeType {
 		],
 	};
 
-
-
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const returnData: IDataObject[] = [];
 
@@ -204,6 +202,7 @@ export class Discord implements INodeType {
 
 			if(!body.payload_json){
 				requestOptions = {
+					resolveWithFullResponse: true,
 					method: 'POST',
 					body,
 					uri: webhookUri,
@@ -214,6 +213,7 @@ export class Discord implements INodeType {
 				};
 			}else {
 				requestOptions = {
+					resolveWithFullResponse: true,
 					method: 'POST',
 					body,
 					uri: webhookUri,
@@ -223,34 +223,50 @@ export class Discord implements INodeType {
 				};
 			}
 			let maxTries = 5;
+			let response;
+
 			do {
 				try {
-					await this.helpers.request(requestOptions);
+					response = await this.helpers.request(requestOptions);
+					const resetAfter = response.headers['x-ratelimit-reset-after'] * 1000;
+					const remainingRatelimit = response.headers['x-ratelimit-remaining'];
+
+					// remaining requests 0
+					// https://discord.com/developers/docs/topics/rate-limits
+					if (!+remainingRatelimit) {
+						await new Promise<void>((resolve) =>
+							setTimeout(resolve, resetAfter || 1000),
+						);
+					}
+
 					break;
 				} catch (error) {
+					// HTTP/1.1 429 TOO MANY REQUESTS
+					// Await when the current rate limit will reset
+					// https://discord.com/developers/docs/topics/rate-limits
 					if (error.statusCode === 429) {
-						//* Await ratelimit to be over
+						const retryAfter = error.response?.headers['retry-after'] || 1000;
+
 						await new Promise<void>((resolve) =>
-							setTimeout(resolve, error.response.body.retry_after || 150),
+							setTimeout(resolve, +retryAfter),
 						);
 
 						continue;
 					}
 
-					//* Different Discord error, throw it
 					throw error;
 				}
 			} while (--maxTries);
 
 			if (maxTries <= 0) {
 				throw new Error(
-					'Could not send Webhook message. Max. amount of rate-limit retries reached.',
+					'Could not send Webhook message. Max amount of rate-limit retries reached.',
 				);
 			}
+
 			returnData.push({ success: true });
 		}
 
-
 		return [this.helpers.returnJsonArray(returnData)];
 	}
 }