Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 57fbb128e6 | |||
| d73266eeb8 | |||
| 2dbdf2d2b1 | |||
| 383e0adc23 | |||
| d7789f5a44 | |||
| 2638990667 | |||
| c33ecdc26f | |||
| b033d80927 | |||
| cf5d616769 | |||
| 8e722f5ab6 | |||
| 2b75709161 | |||
| c5e2c262b7 |
46
changelog.md
46
changelog.md
@@ -1,5 +1,51 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2026-02-14 - 5.4.4 - fix(deps)
|
||||||
|
bump @push.rocks/smartproxy to ^25.2.0
|
||||||
|
|
||||||
|
- Updated @push.rocks/smartproxy from ^25.1.0 to ^25.2.0 (patch, non-breaking).
|
||||||
|
- Current package version is 5.4.3; recommend a patch release to 5.4.4.
|
||||||
|
|
||||||
|
## 2026-02-14 - 5.4.3 - fix(dependencies)
|
||||||
|
bump @push.rocks/smartproxy to ^25.1.0
|
||||||
|
|
||||||
|
- Updated @push.rocks/smartproxy from ^25.0.0 to ^25.1.0 in package.json
|
||||||
|
|
||||||
|
## 2026-02-13 - 5.4.2 - fix(dcrouter)
|
||||||
|
improve domain pattern matching to support routing-glob and wildcard patterns and use matching logic when resolving routes
|
||||||
|
|
||||||
|
- Support routing-glob patterns beginning with '*' (e.g. *example.com) to match base domain, wildcard form, and subdomains
|
||||||
|
- Treat standard wildcard patterns ('*.example.com') as matching both the base domain (example.com) and its subdomains
|
||||||
|
- Use isDomainMatch when resolving routes instead of exact array includes to allow pattern matching
|
||||||
|
- Normalize domain and pattern to lowercase and simplify equality checks
|
||||||
|
|
||||||
|
## 2026-02-13 - 5.4.1 - fix(network,dcrouter)
|
||||||
|
Always register SmartProxy certificate event handlers and include total bytes + improved connection metrics in network stats/UI
|
||||||
|
|
||||||
|
- Always register SmartProxy 'certificate-issued', 'certificate-renewed', and 'certificate-failed' handlers (previously only registered when acmeConfig was present) so certificate events are processed regardless of provisioning path.
|
||||||
|
- Add totalBytes (in/out) to network stats and propagate it through ts_interfaces and app state so total data transferred is available to the UI.
|
||||||
|
- Combine metricsManager.getNetworkStats with collectServerStats to compute activeConnections and adjust connectionDetails/TopEndpoints handling.
|
||||||
|
- Update ops UI to display totalBytes in throughput cards and remove a redundant network-specific auto-refresh fetch.
|
||||||
|
- Type and state updates: ts_interfaces/data/stats.ts and ts_web/appstate.ts updated with totalBytes and initialization/default mapping adjusted.
|
||||||
|
|
||||||
|
## 2026-02-13 - 5.4.0 - feat(certificates)
|
||||||
|
include certificate source/issuer and Rust-side status checks; pass eventComms into certProvisionFunction and record expiry information
|
||||||
|
|
||||||
|
- bump @push.rocks/smartproxy dependency to ^25.0.0
|
||||||
|
- add optional 'source' field to certificate status and propagate event.source when certificates are issued, renewed, or failed
|
||||||
|
- change smartProxy.certProvisionFunction signature to accept eventComms; use it to log attempts, set source and expiryDate, and fall back to http-01 on DNS-01 failure
|
||||||
|
- make buildCertificateOverview async and query smartProxy.getCertificateStatus for a route when event-based status is unknown
|
||||||
|
- improve logging to include certificate source and more contextual messages
|
||||||
|
|
||||||
|
## 2026-02-13 - 5.3.0 - feat(certificates)
|
||||||
|
add certificate overview and reprovisioning in ops UI and API; track SmartProxy certificate events
|
||||||
|
|
||||||
|
- Add CertificateHandler with typedrequest endpoints: getCertificateOverview and reprovisionCertificate
|
||||||
|
- Introduce ICertificateInfo and request/response interfaces for certificate operations
|
||||||
|
- Frontend: add certificate state part, actions (fetchCertificateOverview, reprovisionCertificate), router view, and ops-view-certificates component
|
||||||
|
- DcRouter: add certificateStatusMap, listen to SmartProxy certificate-issued/renewed/failed events, and add findRouteNameForDomain helper
|
||||||
|
- Bump dependency @push.rocks/smartproxy to ^24.0.0
|
||||||
|
|
||||||
## 2026-02-13 - 5.2.0 - feat(monitoring)
|
## 2026-02-13 - 5.2.0 - feat(monitoring)
|
||||||
add throughput metrics and expose them in ops UI
|
add throughput metrics and expose them in ops UI
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@serve.zone/dcrouter",
|
"name": "@serve.zone/dcrouter",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "5.2.0",
|
"version": "5.4.4",
|
||||||
"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": {
|
||||||
@@ -49,7 +49,7 @@
|
|||||||
"@push.rocks/smartnetwork": "^4.4.0",
|
"@push.rocks/smartnetwork": "^4.4.0",
|
||||||
"@push.rocks/smartpath": "^6.0.0",
|
"@push.rocks/smartpath": "^6.0.0",
|
||||||
"@push.rocks/smartpromise": "^4.2.3",
|
"@push.rocks/smartpromise": "^4.2.3",
|
||||||
"@push.rocks/smartproxy": "^23.1.6",
|
"@push.rocks/smartproxy": "^25.2.0",
|
||||||
"@push.rocks/smartradius": "^1.1.1",
|
"@push.rocks/smartradius": "^1.1.1",
|
||||||
"@push.rocks/smartrequest": "^5.0.1",
|
"@push.rocks/smartrequest": "^5.0.1",
|
||||||
"@push.rocks/smartrx": "^3.0.10",
|
"@push.rocks/smartrx": "^3.0.10",
|
||||||
|
|||||||
10
pnpm-lock.yaml
generated
10
pnpm-lock.yaml
generated
@@ -75,8 +75,8 @@ importers:
|
|||||||
specifier: ^4.2.3
|
specifier: ^4.2.3
|
||||||
version: 4.2.3
|
version: 4.2.3
|
||||||
'@push.rocks/smartproxy':
|
'@push.rocks/smartproxy':
|
||||||
specifier: ^23.1.6
|
specifier: ^25.2.0
|
||||||
version: 23.1.6(@push.rocks/smartserve@2.0.1)(socks@2.8.7)
|
version: 25.2.0(@push.rocks/smartserve@2.0.1)(socks@2.8.7)
|
||||||
'@push.rocks/smartradius':
|
'@push.rocks/smartradius':
|
||||||
specifier: ^1.1.1
|
specifier: ^1.1.1
|
||||||
version: 1.1.1
|
version: 1.1.1
|
||||||
@@ -1040,8 +1040,8 @@ packages:
|
|||||||
'@push.rocks/smartpromise@4.2.3':
|
'@push.rocks/smartpromise@4.2.3':
|
||||||
resolution: {integrity: sha512-Ycg/TJR+tMt+S3wSFurOpEoW6nXv12QBtKXgBcjMZ4RsdO28geN46U09osPn9N9WuwQy1PkmTV5J/V4F9U8qEw==}
|
resolution: {integrity: sha512-Ycg/TJR+tMt+S3wSFurOpEoW6nXv12QBtKXgBcjMZ4RsdO28geN46U09osPn9N9WuwQy1PkmTV5J/V4F9U8qEw==}
|
||||||
|
|
||||||
'@push.rocks/smartproxy@23.1.6':
|
'@push.rocks/smartproxy@25.2.0':
|
||||||
resolution: {integrity: sha512-cwTK4d7vOP0nEZzkZSg9Ua7R+J7SIGId9G815GNTRYYZP20TZbvmWDZW/1gf2lw3AuAy2MRIJMPO2BZ7JnZckw==}
|
resolution: {integrity: sha512-cwqtfSI3QziyZOYXZuL4/jq1KHXQRVwGvimHcqhJDsl4cac9y7fM4gKHU4B3m2/2qaih1scP9FPGwlCCVFXR7Q==}
|
||||||
|
|
||||||
'@push.rocks/smartpuppeteer@2.0.5':
|
'@push.rocks/smartpuppeteer@2.0.5':
|
||||||
resolution: {integrity: sha512-yK/qSeWVHIGWRp3c8S5tfdGP6WCKllZC4DR8d8CQlEjszOSBmHtlTdyyqOMBZ/BA4kd+eU5f3A1r4K2tGYty1g==}
|
resolution: {integrity: sha512-yK/qSeWVHIGWRp3c8S5tfdGP6WCKllZC4DR8d8CQlEjszOSBmHtlTdyyqOMBZ/BA4kd+eU5f3A1r4K2tGYty1g==}
|
||||||
@@ -6441,7 +6441,7 @@ snapshots:
|
|||||||
|
|
||||||
'@push.rocks/smartpromise@4.2.3': {}
|
'@push.rocks/smartpromise@4.2.3': {}
|
||||||
|
|
||||||
'@push.rocks/smartproxy@23.1.6(@push.rocks/smartserve@2.0.1)(socks@2.8.7)':
|
'@push.rocks/smartproxy@25.2.0(@push.rocks/smartserve@2.0.1)(socks@2.8.7)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@push.rocks/lik': 6.2.2
|
'@push.rocks/lik': 6.2.2
|
||||||
'@push.rocks/smartacme': 8.0.0(@push.rocks/smartserve@2.0.1)(socks@2.8.7)
|
'@push.rocks/smartacme': 8.0.0(@push.rocks/smartserve@2.0.1)(socks@2.8.7)
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@serve.zone/dcrouter',
|
name: '@serve.zone/dcrouter',
|
||||||
version: '5.2.0',
|
version: '5.4.4',
|
||||||
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -183,6 +183,16 @@ export class DcRouter {
|
|||||||
public cacheDb?: CacheDb;
|
public cacheDb?: CacheDb;
|
||||||
public cacheCleaner?: CacheCleaner;
|
public cacheCleaner?: CacheCleaner;
|
||||||
|
|
||||||
|
// Certificate status tracking from SmartProxy events
|
||||||
|
public certificateStatusMap = new Map<string, {
|
||||||
|
status: 'valid' | 'failed';
|
||||||
|
domain: string;
|
||||||
|
expiryDate?: string;
|
||||||
|
issuedAt?: string;
|
||||||
|
source?: string;
|
||||||
|
error?: string;
|
||||||
|
}>();
|
||||||
|
|
||||||
// TypedRouter for API endpoints
|
// TypedRouter for API endpoints
|
||||||
public typedrouter = new plugins.typedrequest.TypedRouter();
|
public typedrouter = new plugins.typedrequest.TypedRouter();
|
||||||
|
|
||||||
@@ -441,9 +451,14 @@ export class DcRouter {
|
|||||||
});
|
});
|
||||||
await this.smartAcme.start();
|
await this.smartAcme.start();
|
||||||
|
|
||||||
smartProxyConfig.certProvisionFunction = async (domain: string) => {
|
smartProxyConfig.certProvisionFunction = async (domain, eventComms) => {
|
||||||
try {
|
try {
|
||||||
|
eventComms.log(`Attempting DNS-01 via SmartAcme for ${domain}`);
|
||||||
|
eventComms.setSource('smartacme-dns-01');
|
||||||
const cert = await this.smartAcme.getCertificateForDomain(domain);
|
const cert = await this.smartAcme.getCertificateForDomain(domain);
|
||||||
|
if (cert.validUntil) {
|
||||||
|
eventComms.setExpiryDate(new Date(cert.validUntil));
|
||||||
|
}
|
||||||
return {
|
return {
|
||||||
id: cert.id,
|
id: cert.id,
|
||||||
domainName: cert.domainName,
|
domainName: cert.domainName,
|
||||||
@@ -454,7 +469,7 @@ export class DcRouter {
|
|||||||
csr: cert.csr,
|
csr: cert.csr,
|
||||||
};
|
};
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(`[DcRouter] SmartAcme DNS-01 failed for ${domain}, falling back to http-01:`, err.message);
|
eventComms.warn(`SmartAcme DNS-01 failed for ${domain}: ${err.message}, falling back to http-01`);
|
||||||
return 'http01';
|
return 'http01';
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -476,19 +491,41 @@ export class DcRouter {
|
|||||||
console.error('[DcRouter] Error stack:', err.stack);
|
console.error('[DcRouter] Error stack:', err.stack);
|
||||||
});
|
});
|
||||||
|
|
||||||
if (acmeConfig) {
|
// Always listen for certificate events — emitted by both ACME and certProvisionFunction paths
|
||||||
this.smartProxy.on('certificate-issued', (event) => {
|
this.smartProxy.on('certificate-issued', (event: plugins.smartproxy.ICertificateIssuedEvent) => {
|
||||||
console.log(`[DcRouter] Certificate issued for ${event.domain}, expires ${event.expiryDate}`);
|
console.log(`[DcRouter] Certificate issued for ${event.domain} via ${event.source}, expires ${event.expiryDate}`);
|
||||||
});
|
const routeName = this.findRouteNameForDomain(event.domain);
|
||||||
|
if (routeName) {
|
||||||
|
this.certificateStatusMap.set(routeName, {
|
||||||
|
status: 'valid', domain: event.domain,
|
||||||
|
expiryDate: event.expiryDate, issuedAt: new Date().toISOString(),
|
||||||
|
source: event.source,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
this.smartProxy.on('certificate-renewed', (event) => {
|
this.smartProxy.on('certificate-renewed', (event: plugins.smartproxy.ICertificateIssuedEvent) => {
|
||||||
console.log(`[DcRouter] Certificate renewed for ${event.domain}, expires ${event.expiryDate}`);
|
console.log(`[DcRouter] Certificate renewed for ${event.domain} via ${event.source}, expires ${event.expiryDate}`);
|
||||||
});
|
const routeName = this.findRouteNameForDomain(event.domain);
|
||||||
|
if (routeName) {
|
||||||
|
this.certificateStatusMap.set(routeName, {
|
||||||
|
status: 'valid', domain: event.domain,
|
||||||
|
expiryDate: event.expiryDate, issuedAt: new Date().toISOString(),
|
||||||
|
source: event.source,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
this.smartProxy.on('certificate-failed', (event) => {
|
this.smartProxy.on('certificate-failed', (event: plugins.smartproxy.ICertificateFailedEvent) => {
|
||||||
console.error(`[DcRouter] Certificate failed for ${event.domain}:`, event.error);
|
console.error(`[DcRouter] Certificate failed for ${event.domain} (${event.source}):`, event.error);
|
||||||
});
|
const routeName = this.findRouteNameForDomain(event.domain);
|
||||||
}
|
if (routeName) {
|
||||||
|
this.certificateStatusMap.set(routeName, {
|
||||||
|
status: 'failed', domain: event.domain, error: event.error,
|
||||||
|
source: event.source,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// Start SmartProxy
|
// Start SmartProxy
|
||||||
console.log('[DcRouter] Starting SmartProxy...');
|
console.log('[DcRouter] Starting SmartProxy...');
|
||||||
@@ -637,27 +674,45 @@ export class DcRouter {
|
|||||||
* @returns Whether the domain matches the pattern
|
* @returns Whether the domain matches the pattern
|
||||||
*/
|
*/
|
||||||
private isDomainMatch(domain: string, pattern: string): boolean {
|
private isDomainMatch(domain: string, pattern: string): boolean {
|
||||||
// Normalize inputs
|
|
||||||
domain = domain.toLowerCase();
|
domain = domain.toLowerCase();
|
||||||
pattern = pattern.toLowerCase();
|
pattern = pattern.toLowerCase();
|
||||||
|
|
||||||
// Check for exact match
|
if (domain === pattern) return true;
|
||||||
if (domain === pattern) {
|
|
||||||
return true;
|
// Routing-glob: *example.com matches example.com, sub.example.com, *.example.com
|
||||||
|
if (pattern.startsWith('*') && !pattern.startsWith('*.')) {
|
||||||
|
const baseDomain = pattern.slice(1); // *nevermind.cloud → nevermind.cloud
|
||||||
|
if (domain === baseDomain || domain === `*.${baseDomain}`) return true;
|
||||||
|
if (domain.endsWith(baseDomain) && domain.length > baseDomain.length) return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for wildcard match (*.example.com)
|
// Standard wildcard: *.example.com matches sub.example.com and example.com
|
||||||
if (pattern.startsWith('*.')) {
|
if (pattern.startsWith('*.')) {
|
||||||
const patternSuffix = pattern.slice(2); // Remove the "*." prefix
|
const suffix = pattern.slice(2);
|
||||||
|
if (domain === suffix) return true;
|
||||||
// Check if domain ends with the pattern suffix and has at least one character before it
|
return domain.endsWith(suffix) && domain.length > suffix.length;
|
||||||
return domain.endsWith(patternSuffix) && domain.length > patternSuffix.length;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// No match
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find the route name that matches a given domain
|
||||||
|
*/
|
||||||
|
private findRouteNameForDomain(domain: string): string | undefined {
|
||||||
|
if (!this.smartProxy) return undefined;
|
||||||
|
for (const route of this.smartProxy.routeManager.getRoutes()) {
|
||||||
|
if (!route.match.domains || !route.name) continue;
|
||||||
|
const routeDomains = Array.isArray(route.match.domains)
|
||||||
|
? route.match.domains
|
||||||
|
: [route.match.domains];
|
||||||
|
for (const pattern of routeDomains) {
|
||||||
|
if (this.isDomainMatch(domain, pattern)) return route.name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
public async stop() {
|
public async stop() {
|
||||||
console.log('Stopping DcRouter services...');
|
console.log('Stopping DcRouter services...');
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ export class OpsServer {
|
|||||||
private statsHandler: handlers.StatsHandler;
|
private statsHandler: handlers.StatsHandler;
|
||||||
private radiusHandler: handlers.RadiusHandler;
|
private radiusHandler: handlers.RadiusHandler;
|
||||||
private emailOpsHandler: handlers.EmailOpsHandler;
|
private emailOpsHandler: handlers.EmailOpsHandler;
|
||||||
|
private certificateHandler: handlers.CertificateHandler;
|
||||||
|
|
||||||
constructor(dcRouterRefArg: DcRouter) {
|
constructor(dcRouterRefArg: DcRouter) {
|
||||||
this.dcRouterRef = dcRouterRefArg;
|
this.dcRouterRef = dcRouterRefArg;
|
||||||
@@ -57,6 +58,7 @@ export class OpsServer {
|
|||||||
this.statsHandler = new handlers.StatsHandler(this);
|
this.statsHandler = new handlers.StatsHandler(this);
|
||||||
this.radiusHandler = new handlers.RadiusHandler(this);
|
this.radiusHandler = new handlers.RadiusHandler(this);
|
||||||
this.emailOpsHandler = new handlers.EmailOpsHandler(this);
|
this.emailOpsHandler = new handlers.EmailOpsHandler(this);
|
||||||
|
this.certificateHandler = new handlers.CertificateHandler(this);
|
||||||
|
|
||||||
console.log('✅ OpsServer TypedRequest handlers initialized');
|
console.log('✅ OpsServer TypedRequest handlers initialized');
|
||||||
}
|
}
|
||||||
|
|||||||
186
ts/opsserver/handlers/certificate.handler.ts
Normal file
186
ts/opsserver/handlers/certificate.handler.ts
Normal file
@@ -0,0 +1,186 @@
|
|||||||
|
import * as plugins from '../../plugins.js';
|
||||||
|
import type { OpsServer } from '../classes.opsserver.js';
|
||||||
|
import * as interfaces from '../../../ts_interfaces/index.js';
|
||||||
|
|
||||||
|
export class CertificateHandler {
|
||||||
|
public typedrouter = new plugins.typedrequest.TypedRouter();
|
||||||
|
|
||||||
|
constructor(private opsServerRef: OpsServer) {
|
||||||
|
this.opsServerRef.typedrouter.addTypedRouter(this.typedrouter);
|
||||||
|
this.registerHandlers();
|
||||||
|
}
|
||||||
|
|
||||||
|
private registerHandlers(): void {
|
||||||
|
// Get Certificate Overview
|
||||||
|
this.typedrouter.addTypedHandler(
|
||||||
|
new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_GetCertificateOverview>(
|
||||||
|
'getCertificateOverview',
|
||||||
|
async (dataArg) => {
|
||||||
|
const certificates = await this.buildCertificateOverview();
|
||||||
|
const summary = this.buildSummary(certificates);
|
||||||
|
return { certificates, summary };
|
||||||
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
// Reprovision Certificate
|
||||||
|
this.typedrouter.addTypedHandler(
|
||||||
|
new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_ReprovisionCertificate>(
|
||||||
|
'reprovisionCertificate',
|
||||||
|
async (dataArg) => {
|
||||||
|
return this.reprovisionCertificate(dataArg.routeName);
|
||||||
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async buildCertificateOverview(): Promise<interfaces.requests.ICertificateInfo[]> {
|
||||||
|
const dcRouter = this.opsServerRef.dcRouterRef;
|
||||||
|
const smartProxy = dcRouter.smartProxy;
|
||||||
|
if (!smartProxy) return [];
|
||||||
|
|
||||||
|
const routes = smartProxy.routeManager.getRoutes();
|
||||||
|
const certificates: interfaces.requests.ICertificateInfo[] = [];
|
||||||
|
|
||||||
|
for (const route of routes) {
|
||||||
|
if (!route.name) continue;
|
||||||
|
|
||||||
|
const tls = route.action?.tls;
|
||||||
|
if (!tls) continue;
|
||||||
|
|
||||||
|
// Skip passthrough routes - they don't manage certificates
|
||||||
|
if (tls.mode === 'passthrough') continue;
|
||||||
|
|
||||||
|
const routeDomains = route.match.domains
|
||||||
|
? (Array.isArray(route.match.domains) ? route.match.domains : [route.match.domains])
|
||||||
|
: [];
|
||||||
|
|
||||||
|
// Determine source
|
||||||
|
let source: interfaces.requests.TCertificateSource = 'none';
|
||||||
|
if (tls.certificate === 'auto') {
|
||||||
|
// Check if a certProvisionFunction is configured
|
||||||
|
if ((smartProxy.settings as any).certProvisionFunction) {
|
||||||
|
source = 'provision-function';
|
||||||
|
} else {
|
||||||
|
source = 'acme';
|
||||||
|
}
|
||||||
|
} else if (tls.certificate && typeof tls.certificate === 'object') {
|
||||||
|
source = 'static';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start with unknown status
|
||||||
|
let status: interfaces.requests.TCertificateStatus = 'unknown';
|
||||||
|
let expiryDate: string | undefined;
|
||||||
|
let issuedAt: string | undefined;
|
||||||
|
let issuer: string | undefined;
|
||||||
|
let error: string | undefined;
|
||||||
|
|
||||||
|
// Check event-based status from DcRouter's certificateStatusMap
|
||||||
|
const eventStatus = dcRouter.certificateStatusMap.get(route.name);
|
||||||
|
if (eventStatus) {
|
||||||
|
status = eventStatus.status;
|
||||||
|
expiryDate = eventStatus.expiryDate;
|
||||||
|
issuedAt = eventStatus.issuedAt;
|
||||||
|
error = eventStatus.error;
|
||||||
|
if (eventStatus.source) {
|
||||||
|
issuer = eventStatus.source;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try Rust-side certificate status if no event data
|
||||||
|
if (status === 'unknown') {
|
||||||
|
try {
|
||||||
|
const rustStatus = await smartProxy.getCertificateStatus(route.name);
|
||||||
|
if (rustStatus) {
|
||||||
|
if (rustStatus.expiryDate) expiryDate = rustStatus.expiryDate;
|
||||||
|
if (rustStatus.issuer) issuer = rustStatus.issuer;
|
||||||
|
if (rustStatus.issuedAt) issuedAt = rustStatus.issuedAt;
|
||||||
|
if (rustStatus.status === 'valid' || rustStatus.status === 'expired') {
|
||||||
|
status = rustStatus.status;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Rust bridge may not support this command yet — ignore
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Compute status from expiry date if we have one and status is still valid/unknown
|
||||||
|
if (expiryDate && (status === 'valid' || status === 'unknown')) {
|
||||||
|
const expiry = new Date(expiryDate);
|
||||||
|
const now = new Date();
|
||||||
|
const daysUntilExpiry = (expiry.getTime() - now.getTime()) / (1000 * 60 * 60 * 24);
|
||||||
|
|
||||||
|
if (daysUntilExpiry < 0) {
|
||||||
|
status = 'expired';
|
||||||
|
} else if (daysUntilExpiry < 30) {
|
||||||
|
status = 'expiring';
|
||||||
|
} else {
|
||||||
|
status = 'valid';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Static certs with no other info default to 'valid'
|
||||||
|
if (source === 'static' && status === 'unknown') {
|
||||||
|
status = 'valid';
|
||||||
|
}
|
||||||
|
|
||||||
|
const canReprovision = source === 'acme' || source === 'provision-function';
|
||||||
|
|
||||||
|
certificates.push({
|
||||||
|
routeName: route.name,
|
||||||
|
domains: routeDomains,
|
||||||
|
status,
|
||||||
|
source,
|
||||||
|
tlsMode: tls.mode as 'terminate' | 'terminate-and-reencrypt' | 'passthrough',
|
||||||
|
expiryDate,
|
||||||
|
issuer,
|
||||||
|
issuedAt,
|
||||||
|
error,
|
||||||
|
canReprovision,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return certificates;
|
||||||
|
}
|
||||||
|
|
||||||
|
private buildSummary(certificates: interfaces.requests.ICertificateInfo[]): {
|
||||||
|
total: number;
|
||||||
|
valid: number;
|
||||||
|
expiring: number;
|
||||||
|
expired: number;
|
||||||
|
failed: number;
|
||||||
|
unknown: number;
|
||||||
|
} {
|
||||||
|
const summary = { total: 0, valid: 0, expiring: 0, expired: 0, failed: 0, unknown: 0 };
|
||||||
|
summary.total = certificates.length;
|
||||||
|
for (const cert of certificates) {
|
||||||
|
switch (cert.status) {
|
||||||
|
case 'valid': summary.valid++; break;
|
||||||
|
case 'expiring': summary.expiring++; break;
|
||||||
|
case 'expired': summary.expired++; break;
|
||||||
|
case 'failed': summary.failed++; break;
|
||||||
|
case 'provisioning': // count as unknown
|
||||||
|
case 'unknown': summary.unknown++; break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return summary;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async reprovisionCertificate(routeName: string): Promise<{ success: boolean; message?: string }> {
|
||||||
|
const dcRouter = this.opsServerRef.dcRouterRef;
|
||||||
|
const smartProxy = dcRouter.smartProxy;
|
||||||
|
|
||||||
|
if (!smartProxy) {
|
||||||
|
return { success: false, message: 'SmartProxy is not running' };
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await smartProxy.provisionCertificate(routeName);
|
||||||
|
// Clear event-based status so it gets refreshed
|
||||||
|
dcRouter.certificateStatusMap.delete(routeName);
|
||||||
|
return { success: true, message: `Certificate reprovisioning triggered for route '${routeName}'` };
|
||||||
|
} catch (err) {
|
||||||
|
return { success: false, message: err.message || 'Failed to reprovision certificate' };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,3 +5,4 @@ export * from './security.handler.js';
|
|||||||
export * from './stats.handler.js';
|
export * from './stats.handler.js';
|
||||||
export * from './radius.handler.js';
|
export * from './radius.handler.js';
|
||||||
export * from './email-ops.handler.js';
|
export * from './email-ops.handler.js';
|
||||||
|
export * from './certificate.handler.js';
|
||||||
@@ -251,26 +251,21 @@ export class StatsHandler {
|
|||||||
|
|
||||||
if (sections.network && this.opsServerRef.dcRouterRef.metricsManager) {
|
if (sections.network && this.opsServerRef.dcRouterRef.metricsManager) {
|
||||||
promises.push(
|
promises.push(
|
||||||
this.opsServerRef.dcRouterRef.metricsManager.getNetworkStats().then(stats => {
|
(async () => {
|
||||||
const connectionDetails: interfaces.data.IConnectionDetails[] = [];
|
const stats = await this.opsServerRef.dcRouterRef.metricsManager.getNetworkStats();
|
||||||
stats.connectionsByIP.forEach((count, ip) => {
|
const serverStats = await this.collectServerStats();
|
||||||
connectionDetails.push({
|
|
||||||
remoteAddress: ip,
|
|
||||||
protocol: 'https' as any,
|
|
||||||
state: 'established' as any,
|
|
||||||
startTime: Date.now(),
|
|
||||||
bytesIn: 0,
|
|
||||||
bytesOut: 0,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
metrics.network = {
|
metrics.network = {
|
||||||
totalBandwidth: {
|
totalBandwidth: {
|
||||||
in: stats.throughputRate.bytesInPerSecond,
|
in: stats.throughputRate.bytesInPerSecond,
|
||||||
out: stats.throughputRate.bytesOutPerSecond,
|
out: stats.throughputRate.bytesOutPerSecond,
|
||||||
},
|
},
|
||||||
activeConnections: stats.connectionsByIP.size,
|
totalBytes: {
|
||||||
connectionDetails: connectionDetails.slice(0, 50), // Limit to 50 connections
|
in: stats.totalDataTransferred.bytesIn,
|
||||||
|
out: stats.totalDataTransferred.bytesOut,
|
||||||
|
},
|
||||||
|
activeConnections: serverStats.activeConnections,
|
||||||
|
connectionDetails: [],
|
||||||
topEndpoints: stats.topIPs.map(ip => ({
|
topEndpoints: stats.topIPs.map(ip => ({
|
||||||
endpoint: ip.ip,
|
endpoint: ip.ip,
|
||||||
requests: ip.count,
|
requests: ip.count,
|
||||||
@@ -280,7 +275,7 @@ export class StatsHandler {
|
|||||||
},
|
},
|
||||||
})),
|
})),
|
||||||
};
|
};
|
||||||
})
|
})()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -116,6 +116,10 @@ export interface INetworkMetrics {
|
|||||||
in: number;
|
in: number;
|
||||||
out: number;
|
out: number;
|
||||||
};
|
};
|
||||||
|
totalBytes?: {
|
||||||
|
in: number;
|
||||||
|
out: number;
|
||||||
|
};
|
||||||
activeConnections: number;
|
activeConnections: number;
|
||||||
connectionDetails: IConnectionDetails[];
|
connectionDetails: IConnectionDetails[];
|
||||||
topEndpoints: Array<{
|
topEndpoints: Array<{
|
||||||
|
|||||||
54
ts_interfaces/requests/certificate.ts
Normal file
54
ts_interfaces/requests/certificate.ts
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
import * as plugins from '../plugins.js';
|
||||||
|
import * as authInterfaces from '../data/auth.js';
|
||||||
|
|
||||||
|
export type TCertificateStatus = 'valid' | 'expiring' | 'expired' | 'provisioning' | 'failed' | 'unknown';
|
||||||
|
export type TCertificateSource = 'acme' | 'provision-function' | 'static' | 'none';
|
||||||
|
|
||||||
|
export interface ICertificateInfo {
|
||||||
|
routeName: string;
|
||||||
|
domains: string[];
|
||||||
|
status: TCertificateStatus;
|
||||||
|
source: TCertificateSource;
|
||||||
|
tlsMode: 'terminate' | 'terminate-and-reencrypt' | 'passthrough';
|
||||||
|
expiryDate?: string; // ISO string
|
||||||
|
issuer?: string;
|
||||||
|
issuedAt?: string; // ISO string
|
||||||
|
error?: string; // if status === 'failed'
|
||||||
|
canReprovision: boolean; // true for acme/provision-function routes
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface IReq_GetCertificateOverview extends plugins.typedrequestInterfaces.implementsTR<
|
||||||
|
plugins.typedrequestInterfaces.ITypedRequest,
|
||||||
|
IReq_GetCertificateOverview
|
||||||
|
> {
|
||||||
|
method: 'getCertificateOverview';
|
||||||
|
request: {
|
||||||
|
identity?: authInterfaces.IIdentity;
|
||||||
|
};
|
||||||
|
response: {
|
||||||
|
certificates: ICertificateInfo[];
|
||||||
|
summary: {
|
||||||
|
total: number;
|
||||||
|
valid: number;
|
||||||
|
expiring: number;
|
||||||
|
expired: number;
|
||||||
|
failed: number;
|
||||||
|
unknown: number;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface IReq_ReprovisionCertificate extends plugins.typedrequestInterfaces.implementsTR<
|
||||||
|
plugins.typedrequestInterfaces.ITypedRequest,
|
||||||
|
IReq_ReprovisionCertificate
|
||||||
|
> {
|
||||||
|
method: 'reprovisionCertificate';
|
||||||
|
request: {
|
||||||
|
identity?: authInterfaces.IIdentity;
|
||||||
|
routeName: string;
|
||||||
|
};
|
||||||
|
response: {
|
||||||
|
success: boolean;
|
||||||
|
message?: string;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -5,3 +5,4 @@ export * from './stats.js';
|
|||||||
export * from './combined.stats.js';
|
export * from './combined.stats.js';
|
||||||
export * from './radius.js';
|
export * from './radius.js';
|
||||||
export * from './email-ops.js';
|
export * from './email-ops.js';
|
||||||
|
export * from './certificate.js';
|
||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@serve.zone/dcrouter',
|
name: '@serve.zone/dcrouter',
|
||||||
version: '5.2.0',
|
version: '5.4.4',
|
||||||
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,12 +47,21 @@ export interface INetworkState {
|
|||||||
connections: interfaces.data.IConnectionInfo[];
|
connections: interfaces.data.IConnectionInfo[];
|
||||||
connectionsByIP: { [ip: string]: number };
|
connectionsByIP: { [ip: string]: number };
|
||||||
throughputRate: { bytesInPerSecond: number; bytesOutPerSecond: number };
|
throughputRate: { bytesInPerSecond: number; bytesOutPerSecond: number };
|
||||||
|
totalBytes: { in: number; out: number };
|
||||||
topIPs: Array<{ ip: string; count: number }>;
|
topIPs: Array<{ ip: string; count: number }>;
|
||||||
lastUpdated: number;
|
lastUpdated: number;
|
||||||
isLoading: boolean;
|
isLoading: boolean;
|
||||||
error: string | null;
|
error: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ICertificateState {
|
||||||
|
certificates: interfaces.requests.ICertificateInfo[];
|
||||||
|
summary: { total: number; valid: number; expiring: number; expired: number; failed: number; unknown: number };
|
||||||
|
isLoading: boolean;
|
||||||
|
error: string | null;
|
||||||
|
lastUpdated: number;
|
||||||
|
}
|
||||||
|
|
||||||
export interface IEmailOpsState {
|
export interface IEmailOpsState {
|
||||||
currentView: 'queued' | 'sent' | 'failed' | 'received' | 'security';
|
currentView: 'queued' | 'sent' | 'failed' | 'received' | 'security';
|
||||||
queuedEmails: interfaces.requests.IEmailQueueItem[];
|
queuedEmails: interfaces.requests.IEmailQueueItem[];
|
||||||
@@ -103,7 +112,7 @@ export const configStatePart = await appState.getStatePart<IConfigState>(
|
|||||||
// Determine initial view from URL path
|
// Determine initial view from URL path
|
||||||
const getInitialView = (): string => {
|
const getInitialView = (): string => {
|
||||||
const path = typeof window !== 'undefined' ? window.location.pathname : '/';
|
const path = typeof window !== 'undefined' ? window.location.pathname : '/';
|
||||||
const validViews = ['overview', 'network', 'emails', 'logs', 'configuration', 'security'];
|
const validViews = ['overview', 'network', 'emails', 'logs', 'configuration', 'security', 'certificates'];
|
||||||
const segments = path.split('/').filter(Boolean);
|
const segments = path.split('/').filter(Boolean);
|
||||||
const view = segments[0];
|
const view = segments[0];
|
||||||
return validViews.includes(view) ? view : 'overview';
|
return validViews.includes(view) ? view : 'overview';
|
||||||
@@ -136,6 +145,7 @@ export const networkStatePart = await appState.getStatePart<INetworkState>(
|
|||||||
connections: [],
|
connections: [],
|
||||||
connectionsByIP: {},
|
connectionsByIP: {},
|
||||||
throughputRate: { bytesInPerSecond: 0, bytesOutPerSecond: 0 },
|
throughputRate: { bytesInPerSecond: 0, bytesOutPerSecond: 0 },
|
||||||
|
totalBytes: { in: 0, out: 0 },
|
||||||
topIPs: [],
|
topIPs: [],
|
||||||
lastUpdated: 0,
|
lastUpdated: 0,
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
@@ -162,6 +172,18 @@ export const emailOpsStatePart = await appState.getStatePart<IEmailOpsState>(
|
|||||||
'soft'
|
'soft'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
export const certificateStatePart = await appState.getStatePart<ICertificateState>(
|
||||||
|
'certificates',
|
||||||
|
{
|
||||||
|
certificates: [],
|
||||||
|
summary: { total: 0, valid: 0, expiring: 0, expired: 0, failed: 0, unknown: 0 },
|
||||||
|
isLoading: false,
|
||||||
|
error: null,
|
||||||
|
lastUpdated: 0,
|
||||||
|
},
|
||||||
|
'soft'
|
||||||
|
);
|
||||||
|
|
||||||
// Actions for state management
|
// Actions for state management
|
||||||
interface IActionContext {
|
interface IActionContext {
|
||||||
identity: interfaces.data.IIdentity | null;
|
identity: interfaces.data.IIdentity | null;
|
||||||
@@ -341,6 +363,13 @@ export const setActiveViewAction = uiStatePart.createAction<string>(async (state
|
|||||||
}, 100);
|
}, 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If switching to certificates view, ensure we fetch certificate data
|
||||||
|
if (viewName === 'certificates' && currentState.activeView !== 'certificates') {
|
||||||
|
setTimeout(() => {
|
||||||
|
certificateStatePart.dispatchAction(fetchCertificateOverviewAction, null);
|
||||||
|
}, 100);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...currentState,
|
...currentState,
|
||||||
activeView: viewName,
|
activeView: viewName,
|
||||||
@@ -394,6 +423,9 @@ export const fetchNetworkStatsAction = networkStatePart.createAction(async (stat
|
|||||||
connections: connectionsResponse.connections,
|
connections: connectionsResponse.connections,
|
||||||
connectionsByIP,
|
connectionsByIP,
|
||||||
throughputRate: networkStatsResponse.throughputRate || { bytesInPerSecond: 0, bytesOutPerSecond: 0 },
|
throughputRate: networkStatsResponse.throughputRate || { bytesInPerSecond: 0, bytesOutPerSecond: 0 },
|
||||||
|
totalBytes: networkStatsResponse.totalDataTransferred
|
||||||
|
? { in: networkStatsResponse.totalDataTransferred.bytesIn, out: networkStatsResponse.totalDataTransferred.bytesOut }
|
||||||
|
: { in: 0, out: 0 },
|
||||||
topIPs: networkStatsResponse.topIPs || [],
|
topIPs: networkStatsResponse.topIPs || [],
|
||||||
lastUpdated: Date.now(),
|
lastUpdated: Date.now(),
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
@@ -641,6 +673,66 @@ export const removeFromSuppressionListAction = emailOpsStatePart.createAction<st
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// Certificate Actions
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
export const fetchCertificateOverviewAction = certificateStatePart.createAction(async (statePartArg) => {
|
||||||
|
const context = getActionContext();
|
||||||
|
const currentState = statePartArg.getState();
|
||||||
|
|
||||||
|
try {
|
||||||
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
|
interfaces.requests.IReq_GetCertificateOverview
|
||||||
|
>('/typedrequest', 'getCertificateOverview');
|
||||||
|
|
||||||
|
const response = await request.fire({
|
||||||
|
identity: context.identity,
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
certificates: response.certificates,
|
||||||
|
summary: response.summary,
|
||||||
|
isLoading: false,
|
||||||
|
error: null,
|
||||||
|
lastUpdated: Date.now(),
|
||||||
|
};
|
||||||
|
} catch (error) {
|
||||||
|
return {
|
||||||
|
...currentState,
|
||||||
|
isLoading: false,
|
||||||
|
error: error instanceof Error ? error.message : 'Failed to fetch certificate overview',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
export const reprovisionCertificateAction = certificateStatePart.createAction<string>(
|
||||||
|
async (statePartArg, routeName) => {
|
||||||
|
const context = getActionContext();
|
||||||
|
const currentState = statePartArg.getState();
|
||||||
|
|
||||||
|
try {
|
||||||
|
const request = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
|
interfaces.requests.IReq_ReprovisionCertificate
|
||||||
|
>('/typedrequest', 'reprovisionCertificate');
|
||||||
|
|
||||||
|
await request.fire({
|
||||||
|
identity: context.identity,
|
||||||
|
routeName,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Re-fetch overview after reprovisioning
|
||||||
|
await certificateStatePart.dispatchAction(fetchCertificateOverviewAction, null);
|
||||||
|
return statePartArg.getState();
|
||||||
|
} catch (error) {
|
||||||
|
return {
|
||||||
|
...currentState,
|
||||||
|
error: error instanceof Error ? error.message : 'Failed to reprovision certificate',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
// Combined refresh action for efficient polling
|
// Combined refresh action for efficient polling
|
||||||
async function dispatchCombinedRefreshAction() {
|
async function dispatchCombinedRefreshAction() {
|
||||||
const context = getActionContext();
|
const context = getActionContext();
|
||||||
@@ -703,6 +795,7 @@ async function dispatchCombinedRefreshAction() {
|
|||||||
bytesInPerSecond: network.totalBandwidth.in,
|
bytesInPerSecond: network.totalBandwidth.in,
|
||||||
bytesOutPerSecond: network.totalBandwidth.out
|
bytesOutPerSecond: network.totalBandwidth.out
|
||||||
},
|
},
|
||||||
|
totalBytes: network.totalBytes || { in: 0, out: 0 },
|
||||||
topIPs: network.topEndpoints.map(e => ({ ip: e.endpoint, count: e.requests })),
|
topIPs: network.topEndpoints.map(e => ({ ip: e.endpoint, count: e.requests })),
|
||||||
lastUpdated: Date.now(),
|
lastUpdated: Date.now(),
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
@@ -718,6 +811,7 @@ async function dispatchCombinedRefreshAction() {
|
|||||||
bytesInPerSecond: network.totalBandwidth.in,
|
bytesInPerSecond: network.totalBandwidth.in,
|
||||||
bytesOutPerSecond: network.totalBandwidth.out
|
bytesOutPerSecond: network.totalBandwidth.out
|
||||||
},
|
},
|
||||||
|
totalBytes: network.totalBytes || { in: 0, out: 0 },
|
||||||
topIPs: network.topEndpoints.map(e => ({ ip: e.endpoint, count: e.requests })),
|
topIPs: network.topEndpoints.map(e => ({ ip: e.endpoint, count: e.requests })),
|
||||||
lastUpdated: Date.now(),
|
lastUpdated: Date.now(),
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
@@ -725,6 +819,15 @@ async function dispatchCombinedRefreshAction() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Refresh certificate data if on certificates view
|
||||||
|
if (currentView === 'certificates') {
|
||||||
|
try {
|
||||||
|
await certificateStatePart.dispatchAction(fetchCertificateOverviewAction, null);
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Certificate refresh failed:', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Combined refresh failed:', error);
|
console.error('Combined refresh failed:', error);
|
||||||
}
|
}
|
||||||
@@ -749,13 +852,6 @@ let currentRefreshRate = 1000; // Track current refresh rate to avoid unnecessar
|
|||||||
refreshInterval = setInterval(() => {
|
refreshInterval = setInterval(() => {
|
||||||
// Use combined refresh action for efficiency
|
// Use combined refresh action for efficiency
|
||||||
dispatchCombinedRefreshAction();
|
dispatchCombinedRefreshAction();
|
||||||
|
|
||||||
// If network view is active, also ensure we have fresh network data
|
|
||||||
const currentView = uiStatePart.getState().activeView;
|
|
||||||
if (currentView === 'network') {
|
|
||||||
// Network view needs more frequent updates, fetch directly
|
|
||||||
networkStatePart.dispatchAction(fetchNetworkStatsAction, null);
|
|
||||||
}
|
|
||||||
}, uiState.refreshInterval);
|
}, uiState.refreshInterval);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -5,4 +5,5 @@ export * from './ops-view-emails.js';
|
|||||||
export * from './ops-view-logs.js';
|
export * from './ops-view-logs.js';
|
||||||
export * from './ops-view-config.js';
|
export * from './ops-view-config.js';
|
||||||
export * from './ops-view-security.js';
|
export * from './ops-view-security.js';
|
||||||
|
export * from './ops-view-certificates.js';
|
||||||
export * from './shared/index.js';
|
export * from './shared/index.js';
|
||||||
@@ -19,6 +19,7 @@ import { OpsViewEmails } from './ops-view-emails.js';
|
|||||||
import { OpsViewLogs } from './ops-view-logs.js';
|
import { OpsViewLogs } from './ops-view-logs.js';
|
||||||
import { OpsViewConfig } from './ops-view-config.js';
|
import { OpsViewConfig } from './ops-view-config.js';
|
||||||
import { OpsViewSecurity } from './ops-view-security.js';
|
import { OpsViewSecurity } from './ops-view-security.js';
|
||||||
|
import { OpsViewCertificates } from './ops-view-certificates.js';
|
||||||
|
|
||||||
@customElement('ops-dashboard')
|
@customElement('ops-dashboard')
|
||||||
export class OpsDashboard extends DeesElement {
|
export class OpsDashboard extends DeesElement {
|
||||||
@@ -61,6 +62,10 @@ export class OpsDashboard extends DeesElement {
|
|||||||
name: 'Security',
|
name: 'Security',
|
||||||
element: OpsViewSecurity,
|
element: OpsViewSecurity,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'Certificates',
|
||||||
|
element: OpsViewCertificates,
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
355
ts_web/elements/ops-view-certificates.ts
Normal file
355
ts_web/elements/ops-view-certificates.ts
Normal file
@@ -0,0 +1,355 @@
|
|||||||
|
import {
|
||||||
|
DeesElement,
|
||||||
|
html,
|
||||||
|
customElement,
|
||||||
|
type TemplateResult,
|
||||||
|
css,
|
||||||
|
state,
|
||||||
|
cssManager,
|
||||||
|
} 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 { type IStatsTile } from '@design.estate/dees-catalog';
|
||||||
|
|
||||||
|
declare global {
|
||||||
|
interface HTMLElementTagNameMap {
|
||||||
|
'ops-view-certificates': OpsViewCertificates;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@customElement('ops-view-certificates')
|
||||||
|
export class OpsViewCertificates extends DeesElement {
|
||||||
|
@state()
|
||||||
|
accessor certState: appstate.ICertificateState = appstate.certificateStatePart.getState();
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
super();
|
||||||
|
const sub = appstate.certificateStatePart.state.subscribe((newState) => {
|
||||||
|
this.certState = newState;
|
||||||
|
});
|
||||||
|
this.rxSubscriptions.push(sub);
|
||||||
|
}
|
||||||
|
|
||||||
|
async connectedCallback() {
|
||||||
|
await super.connectedCallback();
|
||||||
|
await appstate.certificateStatePart.dispatchAction(appstate.fetchCertificateOverviewAction, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static styles = [
|
||||||
|
cssManager.defaultStyles,
|
||||||
|
viewHostCss,
|
||||||
|
css`
|
||||||
|
.certificatesContainer {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.statusBadge {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 3px 10px;
|
||||||
|
border-radius: 12px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.02em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
|
||||||
|
.statusBadge.valid {
|
||||||
|
background: ${cssManager.bdTheme('#dcfce7', '#14532d')};
|
||||||
|
color: ${cssManager.bdTheme('#166534', '#4ade80')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.statusBadge.expiring {
|
||||||
|
background: ${cssManager.bdTheme('#fff7ed', '#431407')};
|
||||||
|
color: ${cssManager.bdTheme('#9a3412', '#fb923c')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.statusBadge.expired,
|
||||||
|
.statusBadge.failed {
|
||||||
|
background: ${cssManager.bdTheme('#fef2f2', '#450a0a')};
|
||||||
|
color: ${cssManager.bdTheme('#991b1b', '#f87171')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.statusBadge.provisioning {
|
||||||
|
background: ${cssManager.bdTheme('#eff6ff', '#172554')};
|
||||||
|
color: ${cssManager.bdTheme('#1e40af', '#60a5fa')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.statusBadge.unknown {
|
||||||
|
background: ${cssManager.bdTheme('#f3f4f6', '#1f2937')};
|
||||||
|
color: ${cssManager.bdTheme('#4b5563', '#9ca3af')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.sourceBadge {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 3px 8px;
|
||||||
|
border-radius: 4px;
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: 500;
|
||||||
|
background: ${cssManager.bdTheme('#f3f4f6', '#1f2937')};
|
||||||
|
color: ${cssManager.bdTheme('#374151', '#d1d5db')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.domainPills {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.domainPill {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 2px 8px;
|
||||||
|
border-radius: 4px;
|
||||||
|
font-size: 12px;
|
||||||
|
background: ${cssManager.bdTheme('#e0e7ff', '#1e1b4b')};
|
||||||
|
color: ${cssManager.bdTheme('#3730a3', '#a5b4fc')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.moreCount {
|
||||||
|
font-size: 11px;
|
||||||
|
color: ${cssManager.bdTheme('#6b7280', '#9ca3af')};
|
||||||
|
padding: 2px 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.errorText {
|
||||||
|
font-size: 12px;
|
||||||
|
color: ${cssManager.bdTheme('#991b1b', '#f87171')};
|
||||||
|
max-width: 200px;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.expiryInfo {
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.expiryInfo .daysLeft {
|
||||||
|
font-size: 11px;
|
||||||
|
color: ${cssManager.bdTheme('#6b7280', '#9ca3af')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.expiryInfo .daysLeft.warn {
|
||||||
|
color: ${cssManager.bdTheme('#9a3412', '#fb923c')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.expiryInfo .daysLeft.danger {
|
||||||
|
color: ${cssManager.bdTheme('#991b1b', '#f87171')};
|
||||||
|
}
|
||||||
|
`,
|
||||||
|
];
|
||||||
|
|
||||||
|
public render(): TemplateResult {
|
||||||
|
const { summary } = this.certState;
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<ops-sectionheading>Certificates</ops-sectionheading>
|
||||||
|
|
||||||
|
<div class="certificatesContainer">
|
||||||
|
${this.renderStatsTiles(summary)}
|
||||||
|
${this.renderCertificateTable()}
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private renderStatsTiles(summary: appstate.ICertificateState['summary']): TemplateResult {
|
||||||
|
const tiles: IStatsTile[] = [
|
||||||
|
{
|
||||||
|
id: 'total',
|
||||||
|
title: 'Total Certificates',
|
||||||
|
value: summary.total,
|
||||||
|
type: 'number',
|
||||||
|
icon: 'shieldHalved',
|
||||||
|
color: '#3b82f6',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'valid',
|
||||||
|
title: 'Valid',
|
||||||
|
value: summary.valid,
|
||||||
|
type: 'number',
|
||||||
|
icon: 'check',
|
||||||
|
color: '#22c55e',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'expiring',
|
||||||
|
title: 'Expiring Soon',
|
||||||
|
value: summary.expiring,
|
||||||
|
type: 'number',
|
||||||
|
icon: 'clock',
|
||||||
|
color: '#f59e0b',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'problems',
|
||||||
|
title: 'Failed / Expired',
|
||||||
|
value: summary.failed + summary.expired,
|
||||||
|
type: 'number',
|
||||||
|
icon: 'triangleExclamation',
|
||||||
|
color: '#ef4444',
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<dees-statsgrid
|
||||||
|
.tiles=${tiles}
|
||||||
|
.minTileWidth=${200}
|
||||||
|
.gridActions=${[
|
||||||
|
{
|
||||||
|
name: 'Refresh',
|
||||||
|
iconName: 'arrowsRotate',
|
||||||
|
action: async () => {
|
||||||
|
await appstate.certificateStatePart.dispatchAction(
|
||||||
|
appstate.fetchCertificateOverviewAction,
|
||||||
|
null
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
></dees-statsgrid>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private renderCertificateTable(): TemplateResult {
|
||||||
|
return html`
|
||||||
|
<dees-table
|
||||||
|
.data=${this.certState.certificates}
|
||||||
|
.displayFunction=${(cert: interfaces.requests.ICertificateInfo) => ({
|
||||||
|
Route: cert.routeName,
|
||||||
|
Domains: this.renderDomainPills(cert.domains),
|
||||||
|
Status: this.renderStatusBadge(cert.status),
|
||||||
|
Source: this.renderSourceBadge(cert.source),
|
||||||
|
Expires: this.renderExpiry(cert.expiryDate),
|
||||||
|
Error: cert.error
|
||||||
|
? html`<span class="errorText" title="${cert.error}">${cert.error}</span>`
|
||||||
|
: '',
|
||||||
|
})}
|
||||||
|
.dataActions=${[
|
||||||
|
{
|
||||||
|
name: 'Reprovision',
|
||||||
|
iconName: 'arrowsRotate',
|
||||||
|
type: ['inRow'],
|
||||||
|
actionFunc: async (actionData: { item: interfaces.requests.ICertificateInfo }) => {
|
||||||
|
const cert = actionData.item;
|
||||||
|
if (!cert.canReprovision) {
|
||||||
|
const { DeesToast } = await import('@design.estate/dees-catalog');
|
||||||
|
DeesToast.show({
|
||||||
|
message: 'This certificate source does not support reprovisioning.',
|
||||||
|
type: 'warning',
|
||||||
|
duration: 3000,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await appstate.certificateStatePart.dispatchAction(
|
||||||
|
appstate.reprovisionCertificateAction,
|
||||||
|
cert.routeName,
|
||||||
|
);
|
||||||
|
const { DeesToast } = await import('@design.estate/dees-catalog');
|
||||||
|
DeesToast.show({
|
||||||
|
message: `Reprovisioning triggered for ${cert.routeName}`,
|
||||||
|
type: 'success',
|
||||||
|
duration: 3000,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'View Details',
|
||||||
|
iconName: 'magnifyingGlass',
|
||||||
|
type: ['doubleClick', 'contextmenu'],
|
||||||
|
actionFunc: async (actionData: { item: interfaces.requests.ICertificateInfo }) => {
|
||||||
|
const cert = actionData.item;
|
||||||
|
const { DeesModal } = await import('@design.estate/dees-catalog');
|
||||||
|
await DeesModal.createAndShow({
|
||||||
|
heading: `Certificate: ${cert.routeName}`,
|
||||||
|
content: html`
|
||||||
|
<div style="padding: 20px;">
|
||||||
|
<dees-dataview-codebox
|
||||||
|
.heading=${'Certificate Details'}
|
||||||
|
progLang="json"
|
||||||
|
.codeToDisplay=${JSON.stringify(cert, null, 2)}
|
||||||
|
></dees-dataview-codebox>
|
||||||
|
</div>
|
||||||
|
`,
|
||||||
|
menuOptions: [
|
||||||
|
{
|
||||||
|
name: 'Copy Route Name',
|
||||||
|
iconName: 'copy',
|
||||||
|
action: async () => {
|
||||||
|
await navigator.clipboard.writeText(cert.routeName);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
heading1="Certificate Status"
|
||||||
|
heading2="TLS certificates across all routes"
|
||||||
|
searchable
|
||||||
|
.pagination=${true}
|
||||||
|
.paginationSize=${50}
|
||||||
|
dataName="certificate"
|
||||||
|
></dees-table>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private renderDomainPills(domains: string[]): TemplateResult {
|
||||||
|
const maxShow = 3;
|
||||||
|
const visible = domains.slice(0, maxShow);
|
||||||
|
const remaining = domains.length - maxShow;
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<span class="domainPills">
|
||||||
|
${visible.map((d) => html`<span class="domainPill">${d}</span>`)}
|
||||||
|
${remaining > 0 ? html`<span class="moreCount">+${remaining} more</span>` : ''}
|
||||||
|
</span>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private renderStatusBadge(status: interfaces.requests.TCertificateStatus): TemplateResult {
|
||||||
|
return html`<span class="statusBadge ${status}">${status}</span>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private renderSourceBadge(source: interfaces.requests.TCertificateSource): TemplateResult {
|
||||||
|
const labels: Record<string, string> = {
|
||||||
|
acme: 'ACME',
|
||||||
|
'provision-function': 'Custom',
|
||||||
|
static: 'Static',
|
||||||
|
none: 'None',
|
||||||
|
};
|
||||||
|
return html`<span class="sourceBadge">${labels[source] || source}</span>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private renderExpiry(expiryDate?: string): TemplateResult {
|
||||||
|
if (!expiryDate) {
|
||||||
|
return html`<span style="color: ${cssManager.bdTheme('#9ca3af', '#4b5563')}">--</span>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
const expiry = new Date(expiryDate);
|
||||||
|
const now = new Date();
|
||||||
|
const daysLeft = Math.ceil((expiry.getTime() - now.getTime()) / (1000 * 60 * 60 * 24));
|
||||||
|
|
||||||
|
const dateStr = expiry.toLocaleDateString();
|
||||||
|
let daysClass = '';
|
||||||
|
let daysText = '';
|
||||||
|
|
||||||
|
if (daysLeft < 0) {
|
||||||
|
daysClass = 'danger';
|
||||||
|
daysText = `(expired)`;
|
||||||
|
} else if (daysLeft < 30) {
|
||||||
|
daysClass = 'warn';
|
||||||
|
daysText = `(${daysLeft}d left)`;
|
||||||
|
} else {
|
||||||
|
daysText = `(${daysLeft}d left)`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<span class="expiryInfo">
|
||||||
|
${dateStr} <span class="daysLeft ${daysClass}">${daysText}</span>
|
||||||
|
</span>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -426,6 +426,7 @@ export class OpsViewNetwork extends DeesElement {
|
|||||||
type: 'number',
|
type: 'number',
|
||||||
icon: 'download',
|
icon: 'download',
|
||||||
color: '#22c55e',
|
color: '#22c55e',
|
||||||
|
description: `Total: ${this.formatBytes(this.networkState.totalBytes?.in || 0)}`,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'throughputOut',
|
id: 'throughputOut',
|
||||||
@@ -435,6 +436,7 @@ export class OpsViewNetwork extends DeesElement {
|
|||||||
type: 'number',
|
type: 'number',
|
||||||
icon: 'upload',
|
icon: 'upload',
|
||||||
color: '#8b5cf6',
|
color: '#8b5cf6',
|
||||||
|
description: `Total: ${this.formatBytes(this.networkState.totalBytes?.out || 0)}`,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import * as appstate from './appstate.js';
|
|||||||
|
|
||||||
const SmartRouter = plugins.domtools.plugins.smartrouter.SmartRouter;
|
const SmartRouter = plugins.domtools.plugins.smartrouter.SmartRouter;
|
||||||
|
|
||||||
export const validViews = ['overview', 'network', 'emails', 'logs', 'configuration', 'security'] as const;
|
export const validViews = ['overview', 'network', 'emails', 'logs', 'configuration', 'security', 'certificates'] as const;
|
||||||
export const validEmailFolders = ['queued', 'sent', 'failed', 'security'] as const;
|
export const validEmailFolders = ['queued', 'sent', 'failed', 'security'] as const;
|
||||||
|
|
||||||
export type TValidView = typeof validViews[number];
|
export type TValidView = typeof validViews[number];
|
||||||
|
|||||||
Reference in New Issue
Block a user