info/stats fixes
This commit is contained in:
parent
7a88f6b693
commit
bf90ae108a
|
@ -1,17 +1,12 @@
|
||||||
import { readFileSync } from "fs";
|
import { readFileSync } from "fs";
|
||||||
import { dirname } from "path";
|
|
||||||
import { fileURLToPath } from "url";
|
|
||||||
const { version } = JSON.parse(readFileSync(new URL("../../package.json", import.meta.url)));
|
const { version } = JSON.parse(readFileSync(new URL("../../package.json", import.meta.url)));
|
||||||
import Command from "../../classes/command.js";
|
import Command from "../../classes/command.js";
|
||||||
import { exec as baseExec } from "child_process";
|
|
||||||
import { promisify } from "util";
|
|
||||||
import { getServers } from "../../utils/misc.js";
|
import { getServers } from "../../utils/misc.js";
|
||||||
const exec = promisify(baseExec);
|
|
||||||
|
|
||||||
class InfoCommand extends Command {
|
class InfoCommand extends Command {
|
||||||
async run() {
|
async run() {
|
||||||
const owner = await this.client.getRESTUser(process.env.OWNER.split(",")[0]);
|
const owner = await this.client.getRESTUser(process.env.OWNER.split(",")[0]);
|
||||||
const servers = await getServers();
|
const servers = await getServers(this.client);
|
||||||
await this.acknowledge();
|
await this.acknowledge();
|
||||||
return {
|
return {
|
||||||
embeds: [{
|
embeds: [{
|
||||||
|
@ -23,7 +18,7 @@ class InfoCommand extends Command {
|
||||||
description: `This instance is managed by **${owner.username}#${owner.discriminator}**.`,
|
description: `This instance is managed by **${owner.username}#${owner.discriminator}**.`,
|
||||||
fields: [{
|
fields: [{
|
||||||
name: "ℹ️ Version:",
|
name: "ℹ️ Version:",
|
||||||
value: `v${version}${process.env.NODE_ENV === "development" ? `-dev (${(await exec("git rev-parse HEAD", { cwd: dirname(fileURLToPath(import.meta.url)) })).stdout.substring(0, 7)})` : ""}`
|
value: `v${version}${process.env.NODE_ENV === "development" ? `-dev (${process.env.GIT_REV})` : ""}`
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "📝 Credits:",
|
name: "📝 Credits:",
|
||||||
|
|
|
@ -1,22 +1,18 @@
|
||||||
import { readFileSync } from "fs";
|
import { readFileSync } from "fs";
|
||||||
import { dirname } from "path";
|
|
||||||
import { fileURLToPath } from "url";
|
|
||||||
const { version } = JSON.parse(readFileSync(new URL("../../package.json", import.meta.url)));
|
const { version } = JSON.parse(readFileSync(new URL("../../package.json", import.meta.url)));
|
||||||
import os from "os";
|
import os from "os";
|
||||||
import Command from "../../classes/command.js";
|
import Command from "../../classes/command.js";
|
||||||
import { VERSION } from "eris";
|
import { VERSION } from "eris";
|
||||||
import { exec as baseExec } from "child_process";
|
|
||||||
import { promisify } from "util";
|
|
||||||
import pm2 from "pm2";
|
import pm2 from "pm2";
|
||||||
import { getServers } from "../../utils/misc.js";
|
import { getServers } from "../../utils/misc.js";
|
||||||
const exec = promisify(baseExec);
|
|
||||||
|
|
||||||
class StatsCommand extends Command {
|
class StatsCommand extends Command {
|
||||||
async run() {
|
async run() {
|
||||||
const uptime = process.uptime() * 1000;
|
const uptime = process.uptime() * 1000;
|
||||||
const connUptime = this.client.uptime;
|
const connUptime = this.client.uptime;
|
||||||
const owner = await this.client.getRESTUser(process.env.OWNER.split(",")[0]);
|
const owner = await this.client.getRESTUser(process.env.OWNER.split(",")[0]);
|
||||||
const servers = await getServers();
|
const servers = await getServers(this.client);
|
||||||
|
const processMem = `${(process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2)} MB`;
|
||||||
return {
|
return {
|
||||||
embeds: [{
|
embeds: [{
|
||||||
"author": {
|
"author": {
|
||||||
|
@ -27,16 +23,16 @@ class StatsCommand extends Command {
|
||||||
"color": 16711680,
|
"color": 16711680,
|
||||||
"fields": [{
|
"fields": [{
|
||||||
"name": "Version",
|
"name": "Version",
|
||||||
"value": `v${version}${process.env.NODE_ENV === "development" ? `-dev (${(await exec("git rev-parse HEAD", { cwd: dirname(fileURLToPath(import.meta.url)) })).stdout.substring(0, 7)})` : ""}`
|
"value": `v${version}${process.env.NODE_ENV === "development" ? `-dev (${process.env.GIT_REV})` : ""}`
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Process Memory Usage",
|
"name": "Process Memory Usage",
|
||||||
"value": `${(process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2)} MB`,
|
"value": processMem,
|
||||||
"inline": true
|
"inline": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Total Memory Usage",
|
"name": "Total Memory Usage",
|
||||||
"value": process.env.PM2_USAGE ? `${((await this.list()).reduce((prev, cur) => prev + cur.monit.memory, 0) / 1024 / 1024).toFixed(2)} MB` : "Unknown",
|
"value": process.env.PM2_USAGE ? `${((await this.list()).reduce((prev, cur) => prev + cur.monit.memory, 0) / 1024 / 1024).toFixed(2)} MB` : processMem,
|
||||||
"inline": true
|
"inline": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -81,7 +81,7 @@ export function endBroadcast(bot) {
|
||||||
broadcast = false;
|
broadcast = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getServers() {
|
export function getServers(bot) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
if (process.env.PM2_USAGE) {
|
if (process.env.PM2_USAGE) {
|
||||||
pm2.launchBus((err, pm2Bus) => {
|
pm2.launchBus((err, pm2Bus) => {
|
||||||
|
@ -104,7 +104,7 @@ export function getServers() {
|
||||||
if (err) reject(err);
|
if (err) reject(err);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
resolve(0);
|
resolve(bot.guilds.size);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
Loading…
Reference in New Issue