Fix all 14 open Sentry issues

src/app/(profile)/profile/[destinyMembershipId]/page.tsx

@@ -10,6 +10,7 @@ import {
 } from "~/lib/profile/prefetch"
 import { type ProfileProps } from "~/lib/profile/types"
 import { bungieProfileIconUrl } from "~/util/destiny"
+import { isValidDestinyMembershipId } from "~/util/destiny/routeParams"
 
 export const revalidate = 0
 
@@ -19,7 +20,27 @@ type PageProps = {
     }
 }
 
+function isBenignLinkedProfilesError(err: unknown): boolean {
+    if (err instanceof DOMException && err.name === "AbortError") {
+        return true
+    }
+
+    if (err instanceof Error) {
+        return (
+            err.name === "AbortError" ||
+            err.message.includes("aborted") ||
+            err.message.includes("Operation failed after")
+        )
+    }
+
+    return false
+}
+
 export default async function Page({ params }: PageProps) {
+    if (!isValidDestinyMembershipId(params.destinyMembershipId)) {
+        notFound()
+    }
+
     // Find the app profile by id if it exists
     const [appProfile, basicProfile] = await Promise.all([
         getUniqueProfileByDestinyMembershipId(params.destinyMembershipId),
@@ -32,7 +53,13 @@ export default async function Page({ params }: PageProps) {
 
         const linkedProfilesResponse = await prefetchDestinyLinkedProfiles(
             params.destinyMembershipId
-        )
+        ).catch(err => {
+            if (isBenignLinkedProfilesError(err)) {
+                return null
+            }
+
+            throw err
+        })
         const applicableMemberships = linkedProfilesResponse?.profiles.filter(
             m => m.applicableMembershipTypes.length > 0
         )
@@ -85,6 +112,15 @@ export default async function Page({ params }: PageProps) {
 }
 
 export async function generateMetadata({ params }: PageProps): Promise<Metadata> {
+    if (!isValidDestinyMembershipId(params.destinyMembershipId)) {
+        return {
+            robots: {
+                follow: true,
+                index: false
+            }
+        }
+    }
+
     const [profile, basic] = await Promise.all([
         getUniqueProfileByDestinyMembershipId(params.destinyMembershipId),
         prefetchRaidHubPlayerBasic(params.destinyMembershipId)

src/app/clan/[groupId]/page.tsx

@@ -1,14 +1,24 @@
 import { type Metadata } from "next"
+import { notFound } from "next/navigation"
 import { ClanComponent } from "~/components/__deprecated__/clan/Clan"
 import { PageWrapper } from "~/components/PageWrapper"
 import { baseMetadata } from "~/lib/metadata"
 import { fixClanName } from "~/util/destiny/fixClanName"
+import { isValidClanGroupId } from "~/util/destiny/routeParams"
 import { getClan, type PageProps } from "../server"
 
 export const revalidate = 0
 
 export default async function Page({ params }: PageProps) {
+    if (!isValidClanGroupId(params.groupId)) {
+        notFound()
+    }
+
     const clan = await getClan(params.groupId)
+    if (!clan) {
+        notFound()
+    }
+
     return (
         <PageWrapper>
             <ClanComponent clan={clan} groupId={params.groupId} />
@@ -17,6 +27,10 @@ export default async function Page({ params }: PageProps) {
 }
 
 export async function generateMetadata({ params }: PageProps): Promise<Metadata> {
+    if (!isValidClanGroupId(params.groupId)) {
+        return {}
+    }
+
     const clan = await getClan(params.groupId)
 
     if (!clan) return {}

src/app/clan/server.ts

@@ -16,7 +16,7 @@ const clanClient = new ServerBungieClient({
     timeout: 6000
 })
 
-const expectedErrorCodes = [1, 621, 622, 686]
+const expectedErrorCodes = [1, 7, 621, 622, 686]
 
 export const getClan = reactRequestDedupe(async (groupId: string) =>
     getGroup(clanClient, { groupId })

src/components/__deprecated__/profile/raids/raids.module.css

@@ -223,6 +223,12 @@
     cursor: pointer;
 }
 
+.dot > circle,
+.dot > polygon,
+.dot > svg {
+    pointer-events: none;
+}
+
 .dot:hover circle {
     r: 8;
 }

src/components/profile/raids/finder/InstanceFinder.tsx

@@ -7,7 +7,8 @@ import { OptionalWrapper } from "~/components/OptionalWrapper"
 import { usePageProps } from "~/components/PageWrapper"
 import { useSession } from "~/hooks/app/useSession"
 import { type ProfileProps } from "~/lib/profile/types"
-import { useInstances } from "~/services/raidhub/useRaidHubInstances"
+import { RaidHubError } from "~/services/raidhub/RaidHubError"
+import { RETRIABLE_RAIDHUB_ERROR_CODES, useInstances } from "~/services/raidhub/useRaidHubInstances"
 import { InstanceFinderForm } from "./InstanceFinderForm"
 import { InstanceTable } from "./InstanceTable"
 
@@ -88,7 +89,15 @@ const InstanceFinderInternal = memo(() => {
                 <div className="overflow-x-auto">
                     {state.isIdle && <p>Enter your search criteria above to find instances.</p>}
                     {state.isLoading && <p>Loading...</p>}
-                    {state.isError && <p>Error: {(state.error as Error).message}</p>}
+                    {state.isError && (
+                        <p>
+                            Error:{" "}
+                            {state.error instanceof RaidHubError &&
+                            RETRIABLE_RAIDHUB_ERROR_CODES.has(state.error.errorCode)
+                                ? "RaidHub is temporarily unavailable. Please try again in a moment."
+                                : (state.error as Error).message}
+                        </p>
+                    )}
                     {state.isSuccess && state.data.length === 0 && <p>No instances found.</p>}
                     {state.isSuccess && state.data.length > 0 && (
                         <InstanceTable instances={state.data} />

src/components/providers/LocaleManager.tsx

@@ -5,6 +5,15 @@ import { type DestinyManifestLanguage } from "bungie-net-core/manifest"
 import { userAgentFromString } from "next/server"
 import { createContext, useContext, useEffect, useState, type ReactNode } from "react"
 
+function isSupportedLocaleTag(locale: string): boolean {
+    const trimmed = locale.trim()
+    return trimmed.length > 0 && /^[a-z]{2,3}(-[a-z0-9]+)*$/i.test(trimmed)
+}
+
+function sanitizeNavigatorLocales(locales: readonly string[]): string[] {
+    return locales.filter(isSupportedLocaleTag)
+}
+
 const d2ManifestLocales = [
     "en",
     "fr",
@@ -37,9 +46,12 @@ export function LocaleManager(props: { children: ReactNode } | null) {
     const [manifestLanguage, setManifestLanguage] = useState<DestinyManifestLanguage>("en")
 
     useEffect(() => {
-        setLocale(navigator.language)
+        const sanitizedLanguages = sanitizeNavigatorLocales(navigator.languages)
+        const preferredLocale = sanitizeNavigatorLocales([navigator.language])[0] ?? "en-US"
+
+        setLocale(preferredLocale)
         const matchedLanguage = match(
-            navigator.languages,
+            sanitizedLanguages.length > 0 ? sanitizedLanguages : [preferredLocale],
             d2ManifestLocales.map(locale => {
                 const transformedLocale = locale
                     .replace(/-chs$/i, "-Hans")

src/instrumentation-client.ts

@@ -1,4 +1,5 @@
 import * as Sentry from "@sentry/nextjs"
+import { installBrowserCompatShims } from "./lib/browser-compat"
 import { beforeSendClientEvent } from "./lib/sentry/client"
 import {
     getSentryDsnForClient,
@@ -8,6 +9,8 @@ import {
 } from "./lib/sentry/env"
 import { sentrySharedOptions } from "./lib/sentry/shared-options"
 
+installBrowserCompatShims()
+
 const dsn = getSentryDsnForClient()
 
 if (dsn) {

src/lib/browser-compat.ts

@@ -0,0 +1,51 @@
+/**
+ * Early client shims for third-party scripts and embedded browsers that assume
+ * APIs our app does not provide. Loaded from instrumentation-client before React.
+ */
+export function installBrowserCompatShims(): void {
+    if (typeof window === "undefined") {
+        return
+    }
+
+    // Tampermonkey "open in new tab" scripts set SVGAElement.target (read-only in modern browsers).
+    try {
+        const proto = window.SVGAElement?.prototype
+        if (proto) {
+            const descriptor = Object.getOwnPropertyDescriptor(proto, "target")
+            if (descriptor && !descriptor.set) {
+                Object.defineProperty(proto, "target", {
+                    ...descriptor,
+                    set() {
+                        return
+                    },
+                    configurable: true
+                })
+            }
+        }
+    } catch {
+        // Read-only prototype in some environments — safe to continue.
+    }
+
+    // In-app browsers inject sendDataToNative expecting window.webkit.messageHandlers.
+    try {
+        if (!("webkit" in window)) {
+            const messageHandlers = new Proxy(
+                {},
+                {
+                    get: () => ({
+                        postMessage: () => {
+                            return
+                        }
+                    })
+                }
+            )
+
+            Object.defineProperty(window, "webkit", {
+                value: { messageHandlers },
+                configurable: true
+            })
+        }
+    } catch {
+        // Cannot define webkit — continue without shim.
+    }
+}

src/lib/profile/prefetch.ts

@@ -109,8 +109,16 @@ export const prefetchDestinyLinkedProfiles = reactRequestDedupe((membershipId: s
         .catch(e => {
             if (e instanceof BungiePlatformError) {
                 return null
-            } else {
-                throw e
             }
+
+            if (e instanceof DOMException && e.name === "AbortError") {
+                return null
+            }
+
+            if (e instanceof Error && (e.name === "AbortError" || e.message.includes("aborted"))) {
+                return null
+            }
+
+            throw e
         })
 )

src/lib/sentry/policy.ts

@@ -38,7 +38,9 @@ const HANDLED_RAIDHUB_ERROR_CODES = new Set<RaidHubErrorCode>([
     "PathValidationError",
     "QueryValidationError",
     "BodyValidationError",
-    "BungieServiceOffline"
+    "BungieServiceOffline",
+    "InternalServerError",
+    "ServiceUnavailableError"
 ])
 
 const HANDLED_TRPC_ERROR_CODES = new Set(["NOT_FOUND", "UNAUTHORIZED", "FORBIDDEN", "BAD_REQUEST"])
@@ -191,6 +193,12 @@ function isTransientTrpcHtmlError(error: unknown): boolean {
     return message.includes("Unexpected token '<'") || message.includes("<!DOCTYPE")
 }
 
+function isTransientBungieHtmlError(error: unknown): boolean {
+    return (
+        error instanceof BungieHTMLError && BaseBungieClient.TransientHttpStatuses.has(error.status)
+    )
+}
+
 /** Turso/libSQL blips — retried via saferFetch; still skip if all attempts fail. */
 function isTransientTursoPrismaError(error: unknown): boolean {
     const message = getErrorMessage(error)
@@ -288,6 +296,10 @@ export function shouldSkipCapture(error: unknown): boolean {
         return true
     }
 
+    if (isTransientBungieHtmlError(error)) {
+        return true
+    }
+
     if (isTransientTrpcHtmlError(error)) {
         return true
     }

src/services/bungie/BungieClient.ts

@@ -83,18 +83,24 @@ export default abstract class BaseBungieClient implements BungieClientProtocol {
     static readonly RetryableErrorCodes = new Set<PlatformErrorCodes>([
         1672, // DestinyThrottledByGameServer,
         1618, // DestinyUnexpectedError — Bungie 500 blips, often succeeds on retry
+        1626, // DestinyInternalError — transient Bungie 500 on clan/profile lookups
         1688 // DestinyDirectBabelClientTimeout
     ])
 
+    /** Cloudflare / Bungie HTML error pages — retry once before surfacing. */
+    static readonly TransientHttpStatuses = new Set([502, 503, 504, 520, 522, 524])
+
     static readonly ExpectedErrorCodes = new Set<PlatformErrorCodes>([
         5, // SystemDisabled
+        7, // ParameterParseFailure — invalid clan/group id in URL
         8, // ParameterInvalidRange — bad membership/type combos on clan lookups
         18, // InvalidParameters — bad membership/type combos on optional lookups (e.g. clans)
         217, // UserCannotResolveCentralAccount — player search miss
         686, // ClanNotFound
         1600, // DestinyAccountAcquisitionFailure — no linked Destiny account
         1601, // DestinyAccountNotFound — deleted/wrong-platform membership on profile
         1618, // DestinyUnexpectedError — Bungie-side 500, surfaced in UI as load failure
+        1626, // DestinyInternalError — Bungie-side blip on optional clan lookups
         1653, // PGCRNotFound
         1665, // DestinyPrivacyRestriction — private profile
         1688 // DestinyDirectBabelClientTimeout

src/services/bungie/ClientBungieClient.ts

@@ -1,7 +1,7 @@
 import type { BungieFetchConfig } from "bungie-net-core"
 import EventEmitter from "events"
 import { withBungieAuthFailure } from "~/lib/sentry/context"
-import { BungieHTTPError, BungiePlatformError } from "~/models/BungieAPIError"
+import { BungieHTMLError, BungieHTTPError, BungiePlatformError } from "~/models/BungieAPIError"
 import BaseBungieClient from "./BungieClient"
 
 export default class ClientBungieClient extends BaseBungieClient {
@@ -96,10 +96,18 @@ export default class ClientBungieClient extends BaseBungieClient {
                 })
             } else if (
                 err instanceof BungiePlatformError &&
-                ClientBungieClient.RetryableErrorCodes.has(err.ErrorCode)
+                ClientBungieClient.RetryableErrorCodes.has(err.ErrorCode) &&
+                !url.searchParams.has("retry")
             ) {
                 url.searchParams.set("retry", err.cause.ErrorStatus)
                 return this.request(url, payload)
+            } else if (
+                err instanceof BungieHTMLError &&
+                ClientBungieClient.TransientHttpStatuses.has(err.status) &&
+                !url.searchParams.has("retry")
+            ) {
+                url.searchParams.set("retry", `html-${err.status}`)
+                return this.request(url, payload)
             } else {
                 throw err
             }

src/services/bungie/ServerBungieClient.ts

@@ -3,7 +3,7 @@ import "server-only"
 import type { BungieFetchConfig } from "bungie-net-core"
 import { saferFetch } from "~/lib/server/saferFetch"
 import { baseUrl } from "~/lib/server/utils"
-import { BungiePlatformError } from "~/models/BungieAPIError"
+import { BungieHTMLError, BungiePlatformError } from "~/models/BungieAPIError"
 import BaseBungieClient from "~/services/bungie/BungieClient"
 
 export default class ServerBungieClient extends BaseBungieClient {
@@ -67,11 +67,21 @@ export default class ServerBungieClient extends BaseBungieClient {
                 console.error(err)
                 if (
                     err instanceof BungiePlatformError &&
-                    ServerBungieClient.RetryableErrorCodes.has(err.ErrorCode)
+                    ServerBungieClient.RetryableErrorCodes.has(err.ErrorCode) &&
+                    !url.searchParams.has("retry")
                 ) {
                     url.searchParams.set("retry", err.cause.ErrorStatus)
                     return this.request(url, payload) as T
                 }
+
+                if (
+                    err instanceof BungieHTMLError &&
+                    ServerBungieClient.TransientHttpStatuses.has(err.status) &&
+                    !url.searchParams.has("retry")
+                ) {
+                    url.searchParams.set("retry", `html-${err.status}`)
+                    return this.request(url, payload) as T
+                }
             }
             throw err
         }