Merge commit 'refs/pull/62/head' of https://github.com/MathMan05/JankClient

This commit is contained in:
MathMan05 2024-09-19 09:38:48 -05:00
commit 593244ed13
36 changed files with 9911 additions and 11052 deletions

View file

@ -1,310 +0,0 @@
const globals = require("globals");
const unicorn = require("eslint-plugin-unicorn");
const sonarjs = require("eslint-plugin-sonarjs");
const stylistic = require("@stylistic/eslint-plugin-js");
const htmlESLint = require("@html-eslint/eslint-plugin");
const html = require("eslint-plugin-html");
const tsParser = require("@typescript-eslint/parser");
const linterOptions = {
reportUnusedDisableDirectives: "error"
};
const global = {
...globals.browser
};
const rules = {
"array-callback-return": 2,
"block-scoped-var": 2,
"default-case-last": 2,
"default-param-last": 1,
"dot-notation": 1,
"func-name-matching": 2,
"func-style": 0,
"no-array-constructor": 2,
"no-compare-neg-zero": 2,
"no-const-assign": 2,
"no-constructor-return": 2,
"no-dupe-args": 1,
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-div-regex": 2,
"no-eq-null": 2,
"no-extra-boolean-cast": 2,
"no-extra-bind": 2,
"no-extend-native": 2,
"no-empty-pattern": 2,
"no-duplicate-imports": 2,
"no-fallthrough": 2,
"no-func-assign": 2,
"no-import-assign": 2,
"no-invalid-regexp": 2,
"no-invalid-this": 2,
"no-implicit-coercion": [2, {
string: false
}],
"no-implied-eval": 2,
"no-loss-of-precision": 2,
"no-multi-assign": 1,
"no-negated-condition": 1,
"no-new-native-nonconstructor": 2,
"no-new-object": 2,
"no-obj-calls": 2,
"no-self-assign": 2,
"no-unreachable": 1,
"no-unreachable-loop": 1,
"no-unsafe-finally": 2,
"no-unused-vars": 1,
"no-useless-computed-key": 2,
"no-useless-rename": 1,
"no-useless-escape": 1,
"no-unused-expressions": 1,
"no-useless-return": 1,
"no-useless-call": 2,
"no-use-before-define": 0,
"no-useless-concat": 1,
"no-useless-backreference": 1,
"no-useless-catch": 1,
"no-unneeded-ternary": 1,
"no-undef": [2, {
typeof: true
}],
"no-undef-init": 2,
"no-useless-constructor": 1,
"no-redeclare": 1,
"no-shadow-restricted-names": 2,
"no-empty-static-block": 1,
"no-throw-literal": 2,
"no-template-curly-in-string": 1,
"no-unsafe-optional-chaining": 2,
"no-unmodified-loop-condition": 1,
"no-promise-executor-return": 2,
"no-warning-comments": 1,
"no-var": 1,
"no-new-func": 2,
"no-new-wrappers": 2,
"no-multi-str": 2,
"no-shadow": [1, {
builtinGlobals: false
}],
"no-self-compare": 2,
"no-regex-spaces": 1,
"no-constant-binary-expression": 2,
"no-sequences": 2,
"no-irregular-whitespace": [2, {
skipRegExps: true
}],
"no-constant-condition": 1,
"no-unsafe-negation": 2,
"no-lone-blocks": 2,
"object-shorthand": 1,
"prefer-arrow-callback": 1,
"prefer-const": 1,
"use-isnan": 1,
"valid-typeof": 2,
yoda: 2,
"@stylistic/array-bracket-spacing": 2,
"@stylistic/arrow-parens": [2, "as-needed"],
"@stylistic/arrow-spacing": [2, { before: false, after: false }],
"@stylistic/block-spacing": [2, "never"],
"@stylistic/brace-style": 1,
"@stylistic/comma-style": 2,
"@stylistic/computed-property-spacing": 2,
"@stylistic/dot-location": [2, "property"],
"@stylistic/function-call-spacing": 2,
"@stylistic/generator-star-spacing": 2,
"@stylistic/key-spacing": 2,
"@stylistic/indent": [1, "tab"],
"@stylistic/keyword-spacing": [1, { before: false, after: false }],
"@stylistic/new-parens": 2,
"@stylistic/no-mixed-operators": [2, {
groups: [["*", "/"], ["+", "-"]]
}],
"@stylistic/no-extra-semi": 1,
"@stylistic/no-multi-spaces": 1,
"@stylistic/no-mixed-spaces-and-tabs": 2,
"@stylistic/no-floating-decimal": 2,
"@stylistic/no-whitespace-before-property": 2,
"@stylistic/no-trailing-spaces": 1,
"@stylistic/max-statements-per-line": 1,
"@stylistic/max-len": [1, {
code: 200
}],
"@stylistic/quote-props": [2, "as-needed"],
"@stylistic/quotes": [1, "double", {
avoidEscape: false
}],
"@stylistic/padded-blocks": [2, "never"],
"@stylistic/rest-spread-spacing": 2,
"@stylistic/semi": 1,
"@stylistic/space-before-blocks": [2, "never"],
"@stylistic/space-before-function-paren": [2, {
named: "never",
anonymous: "never",
asyncArrow: "always"
}],
"@stylistic/space-in-parens": 2,
"@stylistic/space-unary-ops": 2,
"@stylistic/yield-star-spacing": 2,
"unicorn/error-message": 2,
"unicorn/new-for-builtins": 2,
"unicorn/consistent-empty-array-spread": 2,
"unicorn/consistent-destructuring": 2,
"unicorn/consistent-function-scoping": 2,
"unicorn/no-array-method-this-argument": 2,
"unicorn/no-lonely-if": 1,
"unicorn/no-invalid-fetch-options": 2,
"unicorn/no-instanceof-array": 2,
"unicorn/no-magic-array-flat-depth": 2,
"unicorn/no-nested-ternary": 2,
"unicorn/no-new-buffer": 2,
"unicorn/no-console-spaces": 2,
"unicorn/no-for-loop": 2,
"unicorn/no-useless-undefined": 2,
"unicorn/no-unreadable-iife": 2,
"unicorn/no-unnecessary-await": 2,
"unicorn/no-unreadable-array-destructuring": 2,
"unicorn/no-useless-switch-case": 2,
"unicorn/no-typeof-undefined": 2,
"unicorn/no-useless-fallback-in-spread": 2,
"unicorn/no-useless-length-check": 2,
"unicorn/no-useless-spread": 2,
"unicorn/no-useless-promise-resolve-reject": 2,
"unicorn/no-zero-fractions": 2,
"unicorn/prefer-array-find": 1,
"unicorn/prefer-array-index-of": 1,
"unicorn/prefer-includes": 1,
"unicorn/prefer-logical-operator-over-ternary": 1,
"unicorn/prefer-date-now": 1,
"unicorn/prefer-default-parameters": 1,
"unicorn/prefer-array-some": 1,
"unicorn/prefer-blob-reading-methods": 1,
"unicorn/prefer-at": 1,
"unicorn/prefer-optional-catch-binding": 1,
"unicorn/prefer-regexp-test": 1,
"unicorn/prefer-set-has": 1,
"unicorn/prefer-set-size": 1,
"unicorn/prefer-keyboard-event-key": 1,
"unicorn/prefer-negative-index": 1,
"unicorn/prefer-node-protocol": 1,
"unicorn/prefer-number-properties": [1, {
checkInfinity: true
}],
"unicorn/prefer-prototype-methods": 1,
"unicorn/prefer-string-trim-start-end": 1,
"unicorn/prefer-string-starts-ends-with": 1,
"unicorn/prefer-structured-clone": 1,
"unicorn/throw-new-error": 2,
"unicorn/require-number-to-fixed-digits-argument": 2,
"unicorn/switch-case-braces": [1, "avoid"],
"unicorn/text-encoding-identifier-case": 2,
"unicorn/no-await-in-promise-methods": 2,
"unicorn/no-single-promise-in-promise-methods": 2,
"unicorn/no-negation-in-equality-check": 2,
"unicorn/no-length-as-slice-end": 2,
"sonarjs/no-extra-arguments": 2,
"sonarjs/no-empty-collection": 2,
"sonarjs/no-element-overwrite": 2,
"sonarjs/no-use-of-empty-return-value": 2,
"sonarjs/no-all-duplicated-branches": 2,
"sonarjs/no-ignored-return": 2,
"sonarjs/no-identical-expressions": 2,
"sonarjs/no-one-iteration-loop": 2,
"sonarjs/non-existent-operator": 2,
"sonarjs/no-redundant-boolean": 2,
"sonarjs/no-unused-collection": 1,
"sonarjs/prefer-immediate-return": 2,
"sonarjs/no-inverted-boolean-check": 2,
"sonarjs/no-redundant-jump": 2,
"sonarjs/no-same-line-conditional": 2,
"sonarjs/prefer-object-literal": 2,
"sonarjs/no-collection-size-mischeck": 2,
"sonarjs/prefer-while": 2,
"sonarjs/no-gratuitous-expressions": 2,
"sonarjs/no-duplicated-branches": 2
};
module.exports = [
{
linterOptions,
languageOptions: {
parser: tsParser,
globals: global
},
files: ["webpage/*.ts"],
ignores: ["!*.js", "!*.ts"],
plugins: {
unicorn,
sonarjs,
"@stylistic": stylistic
},
rules
},{
linterOptions,
languageOptions: {
parser: tsParser,
globals: globals.node
},
files: ["*.js", "*.ts"],
plugins: {
unicorn,
sonarjs,
"@stylistic": stylistic
},
rules
},{
linterOptions,
languageOptions: {
globals: global,
parser: require("@html-eslint/parser")
},
files: ["**/*.html"],
plugins: {
unicorn,
sonarjs,
"@stylistic": stylistic,
"@html-eslint": htmlESLint,
html
},
settings: {
"html/html-extensions": [".html"]
},
rules: {
...rules,
"@html-eslint/require-meta-charset": 2,
"@html-eslint/require-button-type": 2,
"@html-eslint/no-restricted-attrs": 2,
"@html-eslint/no-multiple-h1": 1,
"@html-eslint/require-meta-description": 1,
"@html-eslint/no-skip-heading-levels": 2,
"@html-eslint/require-frame-title": 2,
"@html-eslint/no-non-scalable-viewport": 2,
"@html-eslint/no-positive-tabindex": 2,
"@html-eslint/require-meta-viewport": 2,
"@html-eslint/no-abstract-roles": 2,
"@html-eslint/no-aria-hidden-body": 2,
"@html-eslint/no-accesskey-attrs": 2,
"@html-eslint/no-multiple-empty-lines": 2,
"@html-eslint/no-trailing-spaces": 2,
"@html-eslint/indent": [1, "tab"],
"@html-eslint/no-duplicate-attrs": 2,
"@html-eslint/no-inline-styles": 1,
"@html-eslint/no-duplicate-id": 2,
"@html-eslint/no-script-style-type": 2,
"@html-eslint/require-li-container": 2,
"@html-eslint/require-closing-tags": 2,
"@html-eslint/require-doctype": 2,
"@html-eslint/require-lang": 2,
"@html-eslint/require-title": 2,
"@html-eslint/no-extra-spacing-attrs": 2,
"@html-eslint/quotes": 2,
"@html-eslint/require-img-alt": 1
}
}
];

