Compare commits

..

7 Commits

Author SHA1 Message Date
31a6510d8b v6.7.0
Some checks failed
Docker (tags) / security (push) Failing after 1s
Docker (tags) / test (push) Has been skipped
Docker (tags) / release (push) Has been skipped
Docker (tags) / metadata (push) Has been skipped
2026-02-17 11:56:54 +00:00
b5e760ae07 feat(remote-ingress): Support auto-derived effective listen ports, make listenPorts optional, add toggle action and refine remote ingress creation/management UI 2026-02-17 11:56:54 +00:00
ea32babaac v6.6.1
Some checks failed
Docker (tags) / security (push) Failing after 1s
Docker (tags) / test (push) Has been skipped
Docker (tags) / release (push) Has been skipped
Docker (tags) / metadata (push) Has been skipped
2026-02-17 10:57:27 +00:00
a4ddedaf46 fix(icons): standardize icon identifiers to lucide-prefixed names across operational views 2026-02-17 10:57:27 +00:00
7ce09c53ca v6.6.0
Some checks failed
Docker (tags) / security (push) Failing after 1s
Docker (tags) / test (push) Has been skipped
Docker (tags) / release (push) Has been skipped
Docker (tags) / metadata (push) Has been skipped
2026-02-17 10:55:31 +00:00
69be2295f1 feat(remoteingress): derive effective remote ingress listen ports from route configs and expose them via ops API 2026-02-17 10:55:31 +00:00
018efa32f6 v6.5.0
Some checks failed
Docker (tags) / security (push) Failing after 1s
Docker (tags) / test (push) Has been skipped
Docker (tags) / release (push) Has been skipped
Docker (tags) / metadata (push) Has been skipped
2026-02-16 22:42:30 +00:00
16 changed files with 315 additions and 97 deletions

View File

@@ -1,5 +1,39 @@
# Changelog # Changelog
## 2026-02-17 - 6.7.0 - feat(remote-ingress)
Support auto-derived effective listen ports, make listenPorts optional, add toggle action and refine remote ingress creation/management UI
- Add effectiveListenPorts?: number[] to IRemoteIngress interface (present in API responses)
- Make createRemoteIngressAction.listenPorts optional and update creation modal to allow empty ports (auto-derived)
- Add toggleRemoteIngressAction to enable/disable remote ingress edges and wire up Enable/Disable row/context-menu actions
- Update getPortsHtml to prefer manual listenPorts, fall back to effectiveListenPorts, show '(auto)' when derived and 'none' when no ports
- Standardize UI actions to use inRow/contextmenu and actionFunc signatures; update create modal to use explicit Cancel/Create menu options and collect form data programmatically
## 2026-02-17 - 6.6.1 - fix(icons)
standardize icon identifiers to lucide-prefixed names across operational views
- Replaced legacy/ambiguous icon names with 'lucide:...' identifiers in four UI modules: ts_web/elements/ops-view-certificates.ts, ops-view-network.ts, ops-view-overview.ts, and ops-view-security.ts.
- Updated common action/menu icons (e.g. arrowsRotate -> lucide:RefreshCw, magnifyingGlass -> lucide:Search, copy -> lucide:Copy, fileExport -> lucide:FileOutput).
- Mapped dashboard/tile icons to lucide equivalents (e.g. server -> lucide:Server, networkWired/sitemap -> lucide:Network, download/upload -> lucide:Download/Upload, microchip/memory -> lucide:Cpu/MemoryStick).
- Normalized alert and status icons to lucide names (e.g. triangleExclamation -> lucide:TriangleAlert, shield/userShield -> lucide:Shield/ShieldCheck, clock/clockRotateLeft -> lucide:Clock/History).
## 2026-02-17 - 6.6.0 - feat(remoteingress)
derive effective remote ingress listen ports from route configs and expose them via ops API
- Derive listen ports from SmartProxy route configs with remoteIngress.enabled; supports optional edgeFilter to target edges by id or tags.
- Add RemoteIngressManager.setRoutes(), derivePortsForEdge(), and getEffectiveListenPorts() which falls back to manual listenPorts when present.
- dcrouter now supplies route configs to RemoteIngressManager during initialization and when updating SmartProxy configuration to keep derived ports in sync.
- Ops API now returns effectiveListenPorts for edges; createRemoteIngress.listenPorts is optional and createEdge defaults listenPorts to an empty array.
- Bump dependency @serve.zone/remoteingress to ^3.0.4 to align types/behavior.
## 2026-02-16 - 6.5.0 - feat(ops-view-remoteingress)
add 'Create Edge Node' header action to remote ingress table and remove duplicate createNewAction
- Add a 'Create Edge Node' header action in dataActions that opens DeesModal to collect name, listenPorts and tags
- Parse comma-separated listenPorts into integer array and normalize optional tags
- Dispatch appstate.createRemoteIngressAction with the collected payload
- Remove the previously duplicated createNewAction prop from the dees-table
## 2026-02-16 - 6.4.5 - fix(remoteingress) ## 2026-02-16 - 6.4.5 - fix(remoteingress)
mark remote ingress data actions as row actions and bump @design.estate/dees-catalog dependency mark remote ingress data actions as row actions and bump @design.estate/dees-catalog dependency

View File

