RevelaNetwork/Revela-v4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add eslint support! 🎉

Browse source
This commit is contained in:
wearrrrr 2024-03-18 00:11:58 -05:00
parent a5d590b7ab
commit f3e347c1cd
17 changed files with 1368 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.eslintignore Normal file
View file

@ -0,0 +1,3 @@
node_modules/
dist/
public/

31
.eslintrc.cjs Normal file
View file

@ -0,0 +1,31 @@
module.exports = {
env: {
node: true,
es2022: true,
browser: true,
},
extends: ["eslint:recommended", "plugin:astro/recommended"],
parserOptions: {
ecmaVersion: "latest",
sourceType: "module",
},
rules: {
"no-unused-vars": "error",
},
overrides: [
{
files: ["*.astro"],
parser: "astro-eslint-parser",
parserOptions: {
parser: "@typescript-eslint/parser",
extraFileExtensions: [".astro"],
},
},
{
// Define the configuration for `<script>` tag.
// Script in `<script>` is assigned a virtual file name with the `.js` extension.
files: ["**/*.astro/*.js", "*.astro/*.js"],
parser: "@typescript-eslint/parser",
},
],
};

8
.vscode/settings.json vendored
View file

@ -1,5 +1,5 @@
{
"search.exclude": {
"/public/games/**": true
}
}
"search.exclude": {
"/public/games/**": true
}
}

7
Checkfailed.html
View file

@ -16,9 +16,8 @@
<body>
<h1>Welcome to nginx!</h1>
<p>
If you see this page, the nginx web server is successfully installed and
working. Further configuration is required. If you are expecting another
page, please check your network or
If you see this page, the nginx web server is successfully installed and working. Further
configuration is required. If you are expecting another page, please check your network or
<a href="/" id="rcheck"><b>Refresh this page</b></a>
</p>
@ -37,4 +36,4 @@
}
</script>
</body>
</html>
</html>

78
index.js
View file

@ -13,6 +13,7 @@ import { existsSync } from "fs";
import dotenv from "dotenv";
import cookieParser from "cookie-parser";
import wisp from "wisp-server-node";
import fs from "node:fs";
dotenv.config();
const LICENSE_SERVER_URL = "https://license.mercurywork.shop/validate?license=";
@ -52,9 +53,7 @@ async function MasqFail(req, res) {
return;
}
const unsafeSuffix = req.headers.host + ".html";
let safeSuffix = path
.normalize(unsafeSuffix)
.replace(/^(\.\.(\/|\\|$))+/, "");
let safeSuffix = path.normalize(unsafeSuffix).replace(/^(\.\.(\/|\\|$))+/, "");
let safeJoin = path.join(process.cwd() + "/Masqrd", safeSuffix);
try {
await fs.promises.access(safeJoin); // man do I wish this was an if-then instead of a "exception on fail"
@ -72,51 +71,53 @@ async function MasqFail(req, res) {
// Woooooo masqr yayyyy (said no one)
// uncomment for masqr
app.use(async (req, res, next) => {
if (req.headers.host && whiteListedDomains.includes(req.headers.host)) {
next();
return;
}
const authheader = req.headers.authorization;
if (req.cookies["authcheck"]) {
next();
return;
}
if (req.headers.host && whiteListedDomains.includes(req.headers.host)) {
next();
return;
}
const authheader = req.headers.authorization;
if (req.cookies["authcheck"]) {
next();
return;
}
if (req.cookies["refreshcheck"] != "true") {
res.cookie("refreshcheck", "true", { maxAge: 10000 }); // 10s refresh check
MasqFail(req, res);
return;
}
if (req.cookies['refreshcheck'] != "true") {
res.cookie("refreshcheck", "true", {maxAge: 10000}) // 10s refresh check
MasqFail(req, res)
return;
}
if (!authheader) {
res.setHeader('WWW-Authenticate', 'Basic'); // Yeah so we need to do this to get the auth params, kinda annoying and just showing a login prompt gives it away so its behind a 10s refresh check
res.status(401);
MasqFail(req, res)
return;
}
if (!authheader) {
res.setHeader("WWW-Authenticate", "Basic"); // Yeah so we need to do this to get the auth params, kinda annoying and just showing a login prompt gives it away so its behind a 10s refresh check
res.status(401);
MasqFail(req, res);
return;
}
const auth = Buffer.from(authheader.split(' ')[1], 'base64').toString().split(':');
const pass = auth[1];
const auth = Buffer.from(authheader.split(" ")[1], "base64").toString().split(":");
const pass = auth[1];
const licenseCheck = ((await (await fetch(LICENSE_SERVER_URL + pass + "&host=" + req.headers.host)).json()))["status"]
console.log(LICENSE_SERVER_URL + pass + "&host=" + req.headers.host +" returned " +licenseCheck)
if (licenseCheck == "License valid") {
res.cookie("authcheck", "true", {expires: new Date((Date.now()) + (365*24*60*60 * 1000))}) // authorize session, for like a year, by then the link will be expired lol
res.send(`<script> window.location.href = window.location.href </script>`) // fun hack to make the browser refresh and remove the auth params from the URL
return;
}
MasqFail(req, res)
return;
})
const licenseCheck = (
await (await fetch(LICENSE_SERVER_URL + pass + "&host=" + req.headers.host)).json()
)["status"];
console.log(
LICENSE_SERVER_URL + pass + "&host=" + req.headers.host + " returned " + licenseCheck
);
if (licenseCheck == "License valid") {
res.cookie("authcheck", "true", { expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000) }); // authorize session, for like a year, by then the link will be expired lol
res.send(`<script> window.location.href = window.location.href </script>`); // fun hack to make the browser refresh and remove the auth params from the URL
return;
}
MasqFail(req, res);
return;
});
app.use(express.static(path.join(process.cwd(), "static")));
app.use(express.static(path.join(process.cwd(), "build")));
app.use("/uv/", express.static(uvPath));
app.use("/epoxy/", express.static(epoxyPath));
app.use("/libcurl/", express.static(libcurlPath))
app.use("/libcurl/", express.static(libcurlPath));
app.use(express.json());
app.use(
@ -129,7 +130,6 @@ app.use(function (req, res, next) {
console.log("Game request");
res.header("Cross-Origin-Opener-Policy", "same-origin");
res.header("Cross-Origin-Embedder-Policy", "require-corp");
}
next();
});

