Skip to content

Commit

Permalink
Add REST request/429 debugging, temporarily disable message fetch hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
Dragory committed Aug 19, 2021
1 parent 53fea6b commit 187e823
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 12 deletions.
24 changes: 22 additions & 2 deletions backend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,26 @@ import { errorMessage, isDiscordAPIError, isDiscordHTTPError, SECONDS, successMe
import { loadYamlSafely } from "./utils/loadYamlSafely";
import { DecayingCounter } from "./utils/DecayingCounter";

// === START REST DEBUG ===
import fs from "fs";
import path from "path";
const APIRequest = require("discord.js/src/rest/APIRequest.js");

const dateStr = new Date().toISOString().replace(/[:.]/g, "-");
const restDebugFile = path.join("../debug", `rest_${dateStr}.log`);
fs.writeFileSync(restDebugFile, "");

const originalMake = APIRequest.prototype.make;
// tslint:disable-next-line:only-arrow-functions
APIRequest.prototype.make = function(...args) {
const debugInfo = `${new Date().toISOString()} ${this.method.toUpperCase()} ${this.route}`;
fs.appendFileSync(restDebugFile, debugInfo + "\n", { encoding: "utf8" });
// tslint:disable-next-line:no-console
console.log(`[API REQUEST] ${this.method} ${this.route}`);
return originalMake.call(this, ...args);
};
// === END REST DEBUG ===

if (!process.env.KEY) {
// tslint:disable-next-line:no-console
console.error("Project root .env with KEY is required!");
Expand Down Expand Up @@ -152,8 +172,8 @@ connect().then(async () => {
const client = new Client({
partials: ["USER", "CHANNEL", "GUILD_MEMBER", "MESSAGE", "REACTION"],

restGlobalRateLimit: 20,
restTimeOffset: 1000,
restGlobalRateLimit: 50,
// restTimeOffset: 1000,

// Disable mentions by default
allowedMentions: {
Expand Down
22 changes: 12 additions & 10 deletions backend/src/utils/hotfixMessageFetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ let n = 0;
export function hotfixMessageFetch(channel: TextChannel | ThreadChannel, messageId: string): Promise<Message> {
const thisN = ++n;

// tslint:disable-next-line:no-console
console.trace(
`[${thisN}] Queueing to fetch message id ${messageId} from channel ${channel.id} (queue size: ${queue.length})`,
);
return queue.add(async () => {
await sleep(3000);
// tslint:disable-next-line:no-console
console.log(`[${thisN}] Fetching message id ${messageId} from channel ${channel.id}`);
return channel.messages.fetch(messageId);
});
return channel.messages.fetch(messageId);

// // tslint:disable-next-line:no-console
// console.trace(
// `[${thisN}] Queueing to fetch message id ${messageId} from channel ${channel.id} (queue size: ${queue.length})`,
// );
// return queue.add(async () => {
// await sleep(3000);
// // tslint:disable-next-line:no-console
// console.log(`[${thisN}] Fetching message id ${messageId} from channel ${channel.id}`);
// return channel.messages.fetch(messageId);
// });
}
2 changes: 2 additions & 0 deletions debug/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!/.gitignore

0 comments on commit 187e823

Please sign in to comment.