@@ -1,7 +1,7 @@
{ {
"name": "@serve.zone/dcrouter", "name": "@serve.zone/dcrouter",
"private": false, "private": false,
"version": "6.4.5", "version": "6.7.0",
"description": "A multifaceted routing service handling mail and SMS delivery functions.", "description": "A multifaceted routing service handling mail and SMS delivery functions.",
"type": "module", "type": "module",
"exports": { "exports": {
@@ -56,7 +56,7 @@
"@push.rocks/smartstate": "^2.0.30", "@push.rocks/smartstate": "^2.0.30",
"@push.rocks/smartunique": "^3.0.9", "@push.rocks/smartunique": "^3.0.9",
"@serve.zone/interfaces": "^5.3.0", "@serve.zone/interfaces": "^5.3.0",
"@serve.zone/remoteingress": "^3.0.2", "@serve.zone/remoteingress": "^3.0.4",
"@tsclass/tsclass": "^9.3.0", "@tsclass/tsclass": "^9.3.0",
"lru-cache": "^11.2.6", "lru-cache": "^11.2.6",
"uuid": "^13.0.0" "uuid": "^13.0.0"

10
pnpm-lock.yaml generated
View File

@@ -96,8 +96,8 @@ importers:
specifier: ^5.3.0 specifier: ^5.3.0
version: 5.3.0 version: 5.3.0
'@serve.zone/remoteingress': '@serve.zone/remoteingress':
specifier: ^3.0.2 specifier: ^3.0.4
version: 3.0.2 version: 3.0.4
'@tsclass/tsclass': '@tsclass/tsclass':
specifier: ^9.3.0 specifier: ^9.3.0
version: 9.3.0 version: 9.3.0
@@ -1340,8 +1340,8 @@ packages:
'@serve.zone/interfaces@5.3.0': '@serve.zone/interfaces@5.3.0':
resolution: {integrity: sha512-venO7wtDR9ixzD9NhdERBGjNKbFA5LL0yHw4eqGh0UpmvtXVc3SFG0uuHDilOKMZqZ8bttV88qVsFy1aSTJrtA==} resolution: {integrity: sha512-venO7wtDR9ixzD9NhdERBGjNKbFA5LL0yHw4eqGh0UpmvtXVc3SFG0uuHDilOKMZqZ8bttV88qVsFy1aSTJrtA==}
'@serve.zone/remoteingress@3.0.2': '@serve.zone/remoteingress@3.0.4':
resolution: {integrity: sha512-FnwNVO0Dn9xuNv0t81u6pjCizSeCyMjkRKm6wN5qycCdGFoJmFbBamHqV01KtK1KcgDTd7LX+PowSqKReNrBGw==} resolution: {integrity: sha512-ZD66Y8fvW7SjealziOlhaC7+Y/3gxQkZlj/X8rxgVHmGhlc/YQtn6H6LNVazbM88BXK5ns004Qo6ongAB6Ho0Q==}
'@sindresorhus/is@5.6.0': '@sindresorhus/is@5.6.0':
resolution: {integrity: sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==} resolution: {integrity: sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==}
@@ -6830,7 +6830,7 @@ snapshots:
'@push.rocks/smartlog-interfaces': 3.0.2 '@push.rocks/smartlog-interfaces': 3.0.2
'@tsclass/tsclass': 9.3.0 '@tsclass/tsclass': 9.3.0
'@serve.zone/remoteingress@3.0.2': '@serve.zone/remoteingress@3.0.4':
dependencies: dependencies:
'@push.rocks/qenv': 6.1.3 '@push.rocks/qenv': 6.1.3
'@push.rocks/smartrust': 1.2.1 '@push.rocks/smartrust': 1.2.1

View File

@@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@serve.zone/dcrouter', name: '@serve.zone/dcrouter',
version: '6.4.5', version: '6.7.0',
description: 'A multifaceted routing service handling mail and SMS delivery functions.' description: 'A multifaceted routing service handling mail and SMS delivery functions.'
} }

View File

@@ -956,6 +956,11 @@ export class DcRouter {
// Update configuration // Update configuration
this.options.smartProxyConfig = config; this.options.smartProxyConfig = config;
// Update routes on RemoteIngressManager so derived ports stay in sync
if (this.remoteIngressManager && config.routes) {
this.remoteIngressManager.setRoutes(config.routes as any[]);
}
// Start new SmartProxy with updated configuration (will include email routes if configured) // Start new SmartProxy with updated configuration (will include email routes if configured)
await this.setupSmartProxy(); await this.setupSmartProxy();
@@ -1587,6 +1592,10 @@ export class DcRouter {
this.remoteIngressManager = new RemoteIngressManager(this.storageManager); this.remoteIngressManager = new RemoteIngressManager(this.storageManager);
await this.remoteIngressManager.initialize(); await this.remoteIngressManager.initialize();
// Pass current routes so the manager can derive edge ports from remoteIngress-tagged routes
const currentRoutes = this.options.smartProxyConfig?.routes || [];
this.remoteIngressManager.setRoutes(currentRoutes as any[]);
// Create and start the tunnel manager // Create and start the tunnel manager
this.tunnelManager = new TunnelManager(this.remoteIngressManager, { this.tunnelManager = new TunnelManager(this.remoteIngressManager, {
tunnelPort: this.options.remoteIngressConfig.tunnelPort ?? 8443, tunnelPort: this.options.remoteIngressConfig.tunnelPort ?? 8443,

View File

@@ -20,10 +20,11 @@ export class RemoteIngressHandler {
if (!manager) { if (!manager) {
return { edges: [] }; return { edges: [] };
} }
// Return edges without secrets // Return edges without secrets, enriched with effective listen ports
const edges = manager.getAllEdges().map((e) => ({ const edges = manager.getAllEdges().map((e) => ({
...e, ...e,
secret: '********', // Never expose secrets via API secret: '********', // Never expose secrets via API
effectiveListenPorts: manager.getEffectiveListenPorts(e),
})); }));
return { edges }; return { edges };
}, },
@@ -47,7 +48,7 @@ export class RemoteIngressHandler {
const edge = await manager.createEdge( const edge = await manager.createEdge(
dataArg.name, dataArg.name,
dataArg.listenPorts, dataArg.listenPorts || [],
dataArg.tags, dataArg.tags,
); );

View File

@@ -1,9 +1,30 @@
import * as plugins from '../plugins.js'; import * as plugins from '../plugins.js';
import type { StorageManager } from '../storage/classes.storagemanager.js'; import type { StorageManager } from '../storage/classes.storagemanager.js';
import type { IRemoteIngress } from '../../ts_interfaces/data/remoteingress.js'; import type { IRemoteIngress, IDcRouterRouteConfig } from '../../ts_interfaces/data/remoteingress.js';
const STORAGE_PREFIX = '/remote-ingress/'; const STORAGE_PREFIX = '/remote-ingress/';
/**
* Flatten a port range (number | number[] | Array<{from, to}>) to a sorted unique number array.
*/
function extractPorts(portRange: number | number[] | Array<{ from: number; to: number }>): number[] {
const ports = new Set<number>();
if (typeof portRange === 'number') {
ports.add(portRange);
} else if (Array.isArray(portRange)) {
for (const entry of portRange) {
if (typeof entry === 'number') {
ports.add(entry);
} else if (typeof entry === 'object' && 'from' in entry && 'to' in entry) {
for (let p = entry.from; p <= entry.to; p++) {
ports.add(p);
}
}
}
}
return [...ports].sort((a, b) => a - b);
}
/** /**
* Manages CRUD for remote ingress edge registrations. * Manages CRUD for remote ingress edge registrations.
* Persists edge configs via StorageManager and provides * Persists edge configs via StorageManager and provides
@@ -12,6 +33,7 @@ const STORAGE_PREFIX = '/remote-ingress/';
export class RemoteIngressManager { export class RemoteIngressManager {
private storageManager: StorageManager; private storageManager: StorageManager;
private edges: Map<string, IRemoteIngress> = new Map(); private edges: Map<string, IRemoteIngress> = new Map();
private routes: IDcRouterRouteConfig[] = [];
constructor(storageManager: StorageManager) { constructor(storageManager: StorageManager) {
this.storageManager = storageManager; this.storageManager = storageManager;
@@ -30,12 +52,60 @@ export class RemoteIngressManager {
} }
} }
/**
* Store the current route configs for port derivation.
*/
public setRoutes(routes: IDcRouterRouteConfig[]): void {
this.routes = routes;
}
/**
* Derive listen ports for an edge from routes tagged with remoteIngress.enabled.
* When a route specifies edgeFilter, only edges whose id or tags match get that route's ports.
* When edgeFilter is absent, the route applies to all edges.
*/
public derivePortsForEdge(edgeId: string, edgeTags?: string[]): number[] {
const ports = new Set<number>();
for (const route of this.routes) {
if (!route.remoteIngress?.enabled) continue;
// Apply edge filter if present
const filter = route.remoteIngress.edgeFilter;
if (filter && filter.length > 0) {
const idMatch = filter.includes(edgeId);
const tagMatch = edgeTags?.some((tag) => filter.includes(tag)) ?? false;
if (!idMatch && !tagMatch) continue;
}
// Extract ports from the route match
if (route.match?.ports) {
for (const p of extractPorts(route.match.ports)) {
ports.add(p);
}
}
}
return [...ports].sort((a, b) => a - b);
}
/**
* Get the effective listen ports for an edge.
* Returns manual listenPorts if non-empty, otherwise derives ports from tagged routes.
*/
public getEffectiveListenPorts(edge: IRemoteIngress): number[] {
if (edge.listenPorts && edge.listenPorts.length > 0) {
return edge.listenPorts;
}
return this.derivePortsForEdge(edge.id, edge.tags);
}
/** /**
* Create a new edge registration. * Create a new edge registration.
*/ */
public async createEdge( public async createEdge(
name: string, name: string,
listenPorts: number[], listenPorts: number[] = [],
tags?: string[], tags?: string[],
): Promise<IRemoteIngress> { ): Promise<IRemoteIngress> {
const id = plugins.uuid.v4(); const id = plugins.uuid.v4();

View File

@@ -1,3 +1,5 @@
import type { IRouteConfig } from '@push.rocks/smartproxy';
/** /**
* A stored remote ingress edge registration. * A stored remote ingress edge registration.
*/ */
@@ -10,6 +12,8 @@ export interface IRemoteIngress {
tags?: string[]; tags?: string[];
createdAt: number; createdAt: number;
updatedAt: number; updatedAt: number;
/** Effective ports derived from route configs — only present in API responses. */
effectiveListenPorts?: number[];
} }
/** /**
@@ -23,3 +27,25 @@ export interface IRemoteIngressStatus {
lastHeartbeat: number | null; lastHeartbeat: number | null;
connectedAt: number | null; connectedAt: number | null;
} }
/**
* Route-level remote ingress configuration.
* When attached to a route, signals that traffic for this route
* should be accepted from remote edge nodes.
*/
export interface IRouteRemoteIngress {
/** Whether this route receives traffic from edge nodes */
enabled: boolean;
/** Optional filter: only edges whose id or tags match get this route's ports.
* When absent, the route applies to all edges. */
edgeFilter?: string[];
}
/**
* Extended route config used within dcrouter.
* Adds the optional `remoteIngress` property to SmartProxy's IRouteConfig.
* SmartProxy ignores unknown properties at runtime.
*/
export type IDcRouterRouteConfig = IRouteConfig & {
remoteIngress?: IRouteRemoteIngress;
};

View File

@@ -17,7 +17,7 @@ export interface IReq_CreateRemoteIngress extends plugins.typedrequestInterfaces
request: { request: {
identity?: authInterfaces.IIdentity; identity?: authInterfaces.IIdentity;
name: string; name: string;
listenPorts: number[]; listenPorts?: number[];
tags?: string[]; tags?: string[];
}; };
response: { response: {

View File

@@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@serve.zone/dcrouter', name: '@serve.zone/dcrouter',
version: '6.4.5', version: '6.7.0',
description: 'A multifaceted routing service handling mail and SMS delivery functions.' description: 'A multifaceted routing service handling mail and SMS delivery functions.'
} }

View File

@@ -821,7 +821,7 @@ export const fetchRemoteIngressAction = remoteIngressStatePart.createAction(asyn
export const createRemoteIngressAction = remoteIngressStatePart.createAction<{ export const createRemoteIngressAction = remoteIngressStatePart.createAction<{
name: string; name: string;
listenPorts: number[]; listenPorts?: number[];
tags?: string[]; tags?: string[];
}>(async (statePartArg, dataArg) => { }>(async (statePartArg, dataArg) => {
const context = getActionContext(); const context = getActionContext();
@@ -924,6 +924,34 @@ export const clearNewEdgeSecretAction = remoteIngressStatePart.createAction(
} }
); );
export const toggleRemoteIngressAction = remoteIngressStatePart.createAction<{
id: string;
enabled: boolean;
}>(async (statePartArg, dataArg) => {
const context = getActionContext();
const currentState = statePartArg.getState();
try {
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
interfaces.requests.IReq_UpdateRemoteIngress
>('/typedrequest', 'updateRemoteIngress');
await request.fire({
identity: context.identity,
id: dataArg.id,
enabled: dataArg.enabled,
});
await remoteIngressStatePart.dispatchAction(fetchRemoteIngressAction, null);
return statePartArg.getState();
} catch (error) {
return {
...currentState,
error: error instanceof Error ? error.message : 'Failed to toggle edge',
};
}
});
// Combined refresh action for efficient polling // Combined refresh action for efficient polling
async function dispatchCombinedRefreshAction() { async function dispatchCombinedRefreshAction() {
const context = getActionContext(); const context = getActionContext();

View File

@@ -175,7 +175,7 @@ export class OpsViewCertificates extends DeesElement {
title: 'Total Certificates', title: 'Total Certificates',
value: summary.total, value: summary.total,
type: 'number', type: 'number',
icon: 'shieldHalved', icon: 'lucide:ShieldHalf',
color: '#3b82f6', color: '#3b82f6',
}, },
{ {
@@ -183,7 +183,7 @@ export class OpsViewCertificates extends DeesElement {
title: 'Valid', title: 'Valid',
value: summary.valid, value: summary.valid,
type: 'number', type: 'number',
icon: 'check', icon: 'lucide:Check',
color: '#22c55e', color: '#22c55e',
}, },
{ {
@@ -191,7 +191,7 @@ export class OpsViewCertificates extends DeesElement {
title: 'Expiring Soon', title: 'Expiring Soon',
value: summary.expiring, value: summary.expiring,
type: 'number', type: 'number',
icon: 'clock', icon: 'lucide:Clock',
color: '#f59e0b', color: '#f59e0b',
}, },
{ {
@@ -199,7 +199,7 @@ export class OpsViewCertificates extends DeesElement {
title: 'Failed / Expired', title: 'Failed / Expired',
value: summary.failed + summary.expired, value: summary.failed + summary.expired,
type: 'number', type: 'number',
icon: 'triangleExclamation', icon: 'lucide:TriangleAlert',
color: '#ef4444', color: '#ef4444',
}, },
]; ];
@@ -211,7 +211,7 @@ export class OpsViewCertificates extends DeesElement {
.gridActions=${[ .gridActions=${[
{ {
name: 'Refresh', name: 'Refresh',
iconName: 'arrowsRotate', iconName: 'lucide:RefreshCw',
action: async () => { action: async () => {
await appstate.certificateStatePart.dispatchAction( await appstate.certificateStatePart.dispatchAction(
appstate.fetchCertificateOverviewAction, appstate.fetchCertificateOverviewAction,
@@ -243,7 +243,7 @@ export class OpsViewCertificates extends DeesElement {
.dataActions=${[ .dataActions=${[
{ {
name: 'Reprovision', name: 'Reprovision',
iconName: 'arrowsRotate', iconName: 'lucide:RefreshCw',
type: ['inRow'], type: ['inRow'],
actionFunc: async (actionData: { item: interfaces.requests.ICertificateInfo }) => { actionFunc: async (actionData: { item: interfaces.requests.ICertificateInfo }) => {
const cert = actionData.item; const cert = actionData.item;
@@ -270,7 +270,7 @@ export class OpsViewCertificates extends DeesElement {
}, },
{ {
name: 'View Details', name: 'View Details',
iconName: 'magnifyingGlass', iconName: 'lucide:Search',
type: ['doubleClick', 'contextmenu'], type: ['doubleClick', 'contextmenu'],
actionFunc: async (actionData: { item: interfaces.requests.ICertificateInfo }) => { actionFunc: async (actionData: { item: interfaces.requests.ICertificateInfo }) => {
const cert = actionData.item; const cert = actionData.item;
@@ -289,7 +289,7 @@ export class OpsViewCertificates extends DeesElement {
menuOptions: [ menuOptions: [
{ {
name: 'Copy Domain', name: 'Copy Domain',
iconName: 'copy', iconName: 'lucide:Copy',
action: async () => { action: async () => {
await navigator.clipboard.writeText(cert.domain); await navigator.clipboard.writeText(cert.domain);
}, },

View File

@@ -287,7 +287,7 @@ export class OpsViewNetwork extends DeesElement {
.dataActions=${[ .dataActions=${[
{ {
name: 'View Details', name: 'View Details',
iconName: 'magnifyingGlass', iconName: 'lucide:Search',
type: ['inRow', 'doubleClick', 'contextmenu'], type: ['inRow', 'doubleClick', 'contextmenu'],
actionFunc: async (actionData) => { actionFunc: async (actionData) => {
await this.showRequestDetails(actionData.item); await this.showRequestDetails(actionData.item);
@@ -336,7 +336,7 @@ export class OpsViewNetwork extends DeesElement {
menuOptions: [ menuOptions: [
{ {
name: 'Copy Request ID', name: 'Copy Request ID',
iconName: 'copy', iconName: 'lucide:Copy',
action: async () => { action: async () => {
await navigator.clipboard.writeText(request.id); await navigator.clipboard.writeText(request.id);
} }
@@ -429,13 +429,13 @@ export class OpsViewNetwork extends DeesElement {
title: 'Active Connections', title: 'Active Connections',
value: activeConnections, value: activeConnections,
type: 'number', type: 'number',
icon: 'plug', icon: 'lucide:Plug',
color: activeConnections > 100 ? '#f59e0b' : '#22c55e', color: activeConnections > 100 ? '#f59e0b' : '#22c55e',
description: `Total: ${this.networkState.requestsTotal || this.statsState.serverStats?.totalConnections || 0}`, description: `Total: ${this.networkState.requestsTotal || this.statsState.serverStats?.totalConnections || 0}`,
actions: [ actions: [
{ {
name: 'View Details', name: 'View Details',
iconName: 'magnifyingGlass', iconName: 'lucide:Search',
action: async () => { action: async () => {
}, },
}, },
@@ -446,7 +446,7 @@ export class OpsViewNetwork extends DeesElement {
title: 'Requests/sec', title: 'Requests/sec',
value: reqPerSec, value: reqPerSec,
type: 'trend', type: 'trend',
icon: 'chartLine', icon: 'lucide:ChartLine',
color: '#3b82f6', color: '#3b82f6',
trendData: trendData, trendData: trendData,
description: `Total: ${this.formatNumber(this.networkState.requestsTotal || 0)} requests`, description: `Total: ${this.formatNumber(this.networkState.requestsTotal || 0)} requests`,
@@ -457,7 +457,7 @@ export class OpsViewNetwork extends DeesElement {
value: this.formatBitsPerSecond(throughput.in), value: this.formatBitsPerSecond(throughput.in),
unit: '', unit: '',
type: 'number', type: 'number',
icon: 'download', icon: 'lucide:Download',
color: '#22c55e', color: '#22c55e',
description: `Total: ${this.formatBytes(this.networkState.totalBytes?.in || 0)}`, description: `Total: ${this.formatBytes(this.networkState.totalBytes?.in || 0)}`,
}, },
@@ -467,7 +467,7 @@ export class OpsViewNetwork extends DeesElement {
value: this.formatBitsPerSecond(throughput.out), value: this.formatBitsPerSecond(throughput.out),
unit: '', unit: '',
type: 'number', type: 'number',
icon: 'upload', icon: 'lucide:Upload',
color: '#8b5cf6', color: '#8b5cf6',
description: `Total: ${this.formatBytes(this.networkState.totalBytes?.out || 0)}`, description: `Total: ${this.formatBytes(this.networkState.totalBytes?.out || 0)}`,
}, },
@@ -480,7 +480,7 @@ export class OpsViewNetwork extends DeesElement {
.gridActions=${[ .gridActions=${[
{ {
name: 'Export Data', name: 'Export Data',
iconName: 'fileExport', iconName: 'lucide:FileOutput',
action: async () => { action: async () => {
console.log('Export feature coming soon'); console.log('Export feature coming soon');
}, },

View File

@@ -163,7 +163,7 @@ export class OpsViewOverview extends DeesElement {
title: 'Server Status', title: 'Server Status',
value: this.statsState.serverStats.uptime ? 'Online' : 'Offline', value: this.statsState.serverStats.uptime ? 'Online' : 'Offline',
type: 'text', type: 'text',
icon: 'server', icon: 'lucide:Server',
color: this.statsState.serverStats.uptime ? '#22c55e' : '#ef4444', color: this.statsState.serverStats.uptime ? '#22c55e' : '#ef4444',
description: `Uptime: ${this.formatUptime(this.statsState.serverStats.uptime)}`, description: `Uptime: ${this.formatUptime(this.statsState.serverStats.uptime)}`,
}, },
@@ -172,7 +172,7 @@ export class OpsViewOverview extends DeesElement {
title: 'Active Connections', title: 'Active Connections',
value: this.statsState.serverStats.activeConnections, value: this.statsState.serverStats.activeConnections,
type: 'number', type: 'number',
icon: 'networkWired', icon: 'lucide:Network',
color: '#3b82f6', color: '#3b82f6',
description: `Total: ${this.statsState.serverStats.totalConnections}`, description: `Total: ${this.statsState.serverStats.totalConnections}`,
}, },
@@ -181,7 +181,7 @@ export class OpsViewOverview extends DeesElement {
title: 'Throughput In', title: 'Throughput In',
value: this.formatBitsPerSecond(this.statsState.serverStats.throughput?.bytesInPerSecond || 0), value: this.formatBitsPerSecond(this.statsState.serverStats.throughput?.bytesInPerSecond || 0),
type: 'text', type: 'text',
icon: 'download', icon: 'lucide:Download',
color: '#22c55e', color: '#22c55e',
description: `Total: ${this.formatBytes(this.statsState.serverStats.throughput?.bytesIn || 0)}`, description: `Total: ${this.formatBytes(this.statsState.serverStats.throughput?.bytesIn || 0)}`,
}, },
@@ -190,7 +190,7 @@ export class OpsViewOverview extends DeesElement {
title: 'Throughput Out', title: 'Throughput Out',
value: this.formatBitsPerSecond(this.statsState.serverStats.throughput?.bytesOutPerSecond || 0), value: this.formatBitsPerSecond(this.statsState.serverStats.throughput?.bytesOutPerSecond || 0),
type: 'text', type: 'text',
icon: 'upload', icon: 'lucide:Upload',
color: '#8b5cf6', color: '#8b5cf6',
description: `Total: ${this.formatBytes(this.statsState.serverStats.throughput?.bytesOut || 0)}`, description: `Total: ${this.formatBytes(this.statsState.serverStats.throughput?.bytesOut || 0)}`,
}, },
@@ -199,7 +199,7 @@ export class OpsViewOverview extends DeesElement {
title: 'CPU Usage', title: 'CPU Usage',
value: cpuUsage, value: cpuUsage,
type: 'gauge', type: 'gauge',
icon: 'microchip', icon: 'lucide:Cpu',
gaugeOptions: { gaugeOptions: {
min: 0, min: 0,
max: 100, max: 100,
@@ -215,7 +215,7 @@ export class OpsViewOverview extends DeesElement {
title: 'Memory Usage', title: 'Memory Usage',
value: memoryUsage, value: memoryUsage,
type: 'percentage', type: 'percentage',
icon: 'memory', icon: 'lucide:MemoryStick',
color: memoryUsage > 80 ? '#ef4444' : memoryUsage > 60 ? '#f59e0b' : '#22c55e', color: memoryUsage > 80 ? '#ef4444' : memoryUsage > 60 ? '#f59e0b' : '#22c55e',
description: this.statsState.serverStats.memoryUsage.actualUsageBytes !== undefined && this.statsState.serverStats.memoryUsage.maxMemoryMB !== undefined description: this.statsState.serverStats.memoryUsage.actualUsageBytes !== undefined && this.statsState.serverStats.memoryUsage.maxMemoryMB !== undefined
? `${this.formatBytes(this.statsState.serverStats.memoryUsage.actualUsageBytes)} / ${this.formatBytes(this.statsState.serverStats.memoryUsage.maxMemoryMB * 1024 * 1024)}` ? `${this.formatBytes(this.statsState.serverStats.memoryUsage.actualUsageBytes)} / ${this.formatBytes(this.statsState.serverStats.memoryUsage.maxMemoryMB * 1024 * 1024)}`
@@ -229,7 +229,7 @@ export class OpsViewOverview extends DeesElement {
.gridActions=${[ .gridActions=${[
{ {
name: 'Refresh', name: 'Refresh',
iconName: 'arrowsRotate', iconName: 'lucide:RefreshCw',
action: async () => { action: async () => {
await appstate.statsStatePart.dispatchAction(appstate.fetchAllStatsAction, null); await appstate.statsStatePart.dispatchAction(appstate.fetchAllStatsAction, null);
}, },
@@ -251,7 +251,7 @@ export class OpsViewOverview extends DeesElement {
title: 'Emails Sent', title: 'Emails Sent',
value: this.statsState.emailStats.sent, value: this.statsState.emailStats.sent,
type: 'number', type: 'number',
icon: 'paperPlane', icon: 'lucide:Send',
color: '#22c55e', color: '#22c55e',
description: `Delivery rate: ${(deliveryRate * 100).toFixed(1)}%`, description: `Delivery rate: ${(deliveryRate * 100).toFixed(1)}%`,
}, },
@@ -260,7 +260,7 @@ export class OpsViewOverview extends DeesElement {
title: 'Emails Received', title: 'Emails Received',
value: this.statsState.emailStats.received, value: this.statsState.emailStats.received,
type: 'number', type: 'number',
icon: 'envelope', icon: 'lucide:Mail',
color: '#3b82f6', color: '#3b82f6',
}, },
{ {
@@ -268,7 +268,7 @@ export class OpsViewOverview extends DeesElement {
title: 'Queued', title: 'Queued',
value: this.statsState.emailStats.queued, value: this.statsState.emailStats.queued,
type: 'number', type: 'number',
icon: 'clock', icon: 'lucide:Clock',
color: '#f59e0b', color: '#f59e0b',
description: 'Pending delivery', description: 'Pending delivery',
}, },
@@ -277,7 +277,7 @@ export class OpsViewOverview extends DeesElement {
title: 'Failed', title: 'Failed',
value: this.statsState.emailStats.failed, value: this.statsState.emailStats.failed,
type: 'number', type: 'number',
icon: 'triangleExclamation', icon: 'lucide:TriangleAlert',
color: '#ef4444', color: '#ef4444',
description: `Bounce rate: ${(bounceRate * 100).toFixed(1)}%`, description: `Bounce rate: ${(bounceRate * 100).toFixed(1)}%`,
}, },
@@ -300,7 +300,7 @@ export class OpsViewOverview extends DeesElement {
title: 'DNS Queries', title: 'DNS Queries',
value: this.statsState.dnsStats.totalQueries, value: this.statsState.dnsStats.totalQueries,
type: 'number', type: 'number',
icon: 'globe', icon: 'lucide:Globe',
color: '#3b82f6', color: '#3b82f6',
description: 'Total queries handled', description: 'Total queries handled',
}, },
@@ -309,7 +309,7 @@ export class OpsViewOverview extends DeesElement {
title: 'Cache Hit Rate', title: 'Cache Hit Rate',
value: cacheHitRate, value: cacheHitRate,
type: 'percentage', type: 'percentage',
icon: 'database', icon: 'lucide:Database',
color: cacheHitRate > 80 ? '#22c55e' : cacheHitRate > 60 ? '#f59e0b' : '#ef4444', color: cacheHitRate > 80 ? '#22c55e' : cacheHitRate > 60 ? '#f59e0b' : '#ef4444',
description: `${this.statsState.dnsStats.cacheHits} hits / ${this.statsState.dnsStats.cacheMisses} misses`, description: `${this.statsState.dnsStats.cacheHits} hits / ${this.statsState.dnsStats.cacheMisses} misses`,
}, },
@@ -318,7 +318,7 @@ export class OpsViewOverview extends DeesElement {
title: 'Active Domains', title: 'Active Domains',
value: this.statsState.dnsStats.activeDomains, value: this.statsState.dnsStats.activeDomains,
type: 'number', type: 'number',
icon: 'sitemap', icon: 'lucide:Network',
color: '#8b5cf6', color: '#8b5cf6',
}, },
{ {
@@ -327,7 +327,7 @@ export class OpsViewOverview extends DeesElement {
value: this.statsState.dnsStats.averageResponseTime.toFixed(1), value: this.statsState.dnsStats.averageResponseTime.toFixed(1),
unit: 'ms', unit: 'ms',
type: 'number', type: 'number',
icon: 'clockRotateLeft', icon: 'lucide:History',
color: this.statsState.dnsStats.averageResponseTime < 50 ? '#22c55e' : '#f59e0b', color: this.statsState.dnsStats.averageResponseTime < 50 ? '#22c55e' : '#f59e0b',
}, },
]; ];

View File

@@ -187,16 +187,91 @@ export class OpsViewRemoteIngress extends DeesElement {
name: edge.name, name: edge.name,
status: this.getEdgeStatusHtml(edge), status: this.getEdgeStatusHtml(edge),
publicIp: this.getEdgePublicIp(edge.id), publicIp: this.getEdgePublicIp(edge.id),
ports: this.getPortsHtml(edge.listenPorts), ports: this.getPortsHtml(edge),
tunnels: this.getEdgeTunnelCount(edge.id), tunnels: this.getEdgeTunnelCount(edge.id),
lastHeartbeat: this.getLastHeartbeat(edge.id), lastHeartbeat: this.getLastHeartbeat(edge.id),
})} })}
.dataActions=${[ .dataActions=${[
{
name: 'Create Edge Node',
iconName: 'lucide:plus',
type: ['header'],
actionFunc: async () => {
const { DeesModal } = await import('@design.estate/dees-catalog');
const modal = await DeesModal.createAndShow({
heading: 'Create Edge Node',
content: html`
<dees-form>
<dees-input-text .key=${'name'} .label=${'Name'} .required=${true}></dees-input-text>
<dees-input-text .key=${'listenPorts'} .label=${'Listen Ports (comma-separated, auto-derived if empty)'}></dees-input-text>
<dees-input-text .key=${'tags'} .label=${'Tags (comma-separated, optional)'}></dees-input-text>
</dees-form>
`,
menuOptions: [
{
name: 'Cancel',
iconName: 'lucide:x',
action: async (modalArg: any) => await modalArg.destroy(),
},
{
name: 'Create',
iconName: 'lucide:plus',
action: async (modalArg: any) => {
const form = modalArg.shadowRoot?.querySelector('.content')?.querySelector('dees-form');
if (!form) return;
const formData = await form.collectFormData();
const name = formData.name;
if (!name) return;
const portsStr = formData.listenPorts?.trim();
const listenPorts = portsStr
? portsStr.split(',').map((p: string) => parseInt(p.trim(), 10)).filter((p: number) => !isNaN(p))
: undefined;
const tags = formData.tags
? formData.tags.split(',').map((t: string) => t.trim()).filter(Boolean)
: undefined;
await appstate.remoteIngressStatePart.dispatchAction(
appstate.createRemoteIngressAction,
{ name, listenPorts, tags },
);
await modalArg.destroy();
},
},
],
});
},
},
{
name: 'Enable',
iconName: 'lucide:play',
type: ['inRow', 'contextmenu'] as any,
actionRelevancyCheckFunc: (actionData: any) => !actionData.item.enabled,
actionFunc: async (actionData: any) => {
const edge = actionData.item as interfaces.data.IRemoteIngress;
await appstate.remoteIngressStatePart.dispatchAction(
appstate.toggleRemoteIngressAction,
{ id: edge.id, enabled: true },
);
},
},
{
name: 'Disable',
iconName: 'lucide:pause',
type: ['inRow', 'contextmenu'] as any,
actionRelevancyCheckFunc: (actionData: any) => actionData.item.enabled,
actionFunc: async (actionData: any) => {
const edge = actionData.item as interfaces.data.IRemoteIngress;
await appstate.remoteIngressStatePart.dispatchAction(
appstate.toggleRemoteIngressAction,
{ id: edge.id, enabled: false },
);
},
},
{ {
name: 'Regenerate Secret', name: 'Regenerate Secret',
iconName: 'lucide:key', iconName: 'lucide:key',
type: ['row'], type: ['inRow', 'contextmenu'] as any,
action: async (edge: interfaces.data.IRemoteIngress) => { actionFunc: async (actionData: any) => {
const edge = actionData.item as interfaces.data.IRemoteIngress;
await appstate.remoteIngressStatePart.dispatchAction( await appstate.remoteIngressStatePart.dispatchAction(
appstate.regenerateRemoteIngressSecretAction, appstate.regenerateRemoteIngressSecretAction,
edge.id, edge.id,
@@ -206,8 +281,9 @@ export class OpsViewRemoteIngress extends DeesElement {
{ {
name: 'Delete', name: 'Delete',
iconName: 'lucide:trash2', iconName: 'lucide:trash2',
type: ['row'], type: ['inRow', 'contextmenu'] as any,
action: async (edge: interfaces.data.IRemoteIngress) => { actionFunc: async (actionData: any) => {
const edge = actionData.item as interfaces.data.IRemoteIngress;
await appstate.remoteIngressStatePart.dispatchAction( await appstate.remoteIngressStatePart.dispatchAction(
appstate.deleteRemoteIngressAction, appstate.deleteRemoteIngressAction,
edge.id, edge.id,
@@ -215,38 +291,6 @@ export class OpsViewRemoteIngress extends DeesElement {
}, },
}, },
]} ]}
.createNewAction=${async () => {
const { DeesModal } = await import('@design.estate/dees-catalog');
const result = await DeesModal.createAndShow({
heading: 'Create Edge Node',
content: html`
<dees-form>
<dees-input-text .key=${'name'} .label=${'Name'} .required=${true}></dees-input-text>
<dees-input-text .key=${'listenPorts'} .label=${'Listen Ports (comma-separated)'} .required=${true} .value=${'443,25'}></dees-input-text>
<dees-input-text .key=${'tags'} .label=${'Tags (comma-separated, optional)'}></dees-input-text>
</dees-form>
`,
menuOptions: [],
});
if (result) {
const formData = result as any;
const ports = (formData.name ? formData.listenPorts : '443')
.split(',')
.map((p: string) => parseInt(p.trim(), 10))
.filter((p: number) => !isNaN(p));
const tags = formData.tags
? formData.tags.split(',').map((t: string) => t.trim()).filter(Boolean)
: undefined;
await appstate.remoteIngressStatePart.dispatchAction(
appstate.createRemoteIngressAction,
{
name: formData.name,
listenPorts: ports,
tags,
},
);
}
}}
></dees-table> ></dees-table>
</div> </div>
`; `;
@@ -272,8 +316,14 @@ export class OpsViewRemoteIngress extends DeesElement {
return status?.publicIp || '-'; return status?.publicIp || '-';
} }
private getPortsHtml(ports: number[]): TemplateResult { private getPortsHtml(edge: interfaces.data.IRemoteIngress): TemplateResult {
return html`<div class="portsDisplay">${ports.map(p => html`<span class="portBadge">${p}</span>`)}</div>`; const hasManualPorts = edge.listenPorts && edge.listenPorts.length > 0;
const ports = hasManualPorts ? edge.listenPorts : (edge.effectiveListenPorts || []);
const isAuto = !hasManualPorts && ports.length > 0;
if (ports.length === 0) {
return html`<span style="color: var(--text-muted, #6b7280); font-size: 12px;">none</span>`;
}
return html`<div class="portsDisplay">${ports.map(p => html`<span class="portBadge">${p}</span>`)}${isAuto ? html`<span style="font-size: 11px; color: var(--text-muted, #6b7280); align-self: center;">(auto)</span>` : ''}</div>`;
} }
private getEdgeTunnelCount(edgeId: string): number { private getEdgeTunnelCount(edgeId: string): number {

View File

@@ -256,7 +256,7 @@ export class OpsViewSecurity extends DeesElement {
title: 'Threat Level', title: 'Threat Level',
value: threatScore, value: threatScore,
type: 'gauge', type: 'gauge',
icon: 'shield', icon: 'lucide:Shield',
gaugeOptions: { gaugeOptions: {
min: 0, min: 0,
max: 100, max: 100,
@@ -273,7 +273,7 @@ export class OpsViewSecurity extends DeesElement {
title: 'Blocked Threats', title: 'Blocked Threats',
value: metrics.blockedIPs.length + metrics.spamDetected, value: metrics.blockedIPs.length + metrics.spamDetected,
type: 'number', type: 'number',
icon: 'userShield', icon: 'lucide:ShieldCheck',
color: '#ef4444', color: '#ef4444',
description: 'Total threats blocked today', description: 'Total threats blocked today',
}, },
@@ -282,7 +282,7 @@ export class OpsViewSecurity extends DeesElement {
title: 'Active Sessions', title: 'Active Sessions',
value: 0, value: 0,
type: 'number', type: 'number',
icon: 'users', icon: 'lucide:Users',
color: '#22c55e', color: '#22c55e',
description: 'Current authenticated sessions', description: 'Current authenticated sessions',
}, },
@@ -291,7 +291,7 @@ export class OpsViewSecurity extends DeesElement {
title: 'Auth Failures', title: 'Auth Failures',
value: metrics.authenticationFailures, value: metrics.authenticationFailures,
type: 'number', type: 'number',
icon: 'lockOpen', icon: 'lucide:LockOpen',
color: metrics.authenticationFailures > 10 ? '#ef4444' : '#f59e0b', color: metrics.authenticationFailures > 10 ? '#ef4444' : '#f59e0b',
description: 'Failed login attempts today', description: 'Failed login attempts today',
}, },
@@ -355,7 +355,7 @@ export class OpsViewSecurity extends DeesElement {
title: 'Authentication Failures', title: 'Authentication Failures',
value: metrics.authenticationFailures, value: metrics.authenticationFailures,
type: 'number', type: 'number',
icon: 'lockOpen', icon: 'lucide:LockOpen',
color: metrics.authenticationFailures > 10 ? '#ef4444' : '#f59e0b', color: metrics.authenticationFailures > 10 ? '#ef4444' : '#f59e0b',
description: 'Failed authentication attempts today', description: 'Failed authentication attempts today',
}, },
@@ -364,7 +364,7 @@ export class OpsViewSecurity extends DeesElement {
title: 'Successful Logins', title: 'Successful Logins',
value: 0, value: 0,
type: 'number', type: 'number',
icon: 'lock', icon: 'lucide:Lock',
color: '#22c55e', color: '#22c55e',
description: 'Successful logins today', description: 'Successful logins today',
}, },
@@ -399,7 +399,7 @@ export class OpsViewSecurity extends DeesElement {
title: 'Malware Detection', title: 'Malware Detection',
value: metrics.malwareDetected, value: metrics.malwareDetected,
type: 'number', type: 'number',
icon: 'virusSlash', icon: 'lucide:BugOff',
color: metrics.malwareDetected > 0 ? '#ef4444' : '#22c55e', color: metrics.malwareDetected > 0 ? '#ef4444' : '#22c55e',
description: 'Malware detected', description: 'Malware detected',
}, },
@@ -408,7 +408,7 @@ export class OpsViewSecurity extends DeesElement {
title: 'Phishing Detection', title: 'Phishing Detection',
value: metrics.phishingDetected, value: metrics.phishingDetected,
type: 'number', type: 'number',
icon: 'fishFins', icon: 'lucide:Fish',
color: metrics.phishingDetected > 0 ? '#ef4444' : '#22c55e', color: metrics.phishingDetected > 0 ? '#ef4444' : '#22c55e',
description: 'Phishing attempts detected', description: 'Phishing attempts detected',
}, },
@@ -417,7 +417,7 @@ export class OpsViewSecurity extends DeesElement {
title: 'Suspicious Activities', title: 'Suspicious Activities',
value: metrics.suspiciousActivities, value: metrics.suspiciousActivities,
type: 'number', type: 'number',
icon: 'triangleExclamation', icon: 'lucide:TriangleAlert',
color: metrics.suspiciousActivities > 5 ? '#ef4444' : '#f59e0b', color: metrics.suspiciousActivities > 5 ? '#ef4444' : '#f59e0b',
description: 'Suspicious activities detected', description: 'Suspicious activities detected',
}, },
@@ -426,7 +426,7 @@ export class OpsViewSecurity extends DeesElement {
title: 'Spam Detection', title: 'Spam Detection',
value: metrics.spamDetected, value: metrics.spamDetected,
type: 'number', type: 'number',
icon: 'ban', icon: 'lucide:Ban',
color: '#f59e0b', color: '#f59e0b',
description: 'Spam emails blocked', description: 'Spam emails blocked',
}, },