Revert "fix(deps): remove validator (after refactor) (#384)"

This reverts commit b837fa8.

Author: wolfy1339

index.ts

@@ -1,10 +1,13 @@
+import validator from "validator";
 import { fetch as undiciFetch, EnvHttpProxyAgent } from "undici";
 import {
   EventSource,
   type FetchLike,
   type EventSourceFetchInit,
   type ErrorEvent,
 } from "eventsource";
+import url from "node:url";
+import querystring from "node:querystring";
 
 type Severity = "info" | "error";
 
@@ -20,26 +23,6 @@ interface Options {
 
 const proxyAgent = new EnvHttpProxyAgent();
 
-const trimTrailingSlash = (url: string): string => {
-  return url.lastIndexOf("/") === url.length - 1 ? url.slice(0, -1) : url;
-};
-
-function validateURL(urlString: string): asserts urlString is string {
-  if (URL.canParse(urlString) === false) {
-    throw new Error(`The provided URL is invalid.`);
-  }
-
-  const url = new URL(urlString);
-
-  if (!url.protocol || !["http:", "https:"].includes(url.protocol)) {
-    throw new Error(`The provided URL is invalid.`);
-  }
-
-  if (!url.host) {
-    throw new Error(`The provided URL is invalid.`);
-  }
-}
-
 class SmeeClient {
   #source: string;
   #target: string;
@@ -67,13 +50,11 @@ class SmeeClient {
 
     const data = JSON.parse(msg.data);
 
-    const target = new URL(this.#target);
+    const target = url.parse(this.#target, true);
 
-    if (this.#queryForwarding && data.query) {
-      Object.keys(data.query).forEach((key) => {
-        target.searchParams.set(key, data.query[key]);
-      });
-      target.search = target.searchParams.toString();
+    if (this.#queryForwarding) {
+      const mergedQuery = { ...target.query, ...data.query };
+      target.search = querystring.stringify(mergedQuery);
     }
 
     delete data.query;
@@ -95,7 +76,7 @@ class SmeeClient {
     headers["content-type"] = "application/json";
 
     try {
-      const response = await this.#fetch(target, {
+      const response = await this.#fetch(url.format(target), {
         method: "POST",
         mode: data["sec-fetch-mode"],
         body,
@@ -121,16 +102,21 @@ class SmeeClient {
     queryForwarding = true,
     forward,
   }: Options) {
-    validateURL(target);
-    validateURL(source);
-
-    this.#source = trimTrailingSlash(new URL(source).toString());
-    this.#target = trimTrailingSlash(new URL(target).toString());
+    this.#source = source;
+    this.#target = target;
     this.#logger = logger!;
     this.#fetch = fetch;
     this.#queryForwarding = queryForwarding;
     this.#maxConnectionTimeout = maxConnectionTimeout;
     this.#forward = forward;
+
+    if (
+      !validator.isURL(this.#source, {
+        require_tld: false,
+      })
+    ) {
+      throw new Error("The provided URL is invalid.");
+    }
   }
 
   static async createChannel({

package-lock.json

@@ -28,11 +28,13 @@
   "license": "ISC",
   "dependencies": {
     "eventsource": "^4.0.0",
-    "undici": "^7.0.0"
+    "undici": "^7.0.0",
+    "validator": "^13.11.0"
   },
   "devDependencies": {
     "@octokit/tsconfig": "^4.0.0",
     "@types/node": "^24.0.0",
+    "@types/validator": "^13.11.6",
     "@vitest/coverage-v8": "^4.0.0",
     "get-port": "^7.1.0",
     "prettier": "^3.1.0",

package.json

@@ -32,34 +32,13 @@ describe("client", () => {
   describe("constructor", () => {
     describe("source", () => {
       test("throws if source is not a valid URL", () => {
-        [
-          "mailto:do-not-reply@example.com",
-          "ftp://www.google.com/",
-          "123455",
-        ].forEach((source) => {
-          expect(
-            () =>
-              new Client({
-                source,
-                target: "https://example.com",
-              }),
-            source,
-          ).toThrow("The provided URL is invalid.");
-        });
-        [
-          "https:/smee.io/CHANNEL",
-          "http://www.example.com:80",
-          "https://www.example.com:443",
-        ].forEach((source) => {
-          expect(
-            () =>
-              new Client({
-                source,
-                target: "https://example.com",
-              }),
-            source,
-          ).not.toThrow("The provided URL is invalid.");
-        });
+        expect(
+          () =>
+            new Client({
+              source: "mailto:do-not-reply@example.com",
+              target: "https://example.com",
+            }),
+        ).toThrow("The provided URL is invalid.");
       });
     });
   });
@@ -122,7 +101,7 @@ describe("client", () => {
 
       await client.start();
 
-      await fetch(target, {
+      await fetch(target + "/", {
         method: "POST",
         body: JSON.stringify({ hello: "world" }),
         headers: {