Apply PR #1 URL normalization suggestions and accept schemeless URLs in FE validation

src/api/worker.ts

@@ -65,6 +65,11 @@ const createApp = () =>
 				}
 
 				let { alias, original_url } = body;
+				original_url = original_url?.trim() ?? "";
+				if (!original_url) {
+					return errorResponse("URL is required", 400);
+				}
+
 				if (!HAS_URI_SCHEME_PATTERN.test(original_url)) {
 					original_url = `https://${original_url}`;
 				}

src/client/lib/validation.ts

@@ -1,6 +1,15 @@
 import { z } from "zod";
 import { ALIAS_MAX_LENGTH } from "./constants";
 
+const HAS_URI_SCHEME_PATTERN = /^[A-Za-z][A-Za-z\d+\-.]*:\/\//;
+
+export const normalizeUrlInput = (url: string): string => {
+	const trimmed = url.trim();
+	if (!trimmed) return trimmed;
+	if (HAS_URI_SCHEME_PATTERN.test(trimmed)) return trimmed;
+	return `https://${trimmed}`;
+};
+
 const isIpAddress = (hostname: string): boolean => {
 	if (/^(\d{1,3}\.){3}\d{1,3}$/.test(hostname)) return true;
 	if (hostname.includes(":") || hostname.startsWith("[")) return true;
@@ -9,9 +18,11 @@ const isIpAddress = (hostname: string): boolean => {
 
 export const urlSchema = z.object({
 	url: z
-		.string()
-		.url("Invalid URL")
-		.refine((url) => url.startsWith("https://"), {
+		.preprocess(
+			(value) => (typeof value === "string" ? normalizeUrlInput(value) : value),
+			z.string().url("Invalid URL"),
+		)
+		.refine((url) => url.toLowerCase().startsWith("https://"), {
 			message: "Only HTTPS URLs are allowed",
 		})
 		.refine(

src/client/routes/index.tsx

@@ -8,22 +8,27 @@ import {
 	downloadQRCodeFromDataUrl,
 	generateQRCodePNG,
 } from "../../api/lib/qrcode";
-import { ThemeToggle } from "../components/ThemeToggle";
-import { Toast } from "../components/Toast";
 import {
 	ArrowRightIcon,
 	CopyIcon,
 	InfoIcon,
 	LightningLogo,
 	QRIcon,
 } from "../components/icons";
+import { ThemeToggle } from "../components/ThemeToggle";
+import { Toast } from "../components/Toast";
 import { useDecryptAnimation } from "../hooks/useDecryptAnimation";
 import { useSyncStatus } from "../hooks/useSyncStatus";
 import { useUrlShortener } from "../hooks/useUrlShortener";
 import { ALIAS_MAX_LENGTH, getBaseUrl, getShortUrl } from "../lib/constants";
 import { isOnline } from "../lib/sync";
 import { useTheme } from "../lib/useTheme";
-import { isValidAlias, urlSchema, type UrlFormData } from "../lib/validation";
+import {
+	isValidAlias,
+	normalizeUrlInput,
+	type UrlFormData,
+	urlSchema,
+} from "../lib/validation";
 
 function HomePage() {
 	const { isDarkMode, toggleTheme } = useTheme();
@@ -87,7 +92,6 @@ function HomePage() {
 		setValue,
 		watch,
 		clearErrors,
-		setError,
 	} = useForm<UrlFormData>({
 		resolver: zodResolver(urlSchema),
 		mode: "onSubmit",
@@ -123,24 +127,13 @@ function HomePage() {
 	const handlePaste = useCallback(
 		(e: React.ClipboardEvent<HTMLInputElement>) => {
 			const pastedText = e.clipboardData.getData("text").trim();
-
-			if (
-				pastedText.startsWith("http://") ||
-				pastedText.startsWith("https://")
-			) {
+			if (pastedText.length > 0) {
 				e.preventDefault();
-				setValue("url", pastedText);
+				setValue("url", normalizeUrlInput(pastedText));
 				setTimeout(() => handleSubmit(onSubmit)(), 100);
-			} else if (pastedText.length > 0) {
-				e.preventDefault();
-				setValue("url", pastedText);
-				setError("url", {
-					type: "manual",
-					message: "Only HTTPS URLs are allowed",
-				});
 			}
 		},
-		[setValue, handleSubmit, onSubmit, setError],
+		[setValue, handleSubmit, onSubmit],
 	);
 
 	const watchedUrl = watch("url");