184
eslint.config.mjs Normal file
View file

@ -0,0 +1,184 @@
// @ts-check
import eslint from "@eslint/js";
import tseslint from "typescript-eslint";
import html from "@html-eslint/eslint-plugin";
export default tseslint.config(
eslint.configs.recommended,
...tseslint.configs.stylisticTypeChecked,
html.configs["flat/recommended"],
{
languageOptions: {
parserOptions: {
projectService: true,
tsconfigRootDir: import.meta.dirname,
},
},
files: ["**/*.ts", "**/*.html"],
ignores: ["dist/**/*", "node_modules/**/*"],
rules: {
"array-callback-return": 2,
"block-scoped-var": 2,
"default-case-last": 2,
"default-param-last": 1,
"dot-notation": 1,
"func-name-matching": 2,
"func-style": 0,
"no-array-constructor": 2,
"no-compare-neg-zero": 2,
"no-const-assign": 2,
"no-constructor-return": 2,
"no-dupe-args": 1,
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-div-regex": 2,
"no-eq-null": 2,
"no-extra-boolean-cast": 2,
"no-extra-bind": 2,
"no-extend-native": 2,
"no-empty-pattern": 2,
"no-duplicate-imports": 2,
"no-fallthrough": 2,
"no-func-assign": 2,
"no-import-assign": 2,
"no-invalid-regexp": 2,
"no-invalid-this": 2,
"no-implicit-coercion": [
2,
{
string: false,
},
],
"no-implied-eval": 2,
"no-loss-of-precision": 2,
"no-multi-assign": 1,
"no-negated-condition": 1,
"no-new-native-nonconstructor": 2,
"no-new-object": 2,
"no-obj-calls": 2,
"no-self-assign": 2,
"no-unreachable": 1,
"no-unreachable-loop": 1,
"no-unsafe-finally": 2,
"no-unused-vars": 1,
"no-useless-computed-key": 2,
"no-useless-rename": 1,
"no-useless-escape": 1,
"no-unused-expressions": 1,
"no-useless-return": 1,
"no-useless-call": 2,
"no-use-before-define": 0,
"no-useless-concat": 1,
"no-useless-backreference": 1,
"no-useless-catch": 1,
"no-unneeded-ternary": 1,
"no-undef": [
2,
{
typeof: true,
},
],
"no-undef-init": 2,
"no-useless-constructor": 1,
"no-redeclare": 1,
"no-shadow-restricted-names": 2,
"no-empty-static-block": 1,
"no-throw-literal": 2,
"no-template-curly-in-string": 1,
"no-unsafe-optional-chaining": 2,
"no-unmodified-loop-condition": 1,
"no-promise-executor-return": 2,
"no-warning-comments": 1,
"no-var": 1,
"no-new-func": 2,
"no-new-wrappers": 2,
"no-multi-str": 2,
"no-shadow": [
1,
{
builtinGlobals: false,
},
],
"no-self-compare": 2,
"no-regex-spaces": 1,
"no-constant-binary-expression": 2,
"no-sequences": 2,
"no-irregular-whitespace": [
2,
{
skipRegExps: true,
},
],
"no-constant-condition": 1,
"no-unsafe-negation": 2,
"no-lone-blocks": 2,
"object-shorthand": 1,
"prefer-arrow-callback": 1,
"prefer-const": 1,
"use-isnan": 1,
"valid-typeof": 2,
yoda: 2,
"@stylistic/array-bracket-spacing": 2,
"@stylistic/arrow-parens": [2, "as-needed"],
"@stylistic/arrow-spacing": [2, { before: false, after: false }],
"@stylistic/block-spacing": [2, "never"],
"@stylistic/brace-style": 1,
"@stylistic/comma-style": 2,
"@stylistic/computed-property-spacing": 2,
"@stylistic/dot-location": [2, "property"],
"@stylistic/function-call-spacing": 2,
"@stylistic/generator-star-spacing": 2,
"@stylistic/key-spacing": 2,
"@stylistic/indent": [1, "tab"],
"@stylistic/keyword-spacing": [1, { before: false, after: false }],
"@stylistic/new-parens": 2,
"@stylistic/no-mixed-operators": [
2,
{
groups: [
["*", "/"],
["+", "-"],
],
},
],
"@stylistic/no-extra-semi": 1,
"@stylistic/no-multi-spaces": 1,
"@stylistic/no-mixed-spaces-and-tabs": 2,
"@stylistic/no-floating-decimal": 2,
"@stylistic/no-whitespace-before-property": 2,
"@stylistic/no-trailing-spaces": 1,
"@stylistic/max-statements-per-line": 1,
"@stylistic/max-len": [
1,
{
code: 200,
},
],
"@stylistic/quote-props": [2, "as-needed"],
"@stylistic/quotes": [
1,
"double",
{
avoidEscape: false,
},
],
"@stylistic/padded-blocks": [2, "never"],
"@stylistic/rest-spread-spacing": 2,
"@stylistic/semi": 1,
"@stylistic/space-before-blocks": [2, "never"],
"@stylistic/space-before-function-paren": [
2,
{
named: "never",
anonymous: "never",
asyncArrow: "always",
},
],
"@stylistic/space-in-parens": 2,
"@stylistic/space-unary-ops": 2,
"@stylistic/yield-star-spacing": 2,
},
}
);

