move to biomejs

This commit is contained in:
creations 2025-04-07 04:36:07 -04:00
parent 7d78a74a25
commit d91e832eab
Signed by: creations
GPG key ID: 8F553AA4320FC711
19 changed files with 99 additions and 259 deletions

35
biome.json Normal file
View file

@ -0,0 +1,35 @@
{
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
"vcs": {
"enabled": true,
"clientKind": "git",
"useIgnoreFile": false
},
"files": {
"ignoreUnknown": false,
"ignore": []
},
"formatter": {
"enabled": true,
"indentStyle": "tab",
"lineEnding": "lf"
},
"organizeImports": {
"enabled": true
},
"linter": {
"enabled": true,
"rules": {
"recommended": true
}
},
"javascript": {
"formatter": {
"quoteStyle": "double",
"indentStyle": "tab",
"lineEnding": "lf",
"jsxQuoteStyle": "double",
"semicolons": "always"
}
}
}

View file

@ -1,9 +1,8 @@
export const environment: Environment = { export const environment: Environment = {
port: parseInt(process.env.PORT || "8080", 10), port: Number.parseInt(process.env.PORT || "8080", 10),
host: process.env.HOST || "0.0.0.0", host: process.env.HOST || "0.0.0.0",
development: development:
process.env.NODE_ENV === "development" || process.env.NODE_ENV === "development" || process.argv.includes("--dev"),
process.argv.includes("--dev"),
}; };
export const lanyardConfig: LanyardConfig = { export const lanyardConfig: LanyardConfig = {

View file

@ -1,132 +0,0 @@
import pluginJs from "@eslint/js";
import tseslintPlugin from "@typescript-eslint/eslint-plugin";
import tsParser from "@typescript-eslint/parser";
import prettier from "eslint-plugin-prettier";
import promisePlugin from "eslint-plugin-promise";
import simpleImportSort from "eslint-plugin-simple-import-sort";
import unicorn from "eslint-plugin-unicorn";
import unusedImports from "eslint-plugin-unused-imports";
import globals from "globals";
/** @type {import('eslint').Linter.FlatConfig[]} */
export default [
{
files: ["**/*.{js,mjs,cjs}"],
languageOptions: {
globals: globals.node,
},
...pluginJs.configs.recommended,
plugins: {
"simple-import-sort": simpleImportSort,
"unused-imports": unusedImports,
promise: promisePlugin,
prettier: prettier,
unicorn: unicorn,
},
rules: {
"eol-last": ["error", "always"],
"no-multiple-empty-lines": ["error", { max: 1, maxEOF: 1 }],
"no-mixed-spaces-and-tabs": ["error", "smart-tabs"],
"simple-import-sort/imports": "error",
"simple-import-sort/exports": "error",
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-vars": [
"warn",
{
vars: "all",
varsIgnorePattern: "^_",
args: "after-used",
argsIgnorePattern: "^_",
},
],
"promise/always-return": "error",
"promise/no-return-wrap": "error",
"promise/param-names": "error",
"promise/catch-or-return": "error",
"promise/no-nesting": "warn",
"promise/no-promise-in-callback": "warn",
"promise/no-callback-in-promise": "warn",
"prettier/prettier": [
"error",
{
useTabs: true,
tabWidth: 4,
},
],
indent: ["error", "tab", { SwitchCase: 1 }],
"unicorn/filename-case": [
"error",
{
case: "camelCase",
},
],
},
},
{
files: ["**/*.{ts,tsx}"],
languageOptions: {
parser: tsParser,
globals: globals.node,
},
plugins: {
"@typescript-eslint": tseslintPlugin,
"simple-import-sort": simpleImportSort,
"unused-imports": unusedImports,
promise: promisePlugin,
prettier: prettier,
unicorn: unicorn,
},
rules: {
...tseslintPlugin.configs.recommended.rules,
quotes: ["error", "double"],
"eol-last": ["error", "always"],
"no-multiple-empty-lines": ["error", { max: 1, maxEOF: 1 }],
"no-mixed-spaces-and-tabs": ["error", "smart-tabs"],
"simple-import-sort/imports": "error",
"simple-import-sort/exports": "error",
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-vars": [
"warn",
{
vars: "all",
varsIgnorePattern: "^_",
args: "after-used",
argsIgnorePattern: "^_",
},
],
"promise/always-return": "error",
"promise/no-return-wrap": "error",
"promise/param-names": "error",
"promise/catch-or-return": "error",
"promise/no-nesting": "warn",
"promise/no-promise-in-callback": "warn",
"promise/no-callback-in-promise": "warn",
"prettier/prettier": [
"error",
{
useTabs: true,
tabWidth: 4,
},
],
indent: ["error", "tab", { SwitchCase: 1 }],
"unicorn/filename-case": [
"error",
{
case: "camelCase",
},
],
"@typescript-eslint/explicit-function-return-type": ["error"],
"@typescript-eslint/explicit-module-boundary-types": ["error"],
"@typescript-eslint/typedef": [
"error",
{
arrowParameter: true,
variableDeclaration: true,
propertyDeclaration: true,
memberVariableDeclaration: true,
parameter: true,
},
],
},
},
];