1241
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

11
package.json
View file

@ -3,10 +3,12 @@
"type": "module",
"version": "0.0.1",
"scripts": {
"build:all": "npm run format && npm run lint && npm run build",
"start": "node .",
"build": "astro build",
"lint": "prettier --write .",
"lint:check": "prettier --check ."
"format": "prettier --write .",
"format:check": "prettier --check .",
"lint": "eslint ."
},
"dependencies": {
"@astrojs/node": "^8.2.0",
@ -29,6 +31,11 @@
"wisp-server-node": "^1.0.2"
},
"devDependencies": {
"@babel/eslint-parser": "^7.23.10",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"eslint": "^8.57.0",
"eslint-plugin-astro": "^0.31.4",
"prettier": "3.2.5",
"prettier-plugin-astro": "^0.13.0"
}

10
src/components/Dropdown.astro
View file

@ -3,9 +3,15 @@ const { buttonNameDefault, dropdownList, id, localStorageKey } = Astro.props;
---
<div class="dropdown">
<button data-local-storage-key={localStorageKey} id={id} class="dropdown-toggle" type="button" data-toggle="dropdown">
<button
data-local-storage-key={localStorageKey}
id={id}
class="dropdown-toggle"
type="button"
data-toggle="dropdown">
{buttonNameDefault}
<span class="caret"></span></button>
<span class="caret"></span></button
>
<ul class="dropdown-menu" id={id + "-menu"}>
{
dropdownList.map((item: any) => {

2
src/components/Link.astro
View file

@ -5,7 +5,7 @@ interface LinkProps {
content: string;
}
const { href, newTab, content } = Astro.props;
const { href, newTab, content } = Astro.props as LinkProps;
const target = newTab ? "_blank" : "_self";
const rel = newTab ? "noopener noreferrer" : "";
---

5
src/components/ProxyRegistrar.astro
View file

@ -255,7 +255,10 @@
);
if (newurl.length > 30) newurl = newurl.slice(0, 50) + "...";
urlText.innerText = newurl;
} else urlText.innerText = window.__uv$config.decodeUrl(newURL.split(__uv$config.prefix)[1]);
} else
urlText.innerText = window.__uv$config.decodeUrl(
newURL.split(window.__uv$config.prefix)[1]
);
}
}
</script>

3
src/components/SettingsContent/CustomizationTab.astro
View file

