refactor: replace isValidUrl with URL.canParse for URL validation

dubinc · Dec 21, 2024 · 7db1fb0 · 7db1fb0
1 parent d571cc3
commit 7db1fb0
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 40 deletions.
diff --git a/apps/web/app/api/metatags/utils.ts b/apps/web/app/api/metatags/utils.ts
@@ -1,5 +1,5 @@
 import { recordMetatags } from "@/lib/upstash";
-import { fetchWithTimeout, isValidUrl } from "@dub/utils";
+import { fetchWithTimeout } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
 import he from "he";
 import { parse } from "node-html-parser";
@@ -39,7 +39,7 @@ export const getRelativeUrl = (url: string, imageUrl: string) => {
   if (!imageUrl) {
     return null;
   }
-  if (isValidUrl(imageUrl)) {
+  if (URL.canParse(imageUrl)) {
     return imageUrl;
   }
   const { protocol, host } = new URL(url);

diff --git a/apps/web/app/api/track/click/route.ts b/apps/web/app/api/track/click/route.ts
@@ -3,7 +3,7 @@ import { parseRequestBody } from "@/lib/api/utils";
 import { getLinkViaEdge } from "@/lib/planetscale";
 import { recordClick } from "@/lib/tinybird";
 import { ratelimit, redis } from "@/lib/upstash";
-import { isValidUrl, LOCALHOST_IP, nanoid } from "@dub/utils";
+import { LOCALHOST_IP, nanoid } from "@dub/utils";
 import { ipAddress, waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 
@@ -48,7 +48,7 @@ export const POST = async (req: Request) => {
       });
     }
 
-    const finalUrl = isValidUrl(url) ? url : link.url;
+    const finalUrl = URL.canParse(url) ? url : link.url;
 
     const cacheKey = `recordClick:${link.id}:${ip}`;
 

diff --git a/apps/web/lib/api/links/process-link.ts b/apps/web/lib/api/links/process-link.ts
@@ -13,7 +13,6 @@ import {
   getDomainWithoutWWW,
   getUrlFromString,
   isDubDomain,
-  isValidUrl,
   log,
   parseDateTime,
   pluralize,
@@ -78,7 +77,7 @@ export async function processLink<T extends Record<string, any>>({
   // if URL is defined, perform URL checks
   if (url) {
     url = getUrlFromString(url);
-    if (!isValidUrl(url)) {
+    if (!URL.canParse(url)) {
       return {
         link: payload,
         error: "Invalid destination URL",
@@ -453,7 +452,7 @@ export async function processLink<T extends Record<string, any>>({
     expiresAt = datetime;
     if (expiredUrl) {
       expiredUrl = getUrlFromString(expiredUrl);
-      if (!isValidUrl(expiredUrl)) {
+      if (!URL.canParse(expiredUrl)) {
         return {
           link: payload,
           error: "Invalid expired URL.",

diff --git a/apps/web/lib/zod/schemas/utils.ts b/apps/web/lib/zod/schemas/utils.ts
@@ -1,10 +1,10 @@
 import z from "@/lib/zod";
-import { getUrlFromString, isValidUrl, parseDateTime } from "@dub/utils";
+import { getUrlFromString, parseDateTime } from "@dub/utils";
 
 export const parseUrlSchema = z
   .string()
   .transform((v) => getUrlFromString(v))
-  .refine((v) => isValidUrl(v), { message: "Invalid URL" });
+  .refine((v) => URL.canParse(v), { message: "Invalid URL" });
 
 export const parseUrlSchemaAllowEmpty = ({
   maxLength,

diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
@@ -12,7 +12,6 @@ import {
   API_HOSTNAMES,
   APP_HOSTNAMES,
   DEFAULT_REDIRECTS,
-  isValidUrl,
 } from "@dub/utils";
 import { PARTNERS_HOSTNAMES } from "@dub/utils/src/constants";
 import { NextFetchEvent, NextRequest, NextResponse } from "next/server";
@@ -65,7 +64,7 @@ export default async function middleware(req: NextRequest, ev: NextFetchEvent) {
     return PartnersMiddleware(req);
   }
 
-  if (isValidUrl(fullKey)) {
+  if (URL.canParse(fullKey)) {
     return CreateLinkMiddleware(req);
   }
 

diff --git a/apps/web/ui/modals/link-builder/index.tsx b/apps/web/ui/modals/link-builder/index.tsx
@@ -26,7 +26,6 @@ import {
   DEFAULT_LINK_PROPS,
   getApexDomain,
   getUrlWithoutUTMParams,
-  isValidUrl,
   linkConstructor,
 } from "@dub/utils";
 import { useParams, useSearchParams } from "next/navigation";
@@ -401,7 +400,7 @@ function LinkBuilderInner({
                         error={errors.url?.message || undefined}
                         right={
                           <div className="-mb-1 h-6">
-                            {isValidUrl(url) && (
+                            {URL.canParse(url) && (
                               <UTMTemplatesButton
                                 onLoad={(params) => {
                                   setValue(
@@ -556,7 +555,7 @@ export function CreateLinkButton({
     // - workspace has not exceeded links limit
     if (
       pastedContent &&
-      isValidUrl(pastedContent) &&
+      URL.canParse(pastedContent) &&
       target.tagName !== "INPUT" &&
       target.tagName !== "TEXTAREA" &&
       !existingModalBackdrop &&

diff --git a/apps/web/ui/modals/link-builder/options-list.tsx b/apps/web/ui/modals/link-builder/options-list.tsx
@@ -1,7 +1,7 @@
 import { AlertCircleFill, CheckCircleFill, X } from "@/ui/shared/icons";
 import { Tooltip, useMediaQuery } from "@dub/ui";
 import { LoadingSpinner } from "@dub/ui/icons";
-import { cn, fetcher, isValidUrl as isValidUrlFn } from "@dub/utils";
+import { cn, fetcher } from "@dub/utils";
 import { AnimatePresence, motion } from "framer-motion";
 import { ReactNode, useMemo } from "react";
 import { useFormContext } from "react-hook-form";
@@ -102,7 +102,7 @@ function LinkCloakingToggleBadge({
   const [url, domain] = watch(["url", "domain"]);
   const [debouncedUrl] = useDebounce(url, 500);
   const isValidUrl = useMemo(
-    () => debouncedUrl && isValidUrlFn(debouncedUrl),
+    () => debouncedUrl && URL.canParse(debouncedUrl),
     [debouncedUrl],
   );
 

diff --git a/apps/web/ui/modals/link-builder/targeting-modal.tsx b/apps/web/ui/modals/link-builder/targeting-modal.tsx
@@ -14,7 +14,6 @@ import {
   constructURLFromUTMParams,
   COUNTRIES,
   getParamsFromURL,
-  isValidUrl,
   pluralize,
 } from "@dub/utils";
 import {
@@ -74,7 +73,7 @@ function TargetingModal({
   // Get UTM parameters from the parent URL that need to be added on blur
   const getNewParams = useCallback(
     (targetURL: string) => {
-      if (!targetURL?.trim() || !isValidUrl(targetURL)) return;
+      if (!targetURL?.trim() || !URL.canParse(targetURL)) return;
 
       const parentUrl = getValuesParent("url");
       const parentParams = getParamsFromURL(parentUrl);

diff --git a/apps/web/ui/modals/link-builder/utm-modal.tsx b/apps/web/ui/modals/link-builder/utm-modal.tsx
@@ -9,12 +9,7 @@ import {
   UTM_PARAMETERS,
   UTMBuilder,
 } from "@dub/ui";
-import {
-  cn,
-  constructURLFromUTMParams,
-  getParamsFromURL,
-  isValidUrl,
-} from "@dub/utils";
+import { cn, constructURLFromUTMParams, getParamsFromURL } from "@dub/utils";
 import {
   Dispatch,
   SetStateAction,
@@ -213,15 +208,15 @@ function UTMModalInner({ setShowUTMModal }: UTMModalProps) {
             );
           }}
           disabledTooltip={
-            isValidUrl(url)
+            URL.canParse(url)
               ? undefined
               : "Enter a destination URL to add UTM parameters"
           }
           autoFocus
         />
       </div>
 
-      {isValidUrl(url) && (
+      {URL.canParse(url) && (
         <div className="mt-4 grid gap-y-1">
           <span className="block text-sm font-medium text-gray-700">
             URL Preview
@@ -242,7 +237,7 @@ function UTMModalInner({ setShowUTMModal }: UTMModalProps) {
                 });
               }}
               disabledTooltip={
-                isValidUrl(url)
+                URL.canParse(url)
                   ? undefined
                   : "Enter a destination URL to use UTM templates"
               }

diff --git a/packages/utils/src/functions/domains.ts b/packages/utils/src/functions/domains.ts
@@ -5,7 +5,6 @@ import {
   SPECIAL_APEX_DOMAINS,
   ccTLDs,
 } from "../constants";
-import { isValidUrl } from "./urls";
 
 export const generateDomainFromName = (name: string) => {
   const normalizedName = slugify(name, { separator: "" });
@@ -70,7 +69,7 @@ export const getApexDomain = (url: string) => {
 };
 
 export const getDomainWithoutWWW = (url: string) => {
-  if (isValidUrl(url)) {
+  if (URL.canParse(url)) {
     return new URL(url).hostname.replace(/^www\./, "");
   }
   try {

diff --git a/packages/utils/src/functions/urls.ts b/packages/utils/src/functions/urls.ts
@@ -1,14 +1,5 @@
-export const isValidUrl = (url: string) => {
-  try {
-    new URL(url);
-    return true;
-  } catch (e) {
-    return false;
-  }
-};
-
 export const getUrlFromString = (str: string) => {
-  if (isValidUrl(str)) return str;
+  if (URL.canParse(str)) return str;
   try {
     if (str.includes(".") && !str.includes(" ")) {
       return new URL(`https://${str}`).toString();
@@ -18,7 +9,7 @@ export const getUrlFromString = (str: string) => {
 };
 
 export const getUrlFromStringIfValid = (str: string) => {
-  if (isValidUrl(str)) return str;
+  if (URL.canParse(str)) return str;
   try {
     if (str.includes(".") && !str.includes(" ")) {
       return new URL(`https://${str}`).toString();