Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix bug #61

Merged
merged 1 commit into from
Jul 16, 2024
Merged

fix bug #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions src/buttons/requestUserInfoBtn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ export default {

run: async (client, interaction) => {
try {
const { guild, member } = interaction;
const { guild, member, channel } = interaction;

// Defer the interaction immediately to prevent timeout
await interaction.deferReply();

// Get the ticket setup configuration
Expand All @@ -37,20 +36,22 @@ export default {
});
}

// Get user ticket information
const ticket = await ticketSchema.findOne({
// Get the ticket information
const sticket = await ticketSchema.findOne({
guildID: guild.id,
ticketMemberID: interaction.user.id,
ticketChannelID: channel.id,
closed: false,
});
if (!ticket) {

if (!sticket) {
return await interaction.editReply({
content: 'User not found. Please specify a valid user.',
content: 'This ticket is not valid or is closed.',
ephemeral: true,
});
}

const user = await guild.members
.fetch(ticket.ticketMemberID)
.fetch(sticket.ticketMemberID)
.catch(() => null);
if (!user) {
return await interaction.editReply({
Expand All @@ -67,13 +68,13 @@ export default {

if (!tickets || tickets.length === 0) {
return await interaction.editReply({
content: 'This user has no tickets.',
content: 'This user has no closed tickets.',
ephemeral: true,
});
}

// Format tickets into pages
const pages = tickets.map((ticket, index) => {
const pages = tickets.map((ticket) => {
const claimedBy = ticket.claimedBy
? `<@${ticket.claimedBy}>`
: 'Unclaimed';
Expand Down Expand Up @@ -103,16 +104,12 @@ export default {
},
{
name: '⏳ Open Duration',
value: `<t:${Math.floor(
new Date(ticket.createdAt).getTime() / 1000
)}:R>`,
value: `<t:${Math.floor(new Date(ticket.createdAt).getTime() / 1000)}:R>`,
inline: true,
},
{
name: '🔒 Closed At',
value: `<t:${Math.floor(
new Date(ticket.createdAt).getTime() / 1000
)}:R>`,
value: `<t:${Math.floor(new Date(ticket.closedAt).getTime() / 1000)}:R>`,
inline: true,
},
{
Expand Down
16 changes: 1 addition & 15 deletions src/events/validations/buttonValidator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,7 @@ const handleButton = async (client, errorHandler, interaction) => {
const { customId } = interaction;
const button = buttons.get(customId);

if (!button) {
errorHandler.handleError(new Error(`Unknown button: ${customId}`), {
type: 'unknownButton',
buttonId: customId,
userId: interaction.user.id,
guildId: interaction.guild.id,
});
return sendEmbedReply(
interaction,
mConfig.embedColorError,
'This button is not recognized.',
true
);
}

if (!button) return;
const { developersId, testServerId } = config;

// Check if the button is developer-only
Expand Down
122 changes: 92 additions & 30 deletions src/handlers/errorHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { WebhookClient, EmbedBuilder, Events, DiscordAPIError } from 'discord.js';
import {
WebhookClient,
EmbedBuilder,
Events,
DiscordAPIError,
} from 'discord.js';
import Bottleneck from 'bottleneck';

class DiscordBotErrorHandler {
Expand All @@ -10,14 +15,18 @@ class DiscordBotErrorHandler {
retryAttempts: 3,
retryDelay: 1000,
rateLimit: { maxConcurrent: 1, minTime: 2000 },
clientName: 'unknown client',
clientName: 'nory',
...config,
};

if (!this.config.webhookUrl) {
console.error('ERROR_WEBHOOK_URL is not set in the environment variables');
console.error(
'ERROR_WEBHOOK_URL is not set in the environment variables'
);
} else {
this.webhookClient = new WebhookClient({ url: this.config.webhookUrl });
this.webhookClient = new WebhookClient({
url: this.config.webhookUrl,
});
}

this.errorCache = new Map();
Expand All @@ -33,19 +42,28 @@ class DiscordBotErrorHandler {
console.error('Discord client is not provided');
return;
}
this.config.clientName = this.client.user?.username || this.config.clientName;
this.config.clientName =
this.client.user?.username || this.config.clientName;
this.setupEventListeners();
this.client.ws.on('error', this.handleWebSocketError.bind(this));
}

setupEventListeners() {
this.client.on(Events.Error, (error) => this.handleError(error, { type: 'clientError' }));
this.client.on(Events.Warn, (info) => this.handleError(new Error(info), {
type: 'clientWarning',
severity: 'Warning',
}));
process.on('unhandledRejection', (reason) => this.handleError(reason, { type: 'unhandledRejection' }));
process.on('uncaughtException', (error) => this.handleError(error, { type: 'uncaughtException' }));
this.client.on(Events.Error, (error) =>
this.handleError(error, { type: 'clientError' })
);
this.client.on(Events.Warn, (info) =>
this.handleError(new Error(info), {
type: 'clientWarning',
severity: 'Warning',
})
);
process.on('unhandledRejection', (reason) =>
this.handleError(reason, { type: 'unhandledRejection' })
);
process.on('uncaughtException', (error) =>
this.handleError(error, { type: 'uncaughtException' })
);
}

handleWebSocketError(error) {
Expand All @@ -64,7 +82,10 @@ class DiscordBotErrorHandler {
cleanStackTrace(error, limit = 10) {
const stack = (error.stack || '')
.split('\n')
.filter(line => !line.includes('node_modules') && !line.includes('timers.js'))
.filter(
(line) =>
!line.includes('node_modules') && !line.includes('timers.js')
)
.slice(0, limit)
.join('\n');

Expand All @@ -82,7 +103,11 @@ class DiscordBotErrorHandler {
if (guildId) {
try {
const guild = await this.client.guilds.fetch(guildId);
return { id: guild.id, name: guild.name, memberCount: guild.memberCount };
return {
id: guild.id,
name: guild.name,
memberCount: guild.memberCount,
};
} catch (error) {
console.error('Failed to fetch guild context:', error);
}
Expand Down Expand Up @@ -112,16 +137,26 @@ class DiscordBotErrorHandler {
if (message.includes('timeout')) return 'Timeout Error';
if (message.includes('not found')) return 'Not Found Error';
if (message.includes('database')) return 'Database Error';
if (message.includes('auth') || message.includes('token')) return 'Authentication Error';
if (message.includes('connect') || message.includes('connection')) return 'Connection Error';
if (message.includes('parse') || message.includes('syntax')) return 'Parsing Error';
if (message.includes('auth') || message.includes('token'))
return 'Authentication Error';
if (message.includes('connect') || message.includes('connection'))
return 'Connection Error';
if (message.includes('parse') || message.includes('syntax'))
return 'Parsing Error';
if (message.includes('memory')) return 'Memory Error';
if (message.includes('disk') || message.includes('storage')) return 'Storage Error';
if (message.includes('disk') || message.includes('storage'))
return 'Storage Error';
if (message.includes('gateway')) return 'Gateway Error';
if (message.includes('unexpected token')) return 'Unexpected Token Error';
if (message.includes('invalid form body')) return 'Invalid Form Body Error';
if (message.includes('unknown interaction')) return 'Unknown Interaction Error';
if (error instanceof Error && error.message === "Unhandled 'error' event emitted") return 'WebSocket Error';
if (message.includes('invalid form body'))
return 'Invalid Form Body Error';
if (message.includes('unknown interaction'))
return 'Unknown Interaction Error';
if (
error instanceof Error &&
error.message === "Unhandled 'error' event emitted"
)
return 'WebSocket Error';
return 'Unknown Error';
}

Expand All @@ -131,7 +166,11 @@ class DiscordBotErrorHandler {
if ([10008, 10003].includes(error.code)) return 'Major';
return 'Moderate';
}
if (error instanceof Error && error.message === "Unhandled 'error' event emitted") return 'Major';
if (
error instanceof Error &&
error.message === "Unhandled 'error' event emitted"
)
return 'Major';
if (error.critical) return 'Critical';
if (error instanceof TypeError) return 'Warning';
if (error.message.includes('rate limit')) return 'Major';
Expand Down Expand Up @@ -181,7 +220,9 @@ class DiscordBotErrorHandler {
async processErrorQueue() {
while (this.errorQueue.length > 0) {
const errorDetails = this.errorQueue.shift();
await this.limiter.schedule(() => this.sendErrorToWebhook(errorDetails));
await this.limiter.schedule(() =>
this.sendErrorToWebhook(errorDetails)
);
}
this.processingQueue = false;
}
Expand All @@ -194,22 +235,41 @@ class DiscordBotErrorHandler {
.setTitle(`${errorDetails.category} - ${errorDetails.severity}`)
.setDescription(`\`\`\`${errorDetails.message}\`\`\``)
.addFields(
{ name: 'Stack Trace', value: `\`\`\`${errorDetails.stackTrace}\`\`\``, inline: false },
{ name: 'Context', value: `\`\`\`json\n${JSON.stringify(errorDetails.context, null, 2)}\`\`\``, inline: false },
{ name: 'Performance', value: `\`\`\`json\n${JSON.stringify(await errorDetails.performance, null, 2)}\`\`\``, inline: false }
{
name: 'Stack Trace',
value: `\`\`\`${errorDetails.stackTrace}\`\`\``,
inline: false,
},
{
name: 'Context',
value: `\`\`\`json\n${JSON.stringify(errorDetails.context, null, 2)}\`\`\``,
inline: false,
},
{
name: 'Performance',
value: `\`\`\`json\n${JSON.stringify(await errorDetails.performance, null, 2)}\`\`\``,
inline: false,
}
)
.setTimestamp(new Date(errorDetails.timestamp))
.setFooter({ text: `Environment: ${errorDetails.environment.nodeVersion} | Client: ${errorDetails.environment.clientName}` });
.setFooter({
text: `Environment: ${errorDetails.environment.nodeVersion} | Client: ${errorDetails.environment.clientName}`,
});

await this.webhookClient.send({
content: `New ${errorDetails.severity} error reported`,
embeds: [embed],
});
return;
} catch (err) {
console.error(`Failed to send error to webhook (attempt ${attempt + 1}):`, err);
console.error(
`Failed to send error to webhook (attempt ${attempt + 1}):`,
err
);
if (attempt < this.config.retryAttempts - 1) {
await new Promise(resolve => setTimeout(resolve, this.config.retryDelay));
await new Promise((resolve) =>
setTimeout(resolve, this.config.retryDelay)
);
}
}
}
Expand Down Expand Up @@ -237,7 +297,9 @@ class DiscordBotErrorHandler {
const fullContext = await this.captureContext(context);
return {
message: error.message || 'Unknown error',
stackTrace: error.stack ? this.cleanStackTrace(error) : 'No stack trace available',
stackTrace: error.stack
? this.cleanStackTrace(error)
: 'No stack trace available',
category: this.determineErrorCategory(error),
severity: this.determineErrorSeverity(error),
context: fullContext,
Expand Down
14 changes: 10 additions & 4 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,28 @@ import DiscordBotErrorHandler from './handlers/errorHandler.js';

const checkEnvVariables = () => {
if (!process.env.TOKEN) {
console.error('ERROR: TOKEN is not defined in the environment variables.');
console.error(
'ERROR: TOKEN is not defined in the environment variables.'
);
process.exit(1);
}
if (!process.env.MONGODB_TOKEN) {
console.error('ERROR: MONGODB_TOKEN is not defined in the environment variables.');
console.error(
'ERROR: MONGODB_TOKEN is not defined in the environment variables.'
);
process.exit(1);
}
if (!process.env.GITHUB_TOKEN) {
console.error('ERROR: GITHUB_TOKEN is not defined in the environment variables.');
console.error(
'ERROR: GITHUB_TOKEN is not defined in the environment variables.'
);
process.exit(1);
}
};

const main = async () => {
checkEnvVariables();
w
w;
let eventHandler;
try {
const module = await import('./handlers/eventHandler.js');
Expand Down