Sure up some things with browserAccessType

server/db/pg/schema/schema.ts

@@ -159,7 +159,8 @@ export const resources = pgTable("resources", {
     maintenanceEstimatedTime: text("maintenanceEstimatedTime"),
     postAuthPath: text("postAuthPath"),
     health: varchar("health").default("unknown"), // "healthy", "unhealthy", "unknown"
-    wildcard: boolean("wildcard").notNull().default(false)
+    wildcard: boolean("wildcard").notNull().default(false),
+    browserAccessType: text("browserAccessType").default("http") // rdp, ssh, http, vnc
 });
 
 export const targets = pgTable("targets", {
@@ -196,9 +197,11 @@ export const targetHealthCheck = pgTable("targetHealthCheck", {
             onDelete: "cascade"
         })
         .notNull(),
-    siteId: integer("siteId").references(() => sites.siteId, {
+    siteId: integer("siteId")
+        .references(() => sites.siteId, {
             onDelete: "cascade"
-    }).notNull(),
+        })
+        .notNull(),
     name: varchar("name"),
     hcEnabled: boolean("hcEnabled").notNull().default(false),
     hcPath: varchar("hcPath"),
@@ -1097,7 +1100,9 @@ export const roundTripMessageTracker = pgTable("roundTripMessageTracker", {
     complete: boolean("complete").notNull().default(false)
 });
 
-export const statusHistory = pgTable("statusHistory", {
+export const statusHistory = pgTable(
+    "statusHistory",
+    {
         id: serial("id").primaryKey(),
         entityType: varchar("entityType").notNull(),
         entityId: integer("entityId").notNull(),
@@ -1105,11 +1110,20 @@ export const statusHistory = pgTable("statusHistory", {
             .notNull()
             .references(() => orgs.orgId, { onDelete: "cascade" }),
         status: varchar("status").notNull(),
-    timestamp: integer("timestamp").notNull(),
+        timestamp: integer("timestamp").notNull()
-}, (table) => [
+    },
-    index("idx_statusHistory_entity").on(table.entityType, table.entityId, table.timestamp),
+    (table) => [
-    index("idx_statusHistory_org_timestamp").on(table.orgId, table.timestamp),
+        index("idx_statusHistory_entity").on(
-]);
+            table.entityType,
+            table.entityId,
+            table.timestamp
+        ),
+        index("idx_statusHistory_org_timestamp").on(
+            table.orgId,
+            table.timestamp
+        )
+    ]
+);
 
 export type Org = InferSelectModel<typeof orgs>;
 export type User = InferSelectModel<typeof users>;

server/db/sqlite/schema/schema.ts

@@ -180,7 +180,8 @@ export const resources = sqliteTable("resources", {
     maintenanceEstimatedTime: text("maintenanceEstimatedTime"),
     postAuthPath: text("postAuthPath"),
     health: text("health").default("unknown"), // "healthy", "unhealthy", "unknown"
-    wildcard: integer("wildcard", { mode: "boolean" }).notNull().default(false)
+    wildcard: integer("wildcard", { mode: "boolean" }).notNull().default(false),
+    browserAccessType: text("browserAccessType").default("http") // rdp, ssh, http, vnc
 });
 
 export const targets = sqliteTable("targets", {
@@ -219,9 +220,11 @@ export const targetHealthCheck = sqliteTable("targetHealthCheck", {
             onDelete: "cascade"
         })
         .notNull(),
-    siteId: integer("siteId").references(() => sites.siteId, {
+    siteId: integer("siteId")
+        .references(() => sites.siteId, {
             onDelete: "cascade"
-    }).notNull(),
+        })
+        .notNull(),
     name: text("name"),
     hcEnabled: integer("hcEnabled", { mode: "boolean" })
         .notNull()
@@ -1196,7 +1199,9 @@ export const roundTripMessageTracker = sqliteTable("roundTripMessageTracker", {
     complete: integer("complete", { mode: "boolean" }).notNull().default(false)
 });
 
-export const statusHistory = sqliteTable("statusHistory", {
+export const statusHistory = sqliteTable(
+    "statusHistory",
+    {
         id: integer("id").primaryKey({ autoIncrement: true }),
         entityType: text("entityType").notNull(), // "site" | "healthCheck"
         entityId: integer("entityId").notNull(), // siteId or targetHealthCheckId
@@ -1204,11 +1209,20 @@ export const statusHistory = sqliteTable("statusHistory", {
             .notNull()
             .references(() => orgs.orgId, { onDelete: "cascade" }),
         status: text("status").notNull(), // "online"/"offline" for sites; "healthy"/"unhealthy"/"unknown" for healthChecks
-    timestamp: integer("timestamp").notNull(), // unix epoch seconds
+        timestamp: integer("timestamp").notNull() // unix epoch seconds
-}, (table) => [
+    },
-    index("idx_statusHistory_entity").on(table.entityType, table.entityId, table.timestamp),
+    (table) => [
-    index("idx_statusHistory_org_timestamp").on(table.orgId, table.timestamp),
+        index("idx_statusHistory_entity").on(
-]);
+            table.entityType,
+            table.entityId,
+            table.timestamp
+        ),
+        index("idx_statusHistory_org_timestamp").on(
+            table.orgId,
+            table.timestamp
+        )
+    ]
+);
 
 export type Org = InferSelectModel<typeof orgs>;
 export type User = InferSelectModel<typeof users>;

server/routers/resource/listResources.ts

@@ -141,6 +141,7 @@ export type ResourceWithTargets = {
     headerAuthId: number | null;
     wildcard: boolean;
     health: string | null;
+    browserAccessType: string | null;
     targets: Array<{
         targetId: number;
         ip: string;
@@ -178,7 +179,8 @@ function queryResourcesBase() {
             headerAuthId: resourceHeaderAuth.headerAuthId,
             headerAuthExtendedCompatibilityId:
                 resourceHeaderAuthExtendedCompatibility.headerAuthExtendedCompatibilityId,
-            health: resources.health
+            health: resources.health,
+            browserAccessType: resources.browserAccessType
         })
         .from(resources)
         .leftJoin(
@@ -478,6 +480,7 @@ export async function listResources(
                     protocol: row.protocol,
                     proxyPort: row.proxyPort,
                     wildcard: row.wildcard,
+                    browserAccessType: row.browserAccessType,
                     enabled: row.enabled,
                     domainId: row.domainId,
                     headerAuthId: row.headerAuthId,

server/routers/resource/updateResource.ts

@@ -24,7 +24,10 @@ import {
 import { registry } from "@server/openApi";
 import { OpenAPITags } from "@server/openApi";
 import { createCertificate } from "#dynamic/routers/certificates/createCertificate";
-import { validateAndConstructDomain, checkWildcardDomainConflict } from "@server/lib/domainUtils";
+import {
+    validateAndConstructDomain,
+    checkWildcardDomainConflict
+} from "@server/lib/domainUtils";
 import { build } from "@server/build";
 import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
@@ -68,7 +71,8 @@ const updateHttpResourceBodySchema = z
         maintenanceTitle: z.string().max(255).nullable().optional(),
         maintenanceMessage: z.string().max(2000).nullable().optional(),
         maintenanceEstimatedTime: z.string().max(100).nullable().optional(),
-        postAuthPath: z.string().nullable().optional()
+        postAuthPath: z.string().nullable().optional(),
+        browserAccessType: z.enum(["http", "ssh", "rdp", "vnc"]).optional()
     })
     .refine((data) => Object.keys(data).length > 0, {
         error: "At least one field must be provided for update"

src/app/[orgId]/settings/resources/proxy/[niceId]/general/page.tsx

@@ -507,7 +507,9 @@ export default function GeneralForm() {
                     name: data.name,
                     niceId: data.niceId,
                     subdomain: data.subdomain
-                        ? toASCII(finalizeSubdomainSanitize(data.subdomain, true))
+                        ? toASCII(
+                              finalizeSubdomainSanitize(data.subdomain, true)
+                          )
                         : undefined,
                     domainId: data.domainId,
                     proxyPort: data.proxyPort
@@ -555,7 +557,9 @@ export default function GeneralForm() {
     return (
         <>
             <SettingsContainer>
-                {resource?.resourceId && resource?.orgId && (
+                {resource?.resourceId &&
+                    resource?.orgId &&
+                    resource.browserAccessType == "http" && (
                         <UptimeAlertSection
                             orgId={resource.orgId}
                             resourceId={resource.resourceId}

src/app/[orgId]/settings/resources/proxy/[niceId]/proxy/page.tsx

@@ -121,6 +121,10 @@ export default function ReverseProxyTargetsPage(props: {
     const params = use(props.params);
     const { resource, updateResource } = useResourceContext();
 
+    const [targetMode, setTargetMode] = useState<
+        "http" | "ssh" | "rdp" | "vnc"
+    >((resource.browserAccessType as "http" | "ssh" | "rdp" | "vnc") || "http");
+
     const { data: remoteTargets = [], isLoading: isLoadingTargets } = useQuery(
         resourceQueries.resourceTargets({
             resourceId: resource.resourceId
@@ -137,9 +141,12 @@ export default function ReverseProxyTargetsPage(props: {
                 orgId={params.orgId}
                 initialTargets={remoteTargets}
                 resource={resource}
+                targetMode={targetMode}
+                setTargetMode={setTargetMode}
+                updateResource={updateResource}
             />
 
-            {resource.http && (
+            {resource.http && targetMode === "http" && (
                 <ProxyResourceHttpForm
                     resource={resource}
                     updateResource={updateResource}
@@ -159,11 +166,17 @@ export default function ReverseProxyTargetsPage(props: {
 function ProxyResourceTargetsForm({
     orgId,
     initialTargets,
-    resource
+    resource,
+    targetMode,
+    setTargetMode,
+    updateResource
 }: {
     initialTargets: LocalTarget[];
     orgId: string;
     resource: GetResourceResponse;
+    targetMode: "http" | "ssh" | "rdp" | "vnc";
+    setTargetMode: (mode: "http" | "ssh" | "rdp" | "vnc") => void;
+    updateResource: ResourceContextType["updateResource"];
 }) {
     const t = useTranslations();
     const api = createApiClient(useEnvContext());
@@ -201,9 +214,6 @@ function ProxyResourceTargetsForm({
     const [selectedTargetForHealthCheck, setSelectedTargetForHealthCheck] =
         useState<LocalTarget | null>(null);
 
-    const [targetMode, setTargetMode] = useState<
-        "http" | "ssh" | "rdp" | "vnc"
-    >("http");
     const [bgDestination, setBgDestination] = useState("");
     const [bgDestinationPort, setBgDestinationPort] = useState("");
     const [bgSiteId, setBgSiteId] = useState<number | null>(null);
@@ -938,11 +948,30 @@ function ProxyResourceTargetsForm({
                         <span className="text-sm font-medium">Target Type</span>
                         <Select
                             value={targetMode}
-                            onValueChange={(v) =>
+                            onValueChange={async (v) => {
-                                setTargetMode(
+                                const mode = v as
-                                    v as "http" | "ssh" | "rdp" | "vnc"
+                                    | "http"
+                                    | "ssh"
+                                    | "rdp"
+                                    | "vnc";
+                                setTargetMode(mode);
+                                try {
+                                    await api.post(
+                                        `/resource/${resource.resourceId}`,
+                                        { browserAccessType: mode }
+                                    );
+                                    updateResource({ browserAccessType: mode });
+                                } catch (err) {
+                                    toast({
+                                        variant: "destructive",
+                                        title: t("settingsErrorUpdate"),
+                                        description: formatAxiosError(
+                                            err,
+                                            t("settingsErrorUpdateDescription")
                                         )
+                                    });
                                 }
+                            }}
                         >
                             <SelectTrigger className="w-36">
                                 <SelectValue />

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

@@ -125,6 +125,7 @@ export default async function ProxyResourcesPage(
             fullDomain: resource.fullDomain ?? null,
             ssl: resource.ssl,
             wildcard: resource.wildcard,
+            browserAccessType: resource.browserAccessType,
             targets: resource.targets?.map((target) => ({
                 targetId: target.targetId,
                 ip: target.ip,

src/components/ProxyResourcesTable.tsx

@@ -82,6 +82,7 @@ export type ResourceRow = {
     name: string;
     orgId: string;
     domain: string;
+    browserAccessType: string | null;
     authState: string;
     http: boolean;
     protocol: string;
@@ -493,6 +494,12 @@ export default function ProxyResourcesTable({
             ),
             cell: ({ row }) => {
                 const resourceRow = row.original;
+                if (
+                    !resourceRow.http ||
+                    resourceRow.browserAccessType !== "http"
+                ) {
+                    return <span>-</span>;
+                }
                 return (
                     <TargetStatusCell
                         targets={resourceRow.targets}
@@ -521,6 +528,12 @@ export default function ProxyResourcesTable({
             header: () => <span className="p-3">{t("uptime30d")}</span>,
             cell: ({ row }) => {
                 const resourceRow = row.original;
+                if (
+                    !resourceRow.http ||
+                    resourceRow.browserAccessType !== "http"
+                ) {
+                    return <span>-</span>;
+                }
                 return <UptimeMiniBar resourceId={resourceRow.id} days={30} />;
             }
         },