TheDreWen/protojx-manager
1
0
Fork 0
mirror of https://github.com/thedrewen/protojx-manager.git synced 2026-03-21 09:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: refactor command imports, enhance status service with logging and notification features, and update entity definitions

Browse Source
This commit is contained in:
CL TheDreWen
2025-10-31 10:02:44 +01:00
parent 03769b14fa
commit 6b10aaa009
9 changed files with 165 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/utility/ping.command.ts
View File

@@ -1,4 +1,4 @@
import { ApplicationIntegrationType, ButtonInteraction, ButtonStyle, ChatInputCommandInteraction, CommandInteraction, ComponentType, ContainerBuilder, InteractionContextType, MessageFlags, SlashCommandBuilder } from "discord.js";
import { ApplicationIntegrationType, ButtonInteraction, ButtonStyle, ChatInputCommandInteraction, ContainerBuilder, InteractionContextType, MessageFlags, SlashCommandBuilder } from "discord.js";
import { CommandDefinition } from "../../type";
const cmd : CommandDefinition = {

6
src/commands/utility/statut.command.ts
View File

@@ -1,8 +1,6 @@
import { ApplicationIntegrationType, ChatInputCommandInteraction, CommandInteraction, ContainerBuilder, EmbedBuilder, InteractionContextType, MessageFlags, SlashCommandBuilder } from "discord.js";
import ping from "ping";
import { ApplicationIntegrationType, ChatInputCommandInteraction, InteractionContextType, MessageFlags, SlashCommandBuilder } from "discord.js";
import statusService from "../../services/status.service";
import { CommandDefinition, InfraType } from "../../type";
import { secureHeapUsed } from "crypto";
import { CommandDefinition} from "../../type";
const cmd : CommandDefinition = {
data: new SlashCommandBuilder()

2
src/entity/follow.entity.ts
View File

@@ -1,6 +1,6 @@
import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
@Entity()
@Entity({name: 'follows'})
export class Follow {
@PrimaryGeneratedColumn()
id: number;

4
src/entity/guilds.entity.ts → src/entity/guild.entity.ts
View File

@@ -1,10 +1,10 @@
import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
@Entity()
@Entity({name: 'guilds'})
export class Guild {
@PrimaryGeneratedColumn()
id: number;
@Column()
guild_id: string;

16
src/entity/hostslog.entity.ts Normal file
View File

@@ -0,0 +1,16 @@
import { Column, CreateDateColumn, Entity, PrimaryGeneratedColumn } from "typeorm";
@Entity({name: 'hosts_logs'})
export class HostsLog {
@PrimaryGeneratedColumn()
id: number;
@Column()
host: string;
@Column()
status: boolean;
@CreateDateColumn()
created_at: Date;
}

2
src/index.ts
View File

@@ -1,4 +1,4 @@
import { ButtonInteraction, ChatInputCommandInteraction, Client, Collection, Events, GatewayIntentBits, MessageFlags, SlashCommandBuilder } from "discord.js";
import { Client, Collection, Events, GatewayIntentBits, MessageFlags } from "discord.js";
import { configDotenv } from "dotenv";
import path from "path";
import fs from "fs";

236
src/services/status.service.ts
View File

@@ -2,93 +2,118 @@ import ping from "ping";
import * as cron from 'cron';
import { ActivityType, Client, ContainerBuilder } from "discord.js";
import { Host, InfraType } from "../type";
import { loadEnvFile } from "process";
import { configDotenv } from "dotenv";
import { AppDataSource } from "../data-source";
import { HostsLog } from "../entity/hostslog.entity";
import { Repository } from "typeorm";
export class StatusService {
public hosts: Host[] = [
{
'host': 'https://protojx.com',
'name': 'Protojx Website',
alive: false,
ping_type: 'website',
type: 'website'
},
{
'host': 'https://manager.protojx.com',
'name': 'Espace Client',
alive: false,
ping_type: 'website',
type: 'website'
},
{
host: '5.178.99.4',
name: 'RYZEN 01',
alive: false,
ping_type: 'ping',
type: 'ryzen'
},
{
host: '5.178.99.6',
name: 'RYZEN 02',
alive: false,
ping_type: 'ping',
type: 'ryzen'
},
{
host: '5.178.99.5',
name: 'RYZEN 03',
alive: false,
ping_type: 'ping',
type: 'ryzen'
},
{
host: '154.16.254.10',
name: 'RYZEN7 04',
alive: false,
ping_type: 'ping',
type: 'ryzen'
},
{
host: '5.178.99.177',
name: 'XEON 01 (2697A V4)',
alive: false,
ping_type: 'ping',
type: 'xeon'
},
{
host: '5.178.99.248',
name: 'XEON 02 (2687W V4)',
alive: false,
ping_type: 'ping',
type: 'xeon'
},
{
host: '5.178.99.53',
name: 'RYZEN-GAME 01',
alive: false,
ping_type: 'ping',
type: 'games'
},
{
host: '5.178.99.63',
name: 'XEON-GAME 01',
alive: false,
ping_type: 'ping',
type: 'games'
}
];
{
'host': 'https://protojx.com',
'name': 'Protojx Website',
alive: false,
ping_type: 'website',
type: 'website',
notify: false
},
{
'host': 'https://manager.protojx.com',
'name': 'Espace Client',
alive: false,
ping_type: 'website',
type: 'website',
notify: false
},
{
host: '5.178.99.4',
name: 'RYZEN 01',
alive: false,
ping_type: 'ping',
type: 'ryzen',
notify: true
},
{
host: '5.178.99.6',
name: 'RYZEN 02',
alive: false,
ping_type: 'ping',
type: 'ryzen',
notify: true
},
{
host: '5.178.99.5',
name: 'RYZEN 03',
alive: false,
ping_type: 'ping',
type: 'ryzen',
notify: true
},
{
host: '154.16.254.10',
name: 'RYZEN7 04',
alive: false,
ping_type: 'ping',
type: 'ryzen',
notify: true
},
{
host: '5.178.99.177',
name: 'XEON 01 (2697A V4)',
alive: false,
ping_type: 'ping',
type: 'xeon',
notify: true
},
{
host: '5.178.99.248',
name: 'XEON 02 (2687W V4)',
alive: false,
ping_type: 'ping',
type: 'xeon',
notify: true
},
{
host: '5.178.99.53',
name: 'RYZEN-GAME 01',
alive: false,
ping_type: 'ping',
type: 'games',
notify: true
},
{
host: '5.178.99.63',
name: 'XEON-GAME 01',
alive: false,
ping_type: 'ping',
type: 'games',
notify: true
}
];
private client: Client | null = null;
private hostsLogRepo: Repository<HostsLog>;
constructor() {
this.hostsLogRepo = AppDataSource.getRepository(HostsLog);
setTimeout(async () => {
await this.fetch()
this.updateClientStatus();
}, 3000);
const cronJob = new cron.CronJob('*/2 * * * *', async () => {
const oneMonthAgo = new Date();
oneMonthAgo.setMonth(oneMonthAgo.getMonth() - 1);
this.hostsLogRepo.
createQueryBuilder()
.delete()
.from(HostsLog)
.where("created_at < :date", { date: oneMonthAgo })
.execute();
try {
await this.fetch();
await this.updateClientStatus();
@@ -119,27 +144,42 @@ export class StatusService {
}
}
private async fetchAlive(host: Host) {
const latestLog = await this.hostsLogRepo.findOne({ where: { host: host.host }, order: { created_at: 'DESC' } });
// ? Ping and Request Hosts
if (host.ping_type === 'ping') {
let res = await ping.promise.probe(host.host, { timeout: 10 });
host.alive = res.alive;
} else if (host.ping_type === 'website') {
try {
const response = await fetch(host.host, { method: 'HEAD', signal: AbortSignal.timeout(10000) });
host.alive = response.ok;
} catch (error) {
host.alive = false;
}
}
// ? Notification System :
if (!latestLog || latestLog.status != host.alive) {
const log = new HostsLog();
log.host = host.host;
log.status = host.alive;
this.hostsLogRepo.save(log);
}
return host;
}
private async fetch(max = 1): Promise<Host[]> {
const max_ping = 3;
const hosts = this.hosts.filter((value, index) => index < max * max_ping && index >= (max - 1) * max_ping);
async function fetchAlive(host: Host) {
if (host.ping_type === 'ping') {
let res = await ping.promise.probe(host.host, { timeout: 10 });
host.alive = res.alive;
} else if (host.ping_type === 'website') {
try {
const response = await fetch(host.host, { method: 'HEAD', signal: AbortSignal.timeout(10000) });
host.alive = response.ok;
} catch (error) {
host.alive = false;
}
}
return host;
}
const fetchPromises = hosts.map(host => fetchAlive(host));
const fetchPromises = hosts.map(host => this.fetchAlive(host));
const updatedHosts = await Promise.all(fetchPromises);
updatedHosts.forEach((updatedHost, index) => {
@@ -156,16 +196,16 @@ export class StatusService {
return this.hosts;
}
public getUpdatedContainer() : ContainerBuilder {
public getUpdatedContainer(): ContainerBuilder {
const hostTexts = this.hosts.map((s) => {
return {type: s.type, value: `- ${s.name} : ${s.alive ? `${process.env.EMOJI_STATUS_ONLINE} Online` : `${process.env.EMOJI_STATUS_OFFLINE} Offline`}`};
return { type: s.type, value: `- ${s.name} : ${s.alive ? `${process.env.EMOJI_STATUS_ONLINE} Online` : `${process.env.EMOJI_STATUS_OFFLINE} Offline`}` };
});
const container = new ContainerBuilder()
.setAccentColor(0x0000ed)
.addTextDisplayComponents((text) => text.setContent('# Status of protojx services'));
const sections : {title: string, type: InfraType, thumbnail: string}[] = [
const sections: { title: string, type: InfraType, thumbnail: string }[] = [
{
title: 'Websites',
type: 'website',
@@ -194,17 +234,17 @@ export class StatusService {
(section) =>
section.addTextDisplayComponents(
(text) =>
text.setContent('## '+sectionData.title+'\n'+hostTexts.filter((v) => v.type == sectionData.type).map((v) => v.value).join('\n'))
)
.setThumbnailAccessory(
(acc) =>
acc.setURL(sectionData.thumbnail)
text.setContent('## ' + sectionData.title + '\n' + hostTexts.filter((v) => v.type == sectionData.type).map((v) => v.value).join('\n'))
)
.setThumbnailAccessory(
(acc) =>
acc.setURL(sectionData.thumbnail)
)
)
});
const now = new Date();
container.addTextDisplayComponents((text) => text.setContent(`${now.getDate()}-${now.getMonth() + 1}-${now.getFullYear()} ${(now.getHours()+'').padStart(2, "0")}:${(now.getMinutes()+'').padStart(2, "0")}`));
container.addTextDisplayComponents((text) => text.setContent(`${now.getDate()}-${now.getMonth() + 1}-${now.getFullYear()} ${(now.getHours() + '').padStart(2, "0")}:${(now.getMinutes() + '').padStart(2, "0")}`));
return container;
}

3
src/type.d.ts vendored
View File

@@ -6,6 +6,7 @@ export type Host = {
name: string,
alive: boolean,
ping_type: 'ping' | 'website',
type: InfraType
type: InfraType,
notify: boolean;
};
export type CommandDefinition = { data: SlashCommandBuilder, execute: (interaction: ChatInputCommandInteraction) => void, buttons?: { id: string, handle: (interaction: ButtonInteraction) => void}[]};