From e83b50da8ab3c98a654e2e404d3208045266a2b8 Mon Sep 17 00:00:00 2001 From: Thesourtimes Date: Thu, 11 Nov 2021 11:29:08 +0300 Subject: [PATCH 1/3] Put autoregister scripts on a seperate asset file --- api/assets/autoRegister.js | 57 ++++++++++++++++++++++++++++++++++++ api/client_test/index.html | 59 +------------------------------------- 2 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 api/assets/autoRegister.js diff --git a/api/assets/autoRegister.js b/api/assets/autoRegister.js new file mode 100644 index 00000000..29f93370 --- /dev/null +++ b/api/assets/autoRegister.js @@ -0,0 +1,57 @@ + // Auto register guest account: + const prefix = [ + "mysterious", + "adventurous", + "courageous", + "precious", + "cynical", + "despicable", + "suspicious", + "gorgeous", + "lovely", + "stunning", + "based", + "keyed", + "ratioed", + "twink", + "phoned" + ]; + const suffix = [ + "Anonymous", + "Lurker", + "User", + "Enjoyer", + "Hunk", + "Top", + "Bottom", + "Sub", + "Coolstar", + "Wrestling", + "TylerTheCreator", + "Ad" + ]; + + Array.prototype.random = function () { + return this[Math.floor(Math.random() * this.length)]; + }; + + function _generateName() { + return `${prefix.random()}${suffix.random()}`; + } + + const token = JSON.parse(localStorage.getItem("token")); + if (!token && location.pathname !== "/login" && location.pathname !== "/register") { + fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/auth/register`, { + method: "POST", + headers: { "content-type": "application/json" }, + body: JSON.stringify({ username: `${_generateName()}`, consent: true }) //${Date.now().toString().slice(-4)} + }) + .then((x) => x.json()) + .then((x) => { + localStorage.setItem("token", `"${x.token}"`); + if (!window.localStorage) { + // client already loaded -> need to reload to apply the newly registered user token + location.reload(); + } + }); + } diff --git a/api/client_test/index.html b/api/client_test/index.html index a68b191a..7e40d573 100644 --- a/api/client_test/index.html +++ b/api/client_test/index.html @@ -47,64 +47,6 @@ `{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}` ); - // Auto register guest account: - const prefix = [ - "mysterious", - "adventurous", - "courageous", - "precious", - "cynical", - "despicable", - "suspicious", - "gorgeous", - "lovely", - "stunning", - "based", - "keyed", - "ratioed", - "twink", - "phoned" - ]; - const suffix = [ - "Anonymous", - "Lurker", - "User", - "Enjoyer", - "Hunk", - "Top", - "Bottom", - "Sub", - "Coolstar", - "Wrestling", - "TylerTheCreator", - "Ad" - ]; - - Array.prototype.random = function () { - return this[Math.floor(Math.random() * this.length)]; - }; - - function _generateName() { - return `${prefix.random()}${suffix.random()}`; - } - - const token = JSON.parse(localStorage.getItem("token")); - if (!token && location.pathname !== "/login" && location.pathname !== "/register") { - fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/auth/register`, { - method: "POST", - headers: { "content-type": "application/json" }, - body: JSON.stringify({ username: `${_generateName()}`, consent: true }) //${Date.now().toString().slice(-4)} - }) - .then((x) => x.json()) - .then((x) => { - localStorage.setItem("token", `"${x.token}"`); - if (!window.localStorage) { - // client already loaded -> need to reload to apply the newly registered user token - location.reload(); - } - }); - } - const supportedLocales = [ "bg", "cs", @@ -144,6 +86,7 @@ localStorage.setItem("UserSettingsStore", JSON.stringify(settings)); } + From 4e795a14151437872ae0980d2fb0fb69b6a902be Mon Sep 17 00:00:00 2001 From: Thesourtimes Date: Thu, 11 Nov 2021 11:31:03 +0300 Subject: [PATCH 2/3] minor capitulation --- bundle/src/start.ts | 2 +- bundle/src/stats.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/src/start.ts b/bundle/src/start.ts index f683d3e3..8725ba61 100644 --- a/bundle/src/start.ts +++ b/bundle/src/start.ts @@ -81,7 +81,7 @@ Cores: ${cyan(cores)} cluster.on("exit", (worker: any, code: any, signal: any) => { console.log( `[Worker] ${red( - `died with pid: ${worker.process.pid} , restarting ...` + `died with PID: ${worker.process.pid} , restarting ...` )}` ); cluster.fork(); diff --git a/bundle/src/stats.ts b/bundle/src/stats.ts index 9bd9131e..8d87f9d9 100644 --- a/bundle/src/stats.ts +++ b/bundle/src/stats.ts @@ -6,7 +6,7 @@ export function initStats() { console.log(`[Path] running in ${__dirname}`); console.log(`[CPU] ${osu.cpu.model()} Cores x${osu.cpu.count()}`); console.log(`[System] ${os.platform()} ${os.arch()}`); - console.log(`[Process] running with pid: ${process.pid}`); + console.log(`[Process] running with PID: ${process.pid}`); if (process.getuid && process.getuid() === 0) { console.warn( red( From 22084bae4e5c35412342e5e6015611faeb6fddd3 Mon Sep 17 00:00:00 2001 From: Thesourtimes Date: Thu, 11 Nov 2021 11:49:56 +0300 Subject: [PATCH 3/3] move checLocale and other js tp checkLocale --- api/assets/checkLocale.js | 47 +++++++++++++++++++++++++++++++++++++ api/client_test/index.html | 48 +------------------------------------- 2 files changed, 48 insertions(+), 47 deletions(-) create mode 100644 api/assets/checkLocale.js diff --git a/api/assets/checkLocale.js b/api/assets/checkLocale.js new file mode 100644 index 00000000..016d66c8 --- /dev/null +++ b/api/assets/checkLocale.js @@ -0,0 +1,47 @@ + const localStorage = window.localStorage; + // TODO: remote auth + // window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, ""); + localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT); + localStorage.setItem( + "DeveloperOptionsStore", + `{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}` + ); + + const supportedLocales = [ + "bg", + "cs", + "da", + "de", + "el", + "en-GB", + "es-ES", + "fi", + "fr", + "hi", + "hr", + "hu", + "it", + "ja", + "ko", + "lt", + "nl", + "no", + "pl", + "pt-BR", + "ro", + "ru", + "sv-SE", + "th", + "tr", + "uk", + "vi", + "zh-CN", + "zh-TW" + ]; + + const settings = JSON.parse(localStorage.getItem("UserSettingsStore")); + if (settings && !supportedLocales.includes(settings.locale)) { + // fix client locale wrong and client not loading at all + settings.locale = "en-US"; + localStorage.setItem("UserSettingsStore", JSON.stringify(settings)); + } \ No newline at end of file diff --git a/api/client_test/index.html b/api/client_test/index.html index 7e40d573..92499034 100644 --- a/api/client_test/index.html +++ b/api/client_test/index.html @@ -38,55 +38,9 @@ ALGOLIA_KEY: "aca0d7082e4e63af5ba5917d5e96bed0" }; GLOBAL_ENV.MEDIA_PROXY_ENDPOINT = location.protocol + "//" + GLOBAL_ENV.CDN_HOST; - const localStorage = window.localStorage; - // TODO: remote auth - // window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, ""); - localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT); - localStorage.setItem( - "DeveloperOptionsStore", - `{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}` - ); - - const supportedLocales = [ - "bg", - "cs", - "da", - "de", - "el", - "en-GB", - "es-ES", - "fi", - "fr", - "hi", - "hr", - "hu", - "it", - "ja", - "ko", - "lt", - "nl", - "no", - "pl", - "pt-BR", - "ro", - "ru", - "sv-SE", - "th", - "tr", - "uk", - "vi", - "zh-CN", - "zh-TW" - ]; - - const settings = JSON.parse(localStorage.getItem("UserSettingsStore")); - if (settings && !supportedLocales.includes(settings.locale)) { - // fix client locale wrong and client not loading at all - settings.locale = "en-US"; - localStorage.setItem("UserSettingsStore", JSON.stringify(settings)); - } +