@serve.zone/dcrouter 16.2.1 → 16.3.0

package/ts_web/elements/network/ops-view-special-forwards.ts

@@ -4,12 +4,18 @@ import {
   cssManager,
   customElement,
   html,
+  property,
   state,
   type TemplateResult,
 } from '@design.estate/dees-element';
 import * as appstate from '../../appstate.js';
 import * as interfaces from '../../../dist_ts_interfaces/index.js';
 import { viewHostCss } from '../shared/css.js';
+import {
+  getRouteOwner,
+  routeMatchesOwner,
+  type TRouteOwnerFilter,
+} from './route-view-filters.js';
 
 const managedRouteKind = 'letsencrypt-http01-forward' as const;
 
@@ -40,6 +46,9 @@ function getTarget(route: interfaces.data.IMergedRoute): { host: string; port: n
 
 @customElement('ops-view-special-forwards')
 export class OpsViewSpecialForwards extends DeesElement {
+  @property({ type: String })
+  accessor ownerFilter: TRouteOwnerFilter = 'all';
+
   @state()
   accessor routeState: appstate.IRouteManagementState = appstate.routeManagementStatePart.getState()!;
 
@@ -98,7 +107,7 @@ export class OpsViewSpecialForwards extends DeesElement {
   public render(): TemplateResult {
     const forwards = this.routeState.mergedRoutes.filter((route) => {
       return route.metadata?.managedRouteKind === managedRouteKind
-        && route.metadata.ownerType !== 'gatewayClient';
+        && routeMatchesOwner(route, this.ownerFilter);
     });
 
     return html`
@@ -120,9 +129,15 @@ export class OpsViewSpecialForwards extends DeesElement {
           .showColumnFilters=${true}
           .displayFunction=${(route: interfaces.data.IMergedRoute) => {
             const target = getTarget(route);
+            const owner = getRouteOwner(route);
             return {
               Status: route.enabled ? 'Enabled' : 'Disabled',
               Type: 'Let\'s Encrypt HTTP-01',
+              Owner: owner === 'operator'
+                ? 'User'
+                : owner === 'gatewayClient'
+                  ? 'Gateway Client'
+                  : 'System',
               Name: route.route.name || route.id,
               Domains: getDomains(route).join(', '),
               Path: route.route.match.path || '-',
@@ -132,12 +147,16 @@ export class OpsViewSpecialForwards extends DeesElement {
             };
           }}
           .dataActions=${[
-            {
-              name: 'Add HTTP-01 Forward',
-              iconName: 'lucide:plus',
-              type: ['header' as const],
-              actionFunc: async () => this.showForwardDialog(),
-            },
+            ...(this.ownerFilter === 'all' || this.ownerFilter === 'operator'
+              ? [
+                  {
+                    name: 'Add HTTP-01 Forward',
+                    iconName: 'lucide:plus',
+                    type: ['header' as const],
+                    actionFunc: async () => this.showForwardDialog(),
+                  },
+                ]
+              : []),
             {
               name: 'Refresh',
               iconName: 'lucide:refreshCw',
@@ -148,6 +167,9 @@ export class OpsViewSpecialForwards extends DeesElement {
               name: 'Edit',
               iconName: 'lucide:pencil',
               type: ['inRow', 'contextmenu'] as any,
+              actionRelevancyCheckFunc: (route: interfaces.data.IMergedRoute) => {
+                return getRouteOwner(route) === 'operator';
+              },
               actionFunc: async (actionData: any) => {
                 await this.showForwardDialog(actionData.item as interfaces.data.IMergedRoute);
               },
@@ -156,6 +178,9 @@ export class OpsViewSpecialForwards extends DeesElement {
               name: 'Enable / Disable',
               iconName: 'lucide:power',
               type: ['inRow', 'contextmenu'] as any,
+              actionRelevancyCheckFunc: (route: interfaces.data.IMergedRoute) => {
+                return getRouteOwner(route) === 'operator';
+              },
               actionFunc: async (actionData: any) => {
                 const route = actionData.item as interfaces.data.IMergedRoute;
                 await appstate.routeManagementStatePart.dispatchAction(
@@ -168,6 +193,9 @@ export class OpsViewSpecialForwards extends DeesElement {
               name: 'Delete',
               iconName: 'lucide:trash2',
               type: ['inRow', 'contextmenu'] as any,
+              actionRelevancyCheckFunc: (route: interfaces.data.IMergedRoute) => {
+                return getRouteOwner(route) === 'operator';
+              },
               actionFunc: async (actionData: any) => {
                 await this.confirmDelete(actionData.item as interfaces.data.IMergedRoute);
               },

package/ts_web/elements/network/ops-view-vpn.ts

@@ -515,7 +515,7 @@ export class OpsViewVpn extends DeesElement {
             name: 'Enable',
             iconName: 'lucide:power',
             type: ['contextmenu', 'inRow'],
-            actionRelevancyCheckFunc: (actionData: any) => !actionData.item.enabled,
+            actionRelevancyCheckFunc: (client: any) => !client.enabled,
             actionFunc: async (actionData: any) => {
               const client = actionData.item as interfaces.data.IVpnClient;
               await appstate.vpnStatePart.dispatchAction(appstate.toggleVpnClientAction, {
@@ -528,7 +528,7 @@ export class OpsViewVpn extends DeesElement {
             name: 'Disable',
             iconName: 'lucide:power',
             type: ['contextmenu', 'inRow'],
-            actionRelevancyCheckFunc: (actionData: any) => actionData.item.enabled,
+            actionRelevancyCheckFunc: (client: any) => client.enabled,
             actionFunc: async (actionData: any) => {
               const client = actionData.item as interfaces.data.IVpnClient;
               await appstate.vpnStatePart.dispatchAction(appstate.toggleVpnClientAction, {

package/ts_web/elements/network/route-view-filters.ts

@@ -0,0 +1,43 @@
+import {
+  canonicalizeSourceRouteId,
+  type IHttpRedirectInfo,
+  type IMergedRoute,
+} from '../../../dist_ts_interfaces/data/route-management.js';
+
+export type TRouteOwnerFilter = 'all' | 'operator' | 'gatewayClient' | 'system';
+export type TResolvedRouteOwner = Exclude<TRouteOwnerFilter, 'all'>;
+
+export function getRouteOwner(route: IMergedRoute): TResolvedRouteOwner {
+  if (route.metadata?.ownerType === 'gatewayClient') return 'gatewayClient';
+  if (route.metadata?.ownerType === 'system') return 'system';
+  if (route.metadata?.ownerType === 'operator') return 'operator';
+  return route.origin === 'api' ? 'operator' : 'system';
+}
+
+export function routeMatchesOwner(
+  route: IMergedRoute,
+  ownerFilter: TRouteOwnerFilter,
+): boolean {
+  return ownerFilter === 'all' || getRouteOwner(route) === ownerFilter;
+}
+
+function getCanonicalRouteIds(route: IMergedRoute): string[] {
+  const configuredRouteId = (route.route as { id?: string }).id;
+  return [route.id, configuredRouteId]
+    .filter((routeId): routeId is string => Boolean(routeId))
+    .map(canonicalizeSourceRouteId);
+}
+
+export function redirectMatchesOwner(
+  redirect: IHttpRedirectInfo,
+  mergedRoutes: IMergedRoute[],
+  ownerFilter: TRouteOwnerFilter,
+): boolean {
+  if (ownerFilter === 'all') return true;
+
+  const sourceRouteIds = new Set(redirect.sourceRouteIds.map(canonicalizeSourceRouteId));
+  return mergedRoutes.some((route) => {
+    return getCanonicalRouteIds(route).some((routeId) => sourceRouteIds.has(routeId))
+      && getRouteOwner(route) === ownerFilter;
+  });
+}

package/ts_web/elements/security/ops-view-security-blocked.ts

@@ -268,7 +268,7 @@ export class OpsViewSecurityBlocked extends DeesElement {
         name: 'Enable',
         iconName: 'lucide:play',
         type: ['contextmenu'] as any,
-        actionRelevancyCheckFunc: (actionData: any) => !actionData.item.enabled,
+        actionRelevancyCheckFunc: (entry: any) => !entry.enabled,
         actionFunc: async (actionData: any) => {
           const rule = actionData.item as interfaces.data.ISecurityBlockRule;
           await appstate.securityPolicyStatePart.dispatchAction(appstate.updateSecurityBlockRuleAction, {
@@ -281,7 +281,7 @@ export class OpsViewSecurityBlocked extends DeesElement {
         name: 'Disable',
         iconName: 'lucide:pause',
         type: ['contextmenu'] as any,
-        actionRelevancyCheckFunc: (actionData: any) => actionData.item.enabled,
+        actionRelevancyCheckFunc: (entry: any) => entry.enabled,
         actionFunc: async (actionData: any) => {
           const rule = actionData.item as interfaces.data.ISecurityBlockRule;
           await appstate.securityPolicyStatePart.dispatchAction(appstate.updateSecurityBlockRuleAction, {
@@ -331,7 +331,7 @@ export class OpsViewSecurityBlocked extends DeesElement {
         name: 'Block Network Range',
         iconName: 'lucide:network',
         type: ['contextmenu'] as any,
-        actionRelevancyCheckFunc: (actionData: any) => Boolean(actionData.item.networkRange),
+        actionRelevancyCheckFunc: (entry: any) => Boolean(entry.networkRange),
         actionFunc: async (actionData: any) => {
           const record = actionData.item as interfaces.data.IIpIntelligenceRecord;
           await this.showRuleDialog(undefined, {
@@ -345,7 +345,7 @@ export class OpsViewSecurityBlocked extends DeesElement {
         name: 'Block ASN',
         iconName: 'lucide:radio-tower',
         type: ['contextmenu'] as any,
-        actionRelevancyCheckFunc: (actionData: any) => Boolean(actionData.item.asn),
+        actionRelevancyCheckFunc: (entry: any) => Boolean(entry.asn),
         actionFunc: async (actionData: any) => {
           const record = actionData.item as interfaces.data.IIpIntelligenceRecord;
           await this.showRuleDialog(undefined, {
@@ -359,7 +359,7 @@ export class OpsViewSecurityBlocked extends DeesElement {
         name: 'Block Organization',
         iconName: 'lucide:building-2',
         type: ['contextmenu'] as any,
-        actionRelevancyCheckFunc: (actionData: any) => Boolean(actionData.item.asnOrg || actionData.item.registrantOrg),
+        actionRelevancyCheckFunc: (entry: any) => Boolean(entry.asnOrg || entry.registrantOrg),
         actionFunc: async (actionData: any) => {
           const record = actionData.item as interfaces.data.IIpIntelligenceRecord;
           await this.showRuleDialog(undefined, {

package/ts_web/readme.md

@@ -29,12 +29,12 @@ For reporting bugs, issues, or security vulnerabilities, please visit [community
 
 ## Routes Navigation
 
-The `/network/routes` view uses two levels of tabs:
+The `/network/routes` view uses two adjacent, independent multitoggles:
 
-- primary sections: **Standard Routes**, **Special Forwards**, and **Redirects**
-- ownership filters within Standard Routes: **All**, **Operator**, **Gateway Client**, and **System**
+- type: **All**, **Standard**, **Redirect**, and **Special**
+- owner: **All**, **User**, **Gateway Client**, and **System**
 
-Special Forwards create server-managed Let's Encrypt HTTP-01 routes for exact domains and a selected inline or Network Target backend. Redirects remain a derived runtime view. Tab state is stored in the `tab` and `owner` query parameters so deep links and browser history remain stable; the legacy `/network/redirects` URL is normalized to `/network/routes?tab=redirects`.
+The owner selection filters every displayed route projection. **All** keeps Standard, Special, and Redirect routes in separate sections rather than mixing unlike rows. Special routes include managed Let's Encrypt HTTP-01 forwards for exact domains and a selected inline or Network Target backend; non-user routes are read-only. Redirects remain a derived runtime view and inherit ownership from their canonical source routes. Filter state is stored in the `tab` and `owner` query parameters so deep links and browser history remain stable; the legacy `/network/redirects` URL is normalized to `/network/routes?tab=redirects`.
 
 ## Runtime Communication