@ -21,14 +21,13 @@ const languageList = [
<div class="settings-container">
<div class="setting__theme">
<label class="setting-label">{t("settings.customization.theme")}</label>
<Dropdown buttonNameDefault="Alu" dropdownList={themeList} , id="dropdown__selected-theme" />
<Dropdown buttonNameDefault="Alu" dropdownList={themeList} id="dropdown__selected-theme" />
</div>
<div class="setting__language">
<label class="setting-label">{t("settings.customization.language")}</label>
<Dropdown
buttonNameDefault="English"
dropdownList={languageList}
,
id="dropdown__selected-language"
/>
</div>

2
src/components/SettingsContent/ProxyTab.astro
View file

@ -30,7 +30,7 @@ const transportsList = [
{ name: "Epoxy", value: "EpxMod.EpoxyClient" },
{ name: "Libcurl", value: "CurlMod.LibcurlClient" },
{ name: "Bare", value: "BareMod.BareClient" },
]
];
---
<div class="settings-container">

2
src/components/SettingsTablist.astro
View file

@ -312,7 +312,7 @@ const t = useTranslations(lang);
applyInputListeners(wispURLInput, "alu__wispUrl");
[selectedProxyDropdown, openWithDropdown, currentTransportDropdown].forEach((dropdown) => {
let dropdownButton = document.getElementById(dropdown.id.replace("-menu", ""))
let dropdownButton = document.getElementById(dropdown.id.replace("-menu", ""));
applyDropdownEventListeners(
dropdown,
dropdownButton.id,

9
src/components/WelcomeLogging.astro
View file

@ -1,10 +1,4 @@
<script>
declare global {
interface Navigator {
deviceMemory: number;
}
}
let primaryColor = "#8c25fa";
let secondaryColor = "#601aab";
console.log(
@ -30,9 +24,10 @@
);
// Cmon firefox, do we really not support this?? Basic stuff here from the "indie browser".
console.log(
"%cMemory: " + navigator.deviceMemory + "GB",
"%cMemory: " + (navigator as any).deviceMemory + "GB",
`color: ${primaryColor}; font-size: 0.75rem; font-weight: bold;`
);
console.log(
"%cPlease include this information in a bug report!",
`color: ${primaryColor}; font-size: 0.75rem; font-weight: bold;`

22
src/components/ts/TransportManager.ts
View file

@ -8,12 +8,12 @@ declare global {
prefix: string;
};
}
};
}
type transportConfig = {
wisp: string;
wasm?: string;
}
};
export const wispURLDefault =
(location.protocol === "https:" ? "wss://" : "ws://") + location.host + "/";
@ -49,12 +49,16 @@ export default class TransportManager {
const TransportMgr = new TransportManager();
export function initTransport() {
registerRemoteListener(navigator.serviceWorker.controller!);
navigator.serviceWorker.register("/sw.js", {
scope: window.__uv$config.prefix,
}).then((registration) => {
registration.update().then(() => {
TransportMgr.setTransport(TransportMgr.getTransport(), localStorage.getItem("alu__wispUrl") || wispURLDefault);
navigator.serviceWorker
.register("/sw.js", {
scope: window.__uv$config.prefix,
})
.then((registration) => {
registration.update().then(() => {
TransportMgr.setTransport(
TransportMgr.getTransport(),
localStorage.getItem("alu__wispUrl") || wispURLDefault
);
});
});
});
}

17
src/pages/[lang]/index.astro
View file

@ -65,21 +65,18 @@ export function getStaticPaths() {
</div>
</Layout>
<script>
import { initTransport } from "../../components/ts/TransportManager"
import { initTransport } from "../../components/ts/TransportManager";
initTransport();
type Suggestion = {
phrase: string;
};
const debounce = (func: Function, delay: number): ((...args: any[]) => void) => {
let debounceTimer: NodeJS.Timeout;
return function (this: Function, ...args: any[]) {
const context: any = this;
clearTimeout(debounceTimer);
debounceTimer = setTimeout(() => {
func.apply(context, args);
}, delay);
function debounce(func: Function, timeout: number) {
return function (this: any, ...args: any) {
setTimeout(() => {
func.apply(this, args);
}, timeout);
};
};
}
async function sendAPIRequest(urlInput: HTMLInputElement, searchSuggestions: HTMLDivElement) {
if (!urlInput) throw new Error("urlInput is null");

2
tsconfig.json
View file

@ -1,4 +1,4 @@
{
"extends": "astro/tsconfigs/strict",
"exclude": ["dist/**", "node_modules/**", "public/games/**"],
"exclude": ["dist/**", "node_modules/**", "public/games/**", ".eslint.cjs"]
}