urlpurify 2.0.0 → 2.1.1

package/README.md

@@ -39,7 +39,7 @@ cleanUrl(url, {
   // Names, or regexes tested on the lowercased name.
   trackingParams: [...defaultTrackingParams, 'newsletter_id', /^cmp_[a-z0-9_]+$/],
   // The default.
-  maxUnwrapDepth: 6,
+  maxUnwrapDepth: 12,
 })
 ```
 
@@ -76,7 +76,7 @@ const unwrapExample = createParamExtractor({
 cleanUrl(url, { unwrappers: [...defaultUnwrappers, unwrapExample] })
 ```
 
-A value still encoded after one decode, starting with `http%3A` or `https%3A`, is decoded once more. For any other shape, write a plain `UrlUnwrapper`: a function that takes a `URL` and returns the target or `undefined`.
+A value still encoded after one decode, starting with `http%3A` or `https%3A`, is decoded once more. A malformed escape, or one in a legacy charset such as `%E9` for é in Latin-1, stays as written. For any other shape, write a plain `UrlUnwrapper`: a function that takes a `URL` and returns the target or `undefined`.
 
 ### Tracking parameters
 

package/dist/clean.mjs

@@ -1,7 +1,6 @@
 import { fixMalformedProtocol, isHttpUrl, isIpAddress, normalizeUrl, parseUrl, stripWww } from "./node_modules/trousse/dist/urls.mjs";
 import { defaultTrackingParams, defaultUnwrappers } from "./defaults.mjs";
 //#region src/clean.ts
