Fix types

messages/en-US.json

@@ -2411,6 +2411,7 @@
     "editInternalResourceDialogModeCidr": "CIDR",
     "editInternalResourceDialogModeHttp": "HTTP",
     "editInternalResourceDialogModeHttps": "HTTPS",
+    "editInternalResourceDialogModeInference": "Inference",
     "editInternalResourceDialogModeSsh": "SSH",
     "editInternalResourceDialogScheme": "Scheme",
     "editInternalResourceDialogEnableSsl": "Enable TLS",

server/db/pg/schema/schema.ts

@@ -197,7 +197,9 @@ export const resources = pgTable(
         wildcard: boolean("wildcard").notNull().default(false),
         mode: text("mode")
             .default("http")
-            .$type<"rdp" | "ssh" | "http" | "vnc" | "inference">()
+            .$type<
+                "rdp" | "ssh" | "http" | "vnc" | "inference" | "tcp" | "udp"
+            >()
             .notNull(),
         pamMode: varchar("pamMode", { length: 32 })
             .$type<"passthrough" | "push">()

server/db/sqlite/schema/schema.ts

@@ -206,7 +206,7 @@ export const resources = sqliteTable("resources", {
     wildcard: integer("wildcard", { mode: "boolean" }).notNull().default(false),
     mode: text("mode")
         .default("http")
-        .$type<"rdp" | "ssh" | "http" | "vnc" | "inference">()
+        .$type<"rdp" | "ssh" | "http" | "vnc" | "inference" | "tcp" | "udp">()
         .notNull(), // rdp, ssh, http, vnc, inference
     pamMode: text("pamMode")
         .$type<"passthrough" | "push">()

server/private/lib/traefik/getTraefikConfig.ts

@@ -18,6 +18,7 @@ import {
     domains,
     exitNodes,
     loginPage,
+    SiteResource,
     targetHealthCheck
 } from "@server/db";
 import {
@@ -359,7 +360,7 @@ export async function getTraefikConfig(
     let siteResourcesWithFullDomain: {
         siteResourceId: number;
         fullDomain: string | null;
-        mode: "http" | "host" | "cidr" | "ssh";
+        mode: SiteResource["mode"];
     }[] = [];
     if (
         build == "enterprise" &&

server/routers/launcher/formatLauncherAccess.ts

@@ -1,7 +1,8 @@
+import { SiteResource } from "@server/db";
 import { formatEndpoint, parseEndpoint } from "@server/lib/ip";
 
 export type SiteResourceDestinationInput = {
-    mode: "host" | "cidr" | "http" | "ssh";
+    mode: SiteResource["mode"];
     destination: string | null;
     destinationPort: number | null;
     scheme: "http" | "https" | null;

server/routers/resource/createResource.ts

@@ -44,11 +44,11 @@ const createResourceParamsSchema = z.strictObject({
 });
 
 function resolveModeFromLegacyFields(data: {
-    mode?: "http" | "ssh" | "rdp" | "vnc" | "tcp" | "udp";
+    mode?: "http" | "ssh" | "rdp" | "vnc" | "tcp" | "udp" | "inference";
     http?: boolean;
     protocol?: "tcp" | "udp";
 }): {
-    mode?: "http" | "ssh" | "rdp" | "vnc" | "tcp" | "udp";
+    mode?: "http" | "ssh" | "rdp" | "vnc" | "tcp" | "udp" | "inference";
     error?: string;
 } {
     if (data.mode) {

server/routers/resource/listResources.ts

@@ -637,11 +637,12 @@ export async function listResources(
                     ${resourcePassword.passwordId}
                 )
             `;
-            const browserGatewayModes = ["http", "ssh", "rdp", "vnc"];
+            const browserGatewayModes = ["http", "ssh", "rdp", "vnc"] as const;
 
             switch (authState) {
                 case "none":
                     conditions.push(
+                        // TODO: Does inference belong here?
                         or(eq(resources.mode, "tcp"), eq(resources.mode, "udp"))
                     );
                     break;

src/app/[orgId]/settings/resources/private/page.tsx

@@ -1,5 +1,5 @@
 import PrivateResourcesBanner from "@app/components/PrivateResourcesBanner";
-import type { InternalResourceRow } from "@app/components/PrivateResourcesTable";
+import type { PrivateResourceRow } from "@app/components/PrivateResourcesTable";
 import PrivateResourcesTable from "@app/components/PrivateResourcesTable";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { internal } from "@app/lib/api";
@@ -61,7 +61,7 @@ export default async function ClientResourcesPage(
         redirect(`/${params.orgId}/settings/resources`);
     }
 
-    const internalResourceRows: InternalResourceRow[] = siteResources.map(
+    const internalResourceRows: PrivateResourceRow[] = siteResources.map(
         (siteResource) => {
             return {
                 id: siteResource.siteResourceId,

src/app/[orgId]/settings/resources/public/create/page.tsx

@@ -206,7 +206,7 @@ function createAddTargetSchema(t: TranslateFn) {
         );
 }
 
-type NewResourceType = "http" | "ssh" | "rdp" | "vnc" | "tcp" | "udp";
+type NewResourceType = "http" | "ssh" | "rdp" | "vnc" | "tcp" | "udp" | "inference";
 
 type CreateBgTargetFormValues = SshSettingsFormValues;
 

src/components/PrivateResourcesTable.tsx

@@ -69,20 +69,21 @@ import { LabelColumnFilterButton } from "./LabelColumnFilterButton";
 import { LabelsTableCell } from "./LabelsTableCell";
 import { ControlledDataTable } from "./ui/controlled-data-table";
 import { SitesColumnFilterButton } from "./SitesColumnFilterButton";
+import { SiteResource } from "@server/db";
 
-export type InternalResourceSiteRow = ResourceSiteRow;
+export type PrivateResourceSiteRow = ResourceSiteRow;
 
-export type InternalResourceRow = {
+export type PrivateResourceRow = {
     id: number;
     name: string;
     orgId: string;
-    sites: InternalResourceSiteRow[];
+    sites: PrivateResourceSiteRow[];
     siteNames: string[];
     siteAddresses: (string | null)[];
     siteIds: number[];
     siteNiceIds: string[];
     // mode: "host" | "cidr" | "port";
-    mode: "host" | "cidr" | "http" | "ssh";
+    mode: SiteResource["mode"];
     scheme: "http" | "https" | null;
     ssl: boolean;
     // protocol: string | null;
@@ -109,7 +110,7 @@ export type InternalResourceRow = {
     }>;
 };
 
-function formatDestinationDisplay(row: InternalResourceRow): string {
+function formatDestinationDisplay(row: PrivateResourceRow): string {
     return formatSiteResourceDestinationDisplay({
         mode: row.mode,
         destination: row.destination,
@@ -133,7 +134,7 @@ const booleanSearchFilterSchema = z
     .catch(undefined);
 
 type ClientResourcesTableProps = {
-    internalResources: InternalResourceRow[];
+    internalResources: PrivateResourceRow[];
     orgId: string;
     pagination: PaginationState;
     rowCount: number;
@@ -164,10 +165,10 @@ export default function PrivateResourcesTable({
     const [isNavigatingToAddPage, startNavigation] = useTransition();
 
     const [selectedInternalResource, setSelectedInternalResource] =
-        useState<InternalResourceRow | null>(null);
+        useState<PrivateResourceRow | null>(null);
     const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
     const [editingResource, setEditingResource] =
-        useState<InternalResourceRow | null>();
+        useState<PrivateResourceRow | null>();
     const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
 
     const [isRefreshing, startRefreshTransition] = useTransition();
@@ -241,9 +242,9 @@ export default function PrivateResourcesTable({
     };
 
     const internalColumns = useMemo<
-        ExtendedColumnDef<InternalResourceRow>[]
+        ExtendedColumnDef<PrivateResourceRow>[]
     >(() => {
-        const cols: ExtendedColumnDef<InternalResourceRow>[] = [
+        const cols: ExtendedColumnDef<PrivateResourceRow>[] = [
             {
                 accessorKey: "name",
                 enableHiding: false,
@@ -364,15 +365,12 @@ export default function PrivateResourcesTable({
                 ),
                 cell: ({ row }) => {
                     const resourceRow = row.original;
-                    const modeLabels: Record<
+                    const modeLabels: Record<SiteResource["mode"], string> = {
-                        "host" | "cidr" | "port" | "http" | "ssh",
-                        string
-                    > = {
                         host: t("editInternalResourceDialogModeHost"),
                         cidr: t("editInternalResourceDialogModeCidr"),
-                        port: t("editInternalResourceDialogModePort"),
                         http: t("editInternalResourceDialogModeHttp"),
-                        ssh: t("editInternalResourceDialogModeSsh")
+                        ssh: t("editInternalResourceDialogModeSsh"),
+                        inference: t("editInternalResourceDialogModeInference")
                     };
                     return <span>{modeLabels[resourceRow.mode]}</span>;
                 }
@@ -521,7 +519,7 @@ export default function PrivateResourcesTable({
                         className="p-3"
                     />
                 ),
-                cell: ({ row }: { row: { original: InternalResourceRow } }) => (
+                cell: ({ row }: { row: { original: PrivateResourceRow } }) => (
                     <ClientResourceLabelCell
                         resource={row.original}
                         orgId={orgId}
@@ -697,7 +695,7 @@ export default function PrivateResourcesTable({
 }
 
 type ClientResourceLabelCellProps = {
-    resource: InternalResourceRow;
+    resource: PrivateResourceRow;
     orgId: string;
 };
 
@@ -723,7 +721,7 @@ function ClientResourceLabelCell({
 }
 
 type InternalResourceEnabledFormProps = {
-    resource: InternalResourceRow;
+    resource: PrivateResourceRow;
     onToggleInternalResourceEnabled: (
         val: boolean,
         resourceId: number

src/components/SiteResourceInfoBox.tsx

@@ -93,7 +93,8 @@ export function SiteResourceInfoSections({
         host: t("editInternalResourceDialogModeHost"),
         cidr: t("editInternalResourceDialogModeCidr"),
         http: t("editInternalResourceDialogModeHttp"),
-        ssh: t("editInternalResourceDialogModeSsh")
+        ssh: t("editInternalResourceDialogModeSsh"),
+        inference: t("editInternalResourceDialogModeInference")
     };
 
     const destination = formatSiteResourceDestinationDisplay({

src/components/SiteResourcesOverview.tsx

@@ -70,7 +70,8 @@ function PrivateResourceMeta({ row }: { row: SiteResourceRow }) {
         host: t("editInternalResourceDialogModeHost"),
         cidr: t("editInternalResourceDialogModeCidr"),
         http: t("editInternalResourceDialogModeHttp"),
-        ssh: t("editInternalResourceDialogModeSsh")
+        ssh: t("editInternalResourceDialogModeSsh"),
+        inference: t("editInternalResourceDialogModeInference")
     };
     const dest = formatSiteResourceDestinationDisplay({
         mode: row.mode,

src/lib/formatSiteResourceAccess.ts

@@ -1,5 +1,7 @@
+import { SiteResource } from "@server/db";
+
 export type SiteResourceDestinationInput = {
-    mode: "host" | "cidr" | "http" | "ssh";
+    mode: SiteResource["mode"];
     destination: string | null;
     destinationPort: number | null;
     scheme: "http" | "https" | null;

src/lib/privateResourceForm.ts

@@ -1,9 +1,10 @@
 import { z } from "zod";
-import type { InternalResourceRow } from "@app/components/PrivateResourcesTable";
+import type { PrivateResourceRow } from "@app/components/PrivateResourcesTable";
+import { SiteResource } from "@server/db";
 
-export type PrivateResourceMode = "host" | "cidr" | "http" | "ssh";
+export type PrivateResourceMode = SiteResource["mode"];
 
-export type SiteResourceData = InternalResourceRow & {
+export type SiteResourceData = PrivateResourceRow & {
     enabled: boolean;
 };