feat: improve codes (#922)

Author: baseplate-admin

src/frontend/src/lib/functions/bytes.ts

@@ -8,23 +8,25 @@ export const B_VALS = {
 
 export type ByteUnit = keyof typeof B_VALS;
 
-export function formatBytes(bytes: number): { val: number; unit: ByteUnit } {
-	if (!bytes || bytes === 0) return { val: 0, unit: 'MB' };
-	const units: ByteUnit[] = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
+const BYTE_UNITS = Object.keys(B_VALS) as ByteUnit[];
+
+export const formatBytes = (bytes: number): { val: number; unit: ByteUnit } => {
+	if (!bytes) return { val: 0, unit: 'MB' };
+
 	const i = Math.floor(Math.log(bytes) / Math.log(1024));
+
 	return {
-		val: parseFloat((bytes / Math.pow(1024, i)).toFixed(2)),
-		unit: units[i]
+		val: +(bytes / 1024 ** i).toFixed(2),
+		unit: BYTE_UNITS[i]
 	};
-}
+};
+
+export const bytesToNumber = (value: number, unit: ByteUnit) => Math.floor(value * B_VALS[unit]);
 
-export function bytesToNumber(value: number, unit: ByteUnit): number {
-	return Math.floor(value * B_VALS[unit]);
-}
 export const formatFileSize = (bytes: number): string => {
-	if (bytes === 0) return '0 Bytes';
-	const k = 1024;
-	const sizes = ['Bytes', 'KB', 'MB', 'GB'];
-	const i = Math.floor(Math.log(bytes) / Math.log(k));
-	return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
+	if (!bytes) return '0 Bytes';
+
+	const i = Math.floor(Math.log(bytes) / Math.log(1024));
+
+	return `${+(bytes / 1024 ** i).toFixed(2)} ${BYTE_UNITS[i]}`;
 };

src/frontend/src/lib/functions/mime.ts

@@ -69,12 +69,11 @@ const mimeMap: Record<string, string> = {
 
 export function getMimeType(name: string): string {
 	const ext = name.split('.').at(-1)?.toLowerCase() ?? '';
-
-	return mimeMap[ext] || 'application/octet-stream';
+	return mimeMap[ext] ?? 'application/octet-stream';
 }
 
 export function detectMimeFromBytes(bytes: Uint8Array): string | null {
-	const has = (offset: number, ...header: number[]) =>
+	const has = (offset: number, ...header: number[]): boolean =>
 		offset + header.length <= bytes.length &&
 		header.every((value, index) => bytes[offset + index] === value);
 

src/frontend/src/routes/og/+server.ts …frontend/src/routes/og/(base)/+server.tssrc/frontend/src/routes/og/+server.ts renamed to src/frontend/src/routes/og/(base)/+server.ts src/frontend/src/routes/og/+server.ts renamed to src/frontend/src/routes/og/(base)/+server.ts

@@ -1,6 +1,6 @@
 import type { RequestHandler } from '@sveltejs/kit';
-import { buildOgResponse } from './og-response';
-import type { OgConfig } from './og-types';
+import { buildOgResponse } from '../og-response';
+import type { OgConfig } from '../og-types';
 
 const baseOgConfig: OgConfig = {
 	label: 'Private by design',

src/frontend/src/routes/og/og-display.ts

@@ -1,46 +1,28 @@
-import type { OgConfig } from './og-types';
+import type { OgConfig, OgDisplay, OgInputs } from './og-types';
 
-export type OgInputs = {
-	label?: string | null;
-	title?: string | null;
-	description?: string | null;
-	filename?: string | null;
-	size?: string | null;
-	fileCount?: number | null;
-};
-
-export type OgDisplay = {
-	label: string;
-	title: string;
-	subtitle: string;
-	footerTags?: string[];
-};
-
-function trimOr(value: string | null | undefined, fallback: string) {
-	const cleaned = value?.trim();
-	return cleaned ? cleaned : fallback;
-}
+const trimOr = (value: string | null | undefined, fallback: string) => value?.trim() || fallback;
 
-export function buildOgDisplay(config: OgConfig, inputs: OgInputs): OgDisplay {
+export const buildOgDisplay = (config: OgConfig, inputs: OgInputs): OgDisplay => {
 	const label = config.labelFromQuery ? trimOr(inputs.label, config.label) : config.label;
 
-	const title = config.usesFileMeta
-		? trimOr(inputs.filename, 'Encrypted File').slice(0, 42)
-		: trimOr(inputs.title, config.title ?? 'Chithi').slice(0, 42);
+	const title = (
+		config.usesFileMeta
+			? trimOr(inputs.filename, 'Encrypted File')
+			: trimOr(inputs.title, config.title || 'Chithi')
+	).slice(0, 42);
+
+	const fileCount = Number.isFinite(inputs.fileCount) ? inputs.fileCount : null;
 
-	const fileCount =
-		typeof inputs.fileCount === 'number' && Number.isFinite(inputs.fileCount)
-			? inputs.fileCount
-			: null;
 	const fileCountLabel = fileCount && fileCount > 0 ? ` | Files: ${fileCount}` : '';
+
 	const subtitle = config.usesFileMeta
 		? `Size: ${trimOr(inputs.size, 'Unknown size')}${fileCountLabel}`
-		: trimOr(inputs.description, config.description ?? '').slice(0, 90);
+		: trimOr(inputs.description, config.description || '').slice(0, 90);
 
 	return {
 		label,
 		title,
 		subtitle,
 		footerTags: config.footerTags
 	};
-}
+};

src/frontend/src/routes/og/og-types.ts

@@ -6,3 +6,19 @@ export type OgConfig = {
 	labelFromQuery?: boolean;
 	usesFileMeta?: boolean;
 };
+
+export type OgInputs = {
+	label?: string | null;
+	title?: string | null;
+	description?: string | null;
+	filename?: string | null;
+	size?: string | null;
+	fileCount?: number | null;
+};
+
+export type OgDisplay = {
+	label: string;
+	title: string;
+	subtitle: string;
+	footerTags?: string[];
+};