View file

@ -5,24 +5,15 @@
"scripts": { "scripts": {
"start": "bun run src/index.ts", "start": "bun run src/index.ts",
"dev": "bun run --hot src/index.ts --dev", "dev": "bun run --hot src/index.ts --dev",
"lint": "eslint", "lint": "bunx biome check",
"lint:fix": "bun lint --fix", "lint:fix": "bunx biome check --fix",
"cleanup": "rm -rf logs node_modules bun.lockdb" "cleanup": "rm -rf logs node_modules bun.lockdb"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^9.24.0", "@biomejs/biome": "^1.9.4",
"@types/bun": "^1.2.8", "@types/bun": "^1.2.8",
"@types/ejs": "^3.1.5", "@types/ejs": "^3.1.5",
"@typescript-eslint/eslint-plugin": "^8.29.0", "globals": "^16.0.0"
"@typescript-eslint/parser": "^8.29.0",
"eslint": "^9.24.0",
"eslint-plugin-prettier": "^5.2.6",
"eslint-plugin-promise": "^7.2.1",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-unicorn": "^58.0.0",
"eslint-plugin-unused-imports": "^4.1.4",
"globals": "^16.0.0",
"prettier": "^3.5.3"
}, },
"peerDependencies": { "peerDependencies": {
"typescript": "^5.8.3" "typescript": "^5.8.3"

View file

@ -107,7 +107,6 @@ h1 {
flex-wrap: wrap; flex-wrap: wrap;
} }
.custom-status .custom-emoji { .custom-status .custom-emoji {
width: 20px; width: 20px;
height: 20px; height: 20px;

View file

@ -1,5 +1,3 @@
/* eslint-disable indent */
const activityProgressMap = new Map(); const activityProgressMap = new Map();
function formatTime(ms) { function formatTime(ms) {
@ -23,19 +21,19 @@ function formatVerbose(ms) {
function updateElapsedAndProgress() { function updateElapsedAndProgress() {
const now = Date.now(); const now = Date.now();
document.querySelectorAll(".activity-timestamp").forEach((el) => { for (const el of document.querySelectorAll(".activity-timestamp")) {
const start = Number(el.dataset.start); const start = Number(el.dataset.start);
if (!start) return; if (!start) continue;
const elapsed = now - start; const elapsed = now - start;
const display = el.querySelector(".elapsed"); const display = el.querySelector(".elapsed");
if (display) display.textContent = `(${formatVerbose(elapsed)} ago)`; if (display) display.textContent = `(${formatVerbose(elapsed)} ago)`;
}); }
document.querySelectorAll(".progress-bar").forEach((bar) => { for (const bar of document.querySelectorAll(".progress-bar")) {
const start = Number(bar.dataset.start); const start = Number(bar.dataset.start);
const end = Number(bar.dataset.end); const end = Number(bar.dataset.end);
if (!start || !end || end <= start) return; if (!start || !end || end <= start) continue;
const duration = end - start; const duration = end - start;
const elapsed = Math.min(now - start, duration); const elapsed = Math.min(now - start, duration);
@ -46,12 +44,12 @@ function updateElapsedAndProgress() {
const fill = bar.querySelector(".progress-fill"); const fill = bar.querySelector(".progress-fill");
if (fill) fill.style.width = `${progress}%`; if (fill) fill.style.width = `${progress}%`;
}); }
document.querySelectorAll(".progress-time-labels").forEach((label) => { for (const label of document.querySelectorAll(".progress-time-labels")) {
const start = Number(label.dataset.start); const start = Number(label.dataset.start);
const end = Number(label.dataset.end); const end = Number(label.dataset.end);
if (!start || !end || end <= start) return; if (!start || !end || end <= start) continue;
const isPaused = now > end; const isPaused = now > end;
const current = isPaused ? end - start : Math.max(0, now - start); const current = isPaused ? end - start : Math.max(0, now - start);
@ -77,14 +75,14 @@ function updateElapsedAndProgress() {
: formatTime(current); : formatTime(current);
} }
if (totalEl) totalEl.textContent = formatTime(total); if (totalEl) totalEl.textContent = formatTime(total);
}); }
} }
updateElapsedAndProgress(); updateElapsedAndProgress();
setInterval(updateElapsedAndProgress, 1000); setInterval(updateElapsedAndProgress, 1000);
const head = document.querySelector("head"); const head = document.querySelector("head");
let userId = head?.dataset.userId; const userId = head?.dataset.userId;
let instanceUri = head?.dataset.instanceUri; let instanceUri = head?.dataset.instanceUri;
if (userId && instanceUri) { if (userId && instanceUri) {
@ -189,10 +187,7 @@ function buildActivityHTML(activity) {
? `<div class="activity-buttons"> ? `<div class="activity-buttons">
${activity.buttons ${activity.buttons
.map((button, index) => { .map((button, index) => {
const label = const label = typeof button === "string" ? button : button.label;
typeof button === "string"
? button
: button.label;
let url = null; let url = null;
if (typeof button === "object" && button.url) { if (typeof button === "object" && button.url) {
url = button.url; url = button.url;
@ -258,9 +253,7 @@ function buildActivityHTML(activity) {
function updatePresence(data) { function updatePresence(data) {
const avatarWrapper = document.querySelector(".avatar-wrapper"); const avatarWrapper = document.querySelector(".avatar-wrapper");
const statusIndicator = avatarWrapper?.querySelector(".status-indicator"); const statusIndicator = avatarWrapper?.querySelector(".status-indicator");
const mobileIcon = avatarWrapper?.querySelector( const mobileIcon = avatarWrapper?.querySelector(".platform-icon.mobile-only");
".platform-icon.mobile-only",
);
const userInfo = document.querySelector(".user-info"); const userInfo = document.querySelector(".user-info");
const customStatus = userInfo?.querySelector(".custom-status"); const customStatus = userInfo?.querySelector(".custom-status");

View file

@ -1,6 +1,6 @@
export function timestampToReadable(timestamp?: number): string { export function timestampToReadable(timestamp?: number): string {
const date: Date = const date: Date =
timestamp && !isNaN(timestamp) ? new Date(timestamp) : new Date(); timestamp && !Number.isNaN(timestamp) ? new Date(timestamp) : new Date();
if (isNaN(date.getTime())) return "Invalid Date"; if (Number.isNaN(date.getTime())) return "Invalid Date";
return date.toISOString().replace("T", " ").replace("Z", ""); return date.toISOString().replace("T", " ").replace("Z", "");
} }

View file

@ -1,5 +1,5 @@
import { resolve } from "node:path";
import { renderFile } from "ejs"; import { renderFile } from "ejs";
import { resolve } from "path";
export async function renderEjsTemplate( export async function renderEjsTemplate(
viewName: string | string[], viewName: string | string[],

View file

@ -76,7 +76,7 @@ export async function handleReadMe(data: LanyardData): Promise<string | null> {
return null; return null;
if (res.headers.has("content-length")) { if (res.headers.has("content-length")) {
const size: number = parseInt( const size: number = Number.parseInt(
res.headers.get("content-length") || "0", res.headers.get("content-length") || "0",
10, 10,
); );

View file

@ -1,15 +1,15 @@
import { environment } from "@config/environment"; import type { Stats } from "node:fs";
import { timestampToReadable } from "@helpers/char";
import type { Stats } from "fs";
import { import {
type WriteStream,
createWriteStream, createWriteStream,
existsSync, existsSync,
mkdirSync, mkdirSync,
statSync, statSync,
WriteStream, } from "node:fs";
} from "fs"; import { EOL } from "node:os";
import { EOL } from "os"; import { basename, join } from "node:path";
import { basename, join } from "path"; import { environment } from "@config/environment";
import { timestampToReadable } from "@helpers/char";
class Logger { class Logger {
private static instance: Logger; private static instance: Logger;
@ -37,7 +37,7 @@ class Logger {
mkdirSync(logDir, { recursive: true }); mkdirSync(logDir, { recursive: true });
} }
let addSeparator: boolean = false; let addSeparator = false;
if (existsSync(logFile)) { if (existsSync(logFile)) {
const fileStats: Stats = statSync(logFile); const fileStats: Stats = statSync(logFile);
@ -66,9 +66,9 @@ class Logger {
private extractFileName(stack: string): string { private extractFileName(stack: string): string {
const stackLines: string[] = stack.split("\n"); const stackLines: string[] = stack.split("\n");
let callerFile: string = ""; let callerFile = "";
for (let i: number = 2; i < stackLines.length; i++) { for (let i = 2; i < stackLines.length; i++) {
const line: string = stackLines[i].trim(); const line: string = stackLines[i].trim();
if (line && !line.includes("Logger.") && line.includes("(")) { if (line && !line.includes("Logger.") && line.includes("(")) {
callerFile = line.split("(")[1]?.split(")")[0] || ""; callerFile = line.split("(")[1]?.split(")")[0] || "";
@ -91,7 +91,7 @@ class Logger {
return { filename, timestamp: readableTimestamp }; return { filename, timestamp: readableTimestamp };
} }
public info(message: string | string[], breakLine: boolean = false): void { public info(message: string | string[], breakLine = false): void {
const stack: string = new Error().stack || ""; const stack: string = new Error().stack || "";
const { filename, timestamp } = this.getCallerInfo(stack); const { filename, timestamp } = this.getCallerInfo(stack);
@ -110,7 +110,7 @@ class Logger {
this.writeConsoleMessageColored(logMessageParts, breakLine); this.writeConsoleMessageColored(logMessageParts, breakLine);
} }
public warn(message: string | string[], breakLine: boolean = false): void { public warn(message: string | string[], breakLine = false): void {
const stack: string = new Error().stack || ""; const stack: string = new Error().stack || "";
const { filename, timestamp } = this.getCallerInfo(stack); const { filename, timestamp } = this.getCallerInfo(stack);
@ -131,7 +131,7 @@ class Logger {
public error( public error(
message: string | Error | (string | Error)[], message: string | Error | (string | Error)[],
breakLine: boolean = false, breakLine = false,
): void { ): void {
const stack: string = new Error().stack || ""; const stack: string = new Error().stack || "";
const { filename, timestamp } = this.getCallerInfo(stack); const { filename, timestamp } = this.getCallerInfo(stack);
@ -161,7 +161,7 @@ class Logger {
bracketMessage2: string, bracketMessage2: string,
message: string | string[], message: string | string[],
color: string, color: string,
breakLine: boolean = false, breakLine = false,
): void { ): void {
const stack: string = new Error().stack || ""; const stack: string = new Error().stack || "";
const { timestamp } = this.getCallerInfo(stack); const { timestamp } = this.getCallerInfo(stack);
@ -189,7 +189,7 @@ class Logger {
private writeConsoleMessageColored( private writeConsoleMessageColored(
logMessageParts: ILogMessageParts, logMessageParts: ILogMessageParts,
breakLine: boolean = false, breakLine = false,
): void { ): void {
const logMessage: string = Object.keys(logMessageParts) const logMessage: string = Object.keys(logMessageParts)
.map((key: string) => { .map((key: string) => {

View file

@ -3,11 +3,7 @@ import { logger } from "@helpers/logger";
import { serverHandler } from "@/server"; import { serverHandler } from "@/server";
async function main(): Promise<void> { async function main(): Promise<void> {
try {
serverHandler.initialize(); serverHandler.initialize();
} catch (error) {
throw error;
}
} }
main().catch((error: Error) => { main().catch((error: Error) => {

View file

@ -29,8 +29,7 @@ async function handler(request: ExtendedRequest): Promise<Response> {
} }
const presence: LanyardData = data.data; const presence: LanyardData = data.data;
const readme: string | Promise<string> | null = const readme: string | Promise<string> | null = await handleReadMe(presence);
await handleReadMe(presence);
const ejsTemplateData: EjsTemplateData = { const ejsTemplateData: EjsTemplateData = {
title: `${presence.discord_user.username || "Unknown"}`, title: `${presence.discord_user.username || "Unknown"}`,

View file

@ -24,10 +24,7 @@ async function handler(request: ExtendedRequest): Promise<Response> {
try { try {
res = await fetch(url); res = await fetch(url);
} catch { } catch {
return Response.json( return Response.json({ error: "Failed to fetch image" }, { status: 500 });
{ error: "Failed to fetch image" },
{ status: 500 },
);
} }
if (!res.ok) { if (!res.ok) {

View file

@ -28,12 +28,10 @@ async function handler(): Promise<Response> {
} }
const presence: LanyardData = data.data; const presence: LanyardData = data.data;
const readme: string | Promise<string> | null = const readme: string | Promise<string> | null = await handleReadMe(presence);
await handleReadMe(presence);
const ejsTemplateData: EjsTemplateData = { const ejsTemplateData: EjsTemplateData = {
title: title: presence.discord_user.global_name || presence.discord_user.username,
presence.discord_user.global_name || presence.discord_user.username,
username: username:
presence.discord_user.global_name || presence.discord_user.username, presence.discord_user.global_name || presence.discord_user.username,
status: presence.discord_status, status: presence.discord_status,

View file

@ -1,3 +1,4 @@
import { resolve } from "node:path";
import { environment } from "@config/environment"; import { environment } from "@config/environment";
import { logger } from "@helpers/logger"; import { logger } from "@helpers/logger";
import { import {
@ -6,7 +7,6 @@ import {
type MatchedRoute, type MatchedRoute,
type Serve, type Serve,
} from "bun"; } from "bun";
import { resolve } from "path";
import { webSocketHandler } from "@/websocket"; import { webSocketHandler } from "@/websocket";
@ -77,21 +77,16 @@ class ServerHandler {
if (await file.exists()) { if (await file.exists()) {
const fileContent: ArrayBuffer = await file.arrayBuffer(); const fileContent: ArrayBuffer = await file.arrayBuffer();
const contentType: string = const contentType: string = file.type || "application/octet-stream";
file.type || "application/octet-stream";
return new Response(fileContent, { return new Response(fileContent, {
headers: { "Content-Type": contentType }, headers: { "Content-Type": contentType },
}); });
} else { }
logger.warn(`File not found: ${filePath}`); logger.warn(`File not found: ${filePath}`);
return new Response("Not Found", { status: 404 }); return new Response("Not Found", { status: 404 });
}
} catch (error) { } catch (error) {
logger.error([ logger.error([`Error serving static file: ${pathname}`, error as Error]);
`Error serving static file: ${pathname}`,
error as Error,
]);
return new Response("Internal Server Error", { status: 500 }); return new Response("Internal Server Error", { status: 500 });
} }
} }
@ -117,8 +112,7 @@ class ServerHandler {
try { try {
const routeModule: RouteModule = await import(filePath); const routeModule: RouteModule = await import(filePath);
const contentType: string | null = const contentType: string | null = request.headers.get("Content-Type");
request.headers.get("Content-Type");
const actualContentType: string | null = contentType const actualContentType: string | null = contentType
? contentType.split(";")[0].trim() ? contentType.split(";")[0].trim()
: null; : null;
@ -145,9 +139,7 @@ class ServerHandler {
if ( if (
(Array.isArray(routeModule.routeDef.method) && (Array.isArray(routeModule.routeDef.method) &&
!routeModule.routeDef.method.includes( !routeModule.routeDef.method.includes(request.method)) ||
request.method,
)) ||
(!Array.isArray(routeModule.routeDef.method) && (!Array.isArray(routeModule.routeDef.method) &&
routeModule.routeDef.method !== request.method) routeModule.routeDef.method !== request.method)
) { ) {
@ -172,9 +164,7 @@ class ServerHandler {
if (Array.isArray(expectedContentType)) { if (Array.isArray(expectedContentType)) {
matchesAccepts = matchesAccepts =
expectedContentType.includes("*/*") || expectedContentType.includes("*/*") ||
expectedContentType.includes( expectedContentType.includes(actualContentType || "");
actualContentType || "",
);
} else { } else {
matchesAccepts = matchesAccepts =
expectedContentType === "*/*" || expectedContentType === "*/*" ||
@ -213,10 +203,7 @@ class ServerHandler {
} }
} }
} catch (error: unknown) { } catch (error: unknown) {
logger.error([ logger.error([`Error handling route ${request.url}:`, error as Error]);
`Error handling route ${request.url}:`,
error as Error,
]);
response = Response.json( response = Response.json(
{ {

View file

@ -1,5 +1,5 @@
import { logger } from "@helpers/logger"; import { logger } from "@helpers/logger";
import { type ServerWebSocket } from "bun"; import type { ServerWebSocket } from "bun";
class WebSocketHandler { class WebSocketHandler {
public handleMessage(ws: ServerWebSocket, message: string): void { public handleMessage(ws: ServerWebSocket, message: string): void {
@ -20,11 +20,7 @@ class WebSocketHandler {
} }
} }
public handleClose( public handleClose(ws: ServerWebSocket, code: number, reason: string): void {
ws: ServerWebSocket,
code: number,
reason: string,
): void {
logger.warn(`WebSocket closed with code ${code}, reason: ${reason}`); logger.warn(`WebSocket closed with code ${code}, reason: ${reason}`);
} }
} }

View file

@ -2,28 +2,14 @@
"compilerOptions": { "compilerOptions": {
"baseUrl": "./", "baseUrl": "./",
"paths": { "paths": {
"@/*": [ "@/*": ["src/*"],
"src/*" "@config/*": ["config/*"],
], "@types/*": ["types/*"],
"@config/*": [ "@helpers/*": ["src/helpers/*"]
"config/*"
],
"@types/*": [
"types/*"
],
"@helpers/*": [
"src/helpers/*"
]
}, },
"typeRoots": [ "typeRoots": ["./src/types", "./node_modules/@types"],
"./src/types",
"./node_modules/@types"
],
// Enable latest features // Enable latest features
"lib": [ "lib": ["ESNext", "DOM"],
"ESNext",
"DOM"
],
"target": "ESNext", "target": "ESNext",
"module": "ESNext", "module": "ESNext",
"moduleDetection": "force", "moduleDetection": "force",
@ -41,11 +27,7 @@
// Some stricter flags (disabled by default) // Some stricter flags (disabled by default)
"noUnusedLocals": false, "noUnusedLocals": false,
"noUnusedParameters": false, "noUnusedParameters": false,
"noPropertyAccessFromIndexSignature": false, "noPropertyAccessFromIndexSignature": false
}, },
"include": [ "include": ["src", "types", "config"]
"src",
"types",
"config"
],
} }