Merge branch 'private-site-ha' into private-http-ha

2026-04-15 14:26:36 +00:00 · 2026-04-13 10:25:49 -07:00
parent aa41a63430 71497a7887
commit 561a9ab379
39 changed files with 1412 additions and 825 deletions
--- a/src/app/[orgId]/settings/domains/[domainId]/page.tsx
+++ b/src/app/[orgId]/settings/domains/[domainId]/page.tsx
@@ -10,6 +10,7 @@ import { authCookieHeader } from "@app/lib/api/cookies";
 import { GetDNSRecordsResponse } from "@server/routers/domain";
 import DNSRecordsTable from "@app/components/DNSRecordTable";
 import DomainCertForm from "@app/components/DomainCertForm";
+import { build } from "@server/build";

 interface DomainSettingsPageProps {
    params: Promise<{ domainId: string; orgId: string }>;
@@ -65,12 +66,14 @@ export default async function DomainSettingsPage({
                )}
            </div>
            <div className="space-y-6">
-                <DomainInfoCard
-                    failed={domain.failed}
-                    verified={domain.verified}
-                    type={domain.type}
-                    errorMessage={domain.errorMessage}
-                />
+                {build != "oss" && env.flags.usePangolinDns ? (
+                    <DomainInfoCard
+                        failed={domain.failed}
+                        verified={domain.verified}
+                        type={domain.type}
+                        errorMessage={domain.errorMessage}
+                    />
+                ) : null}

                <DNSRecordsTable records={dnsRecords} type={domain.type} />

--- a/src/app/[orgId]/settings/resources/client/page.tsx
+++ b/src/app/[orgId]/settings/resources/client/page.tsx
@@ -56,42 +56,29 @@ export default async function ClientResourcesPage(

    const internalResourceRows: InternalResourceRow[] = siteResources.map(
        (siteResource) => {
-            const rawMode = siteResource.mode as string | undefined;
-            const normalizedMode =
-                rawMode === "https"
-                    ? ("http" as const)
-                    : rawMode === "host" ||
-                        rawMode === "cidr" ||
-                        rawMode === "http"
-                      ? rawMode
-                      : ("host" as const);
            return {
                id: siteResource.siteResourceId,
                name: siteResource.name,
                orgId: params.orgId,
-                sites: [
-                    {
-                        siteId: siteResource.siteId,
-                        siteName: siteResource.siteName,
-                        siteNiceId: siteResource.siteNiceId,
-                        online: siteResource.siteOnline
-                    }
-                ],
-                siteName: siteResource.siteName,
-                siteAddress: siteResource.siteAddress || null,
-                mode: normalizedMode,
-                scheme:
-                    siteResource.scheme ??
-                    (rawMode === "https" ? ("https" as const) : null),
-                ssl: siteResource.ssl === true || rawMode === "https",
+                sites: siteResource.siteIds.map((siteId, idx) => ({
+                    siteId,
+                    siteName: siteResource.siteNames[idx],
+                    siteNiceId: siteResource.siteNiceIds[idx],
+                    online: siteResource.siteOnlines[idx]
+                })),
+                mode: siteResource.mode,
+                scheme: siteResource.scheme,
+                ssl: siteResource.ssl,
+                siteNames: siteResource.siteNames,
+                siteAddresses: siteResource.siteAddresses || null,
                // protocol: siteResource.protocol,
                // proxyPort: siteResource.proxyPort,
-                siteId: siteResource.siteId,
+                siteIds: siteResource.siteIds,
                destination: siteResource.destination,
                httpHttpsPort: siteResource.destinationPort ?? null,
                alias: siteResource.alias || null,
                aliasAddress: siteResource.aliasAddress || null,
-                siteNiceId: siteResource.siteNiceId,
+                siteNiceIds: siteResource.siteNiceIds,
                niceId: siteResource.niceId,
                tcpPortRangeString: siteResource.tcpPortRangeString || null,
                udpPortRangeString: siteResource.udpPortRangeString || null,
--- a/src/app/[orgId]/settings/resources/proxy/[niceId]/proxy/page.tsx
+++ b/src/app/[orgId]/settings/resources/proxy/[niceId]/proxy/page.tsx
@@ -678,6 +678,7 @@ function ProxyResourceTargetsForm({
        getPaginationRowModel: getPaginationRowModel(),
        getSortedRowModel: getSortedRowModel(),
        getFilteredRowModel: getFilteredRowModel(),
+        getRowId: (row) => String(row.targetId),
        state: {
            pagination: {
                pageIndex: 0,
--- a/src/app/[orgId]/settings/resources/proxy/create/page.tsx
+++ b/src/app/[orgId]/settings/resources/proxy/create/page.tsx
@@ -999,6 +999,7 @@ export default function Page() {
        getPaginationRowModel: getPaginationRowModel(),
        getSortedRowModel: getSortedRowModel(),
        getFilteredRowModel: getFilteredRowModel(),
+        getRowId: (row) => String(row.targetId),
        state: {
            pagination: {
                pageIndex: 0,
--- a/src/components/ClientResourcesTable.tsx
+++ b/src/components/ClientResourcesTable.tsx
@@ -20,6 +20,7 @@ import {
    ArrowDown01Icon,
    ArrowUp10Icon,
    ArrowUpDown,
+    ArrowUpRight,
    ChevronDown,
    ChevronsUpDownIcon,
    MoreHorizontal
@@ -52,16 +53,16 @@ export type InternalResourceRow = {
    name: string;
    orgId: string;
    sites: InternalResourceSiteRow[];
-    siteName: string;
-    siteAddress: string | null;
+    siteNames: string[];
+    siteAddresses: (string | null)[];
+    siteIds: number[];
+    siteNiceIds: string[];
    // mode: "host" | "cidr" | "port";
    mode: "host" | "cidr" | "http";
    scheme: "http" | "https" | null;
    ssl: boolean;
    // protocol: string | null;
    // proxyPort: number | null;
-    siteId: number;
-    siteNiceId: string;
    destination: string;
    httpHttpsPort: number | null;
    alias: string | null;
@@ -284,6 +285,60 @@ export default function ClientResourcesTable({
        }
    };

+    function SiteCell({ resourceRow }: { resourceRow: InternalResourceRow }) {
+        const { siteNames, siteNiceIds, orgId } = resourceRow;
+
+        if (!siteNames || siteNames.length === 0) {
+            return <span>-</span>;
+        }
+
+        if (siteNames.length === 1) {
+            return (
+                <Link
+                    href={`/${orgId}/settings/sites/${siteNiceIds[0]}`}
+                >
+                    <Button variant="outline">
+                        {siteNames[0]}
+                        <ArrowUpRight className="ml-2 h-4 w-4" />
+                    </Button>
+                </Link>
+            );
+        }
+
+        return (
+            <DropdownMenu>
+                <DropdownMenuTrigger asChild>
+                    <Button
+                        variant="outline"
+                        size="sm"
+                        className="flex items-center gap-2"
+                    >
+                        <span>
+                            {siteNames.length} {t("sites")}
+                        </span>
+                        <ChevronDown className="h-3 w-3" />
+                    </Button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="start">
+                    {siteNames.map((siteName, idx) => (
+                        <DropdownMenuItem
+                            key={siteNiceIds[idx]}
+                            asChild
+                        >
+                            <Link
+                                href={`/${orgId}/settings/sites/${siteNiceIds[idx]}`}
+                                className="flex items-center gap-2 cursor-pointer"
+                            >
+                                {siteName}
+                                <ArrowUpRight className="h-3 w-3" />
+                            </Link>
+                        </DropdownMenuItem>
+                    ))}
+                </DropdownMenuContent>
+            </DropdownMenu>
+        );
+    }
+
    const internalColumns: ExtendedColumnDef<InternalResourceRow>[] = [
        {
            accessorKey: "name",
@@ -334,8 +389,7 @@ export default function ClientResourcesTable({
        },
        {
            id: "sites",
-            accessorFn: (row) =>
-                row.sites.map((s) => s.siteName).join(", ") || row.siteName,
+            accessorFn: (row) => row.sites.map((s) => s.siteName).join(", "),
            friendlyName: t("sites"),
            header: () => <span className="p-3">{t("sites")}</span>,
            cell: ({ row }) => {
@@ -565,7 +619,7 @@ export default function ClientResourcesTable({
                    onConfirm={async () =>
                        deleteInternalResource(
                            selectedInternalResource!.id,
-                            selectedInternalResource!.siteId
+                            selectedInternalResource!.siteIds[0]
                        )
                    }
                    string={selectedInternalResource.name}
@@ -599,7 +653,11 @@ export default function ClientResourcesTable({
                <EditInternalResourceDialog
                    open={isEditDialogOpen}
                    setOpen={setIsEditDialogOpen}
-                    resource={editingResource}
+                    resource={{
+                        ...editingResource,
+                        siteName: editingResource.siteNames[0] ?? "",
+                        siteId: editingResource.siteIds[0]
+                    }}
                    orgId={orgId}
                    onSuccess={() => {
                        // Delay refresh to allow modal to close smoothly
--- a/src/components/CreateDomainForm.tsx
+++ b/src/components/CreateDomainForm.tsx
@@ -154,7 +154,7 @@ export default function CreateDomainForm({

    const punycodePreview = useMemo(() => {
        if (!baseDomain) return "";
-        const punycode = toPunycode(baseDomain);
+        const punycode = toPunycode(baseDomain.toLowerCase());
        return punycode !== baseDomain.toLowerCase() ? punycode : "";
    }, [baseDomain]);

@@ -239,21 +239,24 @@ export default function CreateDomainForm({
                            className="space-y-4"
                            id="create-domain-form"
                        >
-                            <FormField
-                                control={form.control}
-                                name="type"
-                                render={({ field }) => (
-                                    <FormItem>
-                                        <StrategySelect
-                                            options={domainOptions}
-                                            defaultValue={field.value}
-                                            onChange={field.onChange}
-                                            cols={1}
-                                        />
-                                        <FormMessage />
-                                    </FormItem>
-                                )}
-                            />
+                            {build != "oss" && env.flags.usePangolinDns ? (
+                                <FormField
+                                    control={form.control}
+                                    name="type"
+                                    render={({ field }) => (
+                                        <FormItem>
+                                            <StrategySelect
+                                                options={domainOptions}
+                                                defaultValue={field.value}
+                                                onChange={field.onChange}
+                                                cols={1}
+                                            />
+                                            <FormMessage />
+                                        </FormItem>
+                                    )}
+                                />
+                            ) : null}
+
                            <FormField
                                control={form.control}
                                name="baseDomain"
--- a/src/components/DeviceLoginForm.tsx
+++ b/src/components/DeviceLoginForm.tsx
@@ -319,6 +319,7 @@ export default function DeviceLoginForm({
                                        <div className="flex justify-center">
                                            <InputOTP
                                                maxLength={9}
+                                                pattern={REGEXP_ONLY_DIGITS_AND_CHARS}
                                                {...field}
                                                value={field.value
                                                    .replace(/-/g, "")
--- a/src/components/DomainPicker.tsx
+++ b/src/components/DomainPicker.tsx
@@ -2,6 +2,7 @@

 import { Alert, AlertDescription } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
 import {
    Command,
    CommandEmpty,
@@ -40,9 +41,12 @@ import {
    Check,
    CheckCircle2,
    ChevronsUpDown,
+    KeyRound,
    Zap
 } from "lucide-react";
 import { useTranslations } from "next-intl";
+import { usePaidStatus } from "@/hooks/usePaidStatus";
+import { TierFeature, tierMatrix } from "@server/lib/billing/tierMatrix";
 import { toUnicode } from "punycode";
 import { useCallback, useEffect, useMemo, useState } from "react";

@@ -95,6 +99,7 @@ export default function DomainPicker({
    const { env } = useEnvContext();
    const api = createApiClient({ env });
    const t = useTranslations();
+    const { hasSaasSubscription } = usePaidStatus();

    const { data = [], isLoading: loadingDomains } = useQuery(
        orgQueries.domains({ orgId })
@@ -694,6 +699,23 @@ export default function DomainPicker({
                </div>
            </div>

+            {build === "saas" &&
+                !hasSaasSubscription(
+                    tierMatrix[TierFeature.DomainNamespaces]
+                ) &&
+                !hideFreeDomain && (
+                    <Card className="mt-3 border-black-500/30 bg-linear-to-br from-black-500/10 via-background to-background overflow-hidden">
+                        <CardContent className="py-3 px-4">
+                            <div className="flex items-center gap-2.5 text-sm text-muted-foreground">
+                                <KeyRound className="size-4 shrink-0 text-black-500" />
+                                <span>
+                                    {t("domainPickerFreeDomainsPaidFeature")}
+                                </span>
+                            </div>
+                        </CardContent>
+                    </Card>
+                )}
+
            {/*showProvidedDomainSearch && build === "saas" && (
                <Alert>
                    <AlertCircle className="h-4 w-4" />
--- a/src/components/InviteStatusCard.tsx
+++ b/src/components/InviteStatusCard.tsx
@@ -39,7 +39,11 @@ export default function InviteStatusCard({
    const [loading, setLoading] = useState(true);
    const [error, setError] = useState("");
    const [type, setType] = useState<
-        "rejected" | "wrong_user" | "user_does_not_exist" | "not_logged_in" | "user_limit_exceeded"
+        | "rejected"
+        | "wrong_user"
+        | "user_does_not_exist"
+        | "not_logged_in"
+        | "user_limit_exceeded"
    >("rejected");

    useEffect(() => {
@@ -90,12 +94,12 @@ export default function InviteStatusCard({

            if (!user && type === "user_does_not_exist") {
                const redirectUrl = email
-                    ? `/auth/signup?redirect=/invite?token=${tokenParam}&email=${encodeURIComponent(email)}`
+                    ? `/auth/signup?redirect=/invite?token=${tokenParam}&email=${email}`
                    : `/auth/signup?redirect=/invite?token=${tokenParam}`;
                router.push(redirectUrl);
            } else if (!user && type === "not_logged_in") {
                const redirectUrl = email
-                    ? `/auth/login?redirect=/invite?token=${tokenParam}&email=${encodeURIComponent(email)}`
+                    ? `/auth/login?redirect=/invite?token=${tokenParam}&email=${email}`
                    : `/auth/login?redirect=/invite?token=${tokenParam}`;
                router.push(redirectUrl);
            } else {
@@ -109,7 +113,7 @@ export default function InviteStatusCard({
    async function goToLogin() {
        await api.post("/auth/logout", {});
        const redirectUrl = email
-            ? `/auth/login?redirect=/invite?token=${tokenParam}&email=${encodeURIComponent(email)}`
+            ? `/auth/login?redirect=/invite?token=${tokenParam}&email=${email}`
            : `/auth/login?redirect=/invite?token=${tokenParam}`;
        router.push(redirectUrl);
    }
@@ -117,7 +121,7 @@ export default function InviteStatusCard({
    async function goToSignup() {
        await api.post("/auth/logout", {});
        const redirectUrl = email
-            ? `/auth/signup?redirect=/invite?token=${tokenParam}&email=${encodeURIComponent(email)}`
+            ? `/auth/signup?redirect=/invite?token=${tokenParam}&email=${email}`
            : `/auth/signup?redirect=/invite?token=${tokenParam}`;
        router.push(redirectUrl);
    }
@@ -157,7 +161,9 @@ export default function InviteStatusCard({
                        Cannot Accept Invite
                    </p>
                    <p className="text-center text-sm">
-                        This organization has reached its user limit. Please contact the organization administrator to upgrade their plan before accepting this invite.
+                        This organization has reached its user limit. Please
+                        contact the organization administrator to upgrade their
+                        plan before accepting this invite.
                    </p>
                </div>
            );
--- a/src/components/PendingSitesTable.tsx
+++ b/src/components/PendingSitesTable.tsx
@@ -333,7 +333,8 @@ export default function PendingSitesTable({
                        "jupiter",
                        "saturn",
                        "uranus",
-                        "neptune"
+                        "neptune",
+                        "pluto"
                    ].includes(originalRow.exitNodeName.toLowerCase());

                if (isCloudNode) {
--- a/src/components/SitesTable.tsx
+++ b/src/components/SitesTable.tsx
@@ -342,7 +342,8 @@ export default function SitesTable({
                        "jupiter",
                        "saturn",
                        "uranus",
-                        "neptune"
+                        "neptune",
+                        "pluto"
                    ].includes(originalRow.exitNodeName.toLowerCase());

                if (isCloudNode) {
--- a/src/components/WorldMap.tsx
+++ b/src/components/WorldMap.tsx
@@ -164,7 +164,7 @@ const countryClass = cn(

 const highlightedCountryClass = cn(
    sharedCountryClass,
-    "stroke-2",
+    "stroke-[3]",
    "fill-[#f4f4f5]",
    "stroke-[#f36117]",
    "dark:fill-[#3f3f46]"
@@ -194,11 +194,20 @@ function drawInteractiveCountries(
    const path = setupProjetionPath();
    const data = parseWorldTopoJsonToGeoJsonFeatures();
    const svg = d3.select(element);
+    const countriesLayer = svg.append("g");
+    const hoverLayer = svg.append("g").style("pointer-events", "none");
+    const hoverPath = hoverLayer
+        .append("path")
+        .datum(null)
+        .attr("class", highlightedCountryClass)
+        .style("display", "none");

-    svg.selectAll("path")
+    countriesLayer
+        .selectAll("path")
        .data(data)
        .enter()
        .append("path")
+        .attr("data-country-path", "true")
        .attr("class", countryClass)
        .attr("d", path as never)

@@ -209,9 +218,10 @@ function drawInteractiveCountries(
                y,
                hoveredCountryAlpha3Code: country.properties.a3
            });
-            // brings country to front
-            this.parentNode?.appendChild(this);
-            d3.select(this).attr("class", highlightedCountryClass);
+            hoverPath
+                .datum(country)
+                .attr("d", path(country as any) as string)
+                .style("display", null);
        })

        .on("mousemove", function (event) {
@@ -221,7 +231,7 @@ function drawInteractiveCountries(

        .on("mouseout", function () {
            setTooltip({ x: 0, y: 0, hoveredCountryAlpha3Code: null });
-            d3.select(this).attr("class", countryClass);
+            hoverPath.style("display", "none");
        });

    return svg;
@@ -257,7 +267,7 @@ function colorInCountriesWithValues(
    const svg = d3.select(element);

    return svg
-        .selectAll("path")
+        .selectAll('path[data-country-path="true"]')
        .style("fill", (countryPath) => {
            const country = getCountryByCountryPath(countryPath);
            if (!country?.count) {