urlpurify 2.0.0 → 2.1.1

package/dist/unwraps/feedStatistics.mjs

@@ -1,10 +1,10 @@
 import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64 } from "../utils.mjs";
+import { decodeBase64, getParamValues } from "../utils.mjs";
 //#region src/unwraps/feedStatistics.ts
 const pathRegex = /^\/(?:[^/]+\/){0,2}$/;
 const unwrapFeedStatistics = (url) => {
 	if (!pathRegex.test(url.pathname)) return;
-	const target = decodeBase64(url.searchParams.get("feed-stats-url") ?? "");
+	const target = decodeBase64(getParamValues(url, "feed-stats-url").at(0) ?? "");
 	if (!target || !isHttpUrl(target)) return;
 	return target;
 };

package/dist/unwraps/firebaseDynamicLinks.mjs

@@ -1,7 +1,7 @@
 import { createParamExtractor } from "../utils.mjs";
 //#region src/unwraps/firebaseDynamicLinks.ts
 const appPathRegex = /^\/app\/[\w-]+$/;
-const params = ["link", "ofl"];
+const params = ["ofl", "link"];
 const extractTarget = createParamExtractor({
 	domains: ["app.goo.gl", "page.link"],
 	path: "/",

package/dist/unwraps/firstory.mjs

@@ -1,4 +1,4 @@
-import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 import { getParamTarget } from "../utils.mjs";
 import { getPathTarget } from "../pathTarget.mjs";
 //#region src/unwraps/firstory.ts
@@ -13,9 +13,7 @@ const unwrapFirstory = (url) => {
 	if (!isHostOf(url, trackHosts)) return;
 	const match = url.pathname.match(trackPrefixRegex);
 	if (!match) return;
-	try {
-		return `${decodeURIComponent(url.pathname.slice(match[0].length))}${url.search}${url.hash}`;
-	} catch {}
+	return `${decodePercent(url.pathname.slice(match[0].length))}${url.search}${url.hash}`;
 };
 //#endregion
 export { unwrapFirstory };

package/dist/unwraps/gfnLinkProxy.mjs

@@ -1,10 +1,10 @@
 import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64 } from "../utils.mjs";
+import { decodeBase64, getParamValues } from "../utils.mjs";
 //#region src/unwraps/gfnLinkProxy.ts
 const pathRegex = /^(?:\/[^/]+)?\/redirect\/?$/;
 const unwrapGfnLinkProxy = (url) => {
 	if (!pathRegex.test(url.pathname)) return;
-	const raw = url.searchParams.get("to");
+	const raw = getParamValues(url, "to").at(0);
 	if (!raw) return;
 	const decoded = decodeBase64(raw);
 	if (decoded && isHttpUrl(decoded)) return decoded;

package/dist/unwraps/godcaster.mjs

@@ -1,5 +1,5 @@
-import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
-import { createParamExtractor, percentDecode } from "../utils.mjs";
+import { decodePercent, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
+import { createParamExtractor } from "../utils.mjs";
 //#region src/unwraps/godcaster.ts
 const episodePrefixRegex = /^\/act\/e\/\d+\/\d+\/\d+\//;
 const encodedSchemeRegex = /^https?%(?:25)?3A/i;
@@ -14,7 +14,7 @@ const unwrapGodcaster = (url) => {
 	const match = url.pathname.match(episodePrefixRegex);
 	if (!match) return;
 	let target = url.pathname.slice(match[0].length);
-	while (encodedSchemeRegex.test(target)) target = percentDecode(target);
+	while (encodedSchemeRegex.test(target)) target = decodePercent(target);
 	return `${target}${url.hash}`;
 };
 //#endregion

package/dist/unwraps/govdelivery.d.mts

@@ -0,0 +1,4 @@
+import { UrlUnwrapper } from "../types.mjs";
+//#region src/unwraps/govdelivery.d.ts
+export declare const unwrapGovdelivery: UrlUnwrapper;
+//#endregion

package/dist/unwraps/govdelivery.mjs

@@ -0,0 +1,12 @@
+import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+//#region src/unwraps/govdelivery.ts
+const clickQueryRegex = /^\?type=click&enid=[^&]+&&&\d+&&&(.+)$/;
+const unwrapGovdelivery = (url) => {
+	if (!isHostOf(url, "links.govdelivery.com") || url.pathname !== "/track") return;
+	const match = clickQueryRegex.exec(url.search);
+	if (!match?.[1]) return;
+	const target = `${match[1]}${url.hash}`;
+	if (isHttpUrl(target)) return target;
+};
+//#endregion
+export { unwrapGovdelivery };

package/dist/unwraps/impact.mjs

@@ -1,5 +1,5 @@
-import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { getParamValues, percentDecode } from "../utils.mjs";
+import { decodePercent, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { getParamValues } from "../utils.mjs";
 //#region src/unwraps/impact.ts
 const pathRegex = /^\/c\/\d+\/\d+\/\d+$/;
 const sjvHostRegex = /\.sjv\.io$/;
@@ -12,7 +12,7 @@ const unwrapImpact = (url) => {
 	const isPxfPath = pxfHostRegex.test(url.hostname) && pxfPathRegex.test(url.pathname);
 	if (!pathRegex.test(url.pathname) && !isSjvPath && !isPxfPath) return;
 	let target = getParamValues(url, "u").at(0);
-	if (target && encodedSchemeRegex.test(target)) target = percentDecode(target);
+	if (target && encodedSchemeRegex.test(target)) target = decodePercent(target);
 	if (target && isHttpUrl(target)) return target;
 };
 //#endregion

package/dist/unwraps/indexHu.mjs

@@ -1,5 +1,5 @@
-import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
-import { createParamExtractor, percentDecode } from "../utils.mjs";
+import { decodePercent, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
+import { createParamExtractor } from "../utils.mjs";
 //#region src/unwraps/indexHu.ts
 const sectionParamRegex = /^index_[a-z]+_cikklink$/;
 const encodedSchemeRegex = /^https?%3A/i;
@@ -17,7 +17,7 @@ const unwrapSectionCounter = (url) => {
 	for (const [key, value] of url.searchParams) {
 		if (!sectionParamRegex.test(key) || !value) continue;
 		if (!encodedSchemeRegex.test(value)) return value;
-		return percentDecode(value);
+		return decodePercent(value);
 	}
 };
 const unwrapIndexHu = (url) => {

package/dist/unwraps/invisionNoExternalLinks.mjs

@@ -1,12 +1,12 @@
-import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { getParamValues, percentDecode } from "../utils.mjs";
+import { decodePercent, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { getParamValues } from "../utils.mjs";
 //#region src/unwraps/invisionNoExternalLinks.ts
 const pathRegex = /^(?:\/[^/]+)?\/redirect\/$/;
 const encodedSchemeRegex = /^https?%3A/i;
 const unwrapInvisionNoExternalLinks = (url) => {
 	if (!pathRegex.test(url.pathname)) return;
 	let target = getParamValues(url, "to").at(0);
-	if (target && encodedSchemeRegex.test(target)) target = percentDecode(target);
+	if (target && encodedSchemeRegex.test(target)) target = decodePercent(target);
 	if (!target || !isHttpUrl(target)) return;
 	return target;
 };

package/dist/unwraps/linksynergy.mjs

@@ -1,5 +1,5 @@
-import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { getParamValues, percentDecode } from "../utils.mjs";
+import { decodePercent, isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { getParamValues } from "../utils.mjs";
 //#region src/unwraps/linksynergy.ts
 const linksynergyHosts = [
 	"click.linksynergy.com",
@@ -19,7 +19,7 @@ const unwrapLinksynergy = (url) => {
 	const target = getParamValues(url, param).at(0);
 	if (!target) return;
 	if (isHttpUrl(target)) return target;
-	const decoded = percentDecode(target);
+	const decoded = decodePercent(target);
 	if (isHttpUrl(decoded)) return decoded;
 };
 //#endregion

package/dist/unwraps/logicboard.mjs

@@ -1,12 +1,12 @@
-import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { getParamValues, percentDecode } from "../utils.mjs";
+import { decodePercent, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { getParamValues } from "../utils.mjs";
 //#region src/unwraps/logicboard.ts
 const pathRegex = /^(?:\/[^/]+){0,2}\/away\.php$/;
 const encodedSchemeRegex = /^https?%3A/i;
 const unwrapLogicboard = (url) => {
 	if (!pathRegex.test(url.pathname)) return;
 	let target = getParamValues(url, "s").at(0);
-	if (target && encodedSchemeRegex.test(target)) target = percentDecode(target);
+	if (target && encodedSchemeRegex.test(target)) target = decodePercent(target);
 	if (!target || !isHttpUrl(target)) return;
 	return target;
 };

package/dist/unwraps/mailinblack.mjs

@@ -1,9 +1,9 @@
 import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64Url } from "../utils.mjs";
+import { decodeBase64Url, getParamValues } from "../utils.mjs";
 //#region src/unwraps/mailinblack.ts
 const unwrapMailinblack = (url) => {
 	if (url.pathname !== "/securelink/") return;
-	const key = url.searchParams.get("key");
+	const key = getParamValues(url, "key").at(0);
 	if (!key) return;
 	const json = decodeBase64Url(key);
 	if (!json) return;

package/dist/unwraps/mandrill.mjs

@@ -1,5 +1,5 @@
 import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { createParamExtractor, decodeBase64Url } from "../utils.mjs";
+import { createParamExtractor, decodeBase64Url, getParamValues } from "../utils.mjs";
 //#region src/unwraps/mandrill.ts
 const hosts = ["go.mnsvc.com", "mandrillapp.com"];
 const clickPathRegex = /^\/track\/click\/\d+\/[^/]+$/;
@@ -18,7 +18,7 @@ const unwrapMandrill = (url) => {
 	const target = extractClickPhp(url);
 	if (target) return target;
 	if (!isHostOf(url, hosts) || !clickPathRegex.test(url.pathname)) return;
-	const payload = url.searchParams.get("p");
+	const payload = getParamValues(url, "p").at(0);
 	if (!payload) return;
 	return decodePayload(payload);
 };

package/dist/unwraps/mimecast.mjs

@@ -5,10 +5,7 @@ const mimecastProtectHostRegex = /^url\.(?:au|ca|de|jer|uk|us|usb|za)\.m\.mimeca
 const mimecastPathRegex = /^\/s\/[^/]+$/;
 const unwrapMimecast = (url) => {
 	if (!(mimecastHostRegex.test(url.hostname) || mimecastProtectHostRegex.test(url.hostname)) || !mimecastPathRegex.test(url.pathname)) return;
-	const targetUrl = getParamTarget(url, "url");
-	if (targetUrl) return targetUrl;
-	const targetDomain = url.searchParams.get("domain");
-	if (targetDomain) return `https://${targetDomain}`;
+	return getParamTarget(url, "url");
 };
 //#endregion
 export { unwrapMimecast };

package/dist/unwraps/mohtwize.mjs

@@ -1,4 +1,4 @@
-import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/mohtwize.ts
 const carrierPrefix = "?fileURL=/";
 const schemeRegex = /^https?:/i;
@@ -7,11 +7,7 @@ const unwrapMohtwize = (url) => {
 	if (!isHostOf(url, "stats.mohtwize.net") || url.pathname !== "/redirect.mp3") return;
 	if (!url.search.startsWith(carrierPrefix)) return;
 	let target = `${url.search.slice(10)}${url.hash}`;
-	if (encodedSchemeRegex.test(target)) try {
-		target = decodeURIComponent(target);
-	} catch {
-		return;
-	}
+	if (encodedSchemeRegex.test(target)) target = decodePercent(target);
 	if (!target) return;
 	if (schemeRegex.test(target)) return target;
 	return `https://${target}`;

package/dist/unwraps/mozillaOutgoing.mjs

@@ -1,4 +1,4 @@
-import { decodeSegment, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/mozillaOutgoing.ts
 const pathRegex = /^\/v1\/[0-9a-f]{64}\/(.+)$/;
 const mozillaOutgoingHosts = [
@@ -10,7 +10,7 @@ const unwrapMozillaOutgoing = (url) => {
 	if (!isHostOf(url, mozillaOutgoingHosts)) return;
 	const match = url.pathname.match(pathRegex);
 	if (!match) return;
-	return decodeSegment(match[1]);
+	return decodePercent(match[1]);
 };
 //#endregion
 export { unwrapMozillaOutgoing };

package/dist/unwraps/newswire.mjs

@@ -1,6 +1,6 @@
 import { isAnyOf } from "../node_modules/trousse/dist/matching.mjs";
 import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64Url } from "../utils.mjs";
+import { decodeBase64Url, getParamValues } from "../utils.mjs";
 //#region src/unwraps/newswire.ts
 const hosts = [
 	"stats.newswire.com",
@@ -9,7 +9,7 @@ const hosts = [
 ];
 const unwrapNewswire = (url) => {
 	if (!isAnyOf(url.hostname, hosts) || url.pathname !== "/x/html") return;
-	const value = url.searchParams.get("final");
+	const value = getParamValues(url, "final").at(0);
 	if (!value) return;
 	const decoded = decodeBase64Url(value);
 	if (!decoded || !isHttpUrl(decoded)) return;

package/dist/unwraps/postAffiliatePro.mjs

@@ -1,12 +1,12 @@
-import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { getParamValues, percentDecode } from "../utils.mjs";
+import { decodePercent, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { getParamValues } from "../utils.mjs";
 //#region src/unwraps/postAffiliatePro.ts
 const pathRegex = /^\/(?:[^/]+\/)*scripts\/click\.php$/;
 const encodedSchemeRegex = /^https?%3A/i;
 const unwrapPostAffiliatePro = (url) => {
 	if (!pathRegex.test(url.pathname)) return;
 	let target = getParamValues(url, "desturl").at(0);
-	if (target && encodedSchemeRegex.test(target)) target = percentDecode(target);
+	if (target && encodedSchemeRegex.test(target)) target = decodePercent(target);
 	if (target && isHttpUrl(target)) return target;
 };
 //#endregion

package/dist/unwraps/postmark.mjs

@@ -1,11 +1,11 @@
-import { decodeSegment, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/postmark.ts
 const postmarkPathRegex = /^\/[23][mt]?(s?)\/([^/]+)\//;
 const unwrapPostmark = (url) => {
 	if (!isHostOf(url, ["click.pstmrk.it", "track.pstmrk.it"])) return;
 	const match = url.pathname.match(postmarkPathRegex);
 	if (!match) return;
-	const target = decodeSegment(match[2]);
+	const target = decodePercent(match[2]);
 	if (!target) return;
 	return `${match[1] ? "https" : "http"}://${target}`;
 };

package/dist/unwraps/prezly.mjs

@@ -1,16 +1,11 @@
-import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/prezly.ts
 const pathRegex = /^\/c\/[0-9a-f-]{36}\/[0-9a-f]{8}\/([^/]+)$/;
 const unwrapPrezly = (url) => {
 	if (!isHostOf(url, "prezlymail.com")) return;
 	const match = pathRegex.exec(url.pathname);
 	if (!match?.[1]) return;
-	let target;
-	try {
-		target = decodeURIComponent(match[1]);
-	} catch {
-		return;
-	}
+	const target = decodePercent(match[1]);
 	if (isHttpUrl(target)) return target;
 };
 //#endregion

package/dist/unwraps/proofpointV1.mjs

@@ -1,18 +1,9 @@
-import { decodeSegment } from "../node_modules/trousse/dist/urls.mjs";
 import { createParamExtractor } from "../utils.mjs";
 //#region src/unwraps/proofpointV1.ts
-const createProofpointUnwrapper = (path) => {
-	const baseExtractor = createParamExtractor({
-		hosts: "urldefense.proofpoint.com",
-		path,
-		params: ["u"]
-	});
-	return (url) => {
-		const raw = baseExtractor(url);
-		if (!raw) return;
-		return decodeSegment(raw.replace(/-/g, "%").replace(/_/g, "/"));
-	};
-};
-const unwrapProofpointV1 = createProofpointUnwrapper("/v1/url");
+const unwrapProofpointV1 = createParamExtractor({
+	hosts: "urldefense.proofpoint.com",
+	path: "/v1/url",
+	params: ["u"]
+});
 //#endregion
-export { createProofpointUnwrapper, unwrapProofpointV1 };
+export { unwrapProofpointV1 };

package/dist/unwraps/proofpointV2.mjs

@@ -1,5 +1,15 @@
-import { createProofpointUnwrapper } from "./proofpointV1.mjs";
+import { decodePercent } from "../node_modules/trousse/dist/urls.mjs";
+import { createParamExtractor } from "../utils.mjs";
 //#region src/unwraps/proofpointV2.ts
-const unwrapProofpointV2 = createProofpointUnwrapper("/v2/url");
+const extractTarget = createParamExtractor({
+	hosts: "urldefense.proofpoint.com",
+	path: "/v2/url",
+	params: ["u"]
+});
+const unwrapProofpointV2 = (url) => {
+	const raw = extractTarget(url);
+	if (!raw) return;
+	return decodePercent(raw.replace(/-/g, "%").replace(/_/g, "/"));
+};
 //#endregion
 export { unwrapProofpointV2 };

package/dist/unwraps/qualityClick.mjs

@@ -1,12 +1,12 @@
-import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { getParamValues, percentDecode } from "../utils.mjs";
+import { decodePercent, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { getParamValues } from "../utils.mjs";
 //#region src/unwraps/qualityClick.ts
 const encodedSchemeRegex = /^https?%3A/i;
 const unwrapQualityClick = (url) => {
 	if (url.pathname !== "/go.cgi") return;
 	if (!url.searchParams.has("pid") || !url.searchParams.has("wmid")) return;
 	let target = getParamValues(url, "target").at(0);
-	if (target && encodedSchemeRegex.test(target)) target = percentDecode(target);
+	if (target && encodedSchemeRegex.test(target)) target = decodePercent(target);
 	if (target && isHttpUrl(target)) return target;
 };
 //#endregion

package/dist/unwraps/researchgate.mjs

@@ -1,4 +1,4 @@
-import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 import { createParamExtractor } from "../utils.mjs";
 //#region src/unwraps/researchgate.ts
 const derefPathRegex = /^\/deref\/(.+)$/;
@@ -14,10 +14,8 @@ const unwrapResearchgate = (url) => {
 	const match = derefPathRegex.exec(url.pathname);
 	if (!match?.[1]) return;
 	if (isHttpUrl(match[1])) return `${match[1]}${url.search}${url.hash}`;
-	try {
-		const target = decodeURIComponent(match[1]);
-		if (isHttpUrl(target)) return target;
-	} catch {}
+	const target = decodePercent(match[1]);
+	if (isHttpUrl(target)) return target;
 };
 //#endregion
 export { unwrapResearchgate };

package/dist/unwraps/reviveAdserver.mjs

@@ -1,4 +1,4 @@
-import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 import { getParamTarget } from "../utils.mjs";
 //#region src/unwraps/reviveAdserver.ts
 const clickPathRegex = /^(?:\/[^/]+)*\/c[kl]\.php$/;
@@ -14,10 +14,8 @@ const unwrapReviveAdserver = (url) => {
 			index = url.search.indexOf(marker);
 		}
 		if (index === -1) return;
-		try {
-			const target = decodeURIComponent(url.search.slice(index + marker.length));
-			if (isHttpUrl(target)) return target;
-		} catch {}
+		const target = decodePercent(url.search.slice(index + marker.length));
+		if (isHttpUrl(target)) return target;
 		return;
 	}
 	if (!legacyClickPathRegex.test(url.pathname) || !url.searchParams.has("bannerid")) return;

package/dist/unwraps/serendipity.mjs

@@ -1,10 +1,10 @@
 import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64 } from "../utils.mjs";
+import { decodeBase64, getParamValues } from "../utils.mjs";
 //#region src/unwraps/serendipity.ts
 const pathRegex = /^(?:\/[^/]+)?\/exit\.php$/;
 const unwrapSerendipity = (url) => {
 	if (!pathRegex.test(url.pathname) || !url.searchParams.has("entry_id")) return;
-	const raw = url.searchParams.get("url");
+	const raw = getParamValues(url, "url").at(0);
 	if (!raw) return;
 	const decoded = decodeBase64(raw);
 	if (decoded && isHttpUrl(decoded)) return decoded;

package/dist/unwraps/streak.mjs

@@ -1,4 +1,4 @@
-import { isHostOrSubdomainOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHostOrSubdomainOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/streak.ts
 const domains = ["streaklinks.com", "streak-link.com"];
 const pathRegex = /^\/[\w-]{24}\/([^/]+)$/;
@@ -6,10 +6,8 @@ const unwrapStreak = (url) => {
 	if (!isHostOrSubdomainOf(url, domains)) return;
 	const match = pathRegex.exec(url.pathname);
 	if (!match?.[1]) return;
-	try {
-		const target = decodeURIComponent(match[1]);
-		if (isHttpUrl(target)) return target;
-	} catch {}
+	const target = decodePercent(match[1]);
+	if (isHttpUrl(target)) return target;
 };
 //#endregion
 export { unwrapStreak };

package/dist/unwraps/surly.mjs

@@ -1,4 +1,4 @@
-import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/surly.ts
 const pathRegex = /^\/o\/([^/].*?)(?:\/AA\d{6})?$/;
 const schemeRegex = /^https?:\/\//i;
@@ -6,13 +6,7 @@ const unwrapSurly = (url) => {
 	if (!isHostOf(url, ["sur.ly", "www.sur.ly"])) return;
 	const match = pathRegex.exec(url.pathname);
 	if (!match?.[1]) return;
-	let path;
-	try {
-		path = decodeURIComponent(match[1]);
-	} catch {
-		return;
-	}
-	const target = `https://${path.replace(schemeRegex, "")}`;
+	const target = `https://${decodePercent(match[1]).replace(schemeRegex, "")}`;
 	if (isHttpUrl(target)) return target;
 };
 //#endregion

package/dist/unwraps/webArchive.mjs

@@ -1,4 +1,4 @@
-import { decodeSegment, isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/webArchive.ts
 const hosts = [
 	"web.archive.org",
@@ -30,7 +30,7 @@ const unwrapWebArchive = (url) => {
 	if (isHostOf(url, "wayback.archive-it.org")) match = url.pathname.match(archiveItPathRegex);
 	if (isHostOf(url, "scholar.archive.org")) match = url.pathname.match(scholarPathRegex);
 	if (!match) return;
-	let target = decodeSegment(match[1]);
+	let target = decodePercent(match[1]);
 	if (target && !schemeRegex.test(target) && schemelessRegex.test(target)) target = `http://${target}`;
 	if (!target || !isHttpUrl(target)) return;
 	return `${target}${url.search}${url.hash}`;

package/dist/unwraps/xengentr.mjs

@@ -1,9 +1,9 @@
 import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64 } from "../utils.mjs";
+import { decodeBase64, getParamValues } from "../utils.mjs";
 //#region src/unwraps/xengentr.ts
 const unwrapXengentr = (url) => {
 	if (url.pathname !== "/yonlendirme") return;
-	const raw = url.searchParams.get("to");
+	const raw = getParamValues(url, "to").at(0);
 	if (!raw) return;
 	const decoded = decodeBase64(raw);
 	if (decoded && isHttpUrl(decoded)) return decoded;

package/dist/unwraps/yahooJapanAmpViewer.mjs

@@ -1,4 +1,4 @@
-import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/yahooJapanAmpViewer.ts
 const httpsPathRegex = /^\/amp\/s\/(.+)$/;
 const httpPathRegex = /^\/amp\/(?!s\/)(.+)$/;
@@ -7,12 +7,7 @@ const unwrapYahooJapanAmpViewer = (url) => {
 	const httpsMatch = httpsPathRegex.exec(url.pathname);
 	const match = httpsMatch ?? httpPathRegex.exec(url.pathname);
 	if (!match?.[1]) return;
-	let path;
-	try {
-		path = decodeURIComponent(match[1]);
-	} catch {
-		return;
-	}
+	const path = decodePercent(match[1]);
 	const target = `${httpsMatch ? "https" : "http"}://${path}${url.search}`;
 	if (isHttpUrl(target)) return target;
 };

package/dist/unwraps/yahooSearch.mjs

@@ -1,4 +1,5 @@
-import { decodeSegment, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
+import { decodeEncodedScheme } from "../utils.mjs";
 //#region src/unwraps/yahooSearch.ts
 const hosts = [
 	"r.search.yahoo.com",
@@ -10,7 +11,7 @@ const unencodedTargetRegex = /^(?:\/[^/]+)*\/RU=(https?:\/\/.+?)\/RK=/;
 const unwrapYahooSearch = (url) => {
 	if (!isHostOf(url, hosts)) return;
 	const match = url.pathname.match(yahooPathRegex);
-	if (match) return decodeSegment(match[1]);
+	if (match) return decodeEncodedScheme(decodePercent(match[1]));
 	const unencodedMatch = url.pathname.match(unencodedTargetRegex);
 	if (unencodedMatch) return unencodedMatch[1];
 };

package/dist/unwraps/yandexMail.mjs

@@ -1,10 +1,10 @@
 import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64Url } from "../utils.mjs";
+import { decodeBase64Url, getParamValues } from "../utils.mjs";
 //#region src/unwraps/yandexMail.ts
 const hostRegex = /^mail\.yandex\.(?:com\.tr|[a-z]{2,3})$/;
 const unwrapYandexMail = (url) => {
 	if (!hostRegex.test(url.hostname) || url.pathname !== "/re.jsx") return;
-	const value = url.searchParams.get("l");
+	const value = getParamValues(url, "l").at(0);
 	if (!value) return;
 	const decoded = decodeBase64Url(value);
 	if (!decoded || !isHttpUrl(decoded)) return;

package/dist/unwraps/yourMembership.mjs

@@ -1,12 +1,12 @@
-import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { getParamValues, percentDecode } from "../utils.mjs";
+import { decodePercent, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { getParamValues } from "../utils.mjs";
 //#region src/unwraps/yourMembership.ts
 const ymlinkRegex = /^\d+$/;
 const encodedSchemeRegex = /^https?%3A/i;
 const unwrapYourMembership = (url) => {
 	if (url.pathname !== "/link.asp" || !ymlinkRegex.test(url.searchParams.get("ymlink") ?? "")) return;
 	let target = getParamValues(url, "finalurl").at(0);
-	if (target && encodedSchemeRegex.test(target)) target = percentDecode(target);
+	if (target && encodedSchemeRegex.test(target)) target = decodePercent(target);
 	if (target && isHttpUrl(target)) return target;
 };
 //#endregion