1312
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -12,29 +12,24 @@
"author": "MathMan05",
"license": "GPL-3.0",
"dependencies": {
"@html-eslint/parser": "^0.27.0",
"compression": "^1.7.4",
"express": "^4.19.2",
"node-fetch": "^3.3.2",
"ts-to-jsdoc": "^2.2.0"
},
"devDependencies": {
"@eslint/js": "^9.7.0",
"@eslint/js": "^9.10.0",
"@html-eslint/eslint-plugin": "^0.25.0",
"@html-eslint/parser": "^0.25.0",
"@stylistic/eslint-plugin": "^2.3.0",
"@types/compression": "^1.7.5",
"@types/eslint__js": "^8.42.3",
"@types/express": "^4.17.21",
"@types/node-fetch": "^2.6.11",
"eslint": "^8.57.0",
"eslint-plugin-html": "^8.1.1",
"eslint-plugin-sonarjs": "^1.0.4",
"eslint-plugin-unicorn": "^55.0.0",
"eslint": "^8.57.1",
"gulp": "^5.0.0",
"gulp-copy": "^5.0.0",
"gulp-typescript": "^6.0.0-alpha.1",
"ts-node": "^10.9.2",
"typescript": "^5.5.4",
"typescript-eslint": "^7.17.0"
"typescript": "^5.6.2",
"typescript-eslint": "^7.18.0"
}
}