-const replacementCharacter = "�";
 const refDelimitersRegex = /[\s/?#\\:@]/;
 const signatureParams = [
 	"sig",
@@ -62,13 +61,21 @@ const cleanTarget = (target) => {
 	return repaired;
 };
 const protocolRelativeRegex = /^\/\/[^/]/;
+const bareHostRegex = /^[\p{L}\p{N}-]+(?:\.[\p{L}\p{N}-]+)+(?:[/?#:]|$)/u;
 const addMissingScheme = (target) => {
-	if (!target || !protocolRelativeRegex.test(target)) return target;
-	return `https:${target}`;
+	if (!target) return;
+	if (protocolRelativeRegex.test(target)) return `https:${target}`;
+	if (bareHostRegex.test(target)) return `https://${target}`;
+	return target;
+};
+const schemeSpacingRegex = /^(https?:\/\/)(?:%20|\s|\+)+/i;
+const repairSchemeSpacing = (target) => {
+	if (!target || !schemeSpacingRegex.test(target)) return target;
+	return fixMalformedProtocol(target.replace(schemeSpacingRegex, "$1"));
 };
 const applyUnwrappers = (url, unwrappers) => {
 	for (const unwrap of unwrappers) {
-		const raw = addMissingScheme(unwrap(url));
+		const raw = repairSchemeSpacing(addMissingScheme(unwrap(url)?.trim()));
 		if (!raw || !isHttpUrl(raw)) continue;
 		const target = cleanTarget(raw);
 		if (target) return target;
@@ -81,7 +88,7 @@ const unwrapUrl = (url, unwrappers = defaultUnwrappers) => {
 	const parsed = parseUrl(url);
 	if (!parsed) return;
 	const target = applyUnwrappers(parsed, unwrappers);
-	if (!target || target.includes(replacementCharacter)) return;
+	if (!target) return;
 	return parseUrl(target)?.href;
 };
 const stripTrackingParams = (url, trackingParams = defaultTrackingParams) => {
@@ -93,28 +100,16 @@ const stripTrackingParams = (url, trackingParams = defaultTrackingParams) => {
 const cleanUrl = (url, options) => {
 	const unwrappers = options?.unwrappers ?? defaultUnwrappers;
 	const trackingParams = options?.trackingParams ?? defaultTrackingParams;
-	const maxUnwrapDepth = options?.maxUnwrapDepth ?? 6;
+	const maxUnwrapDepth = options?.maxUnwrapDepth ?? 12;
 	const parsed = parseUrl(url);
 	if (!parsed) return url;
-	let currentUrl = url;
 	let currentParsed = parsed;
-	let intactUrl = url;
-	let intactParsed = parsed;
 	for (let depth = 0; depth < maxUnwrapDepth; depth += 1) {
 		const target = applyUnwrappers(currentParsed, unwrappers);
 		if (!target) break;
 		const targetParsed = parseUrl(target);
 		if (!targetParsed) break;
-		currentUrl = target;
 		currentParsed = targetParsed;
-		if (!target.includes(replacementCharacter)) {
-			intactUrl = target;
-			intactParsed = targetParsed;
-		}
-	}
-	if (currentUrl.includes(replacementCharacter)) {
-		currentUrl = intactUrl;
-		currentParsed = intactParsed;
 	}
 	deleteTrackingParams(currentParsed, trackingParams);
 	return currentParsed.href;

package/dist/defaults.mjs

@@ -151,6 +151,7 @@ import { unwrapGoogleNewsModern } from "./unwraps/googleNewsModern.mjs";
 import { unwrapGoogleScholar } from "./unwraps/googleScholar.mjs";
 import { unwrapGoogleTranslate } from "./unwraps/googleTranslate.mjs";
 import { unwrapGoogleWebLight } from "./unwraps/googleWebLight.mjs";
+import { unwrapGovdelivery } from "./unwraps/govdelivery.mjs";
 import { unwrapGroupMail } from "./unwraps/groupMail.mjs";
 import { unwrapGroupon } from "./unwraps/groupon.mjs";
 import { unwrapGumball } from "./unwraps/gumball.mjs";
@@ -568,6 +569,7 @@ const emailTrackingUnwrappers = [
 	unwrapElasticEmail,
 	unwrapFanbridge,
 	unwrapGlueUp,
+	unwrapGovdelivery,
 	unwrapGroupMail,
 	unwrapHellohq,
 	unwrapHubspotSidekick,

package/dist/index.d.mts

@@ -154,6 +154,7 @@ import { unwrapGoogleNewsModern } from "./unwraps/googleNewsModern.mjs";
 import { unwrapGoogleScholar } from "./unwraps/googleScholar.mjs";
 import { unwrapGoogleTranslate } from "./unwraps/googleTranslate.mjs";
 import { unwrapGoogleWebLight } from "./unwraps/googleWebLight.mjs";
+import { unwrapGovdelivery } from "./unwraps/govdelivery.mjs";
 import { unwrapGroupMail } from "./unwraps/groupMail.mjs";
 import { unwrapGroupon } from "./unwraps/groupon.mjs";
 import { unwrapGumball } from "./unwraps/gumball.mjs";
@@ -388,4 +389,4 @@ import { unwrapZhihu } from "./unwraps/zhihu.mjs";
 import { unwrapZix } from "./unwraps/zix.mjs";
 import { unwrapZscalerIsolation } from "./unwraps/zscalerIsolation.mjs";
 import { ParamExtractorConfig, createParamExtractor } from "./utils.mjs";
-export { type CleanUrlOptions, type ParamExtractorConfig, type TrackingParam, type UrlUnwrapper, advertisingUnwrappers, affiliateParams, affiliateUnwrappers, archiveProxyUnwrappers, campaignParams, cleanUrl, clickAttributionParams, clickCounterUnwrappers, createParamExtractor, defaultTrackingParams, defaultUnwrappers, downloadMeasurementUnwrappers, emailTrackingUnwrappers, housekeepingParams, linkShimUnwrappers, pressReleaseUnwrappers, searchClickUnwrappers, securityGatewayUnwrappers, signInShimUnwrappers, stripTrackingParams, trackingParamsLiterals, trackingParamsPatterns, unwrap12ft, unwrap2performant, unwrap4pda, unwrapA8Net, unwrapAboutCom, unwrapAcast, unwrapAccesstrade, unwrapAceml, unwrapAdcell, unwrapAdfly, unwrapAdjust, unwrapAdmitad, unwrapAdrecord, unwrapAdtraction, unwrapAffilae, unwrapAffiliateFuture, unwrapAffiliatesOne, unwrapAliexpress, unwrapAliyun, unwrapAllblog, unwrapAmazonAffiliate, unwrapAmazonSes, unwrapAmpCache, unwrapAnchor, unwrapAnonymTo, unwrapAnonymouse, unwrapAppsflyerOnelink, unwrapApptrkr, unwrapArchiveToday, unwrapArquivo, unwrapArttrack, unwrapArxiv, unwrapAsk, unwrapAugure, unwrapAusha, unwrapAvantlink, unwrapAwesound, unwrapAwin, unwrapAxigen, unwrapBabyblog, unwrapBacLacWebArchive, unwrapBale, unwrapBananatag, unwrapBarracudaLinkProtect, unwrapBig5Gate, unwrapBing, unwrapBingAds, unwrapBitrix, unwrapBitrixBanner, unwrapBizrate, unwrapBlubrry, unwrapBlueskyRedirect, unwrapBolPartner, unwrapBridgyFed, unwrapBusinessWire, unwrapButton, unwrapBuyAt, unwrapBuybox, unwrapBuzzstream, unwrapBytedance, unwrapCake, unwrapCalendly, unwrapCanva, unwrapCastPlus, unwrapCcbill, unwrapChartable, unwrapCheckPointHarmony, unwrapChitika, unwrapCiscoSecureWeb, unwrapCjNetwork, unwrapClaritas, unwrapCleverbridge, unwrapClevercomm, unwrapCloudhq, unwrapCloze, unwrapCohst, unwrapCommissionFactory, unwrapCommunicationads, unwrapConstantContact, unwrapContactMonkey, unwrapConvertiser, unwrapCsdn, unwrapCse360, unwrapCuelinks, unwrapDasBlog, unwrapDatalifeEngine, unwrapDeployer, unwrapDerefMail, unwrapDeviantartOutgoing, unwrapDigidip, unwrapDigikala, unwrapDirectMail, unwrapDisqus, unwrapDmmAffiliate, unwrapDognet, unwrapDouban, unwrapDropbox, unwrapDstats, unwrapDuckduckgo, unwrapDuckduckgoAds, unwrapDuomai, unwrapDyn, unwrapDzen, unwrapEClick, unwrapEasyMarketing, unwrapEbayRover, unwrapEbuzzing, unwrapEdgepilot, unwrapEffiliation, unwrapEhub, unwrapElasticEmail, unwrapEmbedly, unwrapEpn, unwrapEsva, unwrapEulerian, unwrapEvernote, unwrapExciteTranslate, unwrapExpediaAffiliate, unwrapFacebookShim, unwrapFanbridge, unwrapFederatedMedia, unwrapFeedStatistics, unwrapFeedblitz, unwrapFeedsportal, unwrapFinalsite, unwrapFirebaseDynamicLinks, unwrapFireeye, unwrapFirstory, unwrapFiveByFive, unwrapFiverr, unwrapFlexoffers, unwrapFlipboard, unwrapFortimail, unwrapFtc, unwrapGateSc, unwrapGeoriot, unwrapGfnLinkProxy, unwrapGitee, unwrapGlueUp, unwrapGodcaster, unwrapGoogle, unwrapGoogleAds, unwrapGoogleAmpViewer, unwrapGoogleNews, unwrapGoogleNewsModern, unwrapGoogleScholar, unwrapGoogleTranslate, unwrapGoogleWebLight, unwrapGroupMail, unwrapGroupon, unwrapGumball, unwrapGurunavi, unwrapHackerone, unwrapHashnode, unwrapHasoffers, unwrapHearthis, unwrapHellohq, unwrapHirkereso, unwrapHorde, unwrapHornetsecurity, unwrapHrefLi, unwrapHubspotSidekick, unwrapIcptrack, unwrapIgafnl, unwrapImpact, unwrapIndexHu, unwrapInfospace, unwrapInsiderAffiliate, unwrapInstagramShim, unwrapIntranetQuorum, unwrapInvisionNoExternalLinks, unwrapInvolveAsia, unwrapIrs, unwrapJianshuGo, unwrapJive, unwrapJuejin, unwrapJustwatch, unwrapKlook, unwrapLazada, unwrapLd246, unwrapLetscast, unwrapLeverAnalytics, unwrapLinkA, unwrapLinkconnector, unwrapLinkedin, unwrapLinksynergy, unwrapLinktrust, unwrapLinkwise, unwrapLivejournal, unwrapLnkam, unwrapLocWebArchive, unwrapLocaweb, unwrapLogicboard, unwrapMagellan, unwrapMagnetmail, unwrapMail2easy, unwrapMailRu, unwrapMailRuLink, unwrapMailchimp, unwrapMailinblack, unwrapMailpanion, unwrapMailpgn, unwrapMailstat, unwrapMailtrack, unwrapMandrill, unwrapMarketwire, unwrapMcas, unwrapMedium, unwrapMegalodon, unwrapMimecast, unwrapMinistryCloud, unwrapMintDownloads, unwrapMintFeeder, unwrapMohtwize, unwrapMoshimo, unwrapMozillaOutgoing, unwrapMyNewsletterBuilder, unwrapNarrativ, unwrapNatlibNz, unwrapNaverOutgoing, unwrapNcls, unwrapNdlWarp, unwrapNetaffiliation, unwrapNetcentrum, unwrapNewswire, unwrapNicoMs, unwrapNimble, unwrapNlaWebarchive, unwrapNodeseek, unwrapOkRu, unwrapOp3, unwrapOrkut, unwrapOsnova, unwrapOutlookSafelinks, unwrapOutlookWebAccess, unwrapPagefreezer, unwrapPartnerAds, unwrapPbs, unwrapPhilpapers, unwrapPinterest, unwrapPipedrive, unwrapPocket, unwrapPodcorn, unwrapPodder, unwrapPodkite, unwrapPodroll, unwrapPodscribe, unwrapPodsights, unwrapPodtrac, unwrapPodup, unwrapPostAffiliatePro, unwrapPostmark, unwrapPrNewswire, unwrapPrezly, unwrapPriceGrabber, unwrapPromoJukebox, unwrapProofpointIsolation, unwrapProofpointV1, unwrapProofpointV2, unwrapProofpointV3, unwrapPrweb, unwrapQualityClick, unwrapRakutenAffiliate, unwrapRamblerMail, unwrapRecruitics, unwrapRedditOut, unwrapRediffmail, unwrapRedirectingat, unwrapResearchgate, unwrapReverbnation, unwrapReviveAdserver, unwrapSalesdoubler, unwrapSalesflare, unwrapSalesforceiq, unwrapSaleshandy, unwrapSalsa, unwrapSapHelp, unwrapSbsAd, unwrapSegmentfault, unwrapSerendipity, unwrapShareasale, unwrapShareit, unwrapSkimlinks, unwrapSkyrock, unwrapSlack, unwrapSlickdeals, unwrapSmartAdserver, unwrapSmartredirect, unwrapSmry, unwrapSophos, unwrapSoundOn, unwrapSoundcloud, unwrapSoundstack, unwrapSquarespaceEmail, unwrapSspai, unwrapStay22, unwrapSteamLinkfilter, unwrapStorify, unwrapStreak, unwrapStreamsend, unwrapStumbleupon, unwrapSubscribeRu, unwrapSubstack, unwrapSurly, unwrapSurugaya, unwrapSwap, unwrapSymantecClicktime, unwrapSymplicity, unwrapTargetCircle, unwrapTeacup, unwrapTelegramIv, unwrapTheRegister, unwrapThreadsShim, unwrapTiktok, unwrapTitanhqLinklock, unwrapTopsec, unwrapToucharcade, unwrapTracdelight, unwrapTradedoubler, unwrapTradetracker, unwrapTravelpayouts, unwrapTrendMicro, unwrapTriplelift, unwrapTrustwaveScanmail, unwrapTrxHub, unwrapTumblr, unwrapTwitterRedirect, unwrapTwoCheckout, unwrapUinterbox, unwrapUkWebArchive, unwrapUkgwa, unwrapUnescoWebArchive, unwrapUnhcrWebArchive, unwrapUnisender, unwrapUpAudio, unwrapUrl, unwrapVadeSecure, unwrapValuePress, unwrapValuecommerce, unwrapVanilla, unwrapVbulletin, unwrapVefsafn, unwrapVgWort, unwrapViglink, unwrapVirgool, unwrapVisibli, unwrapVkAway, unwrapVocus, unwrapVoxnest, unwrapVpixl, unwrapVuture, unwrapWebArchive, unwrapWebcitation, unwrapWebgains, unwrapWebharvest, unwrapWikiwix, unwrapWikizero, unwrapWordpressEmail, unwrapWordpressGo2, unwrapWorldNomads, unwrapWpPoczta, unwrapXengentr, unwrapXiaoyuzhou, unwrapXimalaya, unwrapYahooJapan, unwrapYahooJapanAmpViewer, unwrapYahooSearch, unwrapYamm, unwrapYandexMail, unwrapYandexTranslate, unwrapYandexTurbo, unwrapYelp, unwrapYesware, unwrapYouTube, unwrapYourMembership, unwrapZanox, unwrapZayads, unwrapZemanta, unwrapZencastr, unwrapZhihu, unwrapZix, unwrapZscalerIsolation, visitorIdParams };
+export { type CleanUrlOptions, type ParamExtractorConfig, type TrackingParam, type UrlUnwrapper, advertisingUnwrappers, affiliateParams, affiliateUnwrappers, archiveProxyUnwrappers, campaignParams, cleanUrl, clickAttributionParams, clickCounterUnwrappers, createParamExtractor, defaultTrackingParams, defaultUnwrappers, downloadMeasurementUnwrappers, emailTrackingUnwrappers, housekeepingParams, linkShimUnwrappers, pressReleaseUnwrappers, searchClickUnwrappers, securityGatewayUnwrappers, signInShimUnwrappers, stripTrackingParams, trackingParamsLiterals, trackingParamsPatterns, unwrap12ft, unwrap2performant, unwrap4pda, unwrapA8Net, unwrapAboutCom, unwrapAcast, unwrapAccesstrade, unwrapAceml, unwrapAdcell, unwrapAdfly, unwrapAdjust, unwrapAdmitad, unwrapAdrecord, unwrapAdtraction, unwrapAffilae, unwrapAffiliateFuture, unwrapAffiliatesOne, unwrapAliexpress, unwrapAliyun, unwrapAllblog, unwrapAmazonAffiliate, unwrapAmazonSes, unwrapAmpCache, unwrapAnchor, unwrapAnonymTo, unwrapAnonymouse, unwrapAppsflyerOnelink, unwrapApptrkr, unwrapArchiveToday, unwrapArquivo, unwrapArttrack, unwrapArxiv, unwrapAsk, unwrapAugure, unwrapAusha, unwrapAvantlink, unwrapAwesound, unwrapAwin, unwrapAxigen, unwrapBabyblog, unwrapBacLacWebArchive, unwrapBale, unwrapBananatag, unwrapBarracudaLinkProtect, unwrapBig5Gate, unwrapBing, unwrapBingAds, unwrapBitrix, unwrapBitrixBanner, unwrapBizrate, unwrapBlubrry, unwrapBlueskyRedirect, unwrapBolPartner, unwrapBridgyFed, unwrapBusinessWire, unwrapButton, unwrapBuyAt, unwrapBuybox, unwrapBuzzstream, unwrapBytedance, unwrapCake, unwrapCalendly, unwrapCanva, unwrapCastPlus, unwrapCcbill, unwrapChartable, unwrapCheckPointHarmony, unwrapChitika, unwrapCiscoSecureWeb, unwrapCjNetwork, unwrapClaritas, unwrapCleverbridge, unwrapClevercomm, unwrapCloudhq, unwrapCloze, unwrapCohst, unwrapCommissionFactory, unwrapCommunicationads, unwrapConstantContact, unwrapContactMonkey, unwrapConvertiser, unwrapCsdn, unwrapCse360, unwrapCuelinks, unwrapDasBlog, unwrapDatalifeEngine, unwrapDeployer, unwrapDerefMail, unwrapDeviantartOutgoing, unwrapDigidip, unwrapDigikala, unwrapDirectMail, unwrapDisqus, unwrapDmmAffiliate, unwrapDognet, unwrapDouban, unwrapDropbox, unwrapDstats, unwrapDuckduckgo, unwrapDuckduckgoAds, unwrapDuomai, unwrapDyn, unwrapDzen, unwrapEClick, unwrapEasyMarketing, unwrapEbayRover, unwrapEbuzzing, unwrapEdgepilot, unwrapEffiliation, unwrapEhub, unwrapElasticEmail, unwrapEmbedly, unwrapEpn, unwrapEsva, unwrapEulerian, unwrapEvernote, unwrapExciteTranslate, unwrapExpediaAffiliate, unwrapFacebookShim, unwrapFanbridge, unwrapFederatedMedia, unwrapFeedStatistics, unwrapFeedblitz, unwrapFeedsportal, unwrapFinalsite, unwrapFirebaseDynamicLinks, unwrapFireeye, unwrapFirstory, unwrapFiveByFive, unwrapFiverr, unwrapFlexoffers, unwrapFlipboard, unwrapFortimail, unwrapFtc, unwrapGateSc, unwrapGeoriot, unwrapGfnLinkProxy, unwrapGitee, unwrapGlueUp, unwrapGodcaster, unwrapGoogle, unwrapGoogleAds, unwrapGoogleAmpViewer, unwrapGoogleNews, unwrapGoogleNewsModern, unwrapGoogleScholar, unwrapGoogleTranslate, unwrapGoogleWebLight, unwrapGovdelivery, unwrapGroupMail, unwrapGroupon, unwrapGumball, unwrapGurunavi, unwrapHackerone, unwrapHashnode, unwrapHasoffers, unwrapHearthis, unwrapHellohq, unwrapHirkereso, unwrapHorde, unwrapHornetsecurity, unwrapHrefLi, unwrapHubspotSidekick, unwrapIcptrack, unwrapIgafnl, unwrapImpact, unwrapIndexHu, unwrapInfospace, unwrapInsiderAffiliate, unwrapInstagramShim, unwrapIntranetQuorum, unwrapInvisionNoExternalLinks, unwrapInvolveAsia, unwrapIrs, unwrapJianshuGo, unwrapJive, unwrapJuejin, unwrapJustwatch, unwrapKlook, unwrapLazada, unwrapLd246, unwrapLetscast, unwrapLeverAnalytics, unwrapLinkA, unwrapLinkconnector, unwrapLinkedin, unwrapLinksynergy, unwrapLinktrust, unwrapLinkwise, unwrapLivejournal, unwrapLnkam, unwrapLocWebArchive, unwrapLocaweb, unwrapLogicboard, unwrapMagellan, unwrapMagnetmail, unwrapMail2easy, unwrapMailRu, unwrapMailRuLink, unwrapMailchimp, unwrapMailinblack, unwrapMailpanion, unwrapMailpgn, unwrapMailstat, unwrapMailtrack, unwrapMandrill, unwrapMarketwire, unwrapMcas, unwrapMedium, unwrapMegalodon, unwrapMimecast, unwrapMinistryCloud, unwrapMintDownloads, unwrapMintFeeder, unwrapMohtwize, unwrapMoshimo, unwrapMozillaOutgoing, unwrapMyNewsletterBuilder, unwrapNarrativ, unwrapNatlibNz, unwrapNaverOutgoing, unwrapNcls, unwrapNdlWarp, unwrapNetaffiliation, unwrapNetcentrum, unwrapNewswire, unwrapNicoMs, unwrapNimble, unwrapNlaWebarchive, unwrapNodeseek, unwrapOkRu, unwrapOp3, unwrapOrkut, unwrapOsnova, unwrapOutlookSafelinks, unwrapOutlookWebAccess, unwrapPagefreezer, unwrapPartnerAds, unwrapPbs, unwrapPhilpapers, unwrapPinterest, unwrapPipedrive, unwrapPocket, unwrapPodcorn, unwrapPodder, unwrapPodkite, unwrapPodroll, unwrapPodscribe, unwrapPodsights, unwrapPodtrac, unwrapPodup, unwrapPostAffiliatePro, unwrapPostmark, unwrapPrNewswire, unwrapPrezly, unwrapPriceGrabber, unwrapPromoJukebox, unwrapProofpointIsolation, unwrapProofpointV1, unwrapProofpointV2, unwrapProofpointV3, unwrapPrweb, unwrapQualityClick, unwrapRakutenAffiliate, unwrapRamblerMail, unwrapRecruitics, unwrapRedditOut, unwrapRediffmail, unwrapRedirectingat, unwrapResearchgate, unwrapReverbnation, unwrapReviveAdserver, unwrapSalesdoubler, unwrapSalesflare, unwrapSalesforceiq, unwrapSaleshandy, unwrapSalsa, unwrapSapHelp, unwrapSbsAd, unwrapSegmentfault, unwrapSerendipity, unwrapShareasale, unwrapShareit, unwrapSkimlinks, unwrapSkyrock, unwrapSlack, unwrapSlickdeals, unwrapSmartAdserver, unwrapSmartredirect, unwrapSmry, unwrapSophos, unwrapSoundOn, unwrapSoundcloud, unwrapSoundstack, unwrapSquarespaceEmail, unwrapSspai, unwrapStay22, unwrapSteamLinkfilter, unwrapStorify, unwrapStreak, unwrapStreamsend, unwrapStumbleupon, unwrapSubscribeRu, unwrapSubstack, unwrapSurly, unwrapSurugaya, unwrapSwap, unwrapSymantecClicktime, unwrapSymplicity, unwrapTargetCircle, unwrapTeacup, unwrapTelegramIv, unwrapTheRegister, unwrapThreadsShim, unwrapTiktok, unwrapTitanhqLinklock, unwrapTopsec, unwrapToucharcade, unwrapTracdelight, unwrapTradedoubler, unwrapTradetracker, unwrapTravelpayouts, unwrapTrendMicro, unwrapTriplelift, unwrapTrustwaveScanmail, unwrapTrxHub, unwrapTumblr, unwrapTwitterRedirect, unwrapTwoCheckout, unwrapUinterbox, unwrapUkWebArchive, unwrapUkgwa, unwrapUnescoWebArchive, unwrapUnhcrWebArchive, unwrapUnisender, unwrapUpAudio, unwrapUrl, unwrapVadeSecure, unwrapValuePress, unwrapValuecommerce, unwrapVanilla, unwrapVbulletin, unwrapVefsafn, unwrapVgWort, unwrapViglink, unwrapVirgool, unwrapVisibli, unwrapVkAway, unwrapVocus, unwrapVoxnest, unwrapVpixl, unwrapVuture, unwrapWebArchive, unwrapWebcitation, unwrapWebgains, unwrapWebharvest, unwrapWikiwix, unwrapWikizero, unwrapWordpressEmail, unwrapWordpressGo2, unwrapWorldNomads, unwrapWpPoczta, unwrapXengentr, unwrapXiaoyuzhou, unwrapXimalaya, unwrapYahooJapan, unwrapYahooJapanAmpViewer, unwrapYahooSearch, unwrapYamm, unwrapYandexMail, unwrapYandexTranslate, unwrapYandexTurbo, unwrapYelp, unwrapYesware, unwrapYouTube, unwrapYourMembership, unwrapZanox, unwrapZayads, unwrapZemanta, unwrapZencastr, unwrapZhihu, unwrapZix, unwrapZscalerIsolation, visitorIdParams };

package/dist/index.mjs

@@ -152,6 +152,7 @@ import { unwrapGoogleNewsModern } from "./unwraps/googleNewsModern.mjs";
 import { unwrapGoogleScholar } from "./unwraps/googleScholar.mjs";
 import { unwrapGoogleTranslate } from "./unwraps/googleTranslate.mjs";
 import { unwrapGoogleWebLight } from "./unwraps/googleWebLight.mjs";
+import { unwrapGovdelivery } from "./unwraps/govdelivery.mjs";
 import { unwrapGroupMail } from "./unwraps/groupMail.mjs";
 import { unwrapGroupon } from "./unwraps/groupon.mjs";
 import { unwrapGumball } from "./unwraps/gumball.mjs";
@@ -387,4 +388,4 @@ import { unwrapZix } from "./unwraps/zix.mjs";
 import { unwrapZscalerIsolation } from "./unwraps/zscalerIsolation.mjs";
 import { advertisingUnwrappers, affiliateUnwrappers, archiveProxyUnwrappers, clickCounterUnwrappers, defaultTrackingParams, defaultUnwrappers, downloadMeasurementUnwrappers, emailTrackingUnwrappers, linkShimUnwrappers, pressReleaseUnwrappers, searchClickUnwrappers, securityGatewayUnwrappers, signInShimUnwrappers, trackingParamsLiterals, trackingParamsPatterns } from "./defaults.mjs";
 import { cleanUrl, stripTrackingParams, unwrapUrl } from "./clean.mjs";
-export { advertisingUnwrappers, affiliateParams, affiliateUnwrappers, archiveProxyUnwrappers, campaignParams, cleanUrl, clickAttributionParams, clickCounterUnwrappers, createParamExtractor, defaultTrackingParams, defaultUnwrappers, downloadMeasurementUnwrappers, emailTrackingUnwrappers, housekeepingParams, linkShimUnwrappers, pressReleaseUnwrappers, searchClickUnwrappers, securityGatewayUnwrappers, signInShimUnwrappers, stripTrackingParams, trackingParamsLiterals, trackingParamsPatterns, unwrap12ft, unwrap2performant, unwrap4pda, unwrapA8Net, unwrapAboutCom, unwrapAcast, unwrapAccesstrade, unwrapAceml, unwrapAdcell, unwrapAdfly, unwrapAdjust, unwrapAdmitad, unwrapAdrecord, unwrapAdtraction, unwrapAffilae, unwrapAffiliateFuture, unwrapAffiliatesOne, unwrapAliexpress, unwrapAliyun, unwrapAllblog, unwrapAmazonAffiliate, unwrapAmazonSes, unwrapAmpCache, unwrapAnchor, unwrapAnonymTo, unwrapAnonymouse, unwrapAppsflyerOnelink, unwrapApptrkr, unwrapArchiveToday, unwrapArquivo, unwrapArttrack, unwrapArxiv, unwrapAsk, unwrapAugure, unwrapAusha, unwrapAvantlink, unwrapAwesound, unwrapAwin, unwrapAxigen, unwrapBabyblog, unwrapBacLacWebArchive, unwrapBale, unwrapBananatag, unwrapBarracudaLinkProtect, unwrapBig5Gate, unwrapBing, unwrapBingAds, unwrapBitrix, unwrapBitrixBanner, unwrapBizrate, unwrapBlubrry, unwrapBlueskyRedirect, unwrapBolPartner, unwrapBridgyFed, unwrapBusinessWire, unwrapButton, unwrapBuyAt, unwrapBuybox, unwrapBuzzstream, unwrapBytedance, unwrapCake, unwrapCalendly, unwrapCanva, unwrapCastPlus, unwrapCcbill, unwrapChartable, unwrapCheckPointHarmony, unwrapChitika, unwrapCiscoSecureWeb, unwrapCjNetwork, unwrapClaritas, unwrapCleverbridge, unwrapClevercomm, unwrapCloudhq, unwrapCloze, unwrapCohst, unwrapCommissionFactory, unwrapCommunicationads, unwrapConstantContact, unwrapContactMonkey, unwrapConvertiser, unwrapCsdn, unwrapCse360, unwrapCuelinks, unwrapDasBlog, unwrapDatalifeEngine, unwrapDeployer, unwrapDerefMail, unwrapDeviantartOutgoing, unwrapDigidip, unwrapDigikala, unwrapDirectMail, unwrapDisqus, unwrapDmmAffiliate, unwrapDognet, unwrapDouban, unwrapDropbox, unwrapDstats, unwrapDuckduckgo, unwrapDuckduckgoAds, unwrapDuomai, unwrapDyn, unwrapDzen, unwrapEClick, unwrapEasyMarketing, unwrapEbayRover, unwrapEbuzzing, unwrapEdgepilot, unwrapEffiliation, unwrapEhub, unwrapElasticEmail, unwrapEmbedly, unwrapEpn, unwrapEsva, unwrapEulerian, unwrapEvernote, unwrapExciteTranslate, unwrapExpediaAffiliate, unwrapFacebookShim, unwrapFanbridge, unwrapFederatedMedia, unwrapFeedStatistics, unwrapFeedblitz, unwrapFeedsportal, unwrapFinalsite, unwrapFirebaseDynamicLinks, unwrapFireeye, unwrapFirstory, unwrapFiveByFive, unwrapFiverr, unwrapFlexoffers, unwrapFlipboard, unwrapFortimail, unwrapFtc, unwrapGateSc, unwrapGeoriot, unwrapGfnLinkProxy, unwrapGitee, unwrapGlueUp, unwrapGodcaster, unwrapGoogle, unwrapGoogleAds, unwrapGoogleAmpViewer, unwrapGoogleNews, unwrapGoogleNewsModern, unwrapGoogleScholar, unwrapGoogleTranslate, unwrapGoogleWebLight, unwrapGroupMail, unwrapGroupon, unwrapGumball, unwrapGurunavi, unwrapHackerone, unwrapHashnode, unwrapHasoffers, unwrapHearthis, unwrapHellohq, unwrapHirkereso, unwrapHorde, unwrapHornetsecurity, unwrapHrefLi, unwrapHubspotSidekick, unwrapIcptrack, unwrapIgafnl, unwrapImpact, unwrapIndexHu, unwrapInfospace, unwrapInsiderAffiliate, unwrapInstagramShim, unwrapIntranetQuorum, unwrapInvisionNoExternalLinks, unwrapInvolveAsia, unwrapIrs, unwrapJianshuGo, unwrapJive, unwrapJuejin, unwrapJustwatch, unwrapKlook, unwrapLazada, unwrapLd246, unwrapLetscast, unwrapLeverAnalytics, unwrapLinkA, unwrapLinkconnector, unwrapLinkedin, unwrapLinksynergy, unwrapLinktrust, unwrapLinkwise, unwrapLivejournal, unwrapLnkam, unwrapLocWebArchive, unwrapLocaweb, unwrapLogicboard, unwrapMagellan, unwrapMagnetmail, unwrapMail2easy, unwrapMailRu, unwrapMailRuLink, unwrapMailchimp, unwrapMailinblack, unwrapMailpanion, unwrapMailpgn, unwrapMailstat, unwrapMailtrack, unwrapMandrill, unwrapMarketwire, unwrapMcas, unwrapMedium, unwrapMegalodon, unwrapMimecast, unwrapMinistryCloud, unwrapMintDownloads, unwrapMintFeeder, unwrapMohtwize, unwrapMoshimo, unwrapMozillaOutgoing, unwrapMyNewsletterBuilder, unwrapNarrativ, unwrapNatlibNz, unwrapNaverOutgoing, unwrapNcls, unwrapNdlWarp, unwrapNetaffiliation, unwrapNetcentrum, unwrapNewswire, unwrapNicoMs, unwrapNimble, unwrapNlaWebarchive, unwrapNodeseek, unwrapOkRu, unwrapOp3, unwrapOrkut, unwrapOsnova, unwrapOutlookSafelinks, unwrapOutlookWebAccess, unwrapPagefreezer, unwrapPartnerAds, unwrapPbs, unwrapPhilpapers, unwrapPinterest, unwrapPipedrive, unwrapPocket, unwrapPodcorn, unwrapPodder, unwrapPodkite, unwrapPodroll, unwrapPodscribe, unwrapPodsights, unwrapPodtrac, unwrapPodup, unwrapPostAffiliatePro, unwrapPostmark, unwrapPrNewswire, unwrapPrezly, unwrapPriceGrabber, unwrapPromoJukebox, unwrapProofpointIsolation, unwrapProofpointV1, unwrapProofpointV2, unwrapProofpointV3, unwrapPrweb, unwrapQualityClick, unwrapRakutenAffiliate, unwrapRamblerMail, unwrapRecruitics, unwrapRedditOut, unwrapRediffmail, unwrapRedirectingat, unwrapResearchgate, unwrapReverbnation, unwrapReviveAdserver, unwrapSalesdoubler, unwrapSalesflare, unwrapSalesforceiq, unwrapSaleshandy, unwrapSalsa, unwrapSapHelp, unwrapSbsAd, unwrapSegmentfault, unwrapSerendipity, unwrapShareasale, unwrapShareit, unwrapSkimlinks, unwrapSkyrock, unwrapSlack, unwrapSlickdeals, unwrapSmartAdserver, unwrapSmartredirect, unwrapSmry, unwrapSophos, unwrapSoundOn, unwrapSoundcloud, unwrapSoundstack, unwrapSquarespaceEmail, unwrapSspai, unwrapStay22, unwrapSteamLinkfilter, unwrapStorify, unwrapStreak, unwrapStreamsend, unwrapStumbleupon, unwrapSubscribeRu, unwrapSubstack, unwrapSurly, unwrapSurugaya, unwrapSwap, unwrapSymantecClicktime, unwrapSymplicity, unwrapTargetCircle, unwrapTeacup, unwrapTelegramIv, unwrapTheRegister, unwrapThreadsShim, unwrapTiktok, unwrapTitanhqLinklock, unwrapTopsec, unwrapToucharcade, unwrapTracdelight, unwrapTradedoubler, unwrapTradetracker, unwrapTravelpayouts, unwrapTrendMicro, unwrapTriplelift, unwrapTrustwaveScanmail, unwrapTrxHub, unwrapTumblr, unwrapTwitterRedirect, unwrapTwoCheckout, unwrapUinterbox, unwrapUkWebArchive, unwrapUkgwa, unwrapUnescoWebArchive, unwrapUnhcrWebArchive, unwrapUnisender, unwrapUpAudio, unwrapUrl, unwrapVadeSecure, unwrapValuePress, unwrapValuecommerce, unwrapVanilla, unwrapVbulletin, unwrapVefsafn, unwrapVgWort, unwrapViglink, unwrapVirgool, unwrapVisibli, unwrapVkAway, unwrapVocus, unwrapVoxnest, unwrapVpixl, unwrapVuture, unwrapWebArchive, unwrapWebcitation, unwrapWebgains, unwrapWebharvest, unwrapWikiwix, unwrapWikizero, unwrapWordpressEmail, unwrapWordpressGo2, unwrapWorldNomads, unwrapWpPoczta, unwrapXengentr, unwrapXiaoyuzhou, unwrapXimalaya, unwrapYahooJapan, unwrapYahooJapanAmpViewer, unwrapYahooSearch, unwrapYamm, unwrapYandexMail, unwrapYandexTranslate, unwrapYandexTurbo, unwrapYelp, unwrapYesware, unwrapYouTube, unwrapYourMembership, unwrapZanox, unwrapZayads, unwrapZemanta, unwrapZencastr, unwrapZhihu, unwrapZix, unwrapZscalerIsolation, visitorIdParams };
+export { advertisingUnwrappers, affiliateParams, affiliateUnwrappers, archiveProxyUnwrappers, campaignParams, cleanUrl, clickAttributionParams, clickCounterUnwrappers, createParamExtractor, defaultTrackingParams, defaultUnwrappers, downloadMeasurementUnwrappers, emailTrackingUnwrappers, housekeepingParams, linkShimUnwrappers, pressReleaseUnwrappers, searchClickUnwrappers, securityGatewayUnwrappers, signInShimUnwrappers, stripTrackingParams, trackingParamsLiterals, trackingParamsPatterns, unwrap12ft, unwrap2performant, unwrap4pda, unwrapA8Net, unwrapAboutCom, unwrapAcast, unwrapAccesstrade, unwrapAceml, unwrapAdcell, unwrapAdfly, unwrapAdjust, unwrapAdmitad, unwrapAdrecord, unwrapAdtraction, unwrapAffilae, unwrapAffiliateFuture, unwrapAffiliatesOne, unwrapAliexpress, unwrapAliyun, unwrapAllblog, unwrapAmazonAffiliate, unwrapAmazonSes, unwrapAmpCache, unwrapAnchor, unwrapAnonymTo, unwrapAnonymouse, unwrapAppsflyerOnelink, unwrapApptrkr, unwrapArchiveToday, unwrapArquivo, unwrapArttrack, unwrapArxiv, unwrapAsk, unwrapAugure, unwrapAusha, unwrapAvantlink, unwrapAwesound, unwrapAwin, unwrapAxigen, unwrapBabyblog, unwrapBacLacWebArchive, unwrapBale, unwrapBananatag, unwrapBarracudaLinkProtect, unwrapBig5Gate, unwrapBing, unwrapBingAds, unwrapBitrix, unwrapBitrixBanner, unwrapBizrate, unwrapBlubrry, unwrapBlueskyRedirect, unwrapBolPartner, unwrapBridgyFed, unwrapBusinessWire, unwrapButton, unwrapBuyAt, unwrapBuybox, unwrapBuzzstream, unwrapBytedance, unwrapCake, unwrapCalendly, unwrapCanva, unwrapCastPlus, unwrapCcbill, unwrapChartable, unwrapCheckPointHarmony, unwrapChitika, unwrapCiscoSecureWeb, unwrapCjNetwork, unwrapClaritas, unwrapCleverbridge, unwrapClevercomm, unwrapCloudhq, unwrapCloze, unwrapCohst, unwrapCommissionFactory, unwrapCommunicationads, unwrapConstantContact, unwrapContactMonkey, unwrapConvertiser, unwrapCsdn, unwrapCse360, unwrapCuelinks, unwrapDasBlog, unwrapDatalifeEngine, unwrapDeployer, unwrapDerefMail, unwrapDeviantartOutgoing, unwrapDigidip, unwrapDigikala, unwrapDirectMail, unwrapDisqus, unwrapDmmAffiliate, unwrapDognet, unwrapDouban, unwrapDropbox, unwrapDstats, unwrapDuckduckgo, unwrapDuckduckgoAds, unwrapDuomai, unwrapDyn, unwrapDzen, unwrapEClick, unwrapEasyMarketing, unwrapEbayRover, unwrapEbuzzing, unwrapEdgepilot, unwrapEffiliation, unwrapEhub, unwrapElasticEmail, unwrapEmbedly, unwrapEpn, unwrapEsva, unwrapEulerian, unwrapEvernote, unwrapExciteTranslate, unwrapExpediaAffiliate, unwrapFacebookShim, unwrapFanbridge, unwrapFederatedMedia, unwrapFeedStatistics, unwrapFeedblitz, unwrapFeedsportal, unwrapFinalsite, unwrapFirebaseDynamicLinks, unwrapFireeye, unwrapFirstory, unwrapFiveByFive, unwrapFiverr, unwrapFlexoffers, unwrapFlipboard, unwrapFortimail, unwrapFtc, unwrapGateSc, unwrapGeoriot, unwrapGfnLinkProxy, unwrapGitee, unwrapGlueUp, unwrapGodcaster, unwrapGoogle, unwrapGoogleAds, unwrapGoogleAmpViewer, unwrapGoogleNews, unwrapGoogleNewsModern, unwrapGoogleScholar, unwrapGoogleTranslate, unwrapGoogleWebLight, unwrapGovdelivery, unwrapGroupMail, unwrapGroupon, unwrapGumball, unwrapGurunavi, unwrapHackerone, unwrapHashnode, unwrapHasoffers, unwrapHearthis, unwrapHellohq, unwrapHirkereso, unwrapHorde, unwrapHornetsecurity, unwrapHrefLi, unwrapHubspotSidekick, unwrapIcptrack, unwrapIgafnl, unwrapImpact, unwrapIndexHu, unwrapInfospace, unwrapInsiderAffiliate, unwrapInstagramShim, unwrapIntranetQuorum, unwrapInvisionNoExternalLinks, unwrapInvolveAsia, unwrapIrs, unwrapJianshuGo, unwrapJive, unwrapJuejin, unwrapJustwatch, unwrapKlook, unwrapLazada, unwrapLd246, unwrapLetscast, unwrapLeverAnalytics, unwrapLinkA, unwrapLinkconnector, unwrapLinkedin, unwrapLinksynergy, unwrapLinktrust, unwrapLinkwise, unwrapLivejournal, unwrapLnkam, unwrapLocWebArchive, unwrapLocaweb, unwrapLogicboard, unwrapMagellan, unwrapMagnetmail, unwrapMail2easy, unwrapMailRu, unwrapMailRuLink, unwrapMailchimp, unwrapMailinblack, unwrapMailpanion, unwrapMailpgn, unwrapMailstat, unwrapMailtrack, unwrapMandrill, unwrapMarketwire, unwrapMcas, unwrapMedium, unwrapMegalodon, unwrapMimecast, unwrapMinistryCloud, unwrapMintDownloads, unwrapMintFeeder, unwrapMohtwize, unwrapMoshimo, unwrapMozillaOutgoing, unwrapMyNewsletterBuilder, unwrapNarrativ, unwrapNatlibNz, unwrapNaverOutgoing, unwrapNcls, unwrapNdlWarp, unwrapNetaffiliation, unwrapNetcentrum, unwrapNewswire, unwrapNicoMs, unwrapNimble, unwrapNlaWebarchive, unwrapNodeseek, unwrapOkRu, unwrapOp3, unwrapOrkut, unwrapOsnova, unwrapOutlookSafelinks, unwrapOutlookWebAccess, unwrapPagefreezer, unwrapPartnerAds, unwrapPbs, unwrapPhilpapers, unwrapPinterest, unwrapPipedrive, unwrapPocket, unwrapPodcorn, unwrapPodder, unwrapPodkite, unwrapPodroll, unwrapPodscribe, unwrapPodsights, unwrapPodtrac, unwrapPodup, unwrapPostAffiliatePro, unwrapPostmark, unwrapPrNewswire, unwrapPrezly, unwrapPriceGrabber, unwrapPromoJukebox, unwrapProofpointIsolation, unwrapProofpointV1, unwrapProofpointV2, unwrapProofpointV3, unwrapPrweb, unwrapQualityClick, unwrapRakutenAffiliate, unwrapRamblerMail, unwrapRecruitics, unwrapRedditOut, unwrapRediffmail, unwrapRedirectingat, unwrapResearchgate, unwrapReverbnation, unwrapReviveAdserver, unwrapSalesdoubler, unwrapSalesflare, unwrapSalesforceiq, unwrapSaleshandy, unwrapSalsa, unwrapSapHelp, unwrapSbsAd, unwrapSegmentfault, unwrapSerendipity, unwrapShareasale, unwrapShareit, unwrapSkimlinks, unwrapSkyrock, unwrapSlack, unwrapSlickdeals, unwrapSmartAdserver, unwrapSmartredirect, unwrapSmry, unwrapSophos, unwrapSoundOn, unwrapSoundcloud, unwrapSoundstack, unwrapSquarespaceEmail, unwrapSspai, unwrapStay22, unwrapSteamLinkfilter, unwrapStorify, unwrapStreak, unwrapStreamsend, unwrapStumbleupon, unwrapSubscribeRu, unwrapSubstack, unwrapSurly, unwrapSurugaya, unwrapSwap, unwrapSymantecClicktime, unwrapSymplicity, unwrapTargetCircle, unwrapTeacup, unwrapTelegramIv, unwrapTheRegister, unwrapThreadsShim, unwrapTiktok, unwrapTitanhqLinklock, unwrapTopsec, unwrapToucharcade, unwrapTracdelight, unwrapTradedoubler, unwrapTradetracker, unwrapTravelpayouts, unwrapTrendMicro, unwrapTriplelift, unwrapTrustwaveScanmail, unwrapTrxHub, unwrapTumblr, unwrapTwitterRedirect, unwrapTwoCheckout, unwrapUinterbox, unwrapUkWebArchive, unwrapUkgwa, unwrapUnescoWebArchive, unwrapUnhcrWebArchive, unwrapUnisender, unwrapUpAudio, unwrapUrl, unwrapVadeSecure, unwrapValuePress, unwrapValuecommerce, unwrapVanilla, unwrapVbulletin, unwrapVefsafn, unwrapVgWort, unwrapViglink, unwrapVirgool, unwrapVisibli, unwrapVkAway, unwrapVocus, unwrapVoxnest, unwrapVpixl, unwrapVuture, unwrapWebArchive, unwrapWebcitation, unwrapWebgains, unwrapWebharvest, unwrapWikiwix, unwrapWikizero, unwrapWordpressEmail, unwrapWordpressGo2, unwrapWorldNomads, unwrapWpPoczta, unwrapXengentr, unwrapXiaoyuzhou, unwrapXimalaya, unwrapYahooJapan, unwrapYahooJapanAmpViewer, unwrapYahooSearch, unwrapYamm, unwrapYandexMail, unwrapYandexTranslate, unwrapYandexTurbo, unwrapYelp, unwrapYesware, unwrapYouTube, unwrapYourMembership, unwrapZanox, unwrapZayads, unwrapZemanta, unwrapZencastr, unwrapZhihu, unwrapZix, unwrapZscalerIsolation, visitorIdParams };

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

@@ -38,11 +38,36 @@ const isHttpUrl = (url) => {
 const isHostOrSubdomainOf = (url, domains) => {
 	return isHostOf(url, domains) || isSubdomainOf(url, domains);
 };
-const decodeSegment = (segment) => {
-	if (segment === void 0) return;
+const escapeRunRegex = /(?:%[0-9A-Fa-f]{2})+/g;
+const getSequenceLength = (byte) => {
+	if (byte < 128) return 1;
+	if (byte >= 194 && byte < 224) return 2;
+	if (byte >= 224 && byte < 240) return 3;
+	if (byte >= 240 && byte < 245) return 4;
+	return 0;
+};
+const decodeEscapeRun = (run) => {
 	try {
-		return decodeURIComponent(segment);
+		return decodeURIComponent(run);
 	} catch {}
+	const count = run.length / 3;
+	let decoded = "";
+	let index = 0;
+	while (index < count) {
+		const start = index * 3;
+		const length = getSequenceLength(Number.parseInt(run.slice(start + 1, start + 3), 16));
+		if (length && index + length <= count) try {
+			decoded += decodeURIComponent(run.slice(start, start + length * 3));
+			index += length;
+			continue;
+		} catch {}
+		decoded += run.slice(start, start + 3);
+		index += 1;
+	}
+	return decoded;
+};
+const decodePercent = (value) => {
+	return value.replace(escapeRunRegex, decodeEscapeRun);
 };
 const strippedParamsCache = /* @__PURE__ */ new WeakMap();
 const getStrippedParamsSet = (params) => {
@@ -102,6 +127,10 @@ const fixMalformedScheme = (url) => {
 	}
 	return url;
 };
+const segmentEdgeSpace = "(?:\\s|%(?:09|0A|0D|20))";
+const valueEdgeSpace = "(?:\\s|\\+|%(?:09|0A|0D|20))";
+new RegExp(`^${segmentEdgeSpace}+|(?<!${segmentEdgeSpace})${segmentEdgeSpace}+$`, "gi");
+new RegExp(`^${valueEdgeSpace}+|(?<!${valueEdgeSpace})${valueEdgeSpace}+$`, "gi");
 const addMissingScheme = (url, scheme = "https") => {
 	if (url.startsWith("[")) return parseUrl(`${scheme}://${url}`) ? `${scheme}://${url}` : url;
 	const colonIndex = url.indexOf(":");
@@ -203,4 +232,4 @@ const fixMalformedProtocol = fixMalformedScheme;
 /** @deprecated Use `addMissingScheme` instead. */
 const addMissingProtocol = addMissingScheme;
 //#endregion
-export { addMissingProtocol, addMissingScheme, decodeSegment, fixMalformedProtocol, fixMalformedScheme, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, stripWww };
+export { addMissingProtocol, addMissingScheme, decodePercent, fixMalformedProtocol, fixMalformedScheme, isHostOf, isHostOrSubdomainOf, isHttpUrl, isIpAddress, isSubdomainOf, normalizeUrl, parseUrl, stripWww };

package/dist/unwraps/aceml.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 { createParamExtractor, decodeBase64 } from "../utils.mjs";
 //#region src/unwraps/aceml.ts
 const encodedSchemeRegex = /^https?%3A/i;
@@ -11,9 +11,7 @@ const unwrapAceml = (url) => {
 	const raw = baseExtractor(url);
 	if (!raw) return;
 	let decoded = decodeBase64(raw);
-	if (decoded && encodedSchemeRegex.test(decoded)) try {
-		decoded = decodeURIComponent(decoded);
-	} catch {}
+	if (decoded && encodedSchemeRegex.test(decoded)) decoded = decodePercent(decoded);
 	if (decoded && isHttpUrl(decoded)) return decoded;
 	if (isHttpUrl(raw)) return raw;
 };

package/dist/unwraps/adjust.mjs

@@ -4,17 +4,17 @@ import { createParamExtractor, getParamTarget } from "../utils.mjs";
 const hosts = ["app.adjust.com", "app.adjust.net.in"];
 const pathRegex = /^\/[^/]+$/;
 const trackerParams = [
+	"redirect_windows",
 	"redirect",
-	"fallback",
-	"redirect_macos"
+	"fallback"
 ];
 const unwrapUniversalLink = createParamExtractor({
 	hosts: /^[a-z0-9]{4}(?:\.tr)?\.adj\.st$/,
 	params: [
+		"adj_redirect_windows",
 		"adj_redirect",
-		"adj_fallback",
-		"adj_redirect_macos",
-		"adjust_fallback"
+		"adjust_fallback",
+		"adj_fallback"
 	]
 });
 const unwrapTracker = (url) => {

package/dist/unwraps/amazonSes.mjs

@@ -1,14 +1,12 @@
-import { isHostOrSubdomainOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHostOrSubdomainOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/amazonSes.ts
 const awstrackPathRegex = /^\/L0\/(.+?)\/\d+\/[^/]+\/[^/]+$/;
 const customPathRegex = /^\/CL0\/(.+?)\/\d+\/[^/]+-000000\/[^/]+$/;
 const unwrapAmazonSes = (url) => {
 	const match = (isHostOrSubdomainOf(url, "awstrack.me") ? awstrackPathRegex : customPathRegex).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 { unwrapAmazonSes };

package/dist/unwraps/anchor.mjs

@@ -1,5 +1,4 @@
-import { isHostOf } from "../node_modules/trousse/dist/urls.mjs";
-import { percentDecode } from "../utils.mjs";
+import { decodePercent, isHostOf } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/anchor.ts
 const playPrefixRegex = /^\/s\/[^/]+\/podcast\/play\/[^/]+\/(?:sponsor\/[^/]+\/)?/;
 const encodedSchemeRegex = /^https?%(?:25)?3A/i;
@@ -8,7 +7,7 @@ const unwrapAnchor = (url) => {
 	const match = url.pathname.match(playPrefixRegex);
 	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/apptrkr.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/apptrkr.ts
 const encodedSchemeRegex = /^https?%3A/i;
 const unwrapApptrkr = (url) => {
 	if (url.hostname !== "apptrkr.com" || url.pathname !== "/get_redirect.php") return;
 	let target = getParamValues(url, "targetURL").at(-1);
 	if (!target) return;
-	if (encodedSchemeRegex.test(target)) target = percentDecode(target);
+	if (encodedSchemeRegex.test(target)) target = decodePercent(target);
 	if (isHttpUrl(target)) return target;
 };
 //#endregion

package/dist/unwraps/archiveToday.mjs

@@ -1,4 +1,4 @@
-import { decodeSegment, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { decodePercent, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/archiveToday.ts
 const hostRegex = /^(?:www\.)?archive\.(?:is|ph|today|md|fo|vn|li)$/;
 const pathRegex = /^\/(?:\d{14}|\d{4}\.\d{2}\.\d{2}-\d{6}|o\/[^/]+|newest)\/(.+)$/;
@@ -11,7 +11,7 @@ const unwrapArchiveToday = (url) => {
 	const match = url.pathname.match(pathRegex);
 	if (!match) return;
 	let target = match[1];
-	if (encodedSchemeRegex.test(target)) target = decodeSegment(target);
+	if (encodedSchemeRegex.test(target)) target = decodePercent(target);
 	if (!target) return;
 	if (!schemeRegex.test(target)) target = `http://${target}`;
 	target = target.replace(escapedQueryRegex, "?").replace("%23", "#");

package/dist/unwraps/augure.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 { createParamExtractor, decodeBase64 } from "../utils.mjs";
 //#region src/unwraps/augure.ts
 const baseExtractor = createParamExtractor({
@@ -16,12 +16,7 @@ const unwrapAugure = (url) => {
 	if (!raw) return;
 	const decoded = decodeBase64(raw);
 	if (!decoded) return;
-	let target;
-	try {
-		target = decodeURIComponent(decoded);
-	} catch {
-		return;
-	}
+	const target = decodePercent(decoded);
 	if (isHttpUrl(target)) return target;
 };
 //#endregion

package/dist/unwraps/bing.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, getParamTarget } from "../utils.mjs";
+import { decodeBase64Url, getParamTarget, getParamValues } from "../utils.mjs";
 //#region src/unwraps/bing.ts
 const bingHosts = [
 	"bing.com",
@@ -20,7 +20,7 @@ const unwrapBing = (url) => {
 		return target;
 	}
 	if (url.pathname !== "/ck/a") return;
-	const value = url.searchParams.get("u");
+	const value = getParamValues(url, "u").at(0);
 	if (!value || !bingPrefixRegex.test(value)) return;
 	const decoded = decodeBase64Url(value.slice(2));
 	if (!decoded || !isHttpUrl(decoded)) return;

package/dist/unwraps/bingAds.mjs

@@ -1,18 +1,16 @@
 import { isAnyOf } from "../node_modules/trousse/dist/matching.mjs";
-import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64Url } from "../utils.mjs";
+import { decodePercent, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
+import { decodeBase64Url, getParamValues } from "../utils.mjs";
 import { bingHosts } from "./bing.mjs";
 //#region src/unwraps/bingAds.ts
 const adPaths = ["/aclk", "/aclick"];
 const unwrapBingAds = (url) => {
 	if (!isAnyOf(url.hostname, bingHosts) || !adPaths.includes(url.pathname)) return;
-	const value = url.searchParams.get("u");
+	const value = getParamValues(url, "u").at(0);
 	if (!value) return;
 	const decoded = decodeBase64Url(value) ?? "";
-	try {
-		const target = decodeURIComponent(decoded);
-		if (isHttpUrl(target)) return target;
-	} catch {}
+	const target = decodePercent(decoded);
+	if (isHttpUrl(target)) return target;
 };
 //#endregion
 export { unwrapBingAds };

package/dist/unwraps/bitrix.mjs

@@ -1,9 +1,10 @@
-import { getParamValues, percentDecode } from "../utils.mjs";
+import { decodePercent } from "../node_modules/trousse/dist/urls.mjs";
+import { getParamValues } from "../utils.mjs";
 //#region src/unwraps/bitrix.ts
 const encodedSchemeRegex = /^https?%3A/i;
 const getBitrixTarget = (url) => {
 	let target = getParamValues(url, "goto").at(0);
-	if (target && encodedSchemeRegex.test(target)) target = percentDecode(target);
+	if (target && encodedSchemeRegex.test(target)) target = decodePercent(target);
 	return target;
 };
 const unwrapBitrix = (url) => {

package/dist/unwraps/ciscoSecureWeb.mjs

@@ -1,16 +1,13 @@
-import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { percentDecode } from "../utils.mjs";
+import { decodePercent, isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/ciscoSecureWeb.ts
 const pathRegex = /^\/[\w-]+\/(https?(?:%3A|%253A)(?:%2F|%252F){2}[^/]*)$/i;
 const unwrapCiscoSecureWeb = (url) => {
 	if (!isHostOf(url, "secure-web.cisco.com")) return;
 	const match = pathRegex.exec(url.pathname);
 	if (!match?.[1]) return;
-	try {
-		let target = decodeURIComponent(match[1]);
-		if (!isHttpUrl(target)) target = percentDecode(target);
-		if (isHttpUrl(target)) return target;
-	} catch {}
+	let target = decodePercent(match[1]);
+	if (!isHttpUrl(target)) target = decodePercent(target);
+	if (isHttpUrl(target)) return target;
 };
 //#endregion
 export { unwrapCiscoSecureWeb };

package/dist/unwraps/cjNetwork.mjs

@@ -1,4 +1,5 @@
 import { isAnyOf } from "../node_modules/trousse/dist/matching.mjs";
+import { decodePercent } from "../node_modules/trousse/dist/urls.mjs";
 import { createParamExtractor } from "../utils.mjs";
 //#region src/unwraps/cjNetwork.ts
 const hosts = [
@@ -20,13 +21,6 @@ const hosts = [
 ];
 const clickPathRegex = /^\/(?:t\/)?[^/]+$/;
 const deepLinkPathRegex = /^\/links\/\d+\/type\/(?:dlg|am)\/(?:sid\/[^/]*\/)?(?:fragment\/([^/]*)\/)?(https?):\/\/?(.+)$/;
-const decodeFragment = (value) => {
-	try {
-		return decodeURIComponent(value);
-	} catch {
-		return value;
-	}
-};
 const extractUrlParam = createParamExtractor({
 	hosts,
 	params: ["url", "loc"]
@@ -39,7 +33,7 @@ const unwrapCjNetwork = (url) => {
 	}
 	if (!isAnyOf(url.hostname, hosts)) return;
 	const [, fragment, scheme, target] = match;
-	const hash = url.hash || (fragment ? `#${decodeFragment(fragment)}` : "");
+	const hash = url.hash || (fragment ? `#${decodePercent(fragment)}` : "");
 	return `${scheme}://${target}${url.search}${hash}`;
 };
 //#endregion

package/dist/unwraps/cse360.mjs

@@ -1,5 +1,4 @@
-import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { percentDecode } from "../utils.mjs";
+import { decodePercent, isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
 //#region src/unwraps/cse360.ts
 const encodedSchemeRegex = /^https?%3A/i;
 const clickPathRegex = /^\/Click\/AddCampaignEmailClick\/[0-9a-f-]{36}\/([^/]+)\/[0-9a-f-]{36}\/[^/]+\/(?:True|False)$/;
@@ -7,11 +6,9 @@ const unwrapCse360 = (url) => {
 	if (!isHostOf(url, "click.cse360.com.br")) return;
 	const match = clickPathRegex.exec(url.pathname);
 	if (!match?.[1]) return;
-	try {
-		let target = decodeURIComponent(match[1]);
-		if (encodedSchemeRegex.test(target)) target = percentDecode(target);
-		if (isHttpUrl(target)) return target;
-	} catch {}
+	let target = decodePercent(match[1]);
+	if (encodedSchemeRegex.test(target)) target = decodePercent(target);
+	if (isHttpUrl(target)) return target;
 };
 //#endregion
 export { unwrapCse360 };

package/dist/unwraps/datalifeEngine.mjs

@@ -1,11 +1,11 @@
 import { isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64 } from "../utils.mjs";
+import { decodeBase64, getParamValues } from "../utils.mjs";
 //#region src/unwraps/datalifeEngine.ts
 const unwrapDatalifeEngine = (url) => {
 	const isEngineGo = url.pathname === "/engine/go.php";
 	const isIndexGo = url.pathname === "/index.php" && url.searchParams.get("do") === "go";
 	if (!isEngineGo && !isIndexGo) 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/deployer.mjs

@@ -1,5 +1,5 @@
 import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64 } from "../utils.mjs";
+import { decodeBase64, getParamValues } from "../utils.mjs";
 //#region src/unwraps/deployer.ts
 const hosts = [
 	"daily.news.humanevents.com",
@@ -9,7 +9,7 @@ const hosts = [
 const paths = ["/link.php", "/wta/link.php"];
 const unwrapDeployer = (url) => {
 	if (!isHostOf(url, hosts) || !paths.includes(url.pathname) || !url.searchParams.has("AGENCY")) return;
-	const value = url.searchParams.get("drurl")?.replaceAll(" ", "+");
+	const value = getParamValues(url, "drurl").at(0)?.replaceAll(" ", "+");
 	if (!value) return;
 	const target = decodeBase64(value);
 	if (target && isHttpUrl(target)) return target;

package/dist/unwraps/digikala.mjs

@@ -1,10 +1,10 @@
 import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64 } from "../utils.mjs";
+import { decodeBase64, getParamValues } from "../utils.mjs";
 //#region src/unwraps/digikala.ts
 const pathRegex = /^\/api\/v1\/Click\/b\/[A-Za-z0-9]+$/;
 const unwrapDigikala = (url) => {
 	if (!isHostOf(url, "dgkl.io") || !pathRegex.test(url.pathname)) return;
-	const encoded = url.searchParams.get("b64");
+	const encoded = getParamValues(url, "b64").at(0);
 	if (!encoded) return;
 	const target = decodeBase64(encoded);
 	if (target && isHttpUrl(target)) return target;

package/dist/unwraps/disqus.mjs

@@ -1,13 +1,16 @@
 import { createParamExtractor } from "../utils.mjs";
 //#region src/unwraps/disqus.ts
 const paths = ["/", "/url"];
+const signatureRegex = /:[\w-]{27}$/;
 const extractTarget = createParamExtractor({
 	hosts: "disq.us",
 	params: ["url"]
 });
 const unwrapDisqus = (url) => {
 	if (!paths.includes(url.pathname)) return;
-	return extractTarget(url);
+	const target = extractTarget(url);
+	if (url.pathname !== "/url") return target;
+	return target?.replace(signatureRegex, "");
 };
 //#endregion
 export { unwrapDisqus };

package/dist/unwraps/easyMarketing.mjs

@@ -1,5 +1,5 @@
 import { isHostOf, isHttpUrl } from "../node_modules/trousse/dist/urls.mjs";
-import { decodeBase64Url, getParamTarget } from "../utils.mjs";
+import { decodeBase64Url, getParamTarget, getParamValues } from "../utils.mjs";
 //#region src/unwraps/easyMarketing.ts
 const pathRegex = /^\/trck\/eclick\/[0-9a-f]{32}$/;
 const hosts = [
@@ -11,7 +11,7 @@ const unwrapEasyMarketing = (url) => {
 	if (!isHostOf(url, hosts) || !pathRegex.test(url.pathname)) return;
 	const target = getParamTarget(url, "url");
 	if (target) return target;
-	const encoded = url.searchParams.get("url64fb");
+	const encoded = getParamValues(url, "url64fb").at(0);
 	if (!encoded) return;
 	const decoded = decodeBase64Url(encoded);
 	if (decoded && isHttpUrl(decoded)) return decoded;

package/dist/unwraps/facebook.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/facebook.ts
 const legacyTargetRegex = /^\/l\/[\w-]+[/;]\/*([^/].*)$/;
 const legacyEncodedSchemeRegex = /^https?%(?:25)?3A/i;
@@ -35,11 +35,9 @@ const unwrapLsr = createParamExtractor({
 	params: ["u"]
 });
 const decodeLegacyTarget = (value) => {
-	try {
-		const decoded = decodeURIComponent(value);
-		if (!encodedSchemeRegex.test(decoded)) return decoded;
-		return percentDecode(decoded);
-	} catch {}
+	const decoded = decodePercent(value);
+	if (!encodedSchemeRegex.test(decoded)) return decoded;
+	return decodePercent(decoded);
 };
 const unwrapLegacy = (url) => {
 	if (!isHostOf(url, ["www.facebook.com", "l.facebook.com"])) return;