From 131cc2eb3c8c6aceb53c72394093b0c60d09b295 Mon Sep 17 00:00:00 2001 From: Lawrence Millard <161129968+lawrencemillard@users.noreply.github.com> Date: Thu, 6 Feb 2025 17:49:57 +0000 Subject: [PATCH] Replace Cobalt branding with random element names --- api/src/cobalt.js | 2 ++ api/src/config.js | 4 ++-- api/src/core/api.js | 8 +++++--- api/src/misc/randomize-name.js | 6 ++++++ web/src/lib/api/api.ts | 14 +++++++------- web/src/lib/api/server-info.ts | 14 +++++++------- web/src/lib/env.ts | 18 +++++++++--------- web/src/lib/settings/defaults.ts | 4 ++-- web/src/routes/+page.svelte | 14 +++++++------- 9 files changed, 47 insertions(+), 37 deletions(-) create mode 100644 api/src/misc/randomize-name.js diff --git a/api/src/cobalt.js b/api/src/cobalt.js index 5cac208d..6488b49f 100644 --- a/api/src/cobalt.js +++ b/api/src/cobalt.js @@ -9,12 +9,14 @@ import { fileURLToPath } from "url"; import { env, isCluster } from "./config.js" import { Red } from "./misc/console-text.js"; import { initCluster } from "./misc/cluster.js"; +import { randomizeName } from "./misc/randomize-name.js"; const app = express(); const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename).slice(0, -4); +randomizeName(); app.disable("x-powered-by"); if (env.apiURL) { diff --git a/api/src/config.js b/api/src/config.js index 191e8441..860399d8 100644 --- a/api/src/config.js +++ b/api/src/config.js @@ -55,7 +55,7 @@ const env = { } const genericUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"; -const cobaltUserAgent = `cobalt/${version} (+https://github.com/imputnet/cobalt)`; +const nickelZincGalliumUserAgent = `nickelZincGallium/${version} (+https://github.com/imputnet/nickelZincGallium)`; export const setTunnelPort = (port) => env.tunnelPort = port; export const isCluster = env.instanceCount > 1; @@ -77,5 +77,5 @@ if (env.instanceCount > 1 && !env.redisURL) { export { env, genericUserAgent, - cobaltUserAgent, + nickelZincGalliumUserAgent, } diff --git a/api/src/core/api.js b/api/src/core/api.js index e4d3dfcf..72778193 100644 --- a/api/src/core/api.js +++ b/api/src/core/api.js @@ -20,6 +20,7 @@ import { verifyStream, getInternalStream } from "../stream/manage.js"; import { createResponse, normalizeRequest, getIP } from "../processing/request.js"; import * as APIKeys from "../security/api-keys.js"; import * as Cookies from "../processing/cookie/manager.js"; +import { randomizeName } from "../misc/randomize-name.js"; const git = { branch: await getBranch(), @@ -45,8 +46,9 @@ export const runAPI = async (express, app, __dirname, isPrimary = true) => { const startTime = new Date(); const startTimestamp = startTime.getTime(); + randomizeName(); const serverInfo = JSON.stringify({ - cobalt: { + nickelZincGallium: { version: version, url: env.apiURL, startTime: `${startTimestamp}`, @@ -354,7 +356,7 @@ export const runAPI = async (express, app, __dirname, isPrimary = true) => { }, () => { if (isPrimary) { console.log(`\n` + - Bright(Cyan("cobalt ")) + Bright("API ^ω⁠^") + "\n" + + Bright(Cyan("nickelZincGallium ")) + Bright("API ^ω⁠^") + "\n" + "~~~~~~\n" + Bright("version: ") + version + "\n" + @@ -387,7 +389,7 @@ export const runAPI = async (express, app, __dirname, isPrimary = true) => { exclusive: true }, () => { const { port } = server.address(); - console.log(`${Green('[✓]')} cobalt sub-instance running on 127.0.0.1:${port}`); + console.log(`${Green('[✓]')} nickelZincGallium sub-instance running on 127.0.0.1:${port}`); setTunnelPort(port); }); } diff --git a/api/src/misc/randomize-name.js b/api/src/misc/randomize-name.js new file mode 100644 index 00000000..37c031a1 --- /dev/null +++ b/api/src/misc/randomize-name.js @@ -0,0 +1,6 @@ +const names = ['nickel', 'zinc', 'gallium', 'silicon', 'copper', 'aluminium', 'calcium', 'magnesium', 'titanium']; + +export function randomizeName() { + const randomIndex = Math.floor(Math.random() * names.length); + return names[randomIndex]; +} diff --git a/web/src/lib/api/api.ts b/web/src/lib/api/api.ts index 89fba727..39cacf0a 100644 --- a/web/src/lib/api/api.ts +++ b/web/src/lib/api/api.ts @@ -10,7 +10,7 @@ import cachedInfo from "$lib/state/server-info"; import { getServerInfo } from "$lib/api/server-info"; import type { Optional } from "$lib/types/generic"; -import type { CobaltAPIResponse, CobaltErrorResponse } from "$lib/types/api"; +import type { NickelZincGalliumAPIResponse, NickelZincGalliumErrorResponse } from "$lib/types/api"; const getAuthorization = async () => { const processing = get(settings).processing; @@ -22,7 +22,7 @@ const getAuthorization = async () => { error: { code: "error.captcha_ongoing" } - } as CobaltErrorResponse; + } as NickelZincGalliumErrorResponse; } const session = await getSession(); @@ -78,7 +78,7 @@ const request = async (url: string) => { error: { code: "error.api.unreachable" } - } as CobaltErrorResponse; + } as NickelZincGalliumErrorResponse; } const api = currentApiURL(); @@ -96,7 +96,7 @@ const request = async (url: string) => { } } - const response: Optional = await fetch(api, { + const response: Optional = await fetch(api, { method: "POST", redirect: "manual", signal: AbortSignal.timeout(20000), @@ -115,14 +115,14 @@ const request = async (url: string) => { error: { code: "error.api.timed_out" } - } as CobaltErrorResponse; + } as NickelZincGalliumErrorResponse; } }); return response; } -const probeCobaltTunnel = async (url: string) => { +const probeNickelZincGalliumTunnel = async (url: string) => { const request = await fetch(`${url}&p=1`).catch(() => {}); if (request?.status === 200) { return request?.status; @@ -132,5 +132,5 @@ const probeCobaltTunnel = async (url: string) => { export default { request, - probeCobaltTunnel, + probeNickelZincGalliumTunnel, } diff --git a/web/src/lib/api/server-info.ts b/web/src/lib/api/server-info.ts index 0b905fc3..8f565fc8 100644 --- a/web/src/lib/api/server-info.ts +++ b/web/src/lib/api/server-info.ts @@ -4,17 +4,17 @@ import { get } from "svelte/store"; import { currentApiURL } from "$lib/api/api-url"; import { turnstileCreated, turnstileEnabled, turnstileSolved } from "$lib/state/turnstile"; import cachedInfo from "$lib/state/server-info"; -import type { CobaltServerInfoResponse, CobaltErrorResponse, CobaltServerInfo } from "$lib/types/api"; +import type { NickelZincGalliumServerInfoResponse, NickelZincGalliumErrorResponse, NickelZincGalliumServerInfo } from "$lib/types/api"; -export type CobaltServerInfoCache = { - info: CobaltServerInfo, +export type NickelZincGalliumServerInfoCache = { + info: NickelZincGalliumServerInfo, origin: string, } const request = async () => { const apiEndpoint = `${currentApiURL()}/`; - const response: CobaltServerInfoResponse = await fetch(apiEndpoint, { + const response: NickelZincGalliumServerInfoResponse = await fetch(apiEndpoint, { redirect: "manual", signal: AbortSignal.timeout(10000), }) @@ -26,7 +26,7 @@ const request = async () => { error: { code: "error.api.timed_out" } - } as CobaltErrorResponse + } as NickelZincGalliumErrorResponse } }); @@ -50,7 +50,7 @@ export const getServerInfo = async () => { const freshInfo = await request(); - if (!freshInfo || !("cobalt" in freshInfo)) { + if (!freshInfo || !("nickelZincGallium" in freshInfo)) { return false; } @@ -61,7 +61,7 @@ export const getServerInfo = async () => { }); // reload the page if turnstile sitekey changed - if (browser && get(turnstileEnabled) && cache && cache?.info?.cobalt?.turnstileSitekey !== freshInfo?.cobalt?.turnstileSitekey) { + if (browser && get(turnstileEnabled) && cache && cache?.info?.nickelZincGallium?.turnstileSitekey !== freshInfo?.nickelZincGallium?.turnstileSitekey) { window.location.reload(); } diff --git a/web/src/lib/env.ts b/web/src/lib/env.ts index cfad460f..77c71761 100644 --- a/web/src/lib/env.ts +++ b/web/src/lib/env.ts @@ -18,14 +18,14 @@ const variables = { const contacts = { discord: "https://discord.gg/pQPt8HBUPu", - twitter: "https://x.com/justusecobalt", - github: "https://github.com/imputnet/cobalt", - bluesky: "https://bsky.app/profile/cobalt.tools", - telegram_ru: "https://t.me/justusecobalt_ru", + twitter: "https://x.com/justusenickelZincGallium", + github: "https://github.com/imputnet/nickelZincGallium", + bluesky: "https://bsky.app/profile/nickelZincGallium.tools", + telegram_ru: "https://t.me/justusenickelZincGallium_ru", } const partners = { - royalehosting: "https://royalehosting.net/?partner=cobalt", + royalehosting: "https://royalehosting.net/?partner=nickelZincGallium", } const donate = { @@ -50,12 +50,12 @@ const siriShortcuts = { }; const docs = { - instanceHosting: "https://github.com/imputnet/cobalt/blob/main/docs/run-an-instance.md", - webLicense: "https://github.com/imputnet/cobalt/blob/main/web/LICENSE", - apiLicense: "https://github.com/imputnet/cobalt/blob/main/api/LICENSE", + instanceHosting: "https://github.com/imputnet/nickelZincGallium/blob/main/docs/run-an-instance.md", + webLicense: "https://github.com/imputnet/nickelZincGallium/blob/main/web/LICENSE", + apiLicense: "https://github.com/imputnet/nickelZincGallium/blob/main/api/LICENSE", }; -const defaultApiURL = "https://api.cobalt.tools"; +const defaultApiURL = "https://api.nickelZincGallium.tools"; export { donate, defaultApiURL, contacts, partners, siriShortcuts, docs }; export default variables; diff --git a/web/src/lib/settings/defaults.ts b/web/src/lib/settings/defaults.ts index a4448aaa..428acbe6 100644 --- a/web/src/lib/settings/defaults.ts +++ b/web/src/lib/settings/defaults.ts @@ -1,7 +1,7 @@ import { defaultLocale } from "$lib/i18n/translations"; -import type { CobaltSettings } from "$lib/types/settings"; +import type { NickelZincGalliumSettings } from "$lib/types/settings"; -const defaultSettings: CobaltSettings = { +const defaultSettings: NickelZincGalliumSettings = { schemaVersion: 4, advanced: { debug: false, diff --git a/web/src/routes/+page.svelte b/web/src/routes/+page.svelte index 4b264897..fea9c95c 100644 --- a/web/src/routes/+page.svelte +++ b/web/src/routes/+page.svelte @@ -7,14 +7,14 @@ - {$t("general.cobalt")} - + {$t("general.nickelZincGallium")} + -
+