View file

@ -46,7 +46,7 @@ function loadUptimeObject(): UptimeObject {
function saveUptimeObject(): void {
fs.writeFile(
`${__dirname}/uptime.json`,
path.join(__dirname, "..", "uptime.json"),
JSON.stringify(uptimeObject),
(error) => {
if (error) {
@ -86,6 +86,7 @@ async function resolveInstance(
return;
}
activeInstances.add(instance.name);
await checkHealth(instance, api); // Ensure health is checked immediately
scheduleHealthCheck(instance, api);
} catch (error) {
console.error("Error resolving instance:", error);
@ -124,14 +125,16 @@ async function checkHealth(
tries = 0
): Promise<void> {
try {
const response = await fetch(`${api}ping`, { method: "HEAD" });
const response = await fetch(`${api}/ping`, { method: "HEAD" });
console.log(`Checking health for ${instance.name}: ${response.status}`);
if (response.ok || tries > 3) {
console.log(`Setting status for ${instance.name} to ${response.ok}`);
setStatus(instance, response.ok);
} else {
retryHealthCheck(instance, api, tries);
}
} catch (error) {
console.error("Error checking health:", error);
console.error(`Error checking health for ${instance.name}:`, error);
if (tries > 3) {
setStatus(instance, false);
} else {
@ -240,12 +243,13 @@ function setStatus(instance: string | Instance, status: boolean): void {
uptimeObject[name] = obj;
}
if (obj.at(-1)?.online !== status) {
const lastEntry = obj.at(-1);
if (!lastEntry || lastEntry.online !== status) {
obj.push({ time: Date.now(), online: status });
saveUptimeObject();
}
if (typeof instance !== "string") {
calcStats(instance);
}
}
}

View file

@ -1,10 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Jank Client</title>
<meta name="description" content="A spacebar client that has DMs, replying and more">
<meta content="Jank Client" property="og:title">
<meta content="A spacebar client that has DMs, replying and more" property="og:description">
<meta content="/logo.webp" property="og:image">
<meta content="#4b458c" data-react-helmet="true" name="theme-color">
<link href="/style.css" rel="stylesheet">
@ -13,18 +15,24 @@
<body class="Dark-theme">
<div id="titleDiv">
<img src="/logo.svg" width="40" alt="Jank Client Logo">
<img src="/logo.svg" width="40">
<h1 id="pageTitle">Jank Client</h1>
<a href="https://sb-jankclient.vanillaminigames.net/invite/USgYJo?instance=https%3A%2F%2Fspacebar.chat" class="TitleButtons">Spacebar Guild</a>
<a href="https://github.com/MathMan05/JankClient" class="TitleButtons">Github</a>
<a href="https://sb-jankclient.vanillaminigames.net/invite/USgYJo?instance=https%3A%2F%2Fspacebar.chat" class="TitleButtons">Spacebar Guild</a>
<a href="https://github.com/MathMan05/JankClient" class="TitleButtons">Github</a>
<a href="https://sb-jankclient.vanillaminigames.net/invite/USgYJo?instance=https%3A%2F%2Fspacebar.chat"
class="TitleButtons">
<h1>Spacebar Guild</h1>
</a>
<a href="https://github.com/MathMan05/JankClient" class="TitleButtons">
<h1>Github</h1>
</a>
</div>
<div class="flexttb">
<div class="flexttb pagehead"><h1>Welcome to Jank Client</h1></div>
<div class="flexttb pagehead">
<h1>Welcome to Jank Client</h1>
</div>
<div class="pagebox">
<p>Jank Client is a spacebar compatible client seeking to be as good as it can be with many features including:</p>
<p>Jank Client is a spacebar compatible client seeking to be as good as it can be with many features including:
</p>
<ul>
<li>Direct Messaging</li>
<li>Reactions support</li>
@ -40,10 +48,14 @@
</div>
<div class="pagebox">
<h2>Contribute to Jank Client</h2>
<p>We always appreciate some help, wether that be in the form of bug reports, or code, or even just pointing out some typos.</p><br>
</a><a href="https://github.com/MathMan05/JankClient" class="TitleButtons"><h1>Github</h1></a>
<p>We always appreciate some help, wether that be in the form of bug reports, or code, or even just pointing out
some typos.</p><br>
</a><a href="https://github.com/MathMan05/JankClient" class="TitleButtons">
<h1>Github</h1>
</a>
</div>
</div>
</body>
<script src="/home.js" type="module"></script>
</html>

View file

@ -1,9 +1,9 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<meta name="description" content="A spacebar client that has DMs, replying and more">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<title>Jank Client</title>
<meta content="Jank Client" property="og:title">
<meta content="A spacebar client that has DMs, replying and more" property="og:description">
@ -20,10 +20,10 @@
<div id="loading" class="loading">
<div id="centerdiv">
<img src="/logo.svg" alt="Logo" class="logo-image">
<img src="/logo.svg" style="width:3in;height:3in;">
<h1>Jank Client is loading</h1>
<h2 id="load-desc">This shouldn't take long</h2>
<h2 id="switchaccounts">Switch Accounts</h2>
<h1 id="switchaccounts">Switch Accounts</h1>
</div>
</div>
<div class="flexltr" id="page">
@ -37,7 +37,7 @@
<div id="channels"></div>
<div class="flexltr" id="userdock">
<div class="flexltr" id="userinfo">
<img id="userpfp" class="pfp" alt="User Profile Picture">
<img id="userpfp" class="pfp">
<div class="userflex">
<p id="username">USERNAME</p>
@ -78,4 +78,5 @@
</div>
</div>
</body>
</html>

View file

@ -1,4 +1,5 @@
<body class="Dark-theme">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@ -16,7 +17,8 @@
<div>
<label for="instance"><b>Instance:</b></label><br>
<p id="verify"></p>
<input type="search" list="instances" placeholder="Instance URL" id="instancein" name="instance" value="" id="instancein" required>
<input type="search" list="instances" placeholder="Instance URL" id="instancein" name="instance" value=""
id="instancein" required>
</div>
<div>
<label for="uname"><b>Email:</b></label><br>

View file

@ -28,6 +28,7 @@
"target": "ESNext",
"useDefineForClassFields": true,
"resolvePackageJsonImports": true,
"skipLibCheck": true,
"outDir": "./dist",
},
"include": [