@serve.zone/dcrouter 5.1.0 → 5.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_serve/bundle.js +2 -2
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/monitoring/classes.metricsmanager.d.ts +2 -0
- package/dist_ts/monitoring/classes.metricsmanager.js +5 -3
- package/dist_ts/opsserver/handlers/stats.handler.js +7 -1
- package/dist_ts_interfaces/data/stats.d.ts +7 -0
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/elements/ops-view-overview.d.ts +1 -0
- package/dist_ts_web/elements/ops-view-overview.js +30 -1
- package/package.json +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/monitoring/classes.metricsmanager.ts +4 -2
- package/ts/opsserver/handlers/stats.handler.ts +9 -2
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/elements/ops-view-overview.ts +34 -2
package/dist_serve/bundle.js
CHANGED
|
@@ -29117,7 +29117,7 @@ html\`<dees-button>Click me</dees-button>\`</code></pre>
|
|
|
29117
29117
|
<dees-chart-log .label=${"Security Alerts"} .data=${[]}></dees-chart-log>
|
|
29118
29118
|
</div>
|
|
29119
29119
|
`}
|
|
29120
|
-
`}formatUptime(a){let i=Math.floor(a/86400),r=Math.floor(a%86400/3600),s=Math.floor(a%3600/60),n=Math.floor(a%60);return i>0?`${i}d ${r}h ${s}m ${n}s`:r>0?`${r}h ${s}m ${n}s`:s>0?`${s}m ${n}s`:`${n}s`}formatBytes(a){let i=["B","KB","MB","GB","TB"],r=a,s=0;for(;r>=1024&&s<i.length-1;)r/=1024,s++;return`${r.toFixed(1)} ${i[s]}`}renderServerStats(){if(!this.statsState.serverStats)return w``;let a=Math.round(this.statsState.serverStats.cpuUsage.user),i=this.statsState.serverStats.memoryUsage.actualUsagePercentage!==void 0?Math.round(this.statsState.serverStats.memoryUsage.actualUsagePercentage):Math.round(this.statsState.serverStats.memoryUsage.heapUsed/this.statsState.serverStats.memoryUsage.heapTotal*100),r=[{id:"status",title:"Server Status",value:this.statsState.serverStats.uptime?"Online":"Offline",type:"text",icon:"server",color:this.statsState.serverStats.uptime?"#22c55e":"#ef4444",description:`Uptime: ${this.formatUptime(this.statsState.serverStats.uptime)}`},{id:"connections",title:"Active Connections",value:this.statsState.serverStats.activeConnections,type:"number",icon:"networkWired",color:"#3b82f6",description:`Total: ${this.statsState.serverStats.totalConnections}`},{id:"cpu",title:"CPU Usage",value:a,type:"gauge",icon:"microchip",gaugeOptions:{min:0,max:100,thresholds:[{value:0,color:"#22c55e"},{value:60,color:"#f59e0b"},{value:80,color:"#ef4444"}]}},{id:"memory",title:"Memory Usage",value:i,type:"percentage",icon:"memory",color:i>80?"#ef4444":i>60?"#f59e0b":"#22c55e",description:this.statsState.serverStats.memoryUsage.actualUsageBytes!==void 0&&this.statsState.serverStats.memoryUsage.maxMemoryMB!==void 0?`${this.formatBytes(this.statsState.serverStats.memoryUsage.actualUsageBytes)} / ${this.formatBytes(this.statsState.serverStats.memoryUsage.maxMemoryMB*1024*1024)}`:`${this.formatBytes(this.statsState.serverStats.memoryUsage.rss)} / ${this.formatBytes(this.statsState.serverStats.memoryUsage.heapTotal)}`}];return w`
|
|
29120
|
+
`}formatUptime(a){let i=Math.floor(a/86400),r=Math.floor(a%86400/3600),s=Math.floor(a%3600/60),n=Math.floor(a%60);return i>0?`${i}d ${r}h ${s}m ${n}s`:r>0?`${r}h ${s}m ${n}s`:s>0?`${s}m ${n}s`:`${n}s`}formatBytes(a){let i=["B","KB","MB","GB","TB"],r=a,s=0;for(;r>=1024&&s<i.length-1;)r/=1024,s++;return`${r.toFixed(1)} ${i[s]}`}formatBitsPerSecond(a){let i=a*8,r=["bit/s","kbit/s","Mbit/s","Gbit/s"],s=i,n=0;for(;s>=1e3&&n<r.length-1;)s/=1e3,n++;return`${s.toFixed(1)} ${r[n]}`}renderServerStats(){if(!this.statsState.serverStats)return w``;let a=Math.round(this.statsState.serverStats.cpuUsage.user),i=this.statsState.serverStats.memoryUsage.actualUsagePercentage!==void 0?Math.round(this.statsState.serverStats.memoryUsage.actualUsagePercentage):Math.round(this.statsState.serverStats.memoryUsage.heapUsed/this.statsState.serverStats.memoryUsage.heapTotal*100),r=[{id:"status",title:"Server Status",value:this.statsState.serverStats.uptime?"Online":"Offline",type:"text",icon:"server",color:this.statsState.serverStats.uptime?"#22c55e":"#ef4444",description:`Uptime: ${this.formatUptime(this.statsState.serverStats.uptime)}`},{id:"connections",title:"Active Connections",value:this.statsState.serverStats.activeConnections,type:"number",icon:"networkWired",color:"#3b82f6",description:`Total: ${this.statsState.serverStats.totalConnections}`},{id:"throughputIn",title:"Throughput In",value:this.formatBitsPerSecond(this.statsState.serverStats.throughput?.bytesInPerSecond||0),type:"text",icon:"download",color:"#22c55e",description:`Total: ${this.formatBytes(this.statsState.serverStats.throughput?.bytesIn||0)}`},{id:"throughputOut",title:"Throughput Out",value:this.formatBitsPerSecond(this.statsState.serverStats.throughput?.bytesOutPerSecond||0),type:"text",icon:"upload",color:"#8b5cf6",description:`Total: ${this.formatBytes(this.statsState.serverStats.throughput?.bytesOut||0)}`},{id:"cpu",title:"CPU Usage",value:a,type:"gauge",icon:"microchip",gaugeOptions:{min:0,max:100,thresholds:[{value:0,color:"#22c55e"},{value:60,color:"#f59e0b"},{value:80,color:"#ef4444"}]}},{id:"memory",title:"Memory Usage",value:i,type:"percentage",icon:"memory",color:i>80?"#ef4444":i>60?"#f59e0b":"#22c55e",description:this.statsState.serverStats.memoryUsage.actualUsageBytes!==void 0&&this.statsState.serverStats.memoryUsage.maxMemoryMB!==void 0?`${this.formatBytes(this.statsState.serverStats.memoryUsage.actualUsageBytes)} / ${this.formatBytes(this.statsState.serverStats.memoryUsage.maxMemoryMB*1024*1024)}`:`${this.formatBytes(this.statsState.serverStats.memoryUsage.rss)} / ${this.formatBytes(this.statsState.serverStats.memoryUsage.heapTotal)}`}];return w`
|
|
29121
29121
|
<dees-statsgrid
|
|
29122
29122
|
.tiles=${r}
|
|
29123
29123
|
.gridActions=${[{name:"Refresh",iconName:"arrowsRotate",action:async()=>{await o2.dispatchAction(Ol,null)}}]}
|
|
@@ -30536,4 +30536,4 @@ ibantools/jsnext/ibantools.js:
|
|
|
30536
30536
|
* @preferred
|
|
30537
30537
|
*)
|
|
30538
30538
|
*/
|
|
30539
|
-
//# sourceMappingURL=bundle-
|
|
30539
|
+
//# sourceMappingURL=bundle-1770992375998.js.map
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '5.
|
|
6
|
+
version: '5.2.0',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDBFQUEwRTtDQUN4RixDQUFBIn0=
|
|
@@ -131,8 +131,10 @@ export class MetricsManager {
|
|
|
131
131
|
requestsPerSecond: proxyMetrics ? proxyMetrics.requests.perSecond() : 0,
|
|
132
132
|
throughput: proxyMetrics ? {
|
|
133
133
|
bytesIn: proxyMetrics.totals.bytesIn(),
|
|
134
|
-
bytesOut: proxyMetrics.totals.bytesOut()
|
|
135
|
-
|
|
134
|
+
bytesOut: proxyMetrics.totals.bytesOut(),
|
|
135
|
+
bytesInPerSecond: proxyMetrics.throughput.instant().in,
|
|
136
|
+
bytesOutPerSecond: proxyMetrics.throughput.instant().out,
|
|
137
|
+
} : { bytesIn: 0, bytesOut: 0, bytesInPerSecond: 0, bytesOutPerSecond: 0 },
|
|
136
138
|
};
|
|
137
139
|
});
|
|
138
140
|
}
|
|
@@ -443,4 +445,4 @@ export class MetricsManager {
|
|
|
443
445
|
}, 200); // Use 200ms cache for more frequent updates
|
|
444
446
|
}
|
|
445
447
|
}
|
|
446
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.metricsmanager.js","sourceRoot":"","sources":["../../../ts/monitoring/classes.metricsmanager.ts"],"names":[],"mappings":"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"}
|
|
448
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.metricsmanager.js","sourceRoot":"","sources":["../../../ts/monitoring/classes.metricsmanager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,MAAM,OAAO,cAAc;IACjB,MAAM,CAA4B;IAClC,YAAY,CAAoC;IAChD,QAAQ,CAAW;IACnB,aAAa,CAAkB;IAC/B,YAAY,CAAe;IAEnC,YAAY;IACK,eAAe,GAAG,IAAI,CAAC,CAAC,4BAA4B;IAErE,+BAA+B;IACvB,YAAY,GAAG;QACrB,SAAS,EAAE,CAAC;QACZ,aAAa,EAAE,CAAC;QAChB,WAAW,EAAE,CAAC;QACd,YAAY,EAAE,CAAC;QACf,SAAS,EAAE,CAAC;QACZ,aAAa,EAAE,IAAI,IAAI,EAAE,CAAC,YAAY,EAAE;QACxC,aAAa,EAAE,EAAc,EAAE,6BAA6B;QAC5D,UAAU,EAAE,IAAI,GAAG,EAAkB,EAAE,iCAAiC;QACxE,cAAc,EAAE,EAAiE;KAClF,CAAC;IAEF,6BAA6B;IACrB,UAAU,GAAG;QACnB,YAAY,EAAE,CAAC;QACf,SAAS,EAAE,CAAC;QACZ,WAAW,EAAE,CAAC;QACd,UAAU,EAAE,EAA4B;QACxC,UAAU,EAAE,IAAI,GAAG,EAAkB;QACrC,aAAa,EAAE,IAAI,IAAI,EAAE,CAAC,YAAY,EAAE;QACxC,eAAe,EAAE,EAAc,EAAE,8CAA8C;QAC/E,aAAa,EAAE,EAAc,EAAE,6BAA6B;KAC7D,CAAC;IAEF,kCAAkC;IAC1B,eAAe,GAAG;QACxB,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,CAAC;QACf,YAAY,EAAE,CAAC;QACf,eAAe,EAAE,CAAC;QAClB,gBAAgB,EAAE,CAAC;QACnB,aAAa,EAAE,IAAI,IAAI,EAAE,CAAC,YAAY,EAAE;QACxC,SAAS,EAAE,EAAmF;KAC/F,CAAC;IAEF,YAAY,QAAkB;QAC5B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,6CAA6C;QAC7C,IAAI,CAAC,MAAM,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC1C,UAAU,EAAE;gBACV,WAAW,EAAE,YAAY;gBACzB,OAAO,EAAE,MAAM;gBACf,IAAI,EAAE,kBAAkB;aACzB;SACF,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,GAAG,IAAI,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACnF,0CAA0C;QAC1C,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,gCAAgC;QAChC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAE1B,mCAAmC;QACnC,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;YACpC,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,YAAY,EAAE,CAAC;YAE9C,IAAI,WAAW,KAAK,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;gBACpD,IAAI,CAAC,YAAY,CAAC,SAAS,GAAG,CAAC,CAAC;gBAChC,IAAI,CAAC,YAAY,CAAC,aAAa,GAAG,CAAC,CAAC;gBACpC,IAAI,CAAC,YAAY,CAAC,WAAW,GAAG,CAAC,CAAC;gBAClC,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,CAAC,CAAC;gBACnC,IAAI,CAAC,YAAY,CAAC,aAAa,GAAG,EAAE,CAAC;gBACrC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACrC,IAAI,CAAC,YAAY,CAAC,cAAc,GAAG,EAAE,CAAC;gBACtC,IAAI,CAAC,YAAY,CAAC,aAAa,GAAG,WAAW,CAAC;YAChD,CAAC;YAED,IAAI,WAAW,KAAK,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;gBAClD,IAAI,CAAC,UAAU,CAAC,YAAY,GAAG,CAAC,CAAC;gBACjC,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,CAAC,CAAC;gBAC9B,IAAI,CAAC,UAAU,CAAC,WAAW,GAAG,CAAC,CAAC;gBAChC,IAAI,CAAC,UAAU,CAAC,UAAU,GAAG,EAAE,CAAC;gBAChC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACnC,IAAI,CAAC,UAAU,CAAC,eAAe,GAAG,EAAE,CAAC;gBACrC,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,EAAE,CAAC;gBACnC,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,WAAW,CAAC;YAC9C,CAAC;YAED,IAAI,WAAW,KAAK,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC;gBACvD,IAAI,CAAC,eAAe,CAAC,UAAU,GAAG,CAAC,CAAC;gBACpC,IAAI,CAAC,eAAe,CAAC,YAAY,GAAG,CAAC,CAAC;gBACtC,IAAI,CAAC,eAAe,CAAC,YAAY,GAAG,CAAC,CAAC;gBACtC,IAAI,CAAC,eAAe,CAAC,eAAe,GAAG,CAAC,CAAC;gBACzC,IAAI,CAAC,eAAe,CAAC,gBAAgB,GAAG,CAAC,CAAC;gBAC1C,IAAI,CAAC,eAAe,CAAC,SAAS,GAAG,EAAE,CAAC;gBACpC,IAAI,CAAC,eAAe,CAAC,aAAa,GAAG,WAAW,CAAC;YACnD,CAAC;QACH,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,qBAAqB;QAEhC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACpD,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,2BAA2B;QAC3B,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAClC,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QACjC,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IACpD,CAAC;IAED,sDAAsD;IAC/C,KAAK,CAAC,cAAc;QACzB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;YAC9D,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAC7F,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAEpG,OAAO;gBACL,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;gBACxB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;gBACjD,WAAW,EAAE;oBACX,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ;oBACxC,SAAS,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,SAAS;oBAC1C,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ;oBACxC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG;oBAC9B,+BAA+B;oBAC/B,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW;oBAC1C,gBAAgB,EAAE,gBAAgB,CAAC,gBAAgB;oBACnD,qBAAqB,EAAE,gBAAgB,CAAC,gBAAgB;iBACzD;gBACD,QAAQ,EAAE;oBACR,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC,YAAY,IAAI,GAAG,CAAC;oBACtD,MAAM,EAAE,CAAC,EAAE,4CAA4C;iBACxD;gBACD,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBAChE,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;gBACtE,iBAAiB,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;gBACvE,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;oBACzB,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE;oBACtC,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACxC,gBAAgB,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE;oBACtD,iBAAiB,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,GAAG;iBACzD,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE;aAC3E,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,oBAAoB;IACb,KAAK,CAAC,aAAa;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,EAAE;YAC9C,kCAAkC;YAClC,MAAM,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC;gBAChE,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM;gBACrG,CAAC,CAAC,CAAC,CAAC;YAEN,qBAAqB;YACrB,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;iBACrE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC3B,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;iBACZ,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAE/C,wCAAwC;YACxC,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;YAEnE,OAAO;gBACL,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,SAAS;gBACtC,aAAa,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa;gBAC9C,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW;gBAC1C,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,CAAC;oBAC5C,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,GAAG;oBACtE,CAAC,CAAC,CAAC;gBACL,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,SAAS,GAAG,CAAC;oBAC3C,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,GAAG;oBACrG,CAAC,CAAC,GAAG;gBACP,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,SAAS;gBACtC,mBAAmB,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;gBAChD,aAAa;gBACb,cAAc;aACf,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB;IACX,KAAK,CAAC,WAAW;QACtB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE;YAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,GAAG,CAAC;gBACnD,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,GAAG;gBAClE,CAAC,CAAC,CAAC,CAAC;YAEN,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;iBAChE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC3B,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;iBACZ,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAEjD,sDAAsD;YACtD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,MAAM,YAAY,GAAG,GAAG,GAAG,KAAK,CAAC;YACjC,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,YAAY,CAAC,CAAC;YACvF,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM,GAAG,EAAE,CAAC;YAEnD,kCAAkC;YAClC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC;gBAC9D,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM;gBACjG,CAAC,CAAC,CAAC,CAAC;YAEN,OAAO;gBACL,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,GAAG,EAAE,CAAC,GAAG,EAAE;gBACxD,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,YAAY;gBAC1C,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS;gBACpC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW;gBACxC,YAAY,EAAE,YAAY;gBAC1B,UAAU,EAAE,UAAU;gBACtB,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU;gBACtC,mBAAmB,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;gBAChD,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI;aAC/C,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,uBAAuB;IAChB,KAAK,CAAC,gBAAgB;QAC3B,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,EAAE;YACjD,iCAAiC;YACjC,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;YAElE,OAAO;gBACL,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,UAAU;gBAC3C,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,YAAY;gBAC/C,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,YAAY;gBAC/C,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,eAAe;gBACrD,gBAAgB,EAAE,IAAI,CAAC,eAAe,CAAC,gBAAgB;gBACvD,mBAAmB,EAAE,IAAI,CAAC,eAAe,CAAC,YAAY;oBACpD,IAAI,CAAC,eAAe,CAAC,eAAe;oBACpC,IAAI,CAAC,eAAe,CAAC,gBAAgB;gBACvC,eAAe;aAChB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,sCAAsC;IAC/B,KAAK,CAAC,iBAAiB;QAC5B,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,EAAE;YAClD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAE7F,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,MAAM,kBAAkB,GAAG,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC9D,MAAM,cAAc,GAAG,EAAE,CAAC;YAE1B,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,kBAAkB,EAAE,CAAC;gBACpD,cAAc,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK;oBACL,MAAM,EAAE,SAAS;oBACjB,YAAY,EAAE,IAAI,IAAI,EAAE;iBACzB,CAAC,CAAC;YACL,CAAC;YAED,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,+BAA+B;IACxB,cAAc,CAAC,SAAkB,EAAE,cAAuB;QAC/D,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC;QAE9B,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC/D,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACrD,qCAAqC;YACrC,IAAI,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;gBAClD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;YAC1C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC;YACpC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,SAAS,IAAI,SAAS;SAChC,CAAC,CAAC;QAEH,iCAAiC;QACjC,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACnD,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC3C,CAAC;IACH,CAAC;IAEM,kBAAkB,CAAC,MAAe;QACvC,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;QAElC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC;YACpC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,MAAM,IAAI,SAAS;SAC7B,CAAC,CAAC;QAEH,iCAAiC;QACjC,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACnD,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC3C,CAAC;IACH,CAAC;IAEM,gBAAgB,CAAC,SAAkB,EAAE,MAAe;QACzD,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAEhC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC;YACpC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG,SAAS,IAAI,SAAS,KAAK,MAAM,IAAI,eAAe,EAAE;SACnE,CAAC,CAAC;QAEH,iCAAiC;QACjC,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACnD,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC3C,CAAC;IACH,CAAC;IAEM,iBAAiB,CAAC,SAAkB;QACzC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;QAEjC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC;YACpC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,SAAS,IAAI,SAAS;SAChC,CAAC,CAAC;QAEH,iCAAiC;QACjC,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACnD,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC3C,CAAC;IACH,CAAC;IAEM,eAAe,CAAC,IAAY;QACjC,IAAI,CAAC,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC;IACrC,CAAC;IAED,6BAA6B;IACtB,aAAa,CAAC,SAAiB,EAAE,MAAc,EAAE,QAAiB,EAAE,cAAuB;QAChG,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;QAE/B,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;QAChC,CAAC;QAED,wBAAwB;QACxB,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAEjD,2CAA2C;QAC3C,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC;QAC3C,IAAI,CAAC,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,cAAc,CAAC,CAAC;QAErG,kCAAkC;QAClC,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnD,qCAAqC;YACrC,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;gBAChD,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;YACxC,CAAC;QACH,CAAC;QAED,oBAAoB;QACpB,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QAEzF,oCAAoC;QACpC,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC;QAEzD,iEAAiE;QACjE,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YAC3D,6DAA6D;YAC7D,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;iBACnE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC3B,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,qCAAqC;YAE1F,wCAAwC;YACxC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YACnC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE;gBACxC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,kCAAkC;IAC3B,cAAc,CAAC,EAAW,EAAE,MAAe;QAChD,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;QAElC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC;YAClC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,MAAM,EAAE,IAAI,SAAS,aAAa,MAAM,IAAI,iBAAiB,EAAE;SACzE,CAAC,CAAC;QAEH,gCAAgC;QAChC,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACjD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACzC,CAAC;IACH,CAAC;IAEM,gBAAgB,CAAC,QAAiB,EAAE,EAAW;QACpD,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC;QAEpC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC;YAClC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,6BAA6B,QAAQ,IAAI,SAAS,SAAS,EAAE,IAAI,SAAS,EAAE;SACtF,CAAC,CAAC;QAEH,gCAAgC;QAChC,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACjD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACzC,CAAC;IACH,CAAC;IAEM,iBAAiB,CAAC,MAAe;QACtC,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC;QAEpC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC;YAClC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,sBAAsB,MAAM,IAAI,SAAS,EAAE;SACrD,CAAC,CAAC;QAEH,gCAAgC;QAChC,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACjD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACzC,CAAC;IACH,CAAC;IAEM,oBAAoB,CAAC,MAAe;QACzC,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC;QAEvC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC;YAClC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,kBAAkB;YACxB,QAAQ,EAAE,MAAM;YAChB,OAAO,EAAE,yBAAyB,MAAM,IAAI,SAAS,EAAE;SACxD,CAAC,CAAC;QAEH,gCAAgC;QAChC,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACjD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACzC,CAAC;IACH,CAAC;IAEM,qBAAqB,CAAC,MAAe;QAC1C,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;QAExC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC;YAClC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,mBAAmB;YACzB,QAAQ,EAAE,MAAM;YAChB,OAAO,EAAE,yBAAyB,MAAM,IAAI,SAAS,EAAE;SACxD,CAAC,CAAC;QAEH,gCAAgC;QAChC,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACjD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACzC,CAAC;IACH,CAAC;IAED,sCAAsC;IAC/B,KAAK,CAAC,eAAe;QAC1B,sEAAsE;QACtE,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,EAAE;YAChD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAE7F,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,OAAO;oBACL,eAAe,EAAE,IAAI,GAAG,EAAkB;oBAC1C,cAAc,EAAE,EAAE,gBAAgB,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE;oBAC7D,MAAM,EAAE,EAAE;oBACV,oBAAoB,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;iBAClD,CAAC;YACJ,CAAC;YAED,gCAAgC;YAChC,MAAM,eAAe,GAAG,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YACxD,MAAM,iBAAiB,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YAE5D,sBAAsB;YACtB,MAAM,cAAc,GAAG;gBACrB,gBAAgB,EAAE,iBAAiB,CAAC,EAAE;gBACtC,iBAAiB,EAAE,iBAAiB,CAAC,GAAG;aACzC,CAAC;YAEF,cAAc;YACd,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAEnD,6BAA6B;YAC7B,MAAM,oBAAoB,GAAG;gBAC3B,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE;gBACtC,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE;aACzC,CAAC;YAEF,OAAO;gBACL,eAAe;gBACf,cAAc;gBACd,MAAM;gBACN,oBAAoB;aACrB,CAAC;QACJ,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,4CAA4C;IACvD,CAAC;CACF"}
|
|
@@ -22,6 +22,8 @@ export class StatsHandler {
|
|
|
22
22
|
cpuUsage: stats.cpuUsage,
|
|
23
23
|
activeConnections: stats.activeConnections,
|
|
24
24
|
totalConnections: stats.totalConnections,
|
|
25
|
+
requestsPerSecond: stats.requestsPerSecond,
|
|
26
|
+
throughput: stats.throughput,
|
|
25
27
|
},
|
|
26
28
|
history: dataArg.includeHistory ? stats.history : undefined,
|
|
27
29
|
};
|
|
@@ -148,6 +150,8 @@ export class StatsHandler {
|
|
|
148
150
|
cpuUsage: stats.cpuUsage,
|
|
149
151
|
activeConnections: stats.activeConnections,
|
|
150
152
|
totalConnections: stats.totalConnections,
|
|
153
|
+
requestsPerSecond: stats.requestsPerSecond,
|
|
154
|
+
throughput: stats.throughput,
|
|
151
155
|
};
|
|
152
156
|
}));
|
|
153
157
|
}
|
|
@@ -240,6 +244,7 @@ export class StatsHandler {
|
|
|
240
244
|
requestsPerSecond: serverStats.requestsPerSecond,
|
|
241
245
|
activeConnections: serverStats.activeConnections,
|
|
242
246
|
totalConnections: serverStats.totalConnections,
|
|
247
|
+
throughput: serverStats.throughput,
|
|
243
248
|
history: [], // TODO: Implement history tracking
|
|
244
249
|
};
|
|
245
250
|
}
|
|
@@ -262,6 +267,7 @@ export class StatsHandler {
|
|
|
262
267
|
requestsPerSecond: 0,
|
|
263
268
|
activeConnections: 0,
|
|
264
269
|
totalConnections: 0,
|
|
270
|
+
throughput: { bytesIn: 0, bytesOut: 0, bytesInPerSecond: 0, bytesOutPerSecond: 0 },
|
|
265
271
|
history: [],
|
|
266
272
|
};
|
|
267
273
|
}
|
|
@@ -363,4 +369,4 @@ export class StatsHandler {
|
|
|
363
369
|
};
|
|
364
370
|
}
|
|
365
371
|
}
|
|
366
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"stats.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/stats.handler.ts"],"names":[],"mappings":"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"}
|
|
372
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"stats.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/stats.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,13 @@ export interface IServerStats {
|
|
|
16
16
|
};
|
|
17
17
|
activeConnections: number;
|
|
18
18
|
totalConnections: number;
|
|
19
|
+
requestsPerSecond: number;
|
|
20
|
+
throughput: {
|
|
21
|
+
bytesIn: number;
|
|
22
|
+
bytesOut: number;
|
|
23
|
+
bytesInPerSecond: number;
|
|
24
|
+
bytesOutPerSecond: number;
|
|
25
|
+
};
|
|
19
26
|
}
|
|
20
27
|
export interface IEmailStats {
|
|
21
28
|
sent: number;
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '5.
|
|
6
|
+
version: '5.2.0',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsc0JBQXNCO0lBQzVCLE9BQU8sRUFBRSxPQUFPO0lBQ2hCLFdBQVcsRUFBRSwwRUFBMEU7Q0FDeEYsQ0FBQSJ9
|
|
@@ -8,6 +8,7 @@ export declare class OpsViewOverview extends DeesElement {
|
|
|
8
8
|
render(): plugins.deesElement.TemplateResult<1>;
|
|
9
9
|
private formatUptime;
|
|
10
10
|
private formatBytes;
|
|
11
|
+
private formatBitsPerSecond;
|
|
11
12
|
private renderServerStats;
|
|
12
13
|
private renderEmailStats;
|
|
13
14
|
private renderDnsStats;
|
|
@@ -172,6 +172,17 @@ let OpsViewOverview = (() => {
|
|
|
172
172
|
}
|
|
173
173
|
return `${size.toFixed(1)} ${units[unitIndex]}`;
|
|
174
174
|
}
|
|
175
|
+
formatBitsPerSecond(bytesPerSecond) {
|
|
176
|
+
const bitsPerSecond = bytesPerSecond * 8;
|
|
177
|
+
const units = ['bit/s', 'kbit/s', 'Mbit/s', 'Gbit/s'];
|
|
178
|
+
let size = bitsPerSecond;
|
|
179
|
+
let unitIndex = 0;
|
|
180
|
+
while (size >= 1000 && unitIndex < units.length - 1) {
|
|
181
|
+
size /= 1000;
|
|
182
|
+
unitIndex++;
|
|
183
|
+
}
|
|
184
|
+
return `${size.toFixed(1)} ${units[unitIndex]}`;
|
|
185
|
+
}
|
|
175
186
|
renderServerStats() {
|
|
176
187
|
if (!this.statsState.serverStats)
|
|
177
188
|
return html ``;
|
|
@@ -198,6 +209,24 @@ let OpsViewOverview = (() => {
|
|
|
198
209
|
color: '#3b82f6',
|
|
199
210
|
description: `Total: ${this.statsState.serverStats.totalConnections}`,
|
|
200
211
|
},
|
|
212
|
+
{
|
|
213
|
+
id: 'throughputIn',
|
|
214
|
+
title: 'Throughput In',
|
|
215
|
+
value: this.formatBitsPerSecond(this.statsState.serverStats.throughput?.bytesInPerSecond || 0),
|
|
216
|
+
type: 'text',
|
|
217
|
+
icon: 'download',
|
|
218
|
+
color: '#22c55e',
|
|
219
|
+
description: `Total: ${this.formatBytes(this.statsState.serverStats.throughput?.bytesIn || 0)}`,
|
|
220
|
+
},
|
|
221
|
+
{
|
|
222
|
+
id: 'throughputOut',
|
|
223
|
+
title: 'Throughput Out',
|
|
224
|
+
value: this.formatBitsPerSecond(this.statsState.serverStats.throughput?.bytesOutPerSecond || 0),
|
|
225
|
+
type: 'text',
|
|
226
|
+
icon: 'upload',
|
|
227
|
+
color: '#8b5cf6',
|
|
228
|
+
description: `Total: ${this.formatBytes(this.statsState.serverStats.throughput?.bytesOut || 0)}`,
|
|
229
|
+
},
|
|
201
230
|
{
|
|
202
231
|
id: 'cpu',
|
|
203
232
|
title: 'CPU Usage',
|
|
@@ -341,4 +370,4 @@ let OpsViewOverview = (() => {
|
|
|
341
370
|
return OpsViewOverview = _classThis;
|
|
342
371
|
})();
|
|
343
372
|
export { OpsViewOverview };
|
|
344
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-overview.js","sourceRoot":"","sources":["../../ts_web/elements/ops-view-overview.ts"],"names":[],"mappings":"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"}
|
|
373
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-overview.js","sourceRoot":"","sources":["../../ts_web/elements/ops-view-overview.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/dcrouter",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "5.
|
|
4
|
+
"version": "5.2.0",
|
|
5
5
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"exports": {
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@push.rocks/smartnetwork": "^4.4.0",
|
|
50
50
|
"@push.rocks/smartpath": "^6.0.0",
|
|
51
51
|
"@push.rocks/smartpromise": "^4.2.3",
|
|
52
|
-
"@push.rocks/smartproxy": "^23.1.
|
|
52
|
+
"@push.rocks/smartproxy": "^23.1.6",
|
|
53
53
|
"@push.rocks/smartradius": "^1.1.1",
|
|
54
54
|
"@push.rocks/smartrequest": "^5.0.1",
|
|
55
55
|
"@push.rocks/smartrx": "^3.0.10",
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -147,8 +147,10 @@ export class MetricsManager {
|
|
|
147
147
|
requestsPerSecond: proxyMetrics ? proxyMetrics.requests.perSecond() : 0,
|
|
148
148
|
throughput: proxyMetrics ? {
|
|
149
149
|
bytesIn: proxyMetrics.totals.bytesIn(),
|
|
150
|
-
bytesOut: proxyMetrics.totals.bytesOut()
|
|
151
|
-
|
|
150
|
+
bytesOut: proxyMetrics.totals.bytesOut(),
|
|
151
|
+
bytesInPerSecond: proxyMetrics.throughput.instant().in,
|
|
152
|
+
bytesOutPerSecond: proxyMetrics.throughput.instant().out,
|
|
153
|
+
} : { bytesIn: 0, bytesOut: 0, bytesInPerSecond: 0, bytesOutPerSecond: 0 },
|
|
152
154
|
};
|
|
153
155
|
});
|
|
154
156
|
}
|
|
@@ -27,6 +27,8 @@ export class StatsHandler {
|
|
|
27
27
|
cpuUsage: stats.cpuUsage,
|
|
28
28
|
activeConnections: stats.activeConnections,
|
|
29
29
|
totalConnections: stats.totalConnections,
|
|
30
|
+
requestsPerSecond: stats.requestsPerSecond,
|
|
31
|
+
throughput: stats.throughput,
|
|
30
32
|
},
|
|
31
33
|
history: dataArg.includeHistory ? stats.history : undefined,
|
|
32
34
|
};
|
|
@@ -191,6 +193,8 @@ export class StatsHandler {
|
|
|
191
193
|
cpuUsage: stats.cpuUsage,
|
|
192
194
|
activeConnections: stats.activeConnections,
|
|
193
195
|
totalConnections: stats.totalConnections,
|
|
196
|
+
requestsPerSecond: stats.requestsPerSecond,
|
|
197
|
+
throughput: stats.throughput,
|
|
194
198
|
};
|
|
195
199
|
})
|
|
196
200
|
);
|
|
@@ -301,6 +305,7 @@ export class StatsHandler {
|
|
|
301
305
|
requestsPerSecond: number;
|
|
302
306
|
activeConnections: number;
|
|
303
307
|
totalConnections: number;
|
|
308
|
+
throughput: interfaces.data.IServerStats['throughput'];
|
|
304
309
|
history: Array<{
|
|
305
310
|
timestamp: number;
|
|
306
311
|
value: number;
|
|
@@ -316,15 +321,16 @@ export class StatsHandler {
|
|
|
316
321
|
requestsPerSecond: serverStats.requestsPerSecond,
|
|
317
322
|
activeConnections: serverStats.activeConnections,
|
|
318
323
|
totalConnections: serverStats.totalConnections,
|
|
324
|
+
throughput: serverStats.throughput,
|
|
319
325
|
history: [], // TODO: Implement history tracking
|
|
320
326
|
};
|
|
321
327
|
}
|
|
322
|
-
|
|
328
|
+
|
|
323
329
|
// Fallback to basic stats if MetricsManager not available
|
|
324
330
|
const uptime = process.uptime();
|
|
325
331
|
const memUsage = process.memoryUsage();
|
|
326
332
|
const cpuUsage = plugins.os.loadavg()[0] * 100 / plugins.os.cpus().length;
|
|
327
|
-
|
|
333
|
+
|
|
328
334
|
return {
|
|
329
335
|
uptime,
|
|
330
336
|
cpuUsage: {
|
|
@@ -340,6 +346,7 @@ export class StatsHandler {
|
|
|
340
346
|
requestsPerSecond: 0,
|
|
341
347
|
activeConnections: 0,
|
|
342
348
|
totalConnections: 0,
|
|
349
|
+
throughput: { bytesIn: 0, bytesOut: 0, bytesInPerSecond: 0, bytesOutPerSecond: 0 },
|
|
343
350
|
history: [],
|
|
344
351
|
};
|
|
345
352
|
}
|
|
@@ -126,12 +126,26 @@ export class OpsViewOverview extends DeesElement {
|
|
|
126
126
|
const units = ['B', 'KB', 'MB', 'GB', 'TB'];
|
|
127
127
|
let size = bytes;
|
|
128
128
|
let unitIndex = 0;
|
|
129
|
-
|
|
129
|
+
|
|
130
130
|
while (size >= 1024 && unitIndex < units.length - 1) {
|
|
131
131
|
size /= 1024;
|
|
132
132
|
unitIndex++;
|
|
133
133
|
}
|
|
134
|
-
|
|
134
|
+
|
|
135
|
+
return `${size.toFixed(1)} ${units[unitIndex]}`;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
private formatBitsPerSecond(bytesPerSecond: number): string {
|
|
139
|
+
const bitsPerSecond = bytesPerSecond * 8;
|
|
140
|
+
const units = ['bit/s', 'kbit/s', 'Mbit/s', 'Gbit/s'];
|
|
141
|
+
let size = bitsPerSecond;
|
|
142
|
+
let unitIndex = 0;
|
|
143
|
+
|
|
144
|
+
while (size >= 1000 && unitIndex < units.length - 1) {
|
|
145
|
+
size /= 1000;
|
|
146
|
+
unitIndex++;
|
|
147
|
+
}
|
|
148
|
+
|
|
135
149
|
return `${size.toFixed(1)} ${units[unitIndex]}`;
|
|
136
150
|
}
|
|
137
151
|
|
|
@@ -162,6 +176,24 @@ export class OpsViewOverview extends DeesElement {
|
|
|
162
176
|
color: '#3b82f6',
|
|
163
177
|
description: `Total: ${this.statsState.serverStats.totalConnections}`,
|
|
164
178
|
},
|
|
179
|
+
{
|
|
180
|
+
id: 'throughputIn',
|
|
181
|
+
title: 'Throughput In',
|
|
182
|
+
value: this.formatBitsPerSecond(this.statsState.serverStats.throughput?.bytesInPerSecond || 0),
|
|
183
|
+
type: 'text',
|
|
184
|
+
icon: 'download',
|
|
185
|
+
color: '#22c55e',
|
|
186
|
+
description: `Total: ${this.formatBytes(this.statsState.serverStats.throughput?.bytesIn || 0)}`,
|
|
187
|
+
},
|
|
188
|
+
{
|
|
189
|
+
id: 'throughputOut',
|
|
190
|
+
title: 'Throughput Out',
|
|
191
|
+
value: this.formatBitsPerSecond(this.statsState.serverStats.throughput?.bytesOutPerSecond || 0),
|
|
192
|
+
type: 'text',
|
|
193
|
+
icon: 'upload',
|
|
194
|
+
color: '#8b5cf6',
|
|
195
|
+
description: `Total: ${this.formatBytes(this.statsState.serverStats.throughput?.bytesOut || 0)}`,
|
|
196
|
+
},
|
|
165
197
|
{
|
|
166
198
|
id: 'cpu',
|
|
167
199
|
title: 'CPU Usage',
|