bugfixes (#40)

.env.example

@@ -19,7 +19,3 @@ DOCS_PLAYGROUND_DOMAIN=jspaste.eu
 
 # Port for documentation playground [443]:number
 DOCS_PLAYGROUND_PORT=443
-
-### Compression:
-# Compression level for Zlib [6]:number<0-9>
-ZLIB_LEVEL=6

Containerfile

@@ -24,4 +24,4 @@ LABEL org.opencontainers.image.licenses="EUPL-1.2"
 VOLUME /home/nonroot/documents
 EXPOSE 4000/tcp
 
-CMD ["src/index.ts"]
+CMD ["./src/index.ts"]

package.json

@@ -18,7 +18,8 @@
 		"@elysiajs/swagger": "^0.8.5",
 		"@protobuf-ts/plugin": "^2.9.3",
 		"@protobuf-ts/runtime": "^2.9.3",
-		"elysia": "^0.8.15"
+		"elysia": "^0.8.15",
+		"env-var": "^7.4.1"
 	},
 	"devDependencies": {
 		"@types/bun": "^1.0.4",

src/classes/Server.ts

@@ -48,11 +48,17 @@ export class Server {
 			swagger({
 				documentation: {
 					servers: [
-						{ url: `${this.serverConfig.docs.playground.domain}:${this.serverConfig.docs.playground.port}` }
+						{
+							url: (this.serverConfig.docs.playground.https ? 'https://' : 'http://').concat(
+								this.serverConfig.docs.playground.domain,
+								':',
+								this.serverConfig.docs.playground.port.toString()
+							)
+						}
 					],
 					info: {
 						title: 'JSPaste documentation',
-						version: this.serverConfig.versions.map((v) => `v${v}`).join(', '),
+						version: this.serverConfig.versions.map((version) => `v${version}`).join(', '),
 						description:
 							'The JSPaste API documentation. Note that you can use /documents instead of /api/vX/documents to use the latest API version by default.',
 						license: {
@@ -65,7 +71,7 @@ export class Server {
 					syntaxHighlight: { activate: true, theme: 'monokai' }
 				},
 				path: this.serverConfig.docs.path,
-				exclude: [this.serverConfig.docs.path, `${this.serverConfig.docs.path}/json`, /^\/documents/]
+				exclude: [this.serverConfig.docs.path, this.serverConfig.docs.path.concat('/json'), /^\/documents/]
 			})
 		);
 	}

src/interfaces/ServerOptions.ts

@@ -7,6 +7,7 @@ export interface ServerOptions {
 		enabled: boolean;
 		path: string;
 		playground: {
+			https: boolean;
 			domain: string;
 			port: number;
 		};

src/utils/ValidatorUtils.ts

@@ -1,14 +1,18 @@
 export class ValidatorUtils {
-	public static isValidNumber(value: number): boolean {
-		return Number.isFinite(value);
+	public static isValidType<T>(value: unknown, type: new (...args: any[]) => T): value is T {
+		return value instanceof type;
+	}
+
+	public static isValidPrimitiveType<T>(value: unknown, type: string): value is T {
+		return typeof value === type;
 	}
 
-	public static isValidInteger(value: number): boolean {
-		return ValidatorUtils.isValidNumber(value) && Number.isInteger(value);
+	public static isValidNumber(value: number): boolean {
+		return Number.isFinite(value) && Number.isInteger(value);
 	}
 
 	public static isValidString(value: string): boolean {
-		return typeof value === 'string' && !!value.trim();
+		return ValidatorUtils.isValidPrimitiveType(value, 'string') && !!value.trim();
 	}
 
 	public static isValidArray<T>(value: T[], validator: (value: T) => boolean): boolean {
@@ -41,7 +45,7 @@ export class ValidatorUtils {
 	}
 
 	public static isStringLengthBetweenLimits(value: string, min: number, max: number): boolean {
-		return ValidatorUtils.isValidString(value) && value.length >= min && value.length <= max;
+		return ValidatorUtils.isValidString(value) && ValidatorUtils.isLengthBetweenLimits(value, min, max);
 	}
 
 	public static isStringArrayLengthBetweenLimits(min: number, max: number, values: string[]): boolean {

src/utils/constants.ts

@@ -1,18 +1,17 @@
 import type { ServerOptions } from '../interfaces/ServerOptions.ts';
 import type { ZlibCompressionOptions } from 'bun';
 import type { JSPError } from '../classes/ErrorSender.ts';
-import { ValidatorUtils } from './ValidatorUtils.ts';
+import * as env from 'env-var';
 
 // interface Bun.env
 declare module 'bun' {
 	interface Env {
 		PORT: number;
-		DOCS_ENABLED: string;
+		DOCS_ENABLED: boolean;
 		DOCS_PATH: string;
-		DOCS_PLAYGROUND_HTTPS: string;
+		DOCS_PLAYGROUND_HTTPS: boolean;
 		DOCS_PLAYGROUND_DOMAIN: string;
 		DOCS_PLAYGROUND_PORT: number;
-		ZLIB_LEVEL: Range<0, 9>;
 	}
 }
 
@@ -37,25 +36,22 @@ export enum JSPErrorCode {
 	documentInvalidSecretLength = 'jsp.document.invalid_secret_length'
 }
 
-export const serverConfig: ServerOptions = {
-	port: Bun.env.PORT || 4000,
+export const serverConfig: Required<ServerOptions> = {
+	port: env.get('PORT').default(4000).asPortNumber(),
 	versions: [ServerVersion.v1, ServerVersion.v2],
 	docs: {
-		enabled: Bun.env.DOCS_ENABLED === 'true' || true,
-		path: Bun.env.DOCS_PATH || '/docs',
+		enabled: env.get('DOCS_ENABLED').asBoolStrict() ?? true,
+		path: env.get('DOCS_PATH').default('/docs').asString(),
 		playground: {
-			domain: ValidatorUtils.isValidDomain(Bun.env.DOCS_PLAYGROUND_DOMAIN)
-				? (Bun.env.DOCS_PLAYGROUND_HTTPS === 'true' ? 'https://' : 'http://').concat(
-						Bun.env.DOCS_PLAYGROUND_DOMAIN
-					)
-				: 'https://jspaste.eu',
-			port: Bun.env.DOCS_PLAYGROUND_PORT || 443
+			https: env.get('DOCS_PLAYGROUND_HTTPS').asBoolStrict() ?? true,
+			domain: env.get('DOCS_PLAYGROUND_DOMAIN').default('jspaste.eu').asString(),
+			port: env.get('DOCS_PLAYGROUND_PORT').default(443).asPortNumber()
 		}
 	}
-} as const satisfies Required<ServerOptions>;
+} as const;
 
 export const zlibConfig: ZlibCompressionOptions = {
-	level: Bun.env.ZLIB_LEVEL || 6
+	level: 6
 } as const;
 
 // FIXME(inetol): Migrate to new config system