@serve.zone/dcrouter 13.20.2 → 13.21.1
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 +37 -37
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/monitoring/classes.metricsmanager.d.ts +6 -2
- package/dist_ts/monitoring/classes.metricsmanager.js +67 -41
- package/dist_ts/opsserver/handlers/security.handler.js +11 -5
- package/dist_ts/opsserver/handlers/stats.handler.js +2 -1
- package/dist_ts_interfaces/data/stats.d.ts +10 -0
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/appstate.js +23 -16
- package/dist_ts_web/elements/network/ops-view-network-activity.js +7 -3
- package/package.json +3 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/monitoring/classes.metricsmanager.ts +71 -40
- package/ts/opsserver/handlers/security.handler.ts +11 -5
- package/ts/opsserver/handlers/stats.handler.ts +1 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate.ts +23 -18
- package/ts_web/elements/network/ops-view-network-activity.ts +6 -2
|
@@ -130,7 +130,6 @@ let OpsViewNetworkActivity = (() => {
|
|
|
130
130
|
// Subscribe and track unsubscribe functions
|
|
131
131
|
const statsUnsubscribe = appstate.statsStatePart.select().subscribe((state) => {
|
|
132
132
|
this.statsState = state;
|
|
133
|
-
this.updateNetworkData();
|
|
134
133
|
});
|
|
135
134
|
this.rxSubscriptions.push(statsUnsubscribe);
|
|
136
135
|
const networkUnsubscribe = appstate.networkStatePart.select().subscribe((state) => {
|
|
@@ -580,6 +579,8 @@ let OpsViewNetworkActivity = (() => {
|
|
|
580
579
|
'Throughput Out': this.formatBitsPerSecond(item.bytesOutPerSecond),
|
|
581
580
|
'Transferred / min': this.formatBytes(totalBytesPerMin),
|
|
582
581
|
'Connections': item.activeConnections,
|
|
582
|
+
'Req/s': item.requestsPerSecond != null ? item.requestsPerSecond.toFixed(1) : '-',
|
|
583
|
+
'Req/min': item.requestsLastMinute != null ? item.requestsLastMinute.toFixed(0) : '-',
|
|
583
584
|
'Requests': item.requestCount?.toLocaleString() ?? '0',
|
|
584
585
|
'Routes': item.routeCount,
|
|
585
586
|
};
|
|
@@ -601,7 +602,7 @@ let OpsViewNetworkActivity = (() => {
|
|
|
601
602
|
return html `
|
|
602
603
|
<dees-table
|
|
603
604
|
.data=${backends}
|
|
604
|
-
.rowKey=${'
|
|
605
|
+
.rowKey=${'id'}
|
|
605
606
|
.highlightUpdates=${'flash'}
|
|
606
607
|
.displayFunction=${(item) => {
|
|
607
608
|
const totalErrors = item.connectErrors + item.handshakeErrors + item.requestErrors;
|
|
@@ -716,6 +717,9 @@ let OpsViewNetworkActivity = (() => {
|
|
|
716
717
|
return;
|
|
717
718
|
}
|
|
718
719
|
const throughput = this.calculateThroughput();
|
|
720
|
+
if (this.networkState.lastUpdated && now - this.networkState.lastUpdated > 3000) {
|
|
721
|
+
return;
|
|
722
|
+
}
|
|
719
723
|
// Convert to Mbps (bytes * 8 / 1,000,000)
|
|
720
724
|
const throughputInMbps = (throughput.in * 8) / 1000000;
|
|
721
725
|
const throughputOutMbps = (throughput.out * 8) / 1000000;
|
|
@@ -751,4 +755,4 @@ let OpsViewNetworkActivity = (() => {
|
|
|
751
755
|
return OpsViewNetworkActivity = _classThis;
|
|
752
756
|
})();
|
|
753
757
|
export { OpsViewNetworkActivity };
|
|
754
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-network-activity.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-network-activity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAuB,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACtI,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,UAAU,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAmB,MAAM,6BAA6B,CAAC;IASjD,sBAAsB;4BADlC,aAAa,CAAC,2BAA2B,CAAC;;;;sBACC,WAAW;;;;;;;;;;;;;sCAAnB,SAAQ,WAAW;;;;sCAQpD,KAAK,EAAE;wCAGP,KAAK,EAAE;yCAIP,KAAK,EAAE;0CAGP,KAAK,EAAE;YATR,mLAAS,UAAU,6BAAV,UAAU,+FAAuC;YAG1D,yLAAS,YAAY,6BAAZ,YAAY,mGAAyC;YAI9D,4LAAS,aAAa,6BAAb,aAAa,qGAAgD;YAGtE,+LAAS,cAAc,6BAAd,cAAc,uGAAgD;YAnBzE,6KA2tBC;;;;QA1tBC,2CAA2C;QACnC,MAAM,CAAU,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACrE,0CAA0C;QAClC,MAAM,CAAU,kBAAkB,GAAG,IAAI,CAAC,CAAC,WAAW;QAC9D,gDAAgD;QACxC,MAAM,CAAU,eAAe,GAAG,sBAAsB,CAAC,eAAe,GAAG,sBAAsB,CAAC,kBAAkB,CAAC;QAG7H,iFAAsB,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAG,EAAC;QAA1D,IAAS,UAAU,gDAAuC;QAA1D,IAAS,UAAU,sDAAuC;QAG1D,8IAAwB,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAG,GAAC;QAA9D,IAAS,YAAY,kDAAyC;QAA9D,IAAS,YAAY,wDAAyC;QAI9D,kJAAmE,EAAE,GAAC;QAAtE,IAAS,aAAa,mDAAgD;QAAtE,IAAS,aAAa,yDAAgD;QAGtE,qJAAoE,EAAE,GAAC;QAAvE,IAAS,cAAc,oDAAgD;QAAvE,IAAS,cAAc,0DAAgD;QAEvE,uEAAuE;QAC/D,eAAe,gEAAG,CAAC,EAAC;QACpB,oBAAoB,GAAG,sBAAsB,CAAC,kBAAkB,CAAC,CAAC,mCAAmC;QAErG,kBAAkB,GAAQ,IAAI,CAAC;QAC/B,qBAAqB,GAAa,EAAE,CAAC,CAAC,yCAAyC;QAC/E,aAAa,GAAG,KAAK,CAAC,CAAC,yDAAyD;QAChF,iBAAiB,GAAwB,IAAI,CAAC;QAEtD;YACE,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjC,CAAC;QAED,KAAK,CAAC,iBAAiB;YACrB,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAEhC,yDAAyD;YACzD,IAAI,CAAC,iBAAiB,GAAG,GAAG,EAAE;gBAC5B,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;oBACpB,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBACjC,CAAC;YACH,CAAC,CAAC;YACF,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAEtE,kEAAkE;YAClE,MAAM,QAAQ,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;QACzF,CAAC;QAED,KAAK,CAAC,oBAAoB;YACxB,MAAM,KAAK,CAAC,oBAAoB,EAAE,CAAC;YACnC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC3B,QAAQ,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBACzE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAChC,CAAC;QACH,CAAC;QAEO,qBAAqB;YAC3B,4CAA4C;YAC5C,MAAM,gBAAgB,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC5E,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;gBACxB,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAE5C,MAAM,kBAAkB,GAAG,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChF,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;gBAC1B,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAChD,CAAC;QAEO,qBAAqB;YAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAAG,sBAAsB,CAAC;YAEvE,wDAAwD;YACxD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACjE,MAAM,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,eAAe,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC;gBACpE,OAAO;oBACL,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE;oBAC/B,CAAC,EAAE,CAAC;iBACL,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,aAAa,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;YACpC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;QAC/D,CAAC;QAED;;;;;WAKG;QACK,qBAAqB;YAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC;YACpD,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO;YAE7C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAE1B,mEAAmE;YACnE,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAClC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE;gBACtC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE;aAC9C,CAAC,CAAC,CAAC;YACJ,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACnC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE;gBACtC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE;aAC/C,CAAC,CAAC,CAAC;YAEJ,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAAG,sBAAsB,CAAC;YAEvE,kFAAkF;YAClF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,eAAe,CAAC,CAAC;YACnE,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACjD,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAEnD,0DAA0D;YAC1D,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,eAAe,EAAE,CAAC;gBAChD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvB,MAAM,QAAQ,GAAG,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;gBAC7D,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC;oBAClD,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;oBAC7C,CAAC,CAAC,GAAG,CAAC;gBAER,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;oBACxD,CAAC,EAAE,IAAI,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,WAAW,EAAE;oBACjF,CAAC,EAAE,CAAC;iBACL,CAAC,CAAC,CAAC;gBACJ,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;gBAE1C,IAAI,CAAC,aAAa,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;gBACvD,IAAI,CAAC,cAAc,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;QAEM,MAAM,CAAC,MAAM,GAAG;YACrB,UAAU,CAAC,aAAa;YACxB,WAAW;YACX,GAAG,CAAA;;;;;;;;;;;;;;;;;;sBAkBe,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;;;;;;;sBAUnC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;;;;;;;;;;;sBAcnC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;;;;;KAQpD;SACF,CAAC;QAEK,MAAM;YACX,OAAO,IAAI,CAAA;;;;;UAKL,IAAI,CAAC,kBAAkB,EAAE;;;;mBAIhB,iBAAiB;oBAChB;gBACR;oBACE,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,IAAI,CAAC,aAAa;oBACxB,KAAK,EAAE,SAAS;iBACjB;gBACD;oBACE,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,IAAI,CAAC,cAAc;oBACzB,KAAK,EAAE,SAAS;iBACjB;aACF;0BACe,IAAI;2BACH,sBAAsB,CAAC,eAAe;4BACrC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,GAAG,SAAS;;;;UAIlD,IAAI,CAAC,oBAAoB,EAAE;;;UAG3B,IAAI,CAAC,YAAY,EAAE;;;UAGnB,IAAI,CAAC,uBAAuB,EAAE;;;UAG9B,IAAI,CAAC,oBAAoB,EAAE;;;UAG3B,IAAI,CAAC,sBAAsB,EAAE;;KAElC,CAAC;QACJ,CAAC;QAEO,YAAY,CAAC,GAAW;YAC9B,IAAI,GAAG,IAAI,OAAO,EAAE,CAAC;gBACnB,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YAC1C,CAAC;iBAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACvC,CAAC;YACD,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC;QAEO,WAAW,CAAC,KAAa;YAC/B,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACtC,IAAI,IAAI,GAAG,KAAK,CAAC;YACjB,IAAI,SAAS,GAAG,CAAC,CAAC;YAElB,OAAO,IAAI,IAAI,IAAI,IAAI,SAAS,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpD,IAAI,IAAI,IAAI,CAAC;gBACb,SAAS,EAAE,CAAC;YACd,CAAC;YAED,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAClD,CAAC;QAEO,mBAAmB,CAAC,cAAsB;YAChD,MAAM,aAAa,GAAG,cAAc,GAAG,CAAC,CAAC,CAAC,wBAAwB;YAClE,MAAM,KAAK,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACtD,IAAI,IAAI,GAAG,aAAa,CAAC;YACzB,IAAI,SAAS,GAAG,CAAC,CAAC;YAElB,OAAO,IAAI,IAAI,IAAI,IAAI,SAAS,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpD,IAAI,IAAI,IAAI,CAAC,CAAC,+BAA+B;gBAC7C,SAAS,EAAE,CAAC;YACd,CAAC;YAED,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAClD,CAAC;QAEO,mBAAmB;YACzB,8CAA8C;YAC9C,OAAO;gBACL,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,gBAAgB;gBACrD,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,iBAAiB;aACxD,CAAC;QACJ,CAAC;QAEO,kBAAkB;YACxB,6DAA6D;YAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,IAAI,CAAC,CAAC;YAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9C,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,iBAAiB,IAAI,CAAC,CAAC;YAE9E,sFAAsF;YACtF,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAClD,OAAO,SAAS,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;gBAC7B,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC;YAED,MAAM,KAAK,GAAiB;gBAC1B;oBACE,EAAE,EAAE,aAAa;oBACjB,KAAK,EAAE,oBAAoB;oBAC3B,KAAK,EAAE,iBAAiB;oBACxB,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,iBAAiB,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;oBACtD,WAAW,EAAE,UAAU,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,gBAAgB,IAAI,CAAC,CAAC,cAAc;oBAC1G,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,cAAc;4BACpB,QAAQ,EAAE,oBAAoB;4BAC9B,MAAM,EAAE,KAAK,IAAI,EAAE;4BACnB,CAAC;yBACF;qBACF;iBACF;gBACD;oBACE,EAAE,EAAE,UAAU;oBACd,KAAK,EAAE,cAAc;oBACrB,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,kBAAkB;oBACxB,KAAK,EAAE,SAAS;oBAChB,SAAS,EAAE,SAAS;oBACpB,WAAW,EAAE,UAAU,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,IAAI,CAAC,CAAC,WAAW;iBAC1F;gBACD;oBACE,EAAE,EAAE,cAAc;oBAClB,KAAK,EAAE,eAAe;oBACtB,KAAK,EAAE,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC9C,IAAI,EAAE,EAAE;oBACR,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,iBAAiB;oBACvB,KAAK,EAAE,SAAS;oBAChB,WAAW,EAAE,UAAU,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE;iBACjF;gBACD;oBACE,EAAE,EAAE,eAAe;oBACnB,KAAK,EAAE,gBAAgB;oBACvB,KAAK,EAAE,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC;oBAC/C,IAAI,EAAE,EAAE;oBACR,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,eAAe;oBACrB,KAAK,EAAE,SAAS;oBAChB,WAAW,EAAE,UAAU,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE;iBAClF;aACF,CAAC;YAEF,OAAO,IAAI,CAAA;;iBAEE,KAAK;wBACE,GAAG;;KAEtB,CAAC;QACJ,CAAC;QAEO,oBAAoB;YAC1B,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC;YAC/C,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC;YAE9C,MAAM,WAAW,GAA2B;gBAC1C,UAAU,EAAE,SAAS;gBACrB,QAAQ,EAAE,SAAS;gBACnB,QAAQ,EAAE,SAAS;gBACnB,WAAW,EAAE,SAAS;gBACtB,OAAO,EAAE,SAAS;aACnB,CAAC;YAEF,MAAM,cAAc,GAAG,CAAC,IAAkD,EAAE,EAAE;gBAC5E,IAAI,CAAC,IAAI;oBAAE,OAAO,EAAE,CAAC;gBACrB,MAAM,KAAK,GAA0D,EAAE,CAAC;gBACxE,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBAC9G,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC1G,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC1G,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBAChH,IAAI,IAAI,CAAC,WAAW,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAC9G,OAAO,KAAK,CAAC;YACf,CAAC,CAAC;YAEF,MAAM,YAAY,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,WAAW,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;YAEvC,OAAO,IAAI,CAAA;;;mBAGI,oBAAoB;kBACrB,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;wBACvF,IAAI;wBACJ,IAAI;gCACI,KAAK;4BACT,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,GAAG,SAAS;;;mBAGzC,mBAAmB;kBACpB,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;wBACrF,IAAI;wBACJ,IAAI;gCACI,KAAK;4BACT,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,GAAG,SAAS;;;KAGvD,CAAC;QACJ,CAAC;QAEO,YAAY;YAClB,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1C,OAAO,IAAI,CAAA,EAAE,CAAC;YAChB,CAAC;YAED,gCAAgC;YAChC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAuC,CAAC;YACrE,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC;gBACrC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC;oBACrD,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;YAED,iDAAiD;YACjD,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAEjG,OAAO,IAAI,CAAA;;gBAEC,IAAI,CAAC,YAAY,CAAC,MAAM;kBACtB,IAAI;4BACM,OAAO;2BACR,CAAC,MAAqC,EAAE,EAAE;gBAC3D,MAAM,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACxC,OAAO;oBACL,YAAY,EAAE,MAAM,CAAC,EAAE;oBACvB,aAAa,EAAE,MAAM,CAAC,KAAK;oBAC3B,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;oBAChE,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;oBAClE,OAAO,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,gBAAgB,CAAC,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI;iBAClG,CAAC;YACJ,CAAC;;;;6BAIoB,IAAI;sBACX,KAAK;;;KAGtB,CAAC;QACJ,CAAC;QAEO,uBAAuB;YAC7B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,IAAI,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7F,OAAO,IAAI,CAAA,EAAE,CAAC;YAChB,CAAC;YAED,OAAO,IAAI,CAAA;;gBAEC,IAAI,CAAC,YAAY,CAAC,iBAAiB;kBACjC,IAAI;4BACM,OAAO;2BACR,CAAC,MAAkE,EAAE,EAAE;gBACxF,OAAO;oBACL,YAAY,EAAE,MAAM,CAAC,EAAE;oBACvB,cAAc,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC;oBACrD,eAAe,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC;oBACvD,iBAAiB,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;oBACvE,aAAa,EAAE,MAAM,CAAC,KAAK;iBAC5B,CAAC;YACJ,CAAC;;;;6BAIoB,IAAI;sBACX,KAAK;;;KAGtB,CAAC;QACJ,CAAC;QAEO,oBAAoB;YAC1B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvF,OAAO,IAAI,CAAA,EAAE,CAAC;YAChB,CAAC;YAED,OAAO,IAAI,CAAA;;gBAEC,IAAI,CAAC,YAAY,CAAC,cAAc;kBAC9B,QAAQ;4BACE,OAAO;2BACR,CAAC,IAAqC,EAAE,EAAE;gBAC3D,MAAM,gBAAgB,GAAG,CAAC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC;gBAC/E,OAAO;oBACL,QAAQ,EAAE,IAAI,CAAC,MAAM;oBACrB,eAAe,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,gBAAgB,CAAC;oBAChE,gBAAgB,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,iBAAiB,CAAC;oBAClE,mBAAmB,EAAE,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC;oBACvD,aAAa,EAAE,IAAI,CAAC,iBAAiB;oBACrC,UAAU,EAAE,IAAI,CAAC,YAAY,EAAE,cAAc,EAAE,IAAI,GAAG;oBACtD,QAAQ,EAAE,IAAI,CAAC,UAAU;iBAC1B,CAAC;YACJ,CAAC;;;;6BAIoB,IAAI;sBACX,KAAK;;;KAGtB,CAAC;QACJ,CAAC;QAEO,sBAAsB;YAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;YAC5C,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvC,OAAO,IAAI,CAAA,EAAE,CAAC;YAChB,CAAC;YAED,OAAO,IAAI,CAAA;;gBAEC,QAAQ;kBACN,SAAS;4BACC,OAAO;2BACR,CAAC,IAAkC,EAAE,EAAE;gBACxD,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC;gBACnF,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBAE5E,OAAO;oBACL,SAAS,EAAE,IAAI,CAAC,OAAO;oBACvB,QAAQ,EAAE,IAAI,CAAC,MAAM,IAAI,GAAG;oBAC5B,UAAU,EAAE,IAAI,CAAA;2CACe,aAAa,KAAK,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;gBACxE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAA,wDAAwD,IAAI,CAAC,qBAAqB,IAAI,CAAC,uBAAuB,IAAI,CAAC,uBAAuB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE;gBACrM,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAA,wDAAwD,IAAI,CAAC,qBAAqB,IAAI,CAAC,uBAAuB,IAAI,CAAC,uBAAuB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE;aACxM;oBACD,QAAQ,EAAE,IAAI,CAAC,iBAAiB;oBAChC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC;oBACjD,aAAa,EAAE,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG;oBACxF,eAAe,EAAE,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;oBACvF,QAAQ,EAAE,WAAW,GAAG,CAAC;wBACvB,CAAC,CAAC,IAAI,CAAA,mCAAmC,WAAW,SAAS;wBAC7D,CAAC,CAAC,IAAI,CAAA,4CAA4C;oBACpD,WAAW,EAAE,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;iBACnF,CAAC;YACJ,CAAC;uBACc;gBACb;oBACE,IAAI,EAAE,cAAc;oBACpB,QAAQ,EAAE,aAAa;oBACvB,IAAI,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,aAAa,CAAQ;oBACpD,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBACjD,CAAC;iBACF;aACF;;;;6BAIoB,IAAI;sBACX,KAAK;;;KAGtB,CAAC;QACJ,CAAC;QAEO,KAAK,CAAC,kBAAkB,CAAC,OAAqC;YACpE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAElE,MAAM,SAAS,CAAC,aAAa,CAAC;gBAC5B,OAAO,EAAE,YAAY,OAAO,CAAC,OAAO,EAAE;gBACtC,OAAO,EAAE,IAAI,CAAA;;;uBAGI,iBAAiB;;6BAEX,IAAI,CAAC,SAAS,CAAC;oBAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;oBAC5C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;oBAC1C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;oBAC1C,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,MAAM,EAAE;wBACN,OAAO,EAAE,OAAO,CAAC,aAAa;wBAC9B,SAAS,EAAE,OAAO,CAAC,eAAe;wBAClC,OAAO,EAAE,OAAO,CAAC,aAAa;wBAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;qBAC/B;oBACD,WAAW,EAAE;wBACX,YAAY,EAAE,OAAO,CAAC,YAAY;wBAClC,YAAY,EAAE,OAAO,CAAC,YAAY;wBAClC,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;wBACxD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;wBACxD,qBAAqB,EAAE,OAAO,CAAC,qBAAqB;wBACpD,qBAAqB,EAAE,OAAO,CAAC,qBAAqB;qBACrD;oBACD,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,YAAY,EAAE,OAAO,CAAC,YAAY;iBACnC,EAAE,IAAI,EAAE,CAAC,CAAC;;;OAGhB;gBACD,WAAW,EAAE;oBACX;wBACE,IAAI,EAAE,kBAAkB;wBACxB,QAAQ,EAAE,aAAa;wBACvB,MAAM,EAAE,KAAK,IAAI,EAAE;4BACjB,MAAM,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;wBACvD,CAAC;qBACF;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QAEO,KAAK,CAAC,iBAAiB;YAC7B,2EAA2E;YAC3E,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,IAAI,CAAC,CAAC;YAC3D,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;gBAC3C,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;YACrC,CAAC;YAED,wDAAwD;YACxD,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,YAAY,CAAC,iBAAiB,IAAI,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjH,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC/B,CAAC;QACH,CAAC;QAEO,uBAAuB;YAC7B,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,2BAA2B;YAC1D,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC,GAAG,EAAE;gBACzC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,CAAC,EAAE,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;QAChD,CAAC;QAEO,mBAAmB;YACzB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAEvB,uDAAuD;YACvD,IAAI,GAAG,GAAG,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC3D,OAAO;YACT,CAAC;YAED,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAE9C,0CAA0C;YAC1C,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC;YACvD,MAAM,iBAAiB,GAAG,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC;YAEzD,sBAAsB;YACtB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;YAE9C,MAAM,cAAc,GAAG;gBACrB,CAAC,EAAE,SAAS;gBACZ,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,GAAG,EAAE,CAAC,GAAG,EAAE;aAC1C,CAAC;YAEF,MAAM,eAAe,GAAG;gBACtB,CAAC,EAAE,SAAS;gBACZ,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB,GAAG,EAAE,CAAC,GAAG,EAAE;aAC3C,CAAC;YAEF,oFAAoF;YACpF,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,IAAI,sBAAsB,CAAC,eAAe,EAAE,CAAC;gBACxE,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;gBAC3B,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;YAC9B,CAAC;YACD,IAAI,CAAC,aAAa,GAAG,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;YAC7D,IAAI,CAAC,cAAc,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;YAEhE,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC;QAC7B,CAAC;QAEO,sBAAsB;YAC5B,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;gBACvC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;YACjC,CAAC;QACH,CAAC;;YA1tBU,uDAAsB;;;;;SAAtB,sBAAsB"}
|
|
758
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-network-activity.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-network-activity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAuB,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACtI,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,UAAU,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAmB,MAAM,6BAA6B,CAAC;IASjD,sBAAsB;4BADlC,aAAa,CAAC,2BAA2B,CAAC;;;;sBACC,WAAW;;;;;;;;;;;;;sCAAnB,SAAQ,WAAW;;;;sCAQpD,KAAK,EAAE;wCAGP,KAAK,EAAE;yCAIP,KAAK,EAAE;0CAGP,KAAK,EAAE;YATR,mLAAS,UAAU,6BAAV,UAAU,+FAAuC;YAG1D,yLAAS,YAAY,6BAAZ,YAAY,mGAAyC;YAI9D,4LAAS,aAAa,6BAAb,aAAa,qGAAgD;YAGtE,+LAAS,cAAc,6BAAd,cAAc,uGAAgD;YAnBzE,6KA+tBC;;;;QA9tBC,2CAA2C;QACnC,MAAM,CAAU,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACrE,0CAA0C;QAClC,MAAM,CAAU,kBAAkB,GAAG,IAAI,CAAC,CAAC,WAAW;QAC9D,gDAAgD;QACxC,MAAM,CAAU,eAAe,GAAG,sBAAsB,CAAC,eAAe,GAAG,sBAAsB,CAAC,kBAAkB,CAAC;QAG7H,iFAAsB,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAG,EAAC;QAA1D,IAAS,UAAU,gDAAuC;QAA1D,IAAS,UAAU,sDAAuC;QAG1D,8IAAwB,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAG,GAAC;QAA9D,IAAS,YAAY,kDAAyC;QAA9D,IAAS,YAAY,wDAAyC;QAI9D,kJAAmE,EAAE,GAAC;QAAtE,IAAS,aAAa,mDAAgD;QAAtE,IAAS,aAAa,yDAAgD;QAGtE,qJAAoE,EAAE,GAAC;QAAvE,IAAS,cAAc,oDAAgD;QAAvE,IAAS,cAAc,0DAAgD;QAEvE,uEAAuE;QAC/D,eAAe,gEAAG,CAAC,EAAC;QACpB,oBAAoB,GAAG,sBAAsB,CAAC,kBAAkB,CAAC,CAAC,mCAAmC;QAErG,kBAAkB,GAAQ,IAAI,CAAC;QAC/B,qBAAqB,GAAa,EAAE,CAAC,CAAC,yCAAyC;QAC/E,aAAa,GAAG,KAAK,CAAC,CAAC,yDAAyD;QAChF,iBAAiB,GAAwB,IAAI,CAAC;QAEtD;YACE,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjC,CAAC;QAED,KAAK,CAAC,iBAAiB;YACrB,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAEhC,yDAAyD;YACzD,IAAI,CAAC,iBAAiB,GAAG,GAAG,EAAE;gBAC5B,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;oBACpB,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBACjC,CAAC;YACH,CAAC,CAAC;YACF,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAEtE,kEAAkE;YAClE,MAAM,QAAQ,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;QACzF,CAAC;QAED,KAAK,CAAC,oBAAoB;YACxB,MAAM,KAAK,CAAC,oBAAoB,EAAE,CAAC;YACnC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC3B,QAAQ,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBACzE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAChC,CAAC;QACH,CAAC;QAEO,qBAAqB;YAC3B,4CAA4C;YAC5C,MAAM,gBAAgB,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC5E,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YAC1B,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAE5C,MAAM,kBAAkB,GAAG,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChF,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;gBAC1B,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAChD,CAAC;QAEO,qBAAqB;YAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAAG,sBAAsB,CAAC;YAEvE,wDAAwD;YACxD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACjE,MAAM,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,eAAe,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC;gBACpE,OAAO;oBACL,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE;oBAC/B,CAAC,EAAE,CAAC;iBACL,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,aAAa,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;YACpC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;QAC/D,CAAC;QAED;;;;;WAKG;QACK,qBAAqB;YAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC;YACpD,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO;YAE7C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAE1B,mEAAmE;YACnE,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAClC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE;gBACtC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE;aAC9C,CAAC,CAAC,CAAC;YACJ,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACnC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE;gBACtC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE;aAC/C,CAAC,CAAC,CAAC;YAEJ,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAAG,sBAAsB,CAAC;YAEvE,kFAAkF;YAClF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,eAAe,CAAC,CAAC;YACnE,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACjD,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAEnD,0DAA0D;YAC1D,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,eAAe,EAAE,CAAC;gBAChD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvB,MAAM,QAAQ,GAAG,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;gBAC7D,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC;oBAClD,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;oBAC7C,CAAC,CAAC,GAAG,CAAC;gBAER,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;oBACxD,CAAC,EAAE,IAAI,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,WAAW,EAAE;oBACjF,CAAC,EAAE,CAAC;iBACL,CAAC,CAAC,CAAC;gBACJ,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;gBAE1C,IAAI,CAAC,aAAa,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;gBACvD,IAAI,CAAC,cAAc,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;QAEM,MAAM,CAAC,MAAM,GAAG;YACrB,UAAU,CAAC,aAAa;YACxB,WAAW;YACX,GAAG,CAAA;;;;;;;;;;;;;;;;;;sBAkBe,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;;;;;;;sBAUnC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;;;;;;;;;;;sBAcnC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;sBAInC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;;;;;KAQpD;SACF,CAAC;QAEK,MAAM;YACX,OAAO,IAAI,CAAA;;;;;UAKL,IAAI,CAAC,kBAAkB,EAAE;;;;mBAIhB,iBAAiB;oBAChB;gBACR;oBACE,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,IAAI,CAAC,aAAa;oBACxB,KAAK,EAAE,SAAS;iBACjB;gBACD;oBACE,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,IAAI,CAAC,cAAc;oBACzB,KAAK,EAAE,SAAS;iBACjB;aACF;0BACe,IAAI;2BACH,sBAAsB,CAAC,eAAe;4BACrC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,GAAG,SAAS;;;;UAIlD,IAAI,CAAC,oBAAoB,EAAE;;;UAG3B,IAAI,CAAC,YAAY,EAAE;;;UAGnB,IAAI,CAAC,uBAAuB,EAAE;;;UAG9B,IAAI,CAAC,oBAAoB,EAAE;;;UAG3B,IAAI,CAAC,sBAAsB,EAAE;;KAElC,CAAC;QACJ,CAAC;QAEO,YAAY,CAAC,GAAW;YAC9B,IAAI,GAAG,IAAI,OAAO,EAAE,CAAC;gBACnB,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YAC1C,CAAC;iBAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACvC,CAAC;YACD,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC;QAEO,WAAW,CAAC,KAAa;YAC/B,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACtC,IAAI,IAAI,GAAG,KAAK,CAAC;YACjB,IAAI,SAAS,GAAG,CAAC,CAAC;YAElB,OAAO,IAAI,IAAI,IAAI,IAAI,SAAS,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpD,IAAI,IAAI,IAAI,CAAC;gBACb,SAAS,EAAE,CAAC;YACd,CAAC;YAED,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAClD,CAAC;QAEO,mBAAmB,CAAC,cAAsB;YAChD,MAAM,aAAa,GAAG,cAAc,GAAG,CAAC,CAAC,CAAC,wBAAwB;YAClE,MAAM,KAAK,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACtD,IAAI,IAAI,GAAG,aAAa,CAAC;YACzB,IAAI,SAAS,GAAG,CAAC,CAAC;YAElB,OAAO,IAAI,IAAI,IAAI,IAAI,SAAS,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpD,IAAI,IAAI,IAAI,CAAC,CAAC,+BAA+B;gBAC7C,SAAS,EAAE,CAAC;YACd,CAAC;YAED,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAClD,CAAC;QAEO,mBAAmB;YACzB,8CAA8C;YAC9C,OAAO;gBACL,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,gBAAgB;gBACrD,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,iBAAiB;aACxD,CAAC;QACJ,CAAC;QAEO,kBAAkB;YACxB,6DAA6D;YAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,IAAI,CAAC,CAAC;YAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9C,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,iBAAiB,IAAI,CAAC,CAAC;YAE9E,sFAAsF;YACtF,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAClD,OAAO,SAAS,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;gBAC7B,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC;YAED,MAAM,KAAK,GAAiB;gBAC1B;oBACE,EAAE,EAAE,aAAa;oBACjB,KAAK,EAAE,oBAAoB;oBAC3B,KAAK,EAAE,iBAAiB;oBACxB,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,iBAAiB,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;oBACtD,WAAW,EAAE,UAAU,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,gBAAgB,IAAI,CAAC,CAAC,cAAc;oBAC1G,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,cAAc;4BACpB,QAAQ,EAAE,oBAAoB;4BAC9B,MAAM,EAAE,KAAK,IAAI,EAAE;4BACnB,CAAC;yBACF;qBACF;iBACF;gBACD;oBACE,EAAE,EAAE,UAAU;oBACd,KAAK,EAAE,cAAc;oBACrB,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,kBAAkB;oBACxB,KAAK,EAAE,SAAS;oBAChB,SAAS,EAAE,SAAS;oBACpB,WAAW,EAAE,UAAU,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,IAAI,CAAC,CAAC,WAAW;iBAC1F;gBACD;oBACE,EAAE,EAAE,cAAc;oBAClB,KAAK,EAAE,eAAe;oBACtB,KAAK,EAAE,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC9C,IAAI,EAAE,EAAE;oBACR,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,iBAAiB;oBACvB,KAAK,EAAE,SAAS;oBAChB,WAAW,EAAE,UAAU,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE;iBACjF;gBACD;oBACE,EAAE,EAAE,eAAe;oBACnB,KAAK,EAAE,gBAAgB;oBACvB,KAAK,EAAE,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC;oBAC/C,IAAI,EAAE,EAAE;oBACR,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,eAAe;oBACrB,KAAK,EAAE,SAAS;oBAChB,WAAW,EAAE,UAAU,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE;iBAClF;aACF,CAAC;YAEF,OAAO,IAAI,CAAA;;iBAEE,KAAK;wBACE,GAAG;;KAEtB,CAAC;QACJ,CAAC;QAEO,oBAAoB;YAC1B,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC;YAC/C,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC;YAE9C,MAAM,WAAW,GAA2B;gBAC1C,UAAU,EAAE,SAAS;gBACrB,QAAQ,EAAE,SAAS;gBACnB,QAAQ,EAAE,SAAS;gBACnB,WAAW,EAAE,SAAS;gBACtB,OAAO,EAAE,SAAS;aACnB,CAAC;YAEF,MAAM,cAAc,GAAG,CAAC,IAAkD,EAAE,EAAE;gBAC5E,IAAI,CAAC,IAAI;oBAAE,OAAO,EAAE,CAAC;gBACrB,MAAM,KAAK,GAA0D,EAAE,CAAC;gBACxE,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBAC9G,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC1G,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC1G,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBAChH,IAAI,IAAI,CAAC,WAAW,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAC9G,OAAO,KAAK,CAAC;YACf,CAAC,CAAC;YAEF,MAAM,YAAY,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;YACxC,MAAM,WAAW,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;YAEvC,OAAO,IAAI,CAAA;;;mBAGI,oBAAoB;kBACrB,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;wBACvF,IAAI;wBACJ,IAAI;gCACI,KAAK;4BACT,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,GAAG,SAAS;;;mBAGzC,mBAAmB;kBACpB,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;wBACrF,IAAI;wBACJ,IAAI;gCACI,KAAK;4BACT,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,GAAG,SAAS;;;KAGvD,CAAC;QACJ,CAAC;QAEO,YAAY;YAClB,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1C,OAAO,IAAI,CAAA,EAAE,CAAC;YAChB,CAAC;YAED,gCAAgC;YAChC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAuC,CAAC;YACrE,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC;gBACrC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC;oBACrD,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;YAED,iDAAiD;YACjD,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAEjG,OAAO,IAAI,CAAA;;gBAEC,IAAI,CAAC,YAAY,CAAC,MAAM;kBACtB,IAAI;4BACM,OAAO;2BACR,CAAC,MAAqC,EAAE,EAAE;gBAC3D,MAAM,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACxC,OAAO;oBACL,YAAY,EAAE,MAAM,CAAC,EAAE;oBACvB,aAAa,EAAE,MAAM,CAAC,KAAK;oBAC3B,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;oBAChE,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;oBAClE,OAAO,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,gBAAgB,CAAC,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI;iBAClG,CAAC;YACJ,CAAC;;;;6BAIoB,IAAI;sBACX,KAAK;;;KAGtB,CAAC;QACJ,CAAC;QAEO,uBAAuB;YAC7B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,IAAI,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7F,OAAO,IAAI,CAAA,EAAE,CAAC;YAChB,CAAC;YAED,OAAO,IAAI,CAAA;;gBAEC,IAAI,CAAC,YAAY,CAAC,iBAAiB;kBACjC,IAAI;4BACM,OAAO;2BACR,CAAC,MAAkE,EAAE,EAAE;gBACxF,OAAO;oBACL,YAAY,EAAE,MAAM,CAAC,EAAE;oBACvB,cAAc,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC;oBACrD,eAAe,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC;oBACvD,iBAAiB,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;oBACvE,aAAa,EAAE,MAAM,CAAC,KAAK;iBAC5B,CAAC;YACJ,CAAC;;;;6BAIoB,IAAI;sBACX,KAAK;;;KAGtB,CAAC;QACJ,CAAC;QAEO,oBAAoB;YAC1B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvF,OAAO,IAAI,CAAA,EAAE,CAAC;YAChB,CAAC;YAED,OAAO,IAAI,CAAA;;gBAEC,IAAI,CAAC,YAAY,CAAC,cAAc;kBAC9B,QAAQ;4BACE,OAAO;2BACR,CAAC,IAAqC,EAAE,EAAE;gBAC3D,MAAM,gBAAgB,GAAG,CAAC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC;gBAC/E,OAAO;oBACL,QAAQ,EAAE,IAAI,CAAC,MAAM;oBACrB,eAAe,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,gBAAgB,CAAC;oBAChE,gBAAgB,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,iBAAiB,CAAC;oBAClE,mBAAmB,EAAE,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC;oBACvD,aAAa,EAAE,IAAI,CAAC,iBAAiB;oBACrC,OAAO,EAAE,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;oBACjF,SAAS,EAAE,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;oBACrF,UAAU,EAAE,IAAI,CAAC,YAAY,EAAE,cAAc,EAAE,IAAI,GAAG;oBACtD,QAAQ,EAAE,IAAI,CAAC,UAAU;iBAC1B,CAAC;YACJ,CAAC;;;;6BAIoB,IAAI;sBACX,KAAK;;;KAGtB,CAAC;QACJ,CAAC;QAEO,sBAAsB;YAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;YAC5C,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvC,OAAO,IAAI,CAAA,EAAE,CAAC;YAChB,CAAC;YAED,OAAO,IAAI,CAAA;;gBAEC,QAAQ;kBACN,IAAI;4BACM,OAAO;2BACR,CAAC,IAAkC,EAAE,EAAE;gBACxD,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC;gBACnF,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBAE5E,OAAO;oBACL,SAAS,EAAE,IAAI,CAAC,OAAO;oBACvB,QAAQ,EAAE,IAAI,CAAC,MAAM,IAAI,GAAG;oBAC5B,UAAU,EAAE,IAAI,CAAA;2CACe,aAAa,KAAK,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;gBACxE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAA,wDAAwD,IAAI,CAAC,qBAAqB,IAAI,CAAC,uBAAuB,IAAI,CAAC,uBAAuB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE;gBACrM,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAA,wDAAwD,IAAI,CAAC,qBAAqB,IAAI,CAAC,uBAAuB,IAAI,CAAC,uBAAuB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE;aACxM;oBACD,QAAQ,EAAE,IAAI,CAAC,iBAAiB;oBAChC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC;oBACjD,aAAa,EAAE,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG;oBACxF,eAAe,EAAE,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;oBACvF,QAAQ,EAAE,WAAW,GAAG,CAAC;wBACvB,CAAC,CAAC,IAAI,CAAA,mCAAmC,WAAW,SAAS;wBAC7D,CAAC,CAAC,IAAI,CAAA,4CAA4C;oBACpD,WAAW,EAAE,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;iBACnF,CAAC;YACJ,CAAC;uBACc;gBACb;oBACE,IAAI,EAAE,cAAc;oBACpB,QAAQ,EAAE,aAAa;oBACvB,IAAI,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,aAAa,CAAQ;oBACpD,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBACjD,CAAC;iBACF;aACF;;;;6BAIoB,IAAI;sBACX,KAAK;;;KAGtB,CAAC;QACJ,CAAC;QAEO,KAAK,CAAC,kBAAkB,CAAC,OAAqC;YACpE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAElE,MAAM,SAAS,CAAC,aAAa,CAAC;gBAC5B,OAAO,EAAE,YAAY,OAAO,CAAC,OAAO,EAAE;gBACtC,OAAO,EAAE,IAAI,CAAA;;;uBAGI,iBAAiB;;6BAEX,IAAI,CAAC,SAAS,CAAC;oBAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;oBAC5C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;oBAC1C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;oBAC1C,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,MAAM,EAAE;wBACN,OAAO,EAAE,OAAO,CAAC,aAAa;wBAC9B,SAAS,EAAE,OAAO,CAAC,eAAe;wBAClC,OAAO,EAAE,OAAO,CAAC,aAAa;wBAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;qBAC/B;oBACD,WAAW,EAAE;wBACX,YAAY,EAAE,OAAO,CAAC,YAAY;wBAClC,YAAY,EAAE,OAAO,CAAC,YAAY;wBAClC,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;wBACxD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;wBACxD,qBAAqB,EAAE,OAAO,CAAC,qBAAqB;wBACpD,qBAAqB,EAAE,OAAO,CAAC,qBAAqB;qBACrD;oBACD,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,YAAY,EAAE,OAAO,CAAC,YAAY;iBACnC,EAAE,IAAI,EAAE,CAAC,CAAC;;;OAGhB;gBACD,WAAW,EAAE;oBACX;wBACE,IAAI,EAAE,kBAAkB;wBACxB,QAAQ,EAAE,aAAa;wBACvB,MAAM,EAAE,KAAK,IAAI,EAAE;4BACjB,MAAM,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;wBACvD,CAAC;qBACF;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QAEO,KAAK,CAAC,iBAAiB;YAC7B,2EAA2E;YAC3E,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,IAAI,CAAC,CAAC;YAC3D,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;gBAC3C,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;YACrC,CAAC;YAED,wDAAwD;YACxD,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,YAAY,CAAC,iBAAiB,IAAI,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjH,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC/B,CAAC;QACH,CAAC;QAEO,uBAAuB;YAC7B,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,2BAA2B;YAC1D,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC,GAAG,EAAE;gBACzC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,CAAC,EAAE,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;QAChD,CAAC;QAEO,mBAAmB;YACzB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAEvB,uDAAuD;YACvD,IAAI,GAAG,GAAG,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC3D,OAAO;YACT,CAAC;YAED,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9C,IAAI,IAAI,CAAC,YAAY,CAAC,WAAW,IAAI,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,GAAG,IAAI,EAAE,CAAC;gBAChF,OAAO;YACT,CAAC;YAED,0CAA0C;YAC1C,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC;YACvD,MAAM,iBAAiB,GAAG,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC;YAEzD,sBAAsB;YACtB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;YAE9C,MAAM,cAAc,GAAG;gBACrB,CAAC,EAAE,SAAS;gBACZ,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,GAAG,EAAE,CAAC,GAAG,EAAE;aAC1C,CAAC;YAEF,MAAM,eAAe,GAAG;gBACtB,CAAC,EAAE,SAAS;gBACZ,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB,GAAG,EAAE,CAAC,GAAG,EAAE;aAC3C,CAAC;YAEF,oFAAoF;YACpF,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,IAAI,sBAAsB,CAAC,eAAe,EAAE,CAAC;gBACxE,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;gBAC3B,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;YAC9B,CAAC;YACD,IAAI,CAAC,aAAa,GAAG,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;YAC7D,IAAI,CAAC,cAAc,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;YAEhE,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC;QAC7B,CAAC;QAEO,sBAAsB;YAC5B,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;gBACvC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;YACjC,CAAC;QACH,CAAC;;YA9tBU,uDAAsB;;;;;SAAtB,sBAAsB"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/dcrouter",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "13.
|
|
4
|
+
"version": "13.21.1",
|
|
5
5
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"exports": {
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"@push.rocks/smartnetwork": "^4.6.0",
|
|
55
55
|
"@push.rocks/smartpath": "^6.0.0",
|
|
56
56
|
"@push.rocks/smartpromise": "^4.2.3",
|
|
57
|
-
"@push.rocks/smartproxy": "^27.
|
|
57
|
+
"@push.rocks/smartproxy": "^27.8.1",
|
|
58
58
|
"@push.rocks/smartradius": "^1.1.1",
|
|
59
59
|
"@push.rocks/smartrequest": "^5.0.1",
|
|
60
60
|
"@push.rocks/smartrx": "^3.0.10",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"@push.rocks/smartvpn": "1.19.2",
|
|
64
64
|
"@push.rocks/taskbuffer": "^8.0.2",
|
|
65
65
|
"@serve.zone/catalog": "^2.12.4",
|
|
66
|
-
"@serve.zone/interfaces": "^5.3
|
|
66
|
+
"@serve.zone/interfaces": "^5.4.3",
|
|
67
67
|
"@serve.zone/remoteingress": "^4.15.3",
|
|
68
68
|
"@tsclass/tsclass": "^9.5.0",
|
|
69
69
|
"@types/qrcode": "^1.5.6",
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -560,7 +560,9 @@ export class MetricsManager {
|
|
|
560
560
|
requestsPerSecond: 0,
|
|
561
561
|
requestsTotal: 0,
|
|
562
562
|
backends: [] as Array<any>,
|
|
563
|
-
domainActivity: [] as Array<{ domain: string; bytesInPerSecond: number; bytesOutPerSecond: number; activeConnections: number; routeCount: number; requestCount: number }>,
|
|
563
|
+
domainActivity: [] as Array<{ domain: string; bytesInPerSecond: number; bytesOutPerSecond: number; activeConnections: number; routeCount: number; requestCount: number; requestsPerSecond?: number; requestsLastMinute?: number }>,
|
|
564
|
+
frontendProtocols: null,
|
|
565
|
+
backendProtocols: null,
|
|
564
566
|
};
|
|
565
567
|
}
|
|
566
568
|
|
|
@@ -592,6 +594,7 @@ export class MetricsManager {
|
|
|
592
594
|
// Get HTTP request rates
|
|
593
595
|
const requestsPerSecond = proxyMetrics.requests.perSecond();
|
|
594
596
|
const requestsTotal = proxyMetrics.requests.total();
|
|
597
|
+
const domainRequestRates = proxyMetrics.requests.byDomain();
|
|
595
598
|
|
|
596
599
|
// Get frontend/backend protocol distribution
|
|
597
600
|
const frontendProtocols = proxyMetrics.connections.frontendProtocols() ?? null;
|
|
@@ -619,47 +622,48 @@ export class MetricsManager {
|
|
|
619
622
|
const seenCacheKeys = new Set<string>();
|
|
620
623
|
|
|
621
624
|
for (const [key, bm] of backendMetrics) {
|
|
625
|
+
backends.push({
|
|
626
|
+
id: `backend:${key}`,
|
|
627
|
+
backend: key,
|
|
628
|
+
domain: null,
|
|
629
|
+
protocol: bm.protocol,
|
|
630
|
+
activeConnections: bm.activeConnections,
|
|
631
|
+
totalConnections: bm.totalConnections,
|
|
632
|
+
connectErrors: bm.connectErrors,
|
|
633
|
+
handshakeErrors: bm.handshakeErrors,
|
|
634
|
+
requestErrors: bm.requestErrors,
|
|
635
|
+
avgConnectTimeMs: Math.round(bm.avgConnectTimeMs * 10) / 10,
|
|
636
|
+
poolHitRate: Math.round(bm.poolHitRate * 1000) / 1000,
|
|
637
|
+
h2Failures: bm.h2Failures,
|
|
638
|
+
h2Suppressed: false,
|
|
639
|
+
h3Suppressed: false,
|
|
640
|
+
h2CooldownRemainingSecs: null,
|
|
641
|
+
h3CooldownRemainingSecs: null,
|
|
642
|
+
h2ConsecutiveFailures: null,
|
|
643
|
+
h3ConsecutiveFailures: null,
|
|
644
|
+
h3Port: null,
|
|
645
|
+
cacheAgeSecs: null,
|
|
646
|
+
});
|
|
647
|
+
|
|
622
648
|
const cacheEntries = cacheByBackend.get(key);
|
|
623
|
-
if (
|
|
624
|
-
//
|
|
625
|
-
backends.push({
|
|
626
|
-
backend: key,
|
|
627
|
-
domain: null,
|
|
628
|
-
protocol: bm.protocol,
|
|
629
|
-
activeConnections: bm.activeConnections,
|
|
630
|
-
totalConnections: bm.totalConnections,
|
|
631
|
-
connectErrors: bm.connectErrors,
|
|
632
|
-
handshakeErrors: bm.handshakeErrors,
|
|
633
|
-
requestErrors: bm.requestErrors,
|
|
634
|
-
avgConnectTimeMs: Math.round(bm.avgConnectTimeMs * 10) / 10,
|
|
635
|
-
poolHitRate: Math.round(bm.poolHitRate * 1000) / 1000,
|
|
636
|
-
h2Failures: bm.h2Failures,
|
|
637
|
-
h2Suppressed: false,
|
|
638
|
-
h3Suppressed: false,
|
|
639
|
-
h2CooldownRemainingSecs: null,
|
|
640
|
-
h3CooldownRemainingSecs: null,
|
|
641
|
-
h2ConsecutiveFailures: null,
|
|
642
|
-
h3ConsecutiveFailures: null,
|
|
643
|
-
h3Port: null,
|
|
644
|
-
cacheAgeSecs: null,
|
|
645
|
-
});
|
|
646
|
-
} else {
|
|
647
|
-
// One row per domain, each enriched with the shared backend metrics
|
|
649
|
+
if (cacheEntries && cacheEntries.length > 0) {
|
|
650
|
+
// Protocol cache rows are domain-scoped metadata, not live backend connections.
|
|
648
651
|
for (const cache of cacheEntries) {
|
|
649
652
|
const compositeKey = `${cache.host}:${cache.port}:${cache.domain ?? ''}`;
|
|
650
653
|
seenCacheKeys.add(compositeKey);
|
|
651
654
|
backends.push({
|
|
655
|
+
id: `cache:${compositeKey}`,
|
|
652
656
|
backend: key,
|
|
653
657
|
domain: cache.domain ?? null,
|
|
654
658
|
protocol: cache.protocol ?? bm.protocol,
|
|
655
|
-
activeConnections:
|
|
656
|
-
totalConnections:
|
|
657
|
-
connectErrors:
|
|
658
|
-
handshakeErrors:
|
|
659
|
-
requestErrors:
|
|
660
|
-
avgConnectTimeMs:
|
|
661
|
-
poolHitRate:
|
|
662
|
-
h2Failures:
|
|
659
|
+
activeConnections: 0,
|
|
660
|
+
totalConnections: 0,
|
|
661
|
+
connectErrors: 0,
|
|
662
|
+
handshakeErrors: 0,
|
|
663
|
+
requestErrors: 0,
|
|
664
|
+
avgConnectTimeMs: 0,
|
|
665
|
+
poolHitRate: 0,
|
|
666
|
+
h2Failures: 0,
|
|
663
667
|
h2Suppressed: cache.h2Suppressed,
|
|
664
668
|
h3Suppressed: cache.h3Suppressed,
|
|
665
669
|
h2CooldownRemainingSecs: cache.h2CooldownRemainingSecs,
|
|
@@ -678,6 +682,7 @@ export class MetricsManager {
|
|
|
678
682
|
const compositeKey = `${entry.host}:${entry.port}:${entry.domain ?? ''}`;
|
|
679
683
|
if (!seenCacheKeys.has(compositeKey)) {
|
|
680
684
|
backends.push({
|
|
685
|
+
id: `cache:${compositeKey}`,
|
|
681
686
|
backend: `${entry.host}:${entry.port}`,
|
|
682
687
|
domain: entry.domain,
|
|
683
688
|
protocol: entry.protocol,
|
|
@@ -750,6 +755,9 @@ export class MetricsManager {
|
|
|
750
755
|
|
|
751
756
|
// Resolve wildcards using domains seen in request metrics
|
|
752
757
|
const allKnownDomains = new Set<string>(domainRequestTotals.keys());
|
|
758
|
+
for (const domain of domainRequestRates.keys()) {
|
|
759
|
+
allKnownDomains.add(domain);
|
|
760
|
+
}
|
|
753
761
|
for (const entry of protocolCache) {
|
|
754
762
|
if (entry.domain) allKnownDomains.add(entry.domain);
|
|
755
763
|
}
|
|
@@ -775,11 +783,20 @@ export class MetricsManager {
|
|
|
775
783
|
}
|
|
776
784
|
}
|
|
777
785
|
|
|
778
|
-
|
|
779
|
-
|
|
786
|
+
const hasLiveDomainRates = domainRequestRates.size > 0;
|
|
787
|
+
const getDomainWeight = (domain: string): number => {
|
|
788
|
+
const liveRate = domainRequestRates.get(domain);
|
|
789
|
+
return hasLiveDomainRates
|
|
790
|
+
? (liveRate?.lastMinute ?? 0)
|
|
791
|
+
: (domainRequestTotals.get(domain) || 0);
|
|
792
|
+
};
|
|
793
|
+
|
|
794
|
+
// For each route, compute the total activity weight across all resolved domains
|
|
795
|
+
// so we can distribute route-level throughput/connections. Prefer live domain
|
|
796
|
+
// request rates from SmartProxy 27.8+, falling back to lifetime counters.
|
|
780
797
|
const routeTotalRequests = new Map<string, number>();
|
|
781
798
|
for (const [domain, routeKeys] of domainToRoutes) {
|
|
782
|
-
const reqs =
|
|
799
|
+
const reqs = getDomainWeight(domain);
|
|
783
800
|
for (const routeKey of routeKeys) {
|
|
784
801
|
routeTotalRequests.set(routeKey, (routeTotalRequests.get(routeKey) || 0) + reqs);
|
|
785
802
|
}
|
|
@@ -792,10 +809,13 @@ export class MetricsManager {
|
|
|
792
809
|
bytesOutPerSec: number;
|
|
793
810
|
routeCount: number;
|
|
794
811
|
requestCount: number;
|
|
812
|
+
requestsPerSecond: number;
|
|
813
|
+
requestsLastMinute: number;
|
|
795
814
|
}>();
|
|
796
815
|
|
|
797
816
|
for (const [domain, routeKeys] of domainToRoutes) {
|
|
798
|
-
const domainReqs =
|
|
817
|
+
const domainReqs = getDomainWeight(domain);
|
|
818
|
+
const requestRate = domainRequestRates.get(domain);
|
|
799
819
|
let totalConns = 0;
|
|
800
820
|
let totalIn = 0;
|
|
801
821
|
let totalOut = 0;
|
|
@@ -816,7 +836,9 @@ export class MetricsManager {
|
|
|
816
836
|
bytesInPerSec: totalIn,
|
|
817
837
|
bytesOutPerSec: totalOut,
|
|
818
838
|
routeCount: routeKeys.length,
|
|
819
|
-
requestCount:
|
|
839
|
+
requestCount: domainRequestTotals.get(domain) || 0,
|
|
840
|
+
requestsPerSecond: requestRate?.perSecond ?? 0,
|
|
841
|
+
requestsLastMinute: requestRate?.lastMinute ?? 0,
|
|
820
842
|
});
|
|
821
843
|
}
|
|
822
844
|
|
|
@@ -828,8 +850,17 @@ export class MetricsManager {
|
|
|
828
850
|
activeConnections: data.activeConnections,
|
|
829
851
|
routeCount: data.routeCount,
|
|
830
852
|
requestCount: data.requestCount,
|
|
853
|
+
requestsPerSecond: data.requestsPerSecond,
|
|
854
|
+
requestsLastMinute: data.requestsLastMinute,
|
|
831
855
|
}))
|
|
832
|
-
.sort((a, b) =>
|
|
856
|
+
.sort((a, b) => {
|
|
857
|
+
if (hasLiveDomainRates) {
|
|
858
|
+
return (b.requestsPerSecond - a.requestsPerSecond) ||
|
|
859
|
+
(b.requestsLastMinute - a.requestsLastMinute) ||
|
|
860
|
+
((b.bytesInPerSecond + b.bytesOutPerSecond) - (a.bytesInPerSecond + a.bytesOutPerSecond));
|
|
861
|
+
}
|
|
862
|
+
return (b.bytesInPerSecond + b.bytesOutPerSecond) - (a.bytesInPerSecond + a.bytesOutPerSecond);
|
|
863
|
+
});
|
|
833
864
|
|
|
834
865
|
return {
|
|
835
866
|
connectionsByIP,
|
|
@@ -50,19 +50,21 @@ export class SecurityHandler {
|
|
|
50
50
|
localAddress: conn.destination.ip,
|
|
51
51
|
startTime: conn.startTime,
|
|
52
52
|
protocol: conn.type === 'http' ? 'https' : conn.type as any,
|
|
53
|
-
state: conn.status as any,
|
|
53
|
+
state: conn.status === 'active' ? 'connected' : conn.status as any,
|
|
54
54
|
bytesReceived: (conn as any)._throughputIn || 0,
|
|
55
55
|
bytesSent: (conn as any)._throughputOut || 0,
|
|
56
|
+
connectionCount: conn.bytesTransferred || 1,
|
|
56
57
|
}));
|
|
58
|
+
const totalConnections = connectionInfos.reduce((sum, conn) => sum + (conn.connectionCount || 1), 0);
|
|
57
59
|
|
|
58
60
|
const summary = {
|
|
59
|
-
total:
|
|
61
|
+
total: totalConnections,
|
|
60
62
|
byProtocol: connectionInfos.reduce((acc, conn) => {
|
|
61
|
-
acc[conn.protocol] = (acc[conn.protocol] || 0) + 1;
|
|
63
|
+
acc[conn.protocol] = (acc[conn.protocol] || 0) + (conn.connectionCount || 1);
|
|
62
64
|
return acc;
|
|
63
65
|
}, {} as { [protocol: string]: number }),
|
|
64
66
|
byState: connectionInfos.reduce((acc, conn) => {
|
|
65
|
-
acc[conn.state] = (acc[conn.state] || 0) + 1;
|
|
67
|
+
acc[conn.state] = (acc[conn.state] || 0) + (conn.connectionCount || 1);
|
|
66
68
|
return acc;
|
|
67
69
|
}, {} as { [state: string]: number }),
|
|
68
70
|
};
|
|
@@ -104,6 +106,8 @@ export class SecurityHandler {
|
|
|
104
106
|
requestsPerSecond: networkStats.requestsPerSecond || 0,
|
|
105
107
|
requestsTotal: networkStats.requestsTotal || 0,
|
|
106
108
|
backends: networkStats.backends || [],
|
|
109
|
+
frontendProtocols: networkStats.frontendProtocols || null,
|
|
110
|
+
backendProtocols: networkStats.backendProtocols || null,
|
|
107
111
|
};
|
|
108
112
|
}
|
|
109
113
|
|
|
@@ -120,6 +124,8 @@ export class SecurityHandler {
|
|
|
120
124
|
requestsPerSecond: 0,
|
|
121
125
|
requestsTotal: 0,
|
|
122
126
|
backends: [],
|
|
127
|
+
frontendProtocols: null,
|
|
128
|
+
backendProtocols: null,
|
|
123
129
|
};
|
|
124
130
|
}
|
|
125
131
|
)
|
|
@@ -335,4 +341,4 @@ export class SecurityHandler {
|
|
|
335
341
|
limits: [],
|
|
336
342
|
};
|
|
337
343
|
}
|
|
338
|
-
}
|
|
344
|
+
}
|
package/ts_web/appstate.ts
CHANGED
|
@@ -512,15 +512,6 @@ export const fetchNetworkStatsAction = networkStatePart.createAction(async (stat
|
|
|
512
512
|
if (!context.identity) return currentState;
|
|
513
513
|
|
|
514
514
|
try {
|
|
515
|
-
// Fetch active connections using the existing endpoint
|
|
516
|
-
const connectionsRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
|
517
|
-
interfaces.requests.IReq_GetActiveConnections
|
|
518
|
-
>('/typedrequest', 'getActiveConnections');
|
|
519
|
-
|
|
520
|
-
const connectionsResponse = await connectionsRequest.fire({
|
|
521
|
-
identity: context.identity,
|
|
522
|
-
});
|
|
523
|
-
|
|
524
515
|
// Get network stats for throughput and IP data
|
|
525
516
|
const networkStatsRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
|
526
517
|
interfaces.requests.IReq_GetNetworkStats
|
|
@@ -533,22 +524,35 @@ export const fetchNetworkStatsAction = networkStatePart.createAction(async (stat
|
|
|
533
524
|
// Use the connections data for the connection list
|
|
534
525
|
// and network stats for throughput and IP analytics
|
|
535
526
|
const connectionsByIP: { [ip: string]: number } = {};
|
|
527
|
+
const throughputByIP = new Map<string, { in: number; out: number }>();
|
|
528
|
+
for (const item of networkStatsResponse.throughputByIP || []) {
|
|
529
|
+
throughputByIP.set(item.ip, { in: item.in, out: item.out });
|
|
530
|
+
}
|
|
536
531
|
|
|
537
532
|
// Build connectionsByIP from network stats if available
|
|
538
533
|
if (networkStatsResponse.connectionsByIP && Array.isArray(networkStatsResponse.connectionsByIP)) {
|
|
539
534
|
networkStatsResponse.connectionsByIP.forEach((item: { ip: string; count: number }) => {
|
|
540
535
|
connectionsByIP[item.ip] = item.count;
|
|
541
536
|
});
|
|
542
|
-
} else {
|
|
543
|
-
// Fallback: calculate from connections
|
|
544
|
-
connectionsResponse.connections.forEach(conn => {
|
|
545
|
-
const ip = conn.remoteAddress;
|
|
546
|
-
connectionsByIP[ip] = (connectionsByIP[ip] || 0) + 1;
|
|
547
|
-
});
|
|
548
537
|
}
|
|
549
538
|
|
|
539
|
+
const connections: interfaces.data.IConnectionInfo[] = Object.entries(connectionsByIP).map(([ip, count]) => {
|
|
540
|
+
const tp = throughputByIP.get(ip);
|
|
541
|
+
return {
|
|
542
|
+
id: `ip-${ip}`,
|
|
543
|
+
remoteAddress: ip,
|
|
544
|
+
localAddress: 'server',
|
|
545
|
+
startTime: 0,
|
|
546
|
+
protocol: 'https',
|
|
547
|
+
state: 'connected',
|
|
548
|
+
bytesReceived: tp?.in || 0,
|
|
549
|
+
bytesSent: tp?.out || 0,
|
|
550
|
+
connectionCount: count,
|
|
551
|
+
};
|
|
552
|
+
});
|
|
553
|
+
|
|
550
554
|
return {
|
|
551
|
-
connections
|
|
555
|
+
connections,
|
|
552
556
|
connectionsByIP,
|
|
553
557
|
throughputRate: networkStatsResponse.throughputRate || { bytesInPerSecond: 0, bytesOutPerSecond: 0 },
|
|
554
558
|
totalBytes: networkStatsResponse.totalDataTransferred
|
|
@@ -2589,7 +2593,7 @@ async function dispatchCombinedRefreshActionInner() {
|
|
|
2589
2593
|
email: true,
|
|
2590
2594
|
dns: true,
|
|
2591
2595
|
security: true,
|
|
2592
|
-
network: currentView === 'network'
|
|
2596
|
+
network: currentView === 'network' && currentSubview === 'activity',
|
|
2593
2597
|
radius: true,
|
|
2594
2598
|
vpn: true,
|
|
2595
2599
|
},
|
|
@@ -2617,7 +2621,7 @@ async function dispatchCombinedRefreshActionInner() {
|
|
|
2617
2621
|
|
|
2618
2622
|
// Build connectionsByIP from connectionDetails (now populated with real per-IP data)
|
|
2619
2623
|
network.connectionDetails.forEach(conn => {
|
|
2620
|
-
connectionsByIP[conn.remoteAddress] = (connectionsByIP[conn.remoteAddress] || 0) + 1;
|
|
2624
|
+
connectionsByIP[conn.remoteAddress] = (connectionsByIP[conn.remoteAddress] || 0) + (conn.connectionCount || 1);
|
|
2621
2625
|
});
|
|
2622
2626
|
|
|
2623
2627
|
// Build connections from connectionDetails (real per-IP aggregates)
|
|
@@ -2630,6 +2634,7 @@ async function dispatchCombinedRefreshActionInner() {
|
|
|
2630
2634
|
state: conn.state as any,
|
|
2631
2635
|
bytesReceived: conn.bytesIn,
|
|
2632
2636
|
bytesSent: conn.bytesOut,
|
|
2637
|
+
connectionCount: conn.connectionCount,
|
|
2633
2638
|
}));
|
|
2634
2639
|
|
|
2635
2640
|
networkStatePart.setState({
|
|
@@ -79,7 +79,6 @@ export class OpsViewNetworkActivity extends DeesElement {
|
|
|
79
79
|
// Subscribe and track unsubscribe functions
|
|
80
80
|
const statsUnsubscribe = appstate.statsStatePart.select().subscribe((state) => {
|
|
81
81
|
this.statsState = state;
|
|
82
|
-
this.updateNetworkData();
|
|
83
82
|
});
|
|
84
83
|
this.rxSubscriptions.push(statsUnsubscribe);
|
|
85
84
|
|
|
@@ -560,6 +559,8 @@ export class OpsViewNetworkActivity extends DeesElement {
|
|
|
560
559
|
'Throughput Out': this.formatBitsPerSecond(item.bytesOutPerSecond),
|
|
561
560
|
'Transferred / min': this.formatBytes(totalBytesPerMin),
|
|
562
561
|
'Connections': item.activeConnections,
|
|
562
|
+
'Req/s': item.requestsPerSecond != null ? item.requestsPerSecond.toFixed(1) : '-',
|
|
563
|
+
'Req/min': item.requestsLastMinute != null ? item.requestsLastMinute.toFixed(0) : '-',
|
|
563
564
|
'Requests': item.requestCount?.toLocaleString() ?? '0',
|
|
564
565
|
'Routes': item.routeCount,
|
|
565
566
|
};
|
|
@@ -583,7 +584,7 @@ export class OpsViewNetworkActivity extends DeesElement {
|
|
|
583
584
|
return html`
|
|
584
585
|
<dees-table
|
|
585
586
|
.data=${backends}
|
|
586
|
-
.rowKey=${'
|
|
587
|
+
.rowKey=${'id'}
|
|
587
588
|
.highlightUpdates=${'flash'}
|
|
588
589
|
.displayFunction=${(item: interfaces.data.IBackendInfo) => {
|
|
589
590
|
const totalErrors = item.connectErrors + item.handshakeErrors + item.requestErrors;
|
|
@@ -707,6 +708,9 @@ export class OpsViewNetworkActivity extends DeesElement {
|
|
|
707
708
|
}
|
|
708
709
|
|
|
709
710
|
const throughput = this.calculateThroughput();
|
|
711
|
+
if (this.networkState.lastUpdated && now - this.networkState.lastUpdated > 3000) {
|
|
712
|
+
return;
|
|
713
|
+
}
|
|
710
714
|
|
|
711
715
|
// Convert to Mbps (bytes * 8 / 1,000,000)
|
|
712
716
|
const throughputInMbps = (throughput.in * 8) / 1000000;
|