diff --git a/functions/go/[code].ts b/functions/go/[code].ts index ba65eae..0205fa4 100644 --- a/functions/go/[code].ts +++ b/functions/go/[code].ts @@ -1,5 +1,5 @@ /** - * GET /go/etsy-p01/ … /go/etsy-p05/?page= + * GET /go/etsy-p01/ … /go/etsy-p05/ and /go/etsy-shop/?page= * * Click-through to an Etsy listing. Returns a real 200 HTML page (so Cloudflare Web * Analytics counts it as a pageview), then sends the browser on with a meta refresh @@ -11,7 +11,7 @@ * noindex, no-store (the destination depends on page), and not in the sitemap. * Nothing is stored. No KV, no PII. */ -import { etsyListings, sanitiseCoupon, type EtsyCode } from '../../src/config'; +import { listingDestination, sanitiseCoupon, shopDestination, type EtsyCode } from '../../src/config'; type Ctx = { request: Request; params: { code?: string | string[] } }; @@ -34,23 +34,11 @@ export function sanitisePage(raw: string | null): string { return v; } -export function destination(code: EtsyCode, page: string, coupon: string | null = null): string { - const url = new URL(etsyListings[code]); - url.search = ''; - url.searchParams.set('ref', `site-${page}`); - url.searchParams.set('utm_source', 'thedigitalkitbag'); - url.searchParams.set('utm_medium', 'site'); - url.searchParams.set('utm_campaign', page); - url.searchParams.set('utm_content', code); - if (coupon) url.searchParams.set('coupon', coupon); - return url.toString(); -} - function esc(s: string): string { return s.replace(/[&<>"']/g, (c) => ({ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''' })[c] as string); } -function page(dest: string): string { +function page(dest: string, kind: "listing" | "shop" = "listing"): string { const d = esc(dest); return ` @@ -64,7 +52,7 @@ function page(dest: string): string {
-

Taking you to our Etsy listing…

+

Taking you to our Etsy ${kind === "shop" ? "shop" : "listing"}…

Continue to Etsy

Back to The Digital Kitbag

@@ -75,14 +63,22 @@ function page(dest: string): string { export const onRequestGet = async ({ request, params }: Ctx): Promise => { const raw = Array.isArray(params.code) ? params.code[0] : params.code; - const m = /^etsy-(p0[1-5])$/.exec(raw ?? ''); - if (!m) { - return new Response('Not found', { status: 404, headers: { 'Cache-Control': 'no-store', 'X-Robots-Tag': 'noindex' } }); - } - const code = m[1] as EtsyCode; const url = new URL(request.url); - const dest = destination(code, sanitisePage(url.searchParams.get('page')), sanitiseCoupon(url.searchParams.get('coupon'))); - return new Response(page(dest), { + const pageSlug = sanitisePage(url.searchParams.get('page')); + const coupon = sanitiseCoupon(url.searchParams.get('coupon')); + let dest: string; + let kind: 'listing' | 'shop' = 'listing'; + if ((raw ?? '') === 'etsy-shop') { + dest = shopDestination(pageSlug, coupon); + kind = 'shop'; + } else { + const m = /^etsy-(p0[1-5])$/.exec(raw ?? ''); + if (!m) { + return new Response('Not found', { status: 404, headers: { 'Cache-Control': 'no-store', 'X-Robots-Tag': 'noindex' } }); + } + dest = listingDestination(m[1] as EtsyCode, pageSlug, coupon); + } + return new Response(page(dest, kind), { status: 200, headers: { ...SECURITY_HEADERS, diff --git a/package.json b/package.json index cf3d995..b9f09cf 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "dev": "astro dev --port 4391 --host 127.0.0.1", "build": "astro build", "preview": "astro preview --port 4392 --host 127.0.0.1", - "test": "node --experimental-strip-types scripts/test-rate.ts", + "test": "node --experimental-strip-types scripts/test-rate.ts && node --experimental-strip-types scripts/test-tagged-links.ts && node --experimental-strip-types scripts/test-go.ts", "check:dist": "node scripts/check-dist.mjs", "astro": "astro" }, diff --git a/scripts/test-go.ts b/scripts/test-go.ts new file mode 100644 index 0000000..303fce4 --- /dev/null +++ b/scripts/test-go.ts @@ -0,0 +1,27 @@ +import assert from 'node:assert/strict'; +import { listingDestination, sanitiseCoupon, shopDestination } from '../src/config.ts'; + +const shop = shopDestination('em-261127-shop', sanitiseCoupon('BFCM15')); +const shopUrl = new URL(shop); +assert.equal(shopUrl.origin + shopUrl.pathname, 'https://thedigitalkitbag.etsy.com/'); +assert.equal(shopUrl.searchParams.get('ref'), 'site-em-261127-shop'); +assert.equal(shopUrl.searchParams.get('utm_source'), 'thedigitalkitbag'); +assert.equal(shopUrl.searchParams.get('utm_medium'), 'site'); +assert.equal(shopUrl.searchParams.get('utm_campaign'), 'em-261127-shop'); +assert.equal(shopUrl.searchParams.get('utm_content'), 'shop'); +assert.equal(shopUrl.searchParams.get('coupon'), 'BFCM15'); + +const noCoupon = new URL(shopDestination('home', sanitiseCoupon('SAVE50'))); +assert.equal(noCoupon.searchParams.get('coupon'), null); +assert.equal(noCoupon.searchParams.get('utm_content'), 'shop'); +assert.equal(noCoupon.searchParams.get('ref'), 'site-home'); + +const listing = new URL(listingDestination('p02', 'em-bas-3', sanitiseCoupon(null))); +assert.equal(listing.searchParams.get('utm_content'), 'p02'); +assert.equal(listing.searchParams.get('coupon'), null); +assert.match(listing.href, /etsy\.com\/listing\//); + +const partner = new URL(listingDestination('p05', 'x', sanitiseCoupon('partner20'))); +assert.equal(partner.searchParams.get('coupon'), 'PARTNER20'); + +console.log('go hop checks passed'); diff --git a/scripts/test-tagged-links.ts b/scripts/test-tagged-links.ts index c1ad7d3..090a514 100644 --- a/scripts/test-tagged-links.ts +++ b/scripts/test-tagged-links.ts @@ -27,7 +27,7 @@ assert.equal(taggedDestination('a'.repeat(41)), null); // Query strings on the request are not part of the code and cannot retarget it. assert.equal(taggedDestination('ig-bio?dest=https://evil.example'), null); -assert.equal(Object.keys(taggedRoutes).length, 214); +assert.equal(Object.keys(taggedRoutes).length, 241); for (const [code, dest] of Object.entries(taggedRoutes)) { assert.match(code, /^[a-z0-9-]{1,40}$/); assert.equal(isSameSitePath(dest), true, `${code} destination must be same-site`); @@ -44,6 +44,19 @@ assert.equal(taggedDestination('em-270128'), '/free/car-logbook/download/'); assert.equal(taggedDestination('em-261127'), '/go/etsy-p05/?page=em-261127&coupon=BFCM15'); assert.equal(isSameSitePath('/downloads/TDK-BAS-Quarter-Checklist.xlsx'), true); assert.equal(isSameSitePath('/go/etsy-p05/?page=em-261127&coupon=BFCM15'), true); +assert.equal(isSameSitePath('/go/etsy-shop/?page=em-261127-shop&coupon=BFCM15'), true); +assert.equal(taggedDestination('em-bas-3'), '/go/etsy-p02/?page=em-bas-3'); +assert.equal(taggedDestination('em-bas-4'), '/go/etsy-p05/?page=em-bas-4'); +assert.equal(taggedDestination('em-261203'), '/go/etsy-p03/?page=em-261203'); +assert.equal(taggedDestination('em-261127-shop'), '/go/etsy-shop/?page=em-261127-shop&coupon=BFCM15'); +assert.equal(taggedDestination('pt-bookkeeping-central'), '/'); +assert.equal(taggedDestination('pt-behind-the-tools'), '/'); +assert.equal(taggedDestination('tt-v23'), '/tools/rate-calculator/'); +assert.equal(taggedDestination('ig-v23'), '/tools/rate-calculator/'); +assert.equal(taggedDestination('tt-v24'), '/go/etsy-p03/?page=tt-v24'); +assert.equal(taggedDestination('tt-v25'), '/go/etsy-p01/?page=tt-v25'); +assert.equal(taggedDestination('tt-v26'), '/go/etsy-p02/?page=tt-v26'); +assert.equal(taggedDestination('ig-v26'), '/go/etsy-p02/?page=ig-v26'); assert.equal(sanitiseCoupon('BFCM15'), 'BFCM15'); assert.equal(sanitiseCoupon('bfcm15'), 'BFCM15'); diff --git a/src/config.ts b/src/config.ts index 3575436..ea98cfe 100644 --- a/src/config.ts +++ b/src/config.ts @@ -9,6 +9,8 @@ export const brandAssetVersion = '20261117b'; export const etsy = { shop: 'https://www.etsy.com/shop/TheDigitalKitbag', + /** Shop hop used by /go/etsy-shop/. */ + shopHop: 'https://thedigitalkitbag.etsy.com', chargeOutRateCalculator: 'https://www.etsy.com/listing/4619115309/charge-out-rate-calculator-australia-job', gettingPaidKit: 'https://www.etsy.com/listing/4619124012/quote-and-invoice-templates-australia', @@ -131,6 +133,14 @@ export const taggedRoutes = { 'ig-v21': '/tools/rate-calculator/', 'tt-v22': '/go/etsy-p03/?page=tt-v22', 'ig-v22': '/go/etsy-p03/?page=ig-v22', + 'tt-v23': '/tools/rate-calculator/', + 'ig-v23': '/tools/rate-calculator/', + 'tt-v24': '/go/etsy-p03/?page=tt-v24', + 'ig-v24': '/go/etsy-p03/?page=ig-v24', + 'tt-v25': '/go/etsy-p01/?page=tt-v25', + 'ig-v25': '/go/etsy-p01/?page=ig-v25', + 'tt-v26': '/go/etsy-p02/?page=tt-v26', + 'ig-v26': '/go/etsy-p02/?page=ig-v26', // Pinterest 'pin-01': '/blog/tax-invoice-requirements-australia/', 'pin-02': '/blog/tax-invoice-requirements-australia/', @@ -283,8 +293,27 @@ export const taggedRoutes = { 'pt-the-site-shed': '/', 'pt-builders-coach': '/', 'pt-builders-business-blackbelt': '/', + 'pt-bookkeeping-central': '/', + 'pt-lava-bookkeeping': '/', + 'pt-elite-plus-accounting': '/', + 'pt-rv-advisory-group': '/', + 'pt-sterix': '/', + 'pt-the-perth-bookkeeper': '/', + 'pt-peer': '/', + 'pt-egt': '/', + 'pt-cae': '/', + 'pt-gtnt-group': '/', + 'pt-mpa-tasmania': '/', + 'pt-landscape-queensland': '/', + 'pt-mriaq': '/', + 'pt-tradie-intel': '/', + 'pt-behind-the-tools': '/', // Kitbag Email 'em-261127': '/go/etsy-p05/?page=em-261127&coupon=BFCM15', + 'em-261127-shop': '/go/etsy-shop/?page=em-261127-shop&coupon=BFCM15', + 'em-bas-3': '/go/etsy-p02/?page=em-bas-3', + 'em-bas-4': '/go/etsy-p05/?page=em-bas-4', + 'em-261203': '/go/etsy-p03/?page=em-261203', 'em-wel-1a': '/downloads/TDK-Charge-Out-Rate-Check.xlsx', 'em-wel-1b': '/downloads/TDK-BAS-Quarter-Checklist.xlsx', 'em-wel-1c': '/downloads/TDK-Charge-Out-Rate-Check.xlsx', @@ -336,7 +365,7 @@ export function taggedDestination(code: string): string | null { return dest; } -/** Coupons the /go/etsy-p0x/ click-through may append to the Etsy URL. Anything else is dropped. */ +/** Coupons the /go/etsy-p0x/ and /go/etsy-shop/ click-throughs may append to the Etsy URL. Anything else is dropped. */ export const allowedCoupons = ['BFCM15', 'PARTNER20'] as const; export type AllowedCoupon = (typeof allowedCoupons)[number]; @@ -345,3 +374,25 @@ export function sanitiseCoupon(raw: string | null): AllowedCoupon | null { const v = raw.trim().toUpperCase(); return (allowedCoupons as readonly string[]).includes(v) ? (v as AllowedCoupon) : null; } + +/** Build an Etsy hop URL with ref=site- and the standard UTM tags. */ +export function etsyHopUrl(base: string, page: string, content: string, coupon: string | null = null): string { + const url = new URL(base); + url.search = ''; + url.searchParams.set('ref', `site-${page}`); + url.searchParams.set('utm_source', 'thedigitalkitbag'); + url.searchParams.set('utm_medium', 'site'); + url.searchParams.set('utm_campaign', page); + url.searchParams.set('utm_content', content); + if (coupon) url.searchParams.set('coupon', coupon); + return url.toString(); +} + +export function listingDestination(code: EtsyCode, page: string, coupon: string | null = null): string { + return etsyHopUrl(etsyListings[code], page, code, coupon); +} + +/** Shop hop: https://thedigitalkitbag.etsy.com with the same ref/utm pattern, utm_content=shop. */ +export function shopDestination(page: string, coupon: string | null = null): string { + return etsyHopUrl(etsy.shopHop, page, 'shop', coupon); +}