urlpurify 1.4.1 → 1.5.0

package/README.md

@@ -53,6 +53,8 @@ Removes matching query parameters and returns the cleaned URL. The input is retu
 
 Both `cleanUrl` and `stripTrackingParams` also drop a `ref` parameter when its value is the URL's own host (Ghost's self-referral `?ref=example.com` on `example.com`), regardless of the tracking list passed. With any other value `ref` is left alone, since it is often a real referral target.
 
+A tracking list is compiled the first time it's used, and later calls with the same array reuse that result. To change the list, pass a new array. Entries pushed onto an array that's already been used are ignored.
+
 ### `createParamExtractor(config)`
 
 Builds an unwrapper for the common case where the target URL sits in a query parameter:

package/dist/clean.mjs

@@ -1,4 +1,4 @@
-import { parseUrl } from "./node_modules/trousse/dist/urls.mjs";
+import { isHttpUrl, parseUrl, stripWww } from "./node_modules/trousse/dist/urls.mjs";
 import { defaultTrackingParams, defaultUnwrappers } from "./defaults.mjs";
 //#region src/clean.ts
 const trackingMatcherCache = /* @__PURE__ */ new WeakMap();
@@ -20,28 +20,24 @@ const getTrackingMatcher = (params) => {
 const deleteTrackingParams = (url, trackingParams) => {
 	if (!url.search) return false;
 	const matcher = getTrackingMatcher(trackingParams);
-	const keysToDelete = [];
-	for (const key of url.searchParams.keys()) {
+	const host = stripWww(url.hostname);
+	const pairs = url.search.slice(1).split("&");
+	const keptPairs = pairs.filter((pair) => {
+		const entry = new URLSearchParams(pair).entries().next().value;
+		if (!entry) return true;
+		const [key, value] = entry;
 		const name = key.toLowerCase();
-		if (matcher.literals.has(name) || matcher.patterns.some((pattern) => pattern.test(name))) keysToDelete.push(key);
-	}
-	for (const key of keysToDelete) url.searchParams.delete(key);
-	return keysToDelete.length > 0;
-};
-const wwwPrefixRegex = /^www\./;
-const stripHostPrefix = (host) => {
-	return host.replace(wwwPrefixRegex, "").toLowerCase();
-};
-const deleteSelfReferentialParams = (url) => {
-	const value = url.searchParams.get("ref");
-	if (!value || stripHostPrefix(value) !== stripHostPrefix(url.hostname)) return false;
-	url.searchParams.delete("ref");
+		if (matcher.literals.has(name) || matcher.patterns.some((pattern) => name.search(pattern) !== -1)) return false;
+		return key !== "ref" || stripWww(value.toLowerCase()) !== host;
+	});
+	if (keptPairs.length === pairs.length) return false;
+	url.search = keptPairs.join("&");
 	return true;
 };
 const applyUnwrappers = (url, unwrappers) => {
 	for (const unwrap of unwrappers) {
 		const target = unwrap(url);
-		if (target) return target;
+		if (target && isHttpUrl(target)) return target;
 	}
 };
 const unwrapUrl = (url, unwrappers = defaultUnwrappers) => {
@@ -52,9 +48,7 @@ const unwrapUrl = (url, unwrappers = defaultUnwrappers) => {
 const stripTrackingParams = (url, trackingParams = defaultTrackingParams) => {
 	const parsed = parseUrl(url);
 	if (!parsed) return url;
-	const trackingRemoved = deleteTrackingParams(parsed, trackingParams);
-	const selfReferentialRemoved = deleteSelfReferentialParams(parsed);
-	if (trackingRemoved || selfReferentialRemoved) return parsed.toString();
+	if (deleteTrackingParams(parsed, trackingParams)) return parsed.toString();
 	return url;
 };
 const cleanUrl = (url, options) => {
@@ -73,9 +67,7 @@ const cleanUrl = (url, options) => {
 		currentUrl = target;
 		currentParsed = targetParsed;
 	}
-	const trackingRemoved = deleteTrackingParams(currentParsed, trackingParams);
-	const selfReferentialRemoved = deleteSelfReferentialParams(currentParsed);
-	if (trackingRemoved || selfReferentialRemoved) return currentParsed.toString();
+	if (deleteTrackingParams(currentParsed, trackingParams)) return currentParsed.toString();
 	return currentUrl;
 };
 //#endregion

package/dist/index.d.mts

@@ -81,8 +81,9 @@ import { unwrapViglink } from "./unwraps/viglink.mjs";
 import { unwrapVkAway } from "./unwraps/vkAway.mjs";
 import { unwrapWebArchive } from "./unwraps/webArchive.mjs";
 import { unwrapYahooSearch } from "./unwraps/yahooSearch.mjs";
+import { unwrapYandexTranslate } from "./unwraps/yandexTranslate.mjs";
 import { unwrapYandexTurbo } from "./unwraps/yandexTurbo.mjs";
 import { unwrapYouTube } from "./unwraps/youtube.mjs";
 import { unwrapZhihu } from "./unwraps/zhihu.mjs";
 import { ParamExtractorConfig, createParamExtractor } from "./utils.mjs";
-export { type CleanUrlOptions, type ParamExtractorConfig, type TrackingParam, type UrlUnwrapper, cleanUrl, createParamExtractor, defaultTrackingParams, defaultUnwrappers, stripTrackingParams, trackingParamsLiterals, trackingParamsPatterns, unwrapAceml, unwrapAdjust, unwrapAmazonAffiliate, unwrapAmpCache, unwrapAnonymTo, unwrapAwin, unwrapBing, unwrapBlueskyRedirect, unwrapCjNetwork, unwrapCsdn, unwrapDeviantartOutgoing, unwrapDigidip, unwrapDisqus, unwrapDouban, unwrapDuckduckgo, unwrapEbayRover, unwrapEffiliation, unwrapEmbedly, unwrapFacebookShim, unwrapFeedsportal, unwrapFirebaseDynamicLinks, unwrapFlipboard, unwrapGateSc, unwrapGeoriot, unwrapGitee, unwrapGoogle, unwrapGoogleAmpViewer, unwrapGoogleNews, unwrapGoogleNewsModern, unwrapGoogleScholar, unwrapGoogleTranslate, unwrapHashnode, unwrapHrefLi, unwrapIcptrack, unwrapIdealoPartner, unwrapInstagramShim, unwrapJianshuGo, unwrapJuejin, unwrapLeverAnalytics, unwrapLinksynergy, unwrapMailchimp, unwrapMailpanion, unwrapMailpgn, unwrapMailtrack, unwrapMedium, unwrapMimecast, unwrapMozillaOutgoing, unwrapNarrativ, unwrapNaverOutgoing, unwrapNicoMs, unwrapOutlookSafelinks, unwrapPartnerAds, unwrapPocket, unwrapPostmark, unwrapProofpointV1, unwrapProofpointV2, unwrapProofpointV3, unwrapPxf, unwrapRecruitics, unwrapRedditOut, unwrapRedirectingat, unwrapSegmentfault, unwrapShareasale, unwrapSjv, unwrapSkimlinks, unwrapSlack, unwrapSmartredirect, unwrapSspai, unwrapSteamLinkfilter, unwrapTelegramIv, unwrapThreadsShim, unwrapTradedoubler, unwrapTumblr, unwrapUrl, unwrapValuecommerce, unwrapViglink, unwrapVkAway, unwrapWebArchive, unwrapYahooSearch, unwrapYandexTurbo, unwrapYouTube, unwrapZhihu };
+export { type CleanUrlOptions, type ParamExtractorConfig, type TrackingParam, type UrlUnwrapper, cleanUrl, createParamExtractor, defaultTrackingParams, defaultUnwrappers, stripTrackingParams, trackingParamsLiterals, trackingParamsPatterns, unwrapAceml, unwrapAdjust, unwrapAmazonAffiliate, unwrapAmpCache, unwrapAnonymTo, unwrapAwin, unwrapBing, unwrapBlueskyRedirect, unwrapCjNetwork, unwrapCsdn, unwrapDeviantartOutgoing, unwrapDigidip, unwrapDisqus, unwrapDouban, unwrapDuckduckgo, unwrapEbayRover, unwrapEffiliation, unwrapEmbedly, unwrapFacebookShim, unwrapFeedsportal, unwrapFirebaseDynamicLinks, unwrapFlipboard, unwrapGateSc, unwrapGeoriot, unwrapGitee, unwrapGoogle, unwrapGoogleAmpViewer, unwrapGoogleNews, unwrapGoogleNewsModern, unwrapGoogleScholar, unwrapGoogleTranslate, unwrapHashnode, unwrapHrefLi, unwrapIcptrack, unwrapIdealoPartner, unwrapInstagramShim, unwrapJianshuGo, unwrapJuejin, unwrapLeverAnalytics, unwrapLinksynergy, unwrapMailchimp, unwrapMailpanion, unwrapMailpgn, unwrapMailtrack, unwrapMedium, unwrapMimecast, unwrapMozillaOutgoing, unwrapNarrativ, unwrapNaverOutgoing, unwrapNicoMs, unwrapOutlookSafelinks, unwrapPartnerAds, unwrapPocket, unwrapPostmark, unwrapProofpointV1, unwrapProofpointV2, unwrapProofpointV3, unwrapPxf, unwrapRecruitics, unwrapRedditOut, unwrapRedirectingat, unwrapSegmentfault, unwrapShareasale, unwrapSjv, unwrapSkimlinks, unwrapSlack, unwrapSmartredirect, unwrapSspai, unwrapSteamLinkfilter, unwrapTelegramIv, unwrapThreadsShim, unwrapTradedoubler, unwrapTumblr, unwrapUrl, unwrapValuecommerce, unwrapViglink, unwrapVkAway, unwrapWebArchive, unwrapYahooSearch, unwrapYandexTranslate, unwrapYandexTurbo, unwrapYouTube, unwrapZhihu };

package/dist/index.mjs

@@ -83,5 +83,6 @@ import { unwrapTradedoubler } from "./unwraps/tradedoubler.mjs";
 import { unwrapValuecommerce } from "./unwraps/valuecommerce.mjs";
 import { unwrapViglink } from "./unwraps/viglink.mjs";
 import { unwrapWebArchive } from "./unwraps/webArchive.mjs";
+import { unwrapYandexTranslate } from "./unwraps/yandexTranslate.mjs";
 import { unwrapYandexTurbo } from "./unwraps/yandexTurbo.mjs";
-export { cleanUrl, createParamExtractor, defaultTrackingParams, defaultUnwrappers, stripTrackingParams, trackingParamsLiterals, trackingParamsPatterns, unwrapAceml, unwrapAdjust, unwrapAmazonAffiliate, unwrapAmpCache, unwrapAnonymTo, unwrapAwin, unwrapBing, unwrapBlueskyRedirect, unwrapCjNetwork, unwrapCsdn, unwrapDeviantartOutgoing, unwrapDigidip, unwrapDisqus, unwrapDouban, unwrapDuckduckgo, unwrapEbayRover, unwrapEffiliation, unwrapEmbedly, unwrapFacebookShim, unwrapFeedsportal, unwrapFirebaseDynamicLinks, unwrapFlipboard, unwrapGateSc, unwrapGeoriot, unwrapGitee, unwrapGoogle, unwrapGoogleAmpViewer, unwrapGoogleNews, unwrapGoogleNewsModern, unwrapGoogleScholar, unwrapGoogleTranslate, unwrapHashnode, unwrapHrefLi, unwrapIcptrack, unwrapIdealoPartner, unwrapInstagramShim, unwrapJianshuGo, unwrapJuejin, unwrapLeverAnalytics, unwrapLinksynergy, unwrapMailchimp, unwrapMailpanion, unwrapMailpgn, unwrapMailtrack, unwrapMedium, unwrapMimecast, unwrapMozillaOutgoing, unwrapNarrativ, unwrapNaverOutgoing, unwrapNicoMs, unwrapOutlookSafelinks, unwrapPartnerAds, unwrapPocket, unwrapPostmark, unwrapProofpointV1, unwrapProofpointV2, unwrapProofpointV3, unwrapPxf, unwrapRecruitics, unwrapRedditOut, unwrapRedirectingat, unwrapSegmentfault, unwrapShareasale, unwrapSjv, unwrapSkimlinks, unwrapSlack, unwrapSmartredirect, unwrapSspai, unwrapSteamLinkfilter, unwrapTelegramIv, unwrapThreadsShim, unwrapTradedoubler, unwrapTumblr, unwrapUrl, unwrapValuecommerce, unwrapViglink, unwrapVkAway, unwrapWebArchive, unwrapYahooSearch, unwrapYandexTurbo, unwrapYouTube, unwrapZhihu };
+export { cleanUrl, createParamExtractor, defaultTrackingParams, defaultUnwrappers, stripTrackingParams, trackingParamsLiterals, trackingParamsPatterns, unwrapAceml, unwrapAdjust, unwrapAmazonAffiliate, unwrapAmpCache, unwrapAnonymTo, unwrapAwin, unwrapBing, unwrapBlueskyRedirect, unwrapCjNetwork, unwrapCsdn, unwrapDeviantartOutgoing, unwrapDigidip, unwrapDisqus, unwrapDouban, unwrapDuckduckgo, unwrapEbayRover, unwrapEffiliation, unwrapEmbedly, unwrapFacebookShim, unwrapFeedsportal, unwrapFirebaseDynamicLinks, unwrapFlipboard, unwrapGateSc, unwrapGeoriot, unwrapGitee, unwrapGoogle, unwrapGoogleAmpViewer, unwrapGoogleNews, unwrapGoogleNewsModern, unwrapGoogleScholar, unwrapGoogleTranslate, unwrapHashnode, unwrapHrefLi, unwrapIcptrack, unwrapIdealoPartner, unwrapInstagramShim, unwrapJianshuGo, unwrapJuejin, unwrapLeverAnalytics, unwrapLinksynergy, unwrapMailchimp, unwrapMailpanion, unwrapMailpgn, unwrapMailtrack, unwrapMedium, unwrapMimecast, unwrapMozillaOutgoing, unwrapNarrativ, unwrapNaverOutgoing, unwrapNicoMs, unwrapOutlookSafelinks, unwrapPartnerAds, unwrapPocket, unwrapPostmark, unwrapProofpointV1, unwrapProofpointV2, unwrapProofpointV3, unwrapPxf, unwrapRecruitics, unwrapRedditOut, unwrapRedirectingat, unwrapSegmentfault, unwrapShareasale, unwrapSjv, unwrapSkimlinks, unwrapSlack, unwrapSmartredirect, unwrapSspai, unwrapSteamLinkfilter, unwrapTelegramIv, unwrapThreadsShim, unwrapTradedoubler, unwrapTumblr, unwrapUrl, unwrapValuecommerce, unwrapViglink, unwrapVkAway, unwrapWebArchive, unwrapYahooSearch, unwrapYandexTranslate, unwrapYandexTurbo, unwrapYouTube, unwrapZhihu };

package/dist/node_modules/trousse/dist/is.mjs

@@ -0,0 +1,6 @@
+//#region node_modules/trousse/dist/is.js
+const isNullish = (value) => {
+	return value == null;
+};
+//#endregion
+export { isNullish };

package/dist/node_modules/trousse/dist/matching.mjs

@@ -1,15 +1,21 @@
+import { isNullish } from "./is.mjs";
 //#region node_modules/trousse/dist/matching.js
+const testRegex = (regex, value) => {
+	regex.lastIndex = 0;
+	return regex.test(value);
+};
 const isAnyOf = (value, patterns, parser) => {
-	const parsedValue = parser ? parser(value) : value?.toLowerCase()?.trim();
-	return patterns.some((pattern) => {
-		if (pattern instanceof RegExp) return pattern.test(parsedValue);
-		return parsedValue === pattern.toLowerCase().trim();
+	if (isNullish(value)) return false;
+	const parsedValue = parser ? parser(value) : value.toLowerCase().trim();
+	return (typeof patterns === "string" || patterns instanceof RegExp ? [patterns] : patterns).some((pattern) => {
+		if (pattern instanceof RegExp) return testRegex(pattern, parsedValue);
+		return parsedValue === (parser ? pattern : pattern.toLowerCase().trim());
 	});
 };
 const endsWithAnyOf = (value, patterns) => {
 	const lowerValue = value.toLowerCase();
 	return patterns.some((pattern) => {
-		if (pattern instanceof RegExp) return pattern.test(lowerValue);
+		if (pattern instanceof RegExp) return testRegex(pattern, lowerValue);
 		return pattern && lowerValue.endsWith(pattern.toLowerCase());
 	});
 };

package/dist/node_modules/trousse/dist/urls.mjs

@@ -1,20 +1,57 @@
 import { endsWithAnyOf, isAnyOf } from "./matching.mjs";
 //#region node_modules/trousse/dist/urls.js
+const httpProtocols = ["http:", "https:"];
 const parseUrl = (value, base) => {
 	if (value instanceof URL && base === void 0) return value;
+	if (URL.parse) return URL.parse(value, base) ?? void 0;
 	try {
 		return new URL(value, base);
 	} catch {}
 };
-const isHostOf = (url, hosts) => {
+const getHostname = (url) => {
 	const hostname = parseUrl(url)?.hostname;
+	if (!hostname) return;
+	return hostname.endsWith(".") ? hostname.slice(0, -1) : hostname;
+};
+const nonAsciiRegex = /[\u0080-\uffff]/;
+const normalizeDomain = (domain) => {
+	const trimmed = domain.trim();
+	const bare = trimmed.endsWith(".") ? trimmed.slice(0, -1) : trimmed;
+	if (!nonAsciiRegex.test(bare)) return bare;
+	return parseUrl(`http://${bare}`)?.hostname ?? bare;
+};
+const isHostOf = (url, hosts) => {
+	const hostname = getHostname(url);
 	if (!hostname) return false;
-	return isAnyOf(hostname, typeof hosts === "string" ? [hosts] : hosts);
+	return isAnyOf(hostname, (typeof hosts === "string" ? [hosts] : hosts).map(normalizeDomain));
 };
 const isSubdomainOf = (url, domains) => {
-	const hostname = parseUrl(url)?.hostname;
+	const hostname = getHostname(url);
 	if (!hostname) return false;
-	return endsWithAnyOf(hostname, (typeof domains === "string" ? [domains] : domains).map((domain) => `.${domain}`));
+	return endsWithAnyOf(hostname, (typeof domains === "string" ? [domains] : domains).map((domain) => `.${normalizeDomain(domain)}`));
+};
+const isHttpUrl = (url) => {
+	const protocol = parseUrl(url)?.protocol;
+	if (!protocol) return false;
+	return httpProtocols.includes(protocol);
+};
+const isHostOrSubdomainOf = (url, domains) => {
+	return isHostOf(url, domains) || isSubdomainOf(url, domains);
+};
+const decodeSegment = (segment) => {
+	if (segment === void 0) return;
+	try {
+		return decodeURIComponent(segment);
+	} catch {}
+};
+const wwwPrefixRegex = /^www\./;
+const schemeSeparator = String.raw`\.*[:\s=\\/][:\s=.\\/]*`;
+const leadingSchemeSeparator = String.raw`\.*(?::[:\s=.\\/]*|[\s=\\/][:\s=.\\/]+)`;
+String.raw`^\/?[htps]{2,7}${leadingSchemeSeparator}([htps]{2,7})(?!:\d)${schemeSeparator}[.,:/]*(www[./]+)?`;
+String.raw`^\/?(?:h[htps():]{1,10}|t{1,2}ps?)${leadingSchemeSeparator}[.,:/]*(www[./]+)?`;
+const stripWww = (hostname) => {
+	const stripped = hostname.replace(wwwPrefixRegex, "");
+	return stripped.includes(".") ? stripped : hostname;
 };
 //#endregion
-export { isHostOf, isSubdomainOf, parseUrl };
+export { decodeSegment, isHostOf, isHostOrSubdomainOf, isHttpUrl, isSubdomainOf, parseUrl, stripWww };

package/dist/tracking/literals.mjs

@@ -73,7 +73,6 @@ const trackingParamsLiterals = [
 	"__hstc",
 	"__hsfp",
 	"__hssc",
-	"cid",
 	"s_kwcid",
 	"sc_cid",
 	"ef_id",

package/dist/unwraps/aceml.mjs

@@ -1,3 +1,4 @@
+import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 import { createParamExtractor, decodeBase64 } from "../utils.mjs";
 //#region src/unwraps/aceml.ts
 const baseExtractor = createParamExtractor({
@@ -9,7 +10,7 @@ const unwrapAceml = (url) => {
 	const raw = baseExtractor(url);
 	if (!raw) return;
 	const decoded = decodeBase64(raw);
-	if (decoded && (decoded.startsWith("http://") || decoded.startsWith("https://"))) return decoded;
+	if (decoded && isHttpUrl(decoded)) return decoded;
 };
 //#endregion
 export { unwrapAceml };

package/dist/unwraps/adjust.mjs

@@ -1,8 +1,9 @@
+import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/adjust.ts
 const unwrapAdjust = (url) => {
-	if (url.hostname !== "app.adjust.com") return;
+	if (!isHostOf(url, "app.adjust.com")) return;
 	const target = url.searchParams.get("redirect");
-	if (target?.startsWith("https://") !== true && target?.startsWith("http://") !== true) return;
+	if (!target || !isHttpUrl(target)) return;
 	return target;
 };
 //#endregion

package/dist/unwraps/amazonAffiliate.mjs

@@ -3,7 +3,9 @@ const amazonHostRegex = /\.amazon-adsystem\.com$/;
 const amazonPathRegex = /^\/x\/c\/[^/]+\/(https?:\/\/.+)$/;
 const unwrapAmazonAffiliate = (url) => {
 	if (!amazonHostRegex.test(url.hostname)) return;
-	return url.pathname.match(amazonPathRegex)?.[1];
+	const match = url.pathname.match(amazonPathRegex);
+	if (!match) return;
+	return `${match[1]}${url.search}${url.hash}`;
 };
 //#endregion
 export { unwrapAmazonAffiliate };

package/dist/unwraps/ampCache.mjs

@@ -1,13 +1,13 @@
-import { isHostOf, isSubdomainOf } from "../node_modules/trousse/dist/urls.mjs";
+import { isHostOrSubdomainOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/ampCache.ts
 const httpsPathRegex = /^\/c\/s\/(.+)$/;
 const httpPathRegex = /^\/c\/(?!s\/)(.+)$/;
 const unwrapAmpCache = (url) => {
-	if (!isHostOf(url, "cdn.ampproject.org") && !isSubdomainOf(url, "cdn.ampproject.org")) return;
+	if (!isHostOrSubdomainOf(url, "cdn.ampproject.org")) return;
 	const httpsMatch = url.pathname.match(httpsPathRegex);
-	if (httpsMatch) return `https://${httpsMatch[1]}`;
+	if (httpsMatch) return `https://${httpsMatch[1]}${url.search}${url.hash}`;
 	const httpMatch = url.pathname.match(httpPathRegex);
-	if (httpMatch) return `http://${httpMatch[1]}`;
+	if (httpMatch) return `http://${httpMatch[1]}${url.search}${url.hash}`;
 };
 //#endregion
 export { unwrapAmpCache };

package/dist/unwraps/anonymTo.mjs

@@ -1,7 +1,10 @@
+import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/anonymTo.ts
 const unwrapAnonymTo = (url) => {
-	if (url.hostname !== "anonym.to" && url.hostname !== "www.anonym.to") return;
-	return url.search.slice(1) || void 0;
+	if (!isHostOf(url, ["anonym.to", "www.anonym.to"])) return;
+	const target = url.search.slice(1);
+	if (!target) return;
+	return `${target}${url.hash}`;
 };
 //#endregion
 export { unwrapAnonymTo };

package/dist/unwraps/bing.mjs

@@ -1,3 +1,4 @@
+import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 import { decodeBase64Url } from "../utils.mjs";
 //#region src/unwraps/bing.ts
 const bingHostRegex = /^(?:www\.|cn\.)?bing\.com$/;
@@ -7,7 +8,7 @@ const unwrapBing = (url) => {
 	const value = url.searchParams.get("u");
 	if (!value || !bingPrefixRegex.test(value)) return;
 	const decoded = decodeBase64Url(value.slice(2));
-	if (!decoded || !decoded.startsWith("https://") && !decoded.startsWith("http://")) return;
+	if (!decoded || !isHttpUrl(decoded)) return;
 	return decoded;
 };
 //#endregion

package/dist/unwraps/deviantartOutgoing.mjs

@@ -1,7 +1,10 @@
+import { isHostOrSubdomainOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/deviantartOutgoing.ts
 const unwrapDeviantartOutgoing = (url) => {
-	if (!url.hostname.endsWith("deviantart.com") || !url.pathname.endsWith("/outgoing")) return;
-	return url.search.slice(1) || void 0;
+	if (!isHostOrSubdomainOf(url, "deviantart.com") || !url.pathname.endsWith("/outgoing")) return;
+	const target = url.search.slice(1);
+	if (!target) return;
+	return `${target}${url.hash}`;
 };
 //#endregion
 export { unwrapDeviantartOutgoing };

package/dist/unwraps/feedsportal.mjs

@@ -1,3 +1,4 @@
+import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/feedsportal.ts
 const feedsportalPathRegex = /\/([0-9A-Za-z]{20,})\/story01\.htm$/;
 const feedsportalAlphabet = {
@@ -37,7 +38,7 @@ const unwrapFeedsportal = (url) => {
 		const substitution = head ? feedsportalAlphabet[head] : void 0;
 		return substitution === void 0 ? `0${chunk}` : substitution + chunk.slice(1);
 	}).join("");
-	if (!decoded.startsWith("http://") && !decoded.startsWith("https://")) return;
+	if (!isHttpUrl(decoded)) return;
 	return decoded;
 };
 //#endregion

package/dist/unwraps/googleAmpViewer.mjs

@@ -5,9 +5,9 @@ const httpPathRegex = /^\/amp\/(?!s\/)(.+)$/;
 const unwrapGoogleAmpViewer = (url) => {
 	if (!googleAmpHostRegex.test(url.hostname)) return;
 	const httpsMatch = url.pathname.match(httpsPathRegex);
-	if (httpsMatch) return `https://${httpsMatch[1]}`;
+	if (httpsMatch) return `https://${httpsMatch[1]}${url.search}`;
 	const httpMatch = url.pathname.match(httpPathRegex);
-	if (httpMatch) return `http://${httpMatch[1]}`;
+	if (httpMatch) return `http://${httpMatch[1]}${url.search}`;
 };
 //#endregion
 export { unwrapGoogleAmpViewer };

package/dist/unwraps/googleNewsModern.mjs

@@ -1,16 +1,13 @@
 import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64Binary } from "../utils.mjs";
+import { decodeBase64UrlBinary } from "../utils.mjs";
 //#region src/unwraps/googleNewsModern.ts
 const articleIdRegex = /^\/(?:rss\/)?articles\/([\w-]+)/;
-const base64UrlMinusRegex = /-/g;
-const base64UrlUnderscoreRegex = /_/g;
 const protobufFramingRegex = /\x08\x13".+?(https?:\/\/[^\xd2]+)\xd2\x01/;
 const unwrapGoogleNewsModern = (url) => {
 	if (!isHostOf(url, "news.google.com")) return;
 	const match = url.pathname.match(articleIdRegex);
 	if (!match) return;
-	const padded = match[1].replace(base64UrlMinusRegex, "+").replace(base64UrlUnderscoreRegex, "/");
-	return (decodeBase64Binary(padded)?.match(protobufFramingRegex))?.[1];
+	return (decodeBase64UrlBinary(match[1])?.match(protobufFramingRegex))?.[1];
 };
 //#endregion
 export { unwrapGoogleNewsModern };

package/dist/unwraps/hrefLi.mjs

@@ -1,7 +1,10 @@
+import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/hrefLi.ts
 const unwrapHrefLi = (url) => {
-	if (url.hostname !== "href.li" && url.hostname !== "www.href.li") return;
-	return url.search.slice(1) || void 0;
+	if (!isHostOf(url, ["href.li", "www.href.li"])) return;
+	const target = url.search.slice(1);
+	if (!target) return;
+	return `${target}${url.hash}`;
 };
 //#endregion
 export { unwrapHrefLi };

package/dist/unwraps/mozillaOutgoing.mjs

@@ -1,13 +1,12 @@
+import { decodeSegment, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/mozillaOutgoing.ts
 const pathRegex = /^\/v1\/[0-9a-f]{64}\/(.+)$/;
-const mozillaOutgoingHosts = /* @__PURE__ */ new Set(["outgoing.prod.mozaws.net", "prod.outgoing.prod.webservices.mozgcp.net"]);
+const mozillaOutgoingHosts = ["outgoing.prod.mozaws.net", "prod.outgoing.prod.webservices.mozgcp.net"];
 const unwrapMozillaOutgoing = (url) => {
-	if (!mozillaOutgoingHosts.has(url.hostname)) return;
+	if (!isHostOf(url, mozillaOutgoingHosts)) return;
 	const match = url.pathname.match(pathRegex);
 	if (!match) return;
-	try {
-		return decodeURIComponent(match[1]);
-	} catch {}
+	return decodeSegment(match[1]);
 };
 //#endregion
 export { unwrapMozillaOutgoing };

package/dist/unwraps/nicoMs.mjs

@@ -1,7 +1,8 @@
+import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/nicoMs.ts
 const nicoMsRegex = /^\/((?:sm|nm|so|im)\w+)$/;
 const unwrapNicoMs = (url) => {
-	if (url.hostname !== "nico.ms") return;
+	if (!isHostOf(url, "nico.ms")) return;
 	const match = url.pathname.match(nicoMsRegex);
 	if (!match) return;
 	const id = match[1];

package/dist/unwraps/postmark.mjs

@@ -1,12 +1,11 @@
+import { decodeSegment, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/postmark.ts
 const postmarkPathRegex = /^\/[23][st]\/([^/]+)\//;
 const unwrapPostmark = (url) => {
-	if (url.hostname !== "click.pstmrk.it") return;
+	if (!isHostOf(url, "click.pstmrk.it")) return;
 	const match = url.pathname.match(postmarkPathRegex);
 	if (!match) return;
-	try {
-		return decodeURIComponent(match[1]);
-	} catch {}
+	return decodeSegment(match[1]);
 };
 //#endregion
 export { unwrapPostmark };

package/dist/unwraps/proofpointV1.mjs

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

package/dist/unwraps/proofpointV2.mjs

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

package/dist/unwraps/proofpointV3.mjs

@@ -1,17 +1,13 @@
+import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 import { decodeBase64Url, getUtf8ByteLength } from "../utils.mjs";
 //#region src/unwraps/proofpointV3.ts
 const v3PathRegex = /^\/v3\/__(.+)__;([^!]*)!/;
-const v3HostSet = /* @__PURE__ */ new Set([
+const v3Hosts = [
 	"urldefense.com",
 	"urldefense.proofpoint.com",
 	"urldefense.us"
-]);
-const runLengthMap = (() => {
-	const map = {};
-	const alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-	for (let index = 0; index < 64; index += 1) map[alphabet[index]] = index + 2;
-	return map;
-})();
+];
+const runLengthAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
 const decodeReplacements = (mangled, replacementBase64) => {
 	if (replacementBase64.length === 0) return mangled;
 	const replacement = decodeBase64Url(replacementBase64);
@@ -19,11 +15,11 @@ const decodeReplacements = (mangled, replacementBase64) => {
 	const replacementChars = Array.from(replacement);
 	const urlChars = Array.from(mangled);
 	const result = [];
-	const matcher = /(?<!\*)\*(?!\*)|\*{2}[A-Za-z0-9\-_]/g;
+	const markerRegex = /(?<!\*)\*(?!\*)|\*{2}[A-Za-z0-9\-_]/g;
 	let lastIndex = 0;
 	let savedBytes = 0;
 	let match;
-	match = matcher.exec(mangled);
+	match = markerRegex.exec(mangled);
 	while (match !== null) {
 		const startChar = positionInChars(mangled, match.index);
 		const endChar = positionInChars(mangled, match.index + match[0].length);
@@ -33,7 +29,7 @@ const decodeReplacements = (mangled, replacementBase64) => {
 			if (next === void 0) return;
 			result.push(next);
 		} else {
-			let bytesToReplace = runLengthMap[match[0][2]];
+			let bytesToReplace = runLengthAlphabet.indexOf(match[0][2]) + 2;
 			if (savedBytes !== 0) {
 				bytesToReplace += savedBytes;
 				savedBytes = 0;
@@ -53,7 +49,7 @@ const decodeReplacements = (mangled, replacementBase64) => {
 			}
 		}
 		lastIndex = endChar;
-		match = matcher.exec(mangled);
+		match = markerRegex.exec(mangled);
 	}
 	for (let charIndex = lastIndex; charIndex < urlChars.length; charIndex += 1) result.push(urlChars[charIndex]);
 	return result.join("");
@@ -69,7 +65,7 @@ const positionInChars = (source, codeUnitIndex) => {
 	return charIndex;
 };
 const unwrapProofpointV3 = (url) => {
-	if (!v3HostSet.has(url.hostname)) return;
+	if (!isHostOf(url, v3Hosts)) return;
 	const match = `${url.pathname}${url.search}`.match(v3PathRegex);
 	if (!match) return;
 	return decodeReplacements(match[1], match[2]);

package/dist/unwraps/segmentfault.mjs

@@ -1,3 +1,4 @@
+import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 import { createParamExtractor, decodeBase64 } from "../utils.mjs";
 //#region src/unwraps/segmentfault.ts
 const baseExtractor = createParamExtractor({
@@ -8,7 +9,7 @@ const unwrapSegmentfault = (url) => {
 	const raw = baseExtractor(url);
 	if (!raw) return;
 	const decoded = decodeBase64(raw);
-	if (decoded && (decoded.startsWith("http://") || decoded.startsWith("https://"))) return decoded;
+	if (decoded && isHttpUrl(decoded)) return decoded;
 };
 //#endregion
 export { unwrapSegmentfault };

package/dist/unwraps/webArchive.mjs

@@ -1,12 +1,13 @@
+import { decodeSegment, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/webArchive.ts
 const pathRegex = /^\/web\/\d{14}\*?\/(.+)$/;
 const unwrapWebArchive = (url) => {
-	if (url.hostname !== "web.archive.org") return;
+	if (!isHostOf(url, "web.archive.org")) return;
 	const match = url.pathname.match(pathRegex);
 	if (!match) return;
-	try {
-		return decodeURIComponent(match[1]);
-	} catch {}
+	const target = decodeSegment(match[1]);
+	if (!target) return;
+	return `${target}${url.search}${url.hash}`;
 };
 //#endregion
 export { unwrapWebArchive };

package/dist/unwraps/yahooSearch.mjs

@@ -1,12 +1,11 @@
+import { decodeSegment, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/yahooSearch.ts
 const yahooPathRegex = /\/RU=([^/]+)\/RK=/;
 const unwrapYahooSearch = (url) => {
-	if (url.hostname !== "r.search.yahoo.com") return;
+	if (!isHostOf(url, "r.search.yahoo.com")) return;
 	const match = url.pathname.match(yahooPathRegex);
 	if (!match) return;
-	try {
-		return decodeURIComponent(match[1]);
-	} catch {}
+	return decodeSegment(match[1]);
 };
 //#endregion
 export { unwrapYahooSearch };

package/dist/unwraps/yandexTranslate.d.mts

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

package/dist/unwraps/yandexTranslate.mjs

@@ -0,0 +1,11 @@
+import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
+//#region src/unwraps/yandexTranslate.ts
+const proxyPathRegex = /^\/proxy_u\/[^/]+\/(?:(https?)\/)?(.+)$/;
+const unwrapYandexTranslate = (url) => {
+	if (!isHostOf(url, "translated.turbopages.org")) return;
+	const match = url.pathname.match(proxyPathRegex);
+	if (!match) return;
+	return `${match[1] ?? "http"}://${match[2]}${url.search}${url.hash}`;
+};
+//#endregion
+export { unwrapYandexTranslate };

package/dist/utils.mjs

@@ -1,13 +1,8 @@
+import { isAnyOf } from "./node_modules/trousse/dist/matching.mjs";
 //#region src/utils.ts
-const createHostMatcher = (hosts) => {
-	if (hosts instanceof RegExp) return (host) => hosts.test(host);
-	const hostSet = new Set(Array.isArray(hosts) ? hosts : [hosts]);
-	return (host) => hostSet.has(host);
-};
 const createParamExtractor = (config) => {
-	const matchesHost = createHostMatcher(config.hosts);
 	return (url) => {
-		if (!matchesHost(url.hostname)) return;
+		if (!isAnyOf(url.hostname, config.hosts)) return;
 		if (config.path && url.pathname !== config.path) return;
 		for (const param of config.params) {
 			const value = url.searchParams.get(param);
@@ -28,11 +23,18 @@ const decodeBase64 = (value) => {
 	for (let index = 0; index < binary.length; index++) bytes[index] = binary.charCodeAt(index);
 	return utf8Decoder.decode(bytes);
 };
+const toBase64 = (base64Url) => {
+	return base64Url.replace(/-/g, "+").replace(/_/g, "/");
+};
 const decodeBase64Url = (value) => {
-	return decodeBase64(value.replace(/-/g, "+").replace(/_/g, "/"));
+	return decodeBase64(toBase64(value));
+};
+const decodeBase64UrlBinary = (value) => {
+	return decodeBase64Binary(toBase64(value));
 };
+const utf8Encoder = new TextEncoder();
 const getUtf8ByteLength = (value) => {
-	return new TextEncoder().encode(value).length;
+	return utf8Encoder.encode(value).length;
 };
 //#endregion
-export { createParamExtractor, decodeBase64, decodeBase64Binary, decodeBase64Url, getUtf8ByteLength };
+export { createParamExtractor, decodeBase64, decodeBase64Binary, decodeBase64Url, decodeBase64UrlBinary, getUtf8ByteLength };

package/package.json

@@ -41,9 +41,9 @@
   },
   "devDependencies": {
     "@types/bun": "^1.4.2",
-    "kvalita": "^1.23.0",
-    "trousse": "^2.2.1",
+    "kvalita": "^1.24.3",
+    "trousse": "^2.6.1",
     "tsdown": "^0.23.0"
   },
-  "version": "1.4.1"
+  "version": "1.5.0"
 }