Skip to content

Commit

Permalink
run prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
Szedann committed Jul 29, 2023
1 parent 05e4f5a commit 7104e36
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 84 deletions.
4 changes: 3 additions & 1 deletion src/handlers/log.handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ export const logHandler: Handler = (client) => {
const issuesEmbed = new EmbedBuilder()
.setTitle('Log analysis')
.setDescription(
`${issues.length} issue${issues.length == 1 ? '' : 's'} found automatically`
`${issues.length} issue${
issues.length == 1 ? '' : 's'
} found automatically`
)
.setFields(...issues)
.setColor('Red');
Expand Down
16 changes: 10 additions & 6 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,20 @@ client.once('ready', async () => {
Webserver running on port: **${process.env.WEBSERVER_PORT}**
OS: **${process.platform}**
CPU Architecture: **${process.arch}**
Memory: **${Math.round(
(process.memoryUsage().heapUsed / 1024 / 1024) * 100
) / 100
Memory: **${
Math.round(
(process.memoryUsage().heapUsed / 1024 / 1024) * 100
) / 100
} MB**
Node.js version: **${process.version}**
TypeScript version: **${process.env.npm_package_devDependencies_typescript
TypeScript version: **${
process.env.npm_package_devDependencies_typescript
}**
Discord.js version: **${process.env.npm_package_dependencies_discord_js
Discord.js version: **${
process.env.npm_package_dependencies_discord_js
}**
Express version: **${process.env.npm_package_dependencies_express
Express version: **${
process.env.npm_package_dependencies_express
}**
`
)
Expand Down
2 changes: 1 addition & 1 deletion src/logIssueAnalyzers/_logIssueAnalyzers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { optifineAnalyzer } from './optifine';
export const logAnalyzers: Analyzer[] = [
optifineAnalyzer,
minecraftVersionAnalyzer,
createVersionAnalyzer
createVersionAnalyzer,
];

export default logAnalyzers;
2 changes: 1 addition & 1 deletion src/logIssueAnalyzers/minecraftVersion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { getMinecraftVersion } from '../logs/Analyzer';

export const minecraftVersionAnalyzer: Analyzer = async (log) => {
const minecraftVersion = getMinecraftVersion(log);
console.log(minecraftVersion)
console.log(minecraftVersion);
if (!minecraftVersion) return null;
const incompatibleVersions = new Set(['1.19.3', '1.19.4']);
if (incompatibleVersions.has(minecraftVersion))
Expand Down
150 changes: 75 additions & 75 deletions src/logs/Analyzer.ts
Original file line number Diff line number Diff line change
@@ -1,107 +1,107 @@
import { Analyzer } from '../handlers/log.handler';

export const getMinecraftVersion = (log: string) => {
const minecraftVerionRegexes = [
/\n\|[\s\d]+\| Minecraft\s+\| minecraft\s+\| (\S+).+\n/,
/: Loading Minecraft (\S+)/,
/--fml.mcVersion, ([^\s,]+)/,
/--version, ([^,]+),/,
/ --version (\\S+) /,
/Minecraft Version: (.+)/,
];
const minecraftVerionRegexes = [
/\n\|[\s\d]+\| Minecraft\s+\| minecraft\s+\| (\S+).+\n/,
/: Loading Minecraft (\S+)/,
/--fml.mcVersion, ([^\s,]+)/,
/--version, ([^,]+),/,
/ --version (\\S+) /,
/Minecraft Version: (.+)/,
];

for (const regex of minecraftVerionRegexes) {
const regRes = log.match(regex);
if (!regRes) continue;
return regRes[1].toString();
}
for (const regex of minecraftVerionRegexes) {
const regRes = log.match(regex);
if (!regRes) continue;
return regRes[1].toString();
}
};

const minecraftVersionAnalyser: Analyzer = async (log) => {
const version = getMinecraftVersion(log);
if (!version) return null;
return {
name: 'Minecraft Version',
value: '`' + version + '`',
};
const version = getMinecraftVersion(log);
if (!version) return null;
return {
name: 'Minecraft Version',
value: '`' + version + '`',
};
};

export const getJavaVersion = (log: string) => {
const javaVersionRegexes = [/Java Version: (.+)/, /Java is version (.+?),/];
for (const regex of javaVersionRegexes) {
const regRes = log.match(regex);
if (!regRes) continue;
const version = regRes[1].toString();
return version;
}
const javaVersionRegexes = [/Java Version: (.+)/, /Java is version (.+?),/];
for (const regex of javaVersionRegexes) {
const regRes = log.match(regex);
if (!regRes) continue;
const version = regRes[1].toString();
return version;
}
};

export const javaVersionAnalyzer: Analyzer = async (log) => {
const version = getJavaVersion(log);
if (!version) return null;
return {
name: 'Java Version',
value: '`' + version + '`',
};
const version = getJavaVersion(log);
if (!version) return null;
return {
name: 'Java Version',
value: '`' + version + '`',
};
};

export const javaArgumentsAnalyzer: Analyzer = async (text) => {
const javaArgumentsRegex = /Java Arguments:\s+(\[[^\]]+\])/;
const javaArgumentsMatch = text.match(javaArgumentsRegex);
const javaArgumentsRegex = /Java Arguments:\s+(\[[^\]]+\])/;
const javaArgumentsMatch = text.match(javaArgumentsRegex);

if (javaArgumentsMatch) {
const javaargs = javaArgumentsMatch[1].toString();
return {
name: 'Java Arguments',
value: `\`\`\`${javaargs}\`\`\``,
};
}
return null;
if (javaArgumentsMatch) {
const javaargs = javaArgumentsMatch[1].toString();
return {
name: 'Java Arguments',
value: `\`\`\`${javaargs}\`\`\``,
};
}
return null;
};

export type Loader = 'Quilt' | 'Fabric' | 'Forge';

export function getLoader(
log: string
log: string
): { loader: Loader; version: string } | undefined {
const loaderRegexes = new Map<Loader, RegExp[]>();
loaderRegexes.set('Quilt', [
/\n\|[\s\d]+\| Quilt Loader\s+\| quilt_loader\s+\| (\S+).+\n/,
/: Loading .+ with Quilt Loader (\S+)/,
]);
loaderRegexes.set('Fabric', [/: Loading .+ with Fabric Loader (\S+)/]);
loaderRegexes.set('Forge', [
/--fml.forgeVersion, ([^\s,]+)/,
/MinecraftForge v([^\\s,]+) Initialized/,
]);
const loaderRegexes = new Map<Loader, RegExp[]>();
loaderRegexes.set('Quilt', [
/\n\|[\s\d]+\| Quilt Loader\s+\| quilt_loader\s+\| (\S+).+\n/,
/: Loading .+ with Quilt Loader (\S+)/,
]);
loaderRegexes.set('Fabric', [/: Loading .+ with Fabric Loader (\S+)/]);
loaderRegexes.set('Forge', [
/--fml.forgeVersion, ([^\s,]+)/,
/MinecraftForge v([^\\s,]+) Initialized/,
]);

for (const loader of loaderRegexes.keys()) {
const regexes = loaderRegexes.get(loader);
if (!regexes) continue;
for (const regex of regexes) {
const regRes = log.match(regex);
if (!regRes) continue;
const version = regRes[1].toString();
return {
loader: loader,
version: version,
};
for (const loader of loaderRegexes.keys()) {
const regexes = loaderRegexes.get(loader);
if (!regexes) continue;
for (const regex of regexes) {
const regRes = log.match(regex);
if (!regRes) continue;
const version = regRes[1].toString();
return {
loader: loader,
version: version,
};
}
}
}
}

const loaderAnalyser: Analyzer = async (log) => {
const loaderData = getLoader(log);
if (!loaderData) return null;
const { loader, version } = loaderData;
return {
name: 'Loader',
value: `\`${loader} (${version})\``,
};
const loaderData = getLoader(log);
if (!loaderData) return null;
const { loader, version } = loaderData;
return {
name: 'Loader',
value: `\`${loader} (${version})\``,
};
};

export const analyzers: Analyzer[] = [
minecraftVersionAnalyser,
javaVersionAnalyzer,
loaderAnalyser,
minecraftVersionAnalyser,
javaVersionAnalyzer,
loaderAnalyser,
];

0 comments on commit 7104e36

Please sign in to comment.