diff --git a/package.json b/package.json index 39545ca..5aa3c5a 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@push.rocks/smartnetwork": "^4.0.2", "@push.rocks/smartpath": "^5.0.5", "@push.rocks/smartpromise": "^4.0.3", - "@push.rocks/smartproxy": "^19.6.7", + "@push.rocks/smartproxy": "^19.6.12", "@push.rocks/smartrequest": "^2.1.0", "@push.rocks/smartrule": "^2.0.1", "@push.rocks/smartrx": "^3.0.10", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 85c9691..60e4786 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,8 +72,8 @@ importers: specifier: ^4.0.3 version: 4.2.3 '@push.rocks/smartproxy': - specifier: ^19.6.7 - version: 19.6.7(@aws-sdk/credential-providers@3.817.0)(socks@2.8.4) + specifier: ^19.6.12 + version: 19.6.12(@aws-sdk/credential-providers@3.817.0)(socks@2.8.4) '@push.rocks/smartrequest': specifier: ^2.1.0 version: 2.1.0 @@ -1110,8 +1110,8 @@ packages: '@push.rocks/smartpromise@4.2.3': resolution: {integrity: sha512-Ycg/TJR+tMt+S3wSFurOpEoW6nXv12QBtKXgBcjMZ4RsdO28geN46U09osPn9N9WuwQy1PkmTV5J/V4F9U8qEw==} - '@push.rocks/smartproxy@19.6.7': - resolution: {integrity: sha512-tC/zqUzSo4/SPqp52UrSe3cPR/YtyZiFC/HhYktCNfDXaWPqxY3ioViTwC2i6tb/6T6LmNdRJUOXxGFAz1j1cQ==} + '@push.rocks/smartproxy@19.6.12': + resolution: {integrity: sha512-prA5cXpuZaDNWURpxRsxtbqz4SvBK38wbDPZgAHOsLYccAJR9WNLXF65v7tlF2CUJdjhWhaOyY5MaYF1wr928A==} '@push.rocks/smartpuppeteer@2.0.5': resolution: {integrity: sha512-yK/qSeWVHIGWRp3c8S5tfdGP6WCKllZC4DR8d8CQlEjszOSBmHtlTdyyqOMBZ/BA4kd+eU5f3A1r4K2tGYty1g==} @@ -6476,7 +6476,7 @@ snapshots: '@push.rocks/smartpromise@4.2.3': {} - '@push.rocks/smartproxy@19.6.7(@aws-sdk/credential-providers@3.817.0)(socks@2.8.4)': + '@push.rocks/smartproxy@19.6.12(@aws-sdk/credential-providers@3.817.0)(socks@2.8.4)': dependencies: '@push.rocks/lik': 6.2.2 '@push.rocks/smartacme': 8.0.0(@aws-sdk/credential-providers@3.817.0)(socks@2.8.4) diff --git a/ts_web/elements/ops-view-network.ts b/ts_web/elements/ops-view-network.ts index ae3d876..e394e3e 100644 --- a/ts_web/elements/ops-view-network.ts +++ b/ts_web/elements/ops-view-network.ts @@ -33,11 +33,6 @@ export class OpsViewNetwork extends DeesElement { @state() private networkState = appstate.networkStatePart.getState(); - @state() - private selectedTimeRange: '1m' | '5m' | '15m' | '1h' | '24h' = '5m'; - - @state() - private selectedProtocol: 'all' | 'http' | 'https' | 'smtp' | 'dns' = 'all'; @state() private networkRequests: INetworkRequest[] = []; @@ -47,9 +42,6 @@ export class OpsViewNetwork extends DeesElement { @state() private trafficDataOut: Array<{ x: string | number; y: number }> = []; - - @state() - private isLoading = false; private lastTrafficUpdateTime = 0; private trafficUpdateInterval = 1000; // Update every 1 second @@ -86,16 +78,9 @@ export class OpsViewNetwork extends DeesElement { private initializeTrafficData() { const now = Date.now(); - const timeRanges = { - '1m': 60 * 1000, - '5m': 5 * 60 * 1000, - '15m': 15 * 60 * 1000, - '1h': 60 * 60 * 1000, - '24h': 24 * 60 * 60 * 1000, - }; - - const range = timeRanges[this.selectedTimeRange]; - const bucketSize = range / 60; + // Fixed 5 minute time range + const range = 5 * 60 * 1000; // 5 minutes + const bucketSize = range / 60; // 60 data points // Initialize with empty data points for both in and out const emptyData = Array.from({ length: 60 }, (_, i) => { @@ -127,26 +112,6 @@ export class OpsViewNetwork extends DeesElement { gap: 24px; } - .controlBar { - display: flex; - gap: 16px; - align-items: center; - flex-wrap: wrap; - margin-bottom: 24px; - } - - .controlGroup { - display: flex; - gap: 8px; - align-items: center; - } - - .controlLabel { - font-size: 14px; - color: ${cssManager.bdTheme('#666', '#999')}; - margin-right: 8px; - } - dees-statsgrid { margin-bottom: 24px; } @@ -220,47 +185,6 @@ export class OpsViewNetwork extends DeesElement { Network Activity
- -
-
- Time Range: - - ${(['1m', '5m', '15m', '1h', '24h'] as const).map(range => html` - this.handleTimeRangeChange(range)} - .type=${this.selectedTimeRange === range ? 'highlighted' : 'normal'} - > - ${range} - - `)} - -
- -
- Protocol: - this.selectedProtocol = e.detail.key} - > -
- -
- this.refreshData()} - .disabled=${this.isLoading} - > - ${this.isLoading ? html`` : 'Refresh'} - -
-
- ${this.renderNetworkStats()} @@ -299,7 +223,7 @@ export class OpsViewNetwork extends DeesElement { ({ Time: new Date(req.timestamp).toLocaleTimeString(), Protocol: html`${req.protocol.toUpperCase()}`, @@ -322,7 +246,7 @@ export class OpsViewNetwork extends DeesElement { } ]} heading1="Recent Network Activity" - heading2="Last ${this.selectedTimeRange} of network requests" + heading2="Recent network requests" searchable .pagination=${true} .paginationSize=${50} @@ -373,22 +297,6 @@ export class OpsViewNetwork extends DeesElement { }); } - private getFilteredRequests(): INetworkRequest[] { - if (this.selectedProtocol === 'all') { - return this.networkRequests; - } - - // Map protocol filter to actual protocol values - const protocolMap: Record = { - 'http': ['http'], - 'https': ['https'], - 'smtp': ['tcp'], // SMTP runs over TCP - 'dns': ['udp'], // DNS typically runs over UDP - }; - - const allowedProtocols = protocolMap[this.selectedProtocol] || [this.selectedProtocol]; - return this.networkRequests.filter(req => allowedProtocols.includes(req.protocol)); - } private renderStatus(statusCode?: number): TemplateResult { if (!statusCode) { @@ -406,16 +314,6 @@ export class OpsViewNetwork extends DeesElement { return url.substring(0, maxLength - 3) + '...'; } - private getProtocolLabel(protocol: string): string { - const labels: Record = { - 'all': 'All Protocols', - 'http': 'HTTP', - 'https': 'HTTPS', - 'smtp': 'SMTP', - 'dns': 'DNS', - }; - return labels[protocol] || protocol.toUpperCase(); - } private formatNumber(num: number): string { if (num >= 1000000) { @@ -554,26 +452,22 @@ export class OpsViewNetwork extends DeesElement { `; } - private async refreshData() { - this.isLoading = true; - await appstate.statsStatePart.dispatchAction(appstate.fetchAllStatsAction, null); - await appstate.networkStatePart.dispatchAction(appstate.fetchNetworkStatsAction, null); - await this.updateNetworkData(); - this.isLoading = false; - } private renderTopIPs(): TemplateResult { if (this.networkState.topIPs.length === 0) { return html``; } + // Calculate total connections across all top IPs + const totalConnections = this.networkState.topIPs.reduce((sum, ipData) => sum + ipData.count, 0); + return html` ({ 'IP Address': ipData.ip, 'Connections': ipData.count, - 'Percentage': ((ipData.count / this.networkState.connections.length) * 100).toFixed(1) + '%', + 'Percentage': totalConnections > 0 ? ((ipData.count / totalConnections) * 100).toFixed(1) + '%' : '0%', })} heading1="Top Connected IPs" heading2="IPs with most active connections" @@ -611,16 +505,9 @@ export class OpsViewNetwork extends DeesElement { private updateTrafficData() { const now = Date.now(); - const timeRanges = { - '1m': 60 * 1000, - '5m': 5 * 60 * 1000, - '15m': 15 * 60 * 1000, - '1h': 60 * 60 * 1000, - '24h': 24 * 60 * 60 * 1000, - }; - - const range = timeRanges[this.selectedTimeRange]; - const bucketSize = range / 60; // 60 data points + // Fixed 5 minute time range + const range = 5 * 60 * 1000; // 5 minutes + const bucketSize = range / 60; // 60 data points // 60 data points // Check if enough time has passed to add a new data point const timeSinceLastUpdate = now - this.lastTrafficUpdateTime; @@ -707,10 +594,4 @@ export class OpsViewNetwork extends DeesElement { } } - private handleTimeRangeChange(range: '1m' | '5m' | '15m' | '1h' | '24h') { - this.selectedTimeRange = range; - // Reinitialize traffic data for new time range - this.initializeTrafficData(); - this.updateNetworkData(); - } } \ No newline at end of file