@serve.zone/dcrouter 11.0.39 → 11.0.40
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 +1 -1
- package/dist_ts/errors/base.errors.js +320 -0
- package/dist_ts/errors/error.codes.d.ts +115 -0
- package/dist_ts/errors/error.codes.js +136 -0
- package/dist_ts/monitoring/classes.metricsmanager.d.ts +178 -0
- package/dist_ts/monitoring/classes.metricsmanager.js +642 -0
- package/dist_ts/monitoring/index.d.ts +1 -0
- package/dist_ts/monitoring/index.js +2 -0
- package/dist_ts/opsserver/classes.opsserver.d.ts +37 -0
- package/dist_ts/opsserver/classes.opsserver.js +85 -0
- package/dist_ts/opsserver/handlers/api-token.handler.d.ts +6 -0
- package/dist_ts/opsserver/handlers/api-token.handler.js +62 -0
- package/dist_ts/opsserver/handlers/certificate.handler.d.ts +32 -0
- package/dist_ts/opsserver/handlers/certificate.handler.js +421 -0
- package/dist_ts/opsserver/handlers/email-ops.handler.d.ts +30 -0
- package/dist_ts/opsserver/handlers/email-ops.handler.js +227 -0
- package/dist_ts/opsserver/handlers/index.d.ts +11 -0
- package/dist_ts/opsserver/handlers/index.js +12 -0
- package/dist_ts/opsserver/handlers/radius.handler.d.ts +6 -0
- package/dist_ts/opsserver/handlers/radius.handler.js +295 -0
- package/dist_ts/opsserver/handlers/remoteingress.handler.d.ts +6 -0
- package/dist_ts/opsserver/handlers/remoteingress.handler.js +156 -0
- package/dist_ts/opsserver/handlers/route-management.handler.d.ts +14 -0
- package/dist_ts/opsserver/handlers/route-management.handler.js +117 -0
- package/dist_ts/opsserver/handlers/security.handler.d.ts +9 -0
- package/dist_ts/opsserver/handlers/security.handler.js +231 -0
- package/dist_ts/opsserver/handlers/stats.handler.d.ts +11 -0
- package/dist_ts/opsserver/handlers/stats.handler.js +399 -0
- package/dist_ts/opsserver/helpers/guards.d.ts +27 -0
- package/dist_ts/opsserver/helpers/guards.js +43 -0
- package/dist_ts/opsserver/index.d.ts +1 -0
- package/dist_ts/opsserver/index.js +2 -0
- package/dist_ts/radius/classes.accounting.manager.d.ts +218 -0
- package/dist_ts/radius/classes.accounting.manager.js +417 -0
- package/dist_ts/radius/classes.radius.server.d.ts +171 -0
- package/dist_ts/radius/classes.radius.server.js +385 -0
- package/dist_ts/radius/classes.vlan.manager.d.ts +128 -0
- package/dist_ts/radius/classes.vlan.manager.js +279 -0
- package/dist_ts/radius/index.d.ts +13 -0
- package/dist_ts/radius/index.js +14 -0
- package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +82 -0
- package/dist_ts/remoteingress/classes.remoteingress-manager.js +227 -0
- package/dist_ts/remoteingress/classes.tunnel-manager.d.ts +59 -0
- package/dist_ts/remoteingress/classes.tunnel-manager.js +165 -0
- package/dist_ts/remoteingress/index.d.ts +2 -0
- package/dist_ts/remoteingress/index.js +3 -0
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/package.json +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts_web/00_commitinfo_data.ts +1 -1
|
@@ -0,0 +1,218 @@
|
|
|
1
|
+
import type { StorageManager } from '../storage/index.js';
|
|
2
|
+
/**
|
|
3
|
+
* RADIUS accounting session
|
|
4
|
+
*/
|
|
5
|
+
export interface IAccountingSession {
|
|
6
|
+
/** Unique session ID from RADIUS */
|
|
7
|
+
sessionId: string;
|
|
8
|
+
/** Username (often MAC address for MAB) */
|
|
9
|
+
username: string;
|
|
10
|
+
/** MAC address of the device */
|
|
11
|
+
macAddress?: string;
|
|
12
|
+
/** NAS IP address (switch/AP) */
|
|
13
|
+
nasIpAddress: string;
|
|
14
|
+
/** NAS port (physical or virtual) */
|
|
15
|
+
nasPort?: number;
|
|
16
|
+
/** NAS port type */
|
|
17
|
+
nasPortType?: string;
|
|
18
|
+
/** NAS identifier (name) */
|
|
19
|
+
nasIdentifier?: string;
|
|
20
|
+
/** Assigned VLAN */
|
|
21
|
+
vlanId?: number;
|
|
22
|
+
/** Assigned IP address (if any) */
|
|
23
|
+
framedIpAddress?: string;
|
|
24
|
+
/** Called station ID (usually BSSID for wireless) */
|
|
25
|
+
calledStationId?: string;
|
|
26
|
+
/** Calling station ID (usually client MAC) */
|
|
27
|
+
callingStationId?: string;
|
|
28
|
+
/** Session start time */
|
|
29
|
+
startTime: number;
|
|
30
|
+
/** Session end time (0 if active) */
|
|
31
|
+
endTime: number;
|
|
32
|
+
/** Last update time (interim accounting) */
|
|
33
|
+
lastUpdateTime: number;
|
|
34
|
+
/** Session status */
|
|
35
|
+
status: 'active' | 'stopped' | 'terminated';
|
|
36
|
+
/** Termination cause (if stopped) */
|
|
37
|
+
terminateCause?: string;
|
|
38
|
+
/** Input octets (bytes received by NAS from client) */
|
|
39
|
+
inputOctets: number;
|
|
40
|
+
/** Output octets (bytes sent by NAS to client) */
|
|
41
|
+
outputOctets: number;
|
|
42
|
+
/** Input packets */
|
|
43
|
+
inputPackets: number;
|
|
44
|
+
/** Output packets */
|
|
45
|
+
outputPackets: number;
|
|
46
|
+
/** Session duration in seconds */
|
|
47
|
+
sessionTime: number;
|
|
48
|
+
/** Service type */
|
|
49
|
+
serviceType?: string;
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Accounting summary for a time period
|
|
53
|
+
*/
|
|
54
|
+
export interface IAccountingSummary {
|
|
55
|
+
/** Time period start */
|
|
56
|
+
periodStart: number;
|
|
57
|
+
/** Time period end */
|
|
58
|
+
periodEnd: number;
|
|
59
|
+
/** Total sessions */
|
|
60
|
+
totalSessions: number;
|
|
61
|
+
/** Active sessions */
|
|
62
|
+
activeSessions: number;
|
|
63
|
+
/** Total input bytes */
|
|
64
|
+
totalInputBytes: number;
|
|
65
|
+
/** Total output bytes */
|
|
66
|
+
totalOutputBytes: number;
|
|
67
|
+
/** Total session time (seconds) */
|
|
68
|
+
totalSessionTime: number;
|
|
69
|
+
/** Average session duration (seconds) */
|
|
70
|
+
averageSessionDuration: number;
|
|
71
|
+
/** Unique users/devices */
|
|
72
|
+
uniqueUsers: number;
|
|
73
|
+
/** Sessions by VLAN */
|
|
74
|
+
sessionsByVlan: Record<number, number>;
|
|
75
|
+
/** Top users by traffic */
|
|
76
|
+
topUsersByTraffic: Array<{
|
|
77
|
+
username: string;
|
|
78
|
+
totalBytes: number;
|
|
79
|
+
}>;
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* Accounting manager configuration
|
|
83
|
+
*/
|
|
84
|
+
export interface IAccountingManagerConfig {
|
|
85
|
+
/** Storage key prefix */
|
|
86
|
+
storagePrefix?: string;
|
|
87
|
+
/** Session retention period in days (default: 30) */
|
|
88
|
+
retentionDays?: number;
|
|
89
|
+
/** Enable detailed session logging */
|
|
90
|
+
detailedLogging?: boolean;
|
|
91
|
+
/** Maximum active sessions to track in memory */
|
|
92
|
+
maxActiveSessions?: number;
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* Manages RADIUS accounting data including:
|
|
96
|
+
* - Session tracking (start/stop/interim)
|
|
97
|
+
* - Data usage tracking (bytes in/out)
|
|
98
|
+
* - Session history and retention
|
|
99
|
+
* - Billing reports and summaries
|
|
100
|
+
*/
|
|
101
|
+
export declare class AccountingManager {
|
|
102
|
+
private activeSessions;
|
|
103
|
+
private config;
|
|
104
|
+
private storageManager?;
|
|
105
|
+
private stats;
|
|
106
|
+
constructor(config?: IAccountingManagerConfig, storageManager?: StorageManager);
|
|
107
|
+
/**
|
|
108
|
+
* Initialize the accounting manager
|
|
109
|
+
*/
|
|
110
|
+
initialize(): Promise<void>;
|
|
111
|
+
/**
|
|
112
|
+
* Handle accounting start request
|
|
113
|
+
*/
|
|
114
|
+
handleAccountingStart(data: {
|
|
115
|
+
sessionId: string;
|
|
116
|
+
username: string;
|
|
117
|
+
macAddress?: string;
|
|
118
|
+
nasIpAddress: string;
|
|
119
|
+
nasPort?: number;
|
|
120
|
+
nasPortType?: string;
|
|
121
|
+
nasIdentifier?: string;
|
|
122
|
+
vlanId?: number;
|
|
123
|
+
framedIpAddress?: string;
|
|
124
|
+
calledStationId?: string;
|
|
125
|
+
callingStationId?: string;
|
|
126
|
+
serviceType?: string;
|
|
127
|
+
}): Promise<void>;
|
|
128
|
+
/**
|
|
129
|
+
* Handle accounting interim update request
|
|
130
|
+
*/
|
|
131
|
+
handleAccountingUpdate(data: {
|
|
132
|
+
sessionId: string;
|
|
133
|
+
inputOctets?: number;
|
|
134
|
+
outputOctets?: number;
|
|
135
|
+
inputPackets?: number;
|
|
136
|
+
outputPackets?: number;
|
|
137
|
+
sessionTime?: number;
|
|
138
|
+
}): Promise<void>;
|
|
139
|
+
/**
|
|
140
|
+
* Handle accounting stop request
|
|
141
|
+
*/
|
|
142
|
+
handleAccountingStop(data: {
|
|
143
|
+
sessionId: string;
|
|
144
|
+
terminateCause?: string;
|
|
145
|
+
inputOctets?: number;
|
|
146
|
+
outputOctets?: number;
|
|
147
|
+
inputPackets?: number;
|
|
148
|
+
outputPackets?: number;
|
|
149
|
+
sessionTime?: number;
|
|
150
|
+
}): Promise<void>;
|
|
151
|
+
/**
|
|
152
|
+
* Get an active session by ID
|
|
153
|
+
*/
|
|
154
|
+
getSession(sessionId: string): IAccountingSession | undefined;
|
|
155
|
+
/**
|
|
156
|
+
* Get all active sessions
|
|
157
|
+
*/
|
|
158
|
+
getActiveSessions(): IAccountingSession[];
|
|
159
|
+
/**
|
|
160
|
+
* Get active sessions by username
|
|
161
|
+
*/
|
|
162
|
+
getSessionsByUsername(username: string): IAccountingSession[];
|
|
163
|
+
/**
|
|
164
|
+
* Get active sessions by NAS IP
|
|
165
|
+
*/
|
|
166
|
+
getSessionsByNas(nasIpAddress: string): IAccountingSession[];
|
|
167
|
+
/**
|
|
168
|
+
* Get active sessions by VLAN
|
|
169
|
+
*/
|
|
170
|
+
getSessionsByVlan(vlanId: number): IAccountingSession[];
|
|
171
|
+
/**
|
|
172
|
+
* Get accounting summary for a time period
|
|
173
|
+
*/
|
|
174
|
+
getSummary(startTime: number, endTime: number): Promise<IAccountingSummary>;
|
|
175
|
+
/**
|
|
176
|
+
* Get statistics
|
|
177
|
+
*/
|
|
178
|
+
getStats(): {
|
|
179
|
+
activeSessions: number;
|
|
180
|
+
totalSessionsStarted: number;
|
|
181
|
+
totalSessionsStopped: number;
|
|
182
|
+
totalInputBytes: number;
|
|
183
|
+
totalOutputBytes: number;
|
|
184
|
+
interimUpdatesReceived: number;
|
|
185
|
+
};
|
|
186
|
+
/**
|
|
187
|
+
* Disconnect a session (admin action)
|
|
188
|
+
*/
|
|
189
|
+
disconnectSession(sessionId: string, reason?: string): Promise<boolean>;
|
|
190
|
+
/**
|
|
191
|
+
* Clean up old archived sessions based on retention policy
|
|
192
|
+
*/
|
|
193
|
+
cleanupOldSessions(): Promise<number>;
|
|
194
|
+
/**
|
|
195
|
+
* Find the oldest active session
|
|
196
|
+
*/
|
|
197
|
+
private findOldestSession;
|
|
198
|
+
/**
|
|
199
|
+
* Evict a session from memory
|
|
200
|
+
*/
|
|
201
|
+
private evictSession;
|
|
202
|
+
/**
|
|
203
|
+
* Load active sessions from storage
|
|
204
|
+
*/
|
|
205
|
+
private loadActiveSessions;
|
|
206
|
+
/**
|
|
207
|
+
* Persist a session to storage
|
|
208
|
+
*/
|
|
209
|
+
private persistSession;
|
|
210
|
+
/**
|
|
211
|
+
* Archive a completed session
|
|
212
|
+
*/
|
|
213
|
+
private archiveSession;
|
|
214
|
+
/**
|
|
215
|
+
* Get archived sessions for a time period
|
|
216
|
+
*/
|
|
217
|
+
private getArchivedSessions;
|
|
218
|
+
}
|
|
@@ -0,0 +1,417 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
import { logger } from '../logger.js';
|
|
3
|
+
/**
|
|
4
|
+
* Manages RADIUS accounting data including:
|
|
5
|
+
* - Session tracking (start/stop/interim)
|
|
6
|
+
* - Data usage tracking (bytes in/out)
|
|
7
|
+
* - Session history and retention
|
|
8
|
+
* - Billing reports and summaries
|
|
9
|
+
*/
|
|
10
|
+
export class AccountingManager {
|
|
11
|
+
activeSessions = new Map();
|
|
12
|
+
config;
|
|
13
|
+
storageManager;
|
|
14
|
+
// Counters for statistics
|
|
15
|
+
stats = {
|
|
16
|
+
totalSessionsStarted: 0,
|
|
17
|
+
totalSessionsStopped: 0,
|
|
18
|
+
totalInputBytes: 0,
|
|
19
|
+
totalOutputBytes: 0,
|
|
20
|
+
interimUpdatesReceived: 0,
|
|
21
|
+
};
|
|
22
|
+
constructor(config, storageManager) {
|
|
23
|
+
this.config = {
|
|
24
|
+
storagePrefix: config?.storagePrefix ?? '/radius/accounting',
|
|
25
|
+
retentionDays: config?.retentionDays ?? 30,
|
|
26
|
+
detailedLogging: config?.detailedLogging ?? false,
|
|
27
|
+
maxActiveSessions: config?.maxActiveSessions ?? 10000,
|
|
28
|
+
};
|
|
29
|
+
this.storageManager = storageManager;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Initialize the accounting manager
|
|
33
|
+
*/
|
|
34
|
+
async initialize() {
|
|
35
|
+
if (this.storageManager) {
|
|
36
|
+
await this.loadActiveSessions();
|
|
37
|
+
}
|
|
38
|
+
logger.log('info', `AccountingManager initialized with ${this.activeSessions.size} active sessions`);
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Handle accounting start request
|
|
42
|
+
*/
|
|
43
|
+
async handleAccountingStart(data) {
|
|
44
|
+
const now = Date.now();
|
|
45
|
+
const session = {
|
|
46
|
+
sessionId: data.sessionId,
|
|
47
|
+
username: data.username,
|
|
48
|
+
macAddress: data.macAddress,
|
|
49
|
+
nasIpAddress: data.nasIpAddress,
|
|
50
|
+
nasPort: data.nasPort,
|
|
51
|
+
nasPortType: data.nasPortType,
|
|
52
|
+
nasIdentifier: data.nasIdentifier,
|
|
53
|
+
vlanId: data.vlanId,
|
|
54
|
+
framedIpAddress: data.framedIpAddress,
|
|
55
|
+
calledStationId: data.calledStationId,
|
|
56
|
+
callingStationId: data.callingStationId,
|
|
57
|
+
serviceType: data.serviceType,
|
|
58
|
+
startTime: now,
|
|
59
|
+
endTime: 0,
|
|
60
|
+
lastUpdateTime: now,
|
|
61
|
+
status: 'active',
|
|
62
|
+
inputOctets: 0,
|
|
63
|
+
outputOctets: 0,
|
|
64
|
+
inputPackets: 0,
|
|
65
|
+
outputPackets: 0,
|
|
66
|
+
sessionTime: 0,
|
|
67
|
+
};
|
|
68
|
+
// Check if we're at capacity
|
|
69
|
+
if (this.activeSessions.size >= this.config.maxActiveSessions) {
|
|
70
|
+
// Remove oldest session
|
|
71
|
+
const oldest = this.findOldestSession();
|
|
72
|
+
if (oldest) {
|
|
73
|
+
await this.evictSession(oldest);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
this.activeSessions.set(data.sessionId, session);
|
|
77
|
+
this.stats.totalSessionsStarted++;
|
|
78
|
+
if (this.config.detailedLogging) {
|
|
79
|
+
logger.log('info', `Accounting Start: session=${data.sessionId}, user=${data.username}, NAS=${data.nasIpAddress}`);
|
|
80
|
+
}
|
|
81
|
+
// Persist session
|
|
82
|
+
if (this.storageManager) {
|
|
83
|
+
await this.persistSession(session);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Handle accounting interim update request
|
|
88
|
+
*/
|
|
89
|
+
async handleAccountingUpdate(data) {
|
|
90
|
+
const session = this.activeSessions.get(data.sessionId);
|
|
91
|
+
if (!session) {
|
|
92
|
+
logger.log('warn', `Interim update for unknown session: ${data.sessionId}`);
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
// Update session metrics
|
|
96
|
+
if (data.inputOctets !== undefined) {
|
|
97
|
+
session.inputOctets = data.inputOctets;
|
|
98
|
+
}
|
|
99
|
+
if (data.outputOctets !== undefined) {
|
|
100
|
+
session.outputOctets = data.outputOctets;
|
|
101
|
+
}
|
|
102
|
+
if (data.inputPackets !== undefined) {
|
|
103
|
+
session.inputPackets = data.inputPackets;
|
|
104
|
+
}
|
|
105
|
+
if (data.outputPackets !== undefined) {
|
|
106
|
+
session.outputPackets = data.outputPackets;
|
|
107
|
+
}
|
|
108
|
+
if (data.sessionTime !== undefined) {
|
|
109
|
+
session.sessionTime = data.sessionTime;
|
|
110
|
+
}
|
|
111
|
+
session.lastUpdateTime = Date.now();
|
|
112
|
+
this.stats.interimUpdatesReceived++;
|
|
113
|
+
if (this.config.detailedLogging) {
|
|
114
|
+
logger.log('debug', `Accounting Interim: session=${data.sessionId}, in=${data.inputOctets}, out=${data.outputOctets}`);
|
|
115
|
+
}
|
|
116
|
+
// Update persisted session
|
|
117
|
+
if (this.storageManager) {
|
|
118
|
+
await this.persistSession(session);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
* Handle accounting stop request
|
|
123
|
+
*/
|
|
124
|
+
async handleAccountingStop(data) {
|
|
125
|
+
const session = this.activeSessions.get(data.sessionId);
|
|
126
|
+
if (!session) {
|
|
127
|
+
logger.log('warn', `Stop for unknown session: ${data.sessionId}`);
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
// Update final metrics
|
|
131
|
+
if (data.inputOctets !== undefined) {
|
|
132
|
+
session.inputOctets = data.inputOctets;
|
|
133
|
+
}
|
|
134
|
+
if (data.outputOctets !== undefined) {
|
|
135
|
+
session.outputOctets = data.outputOctets;
|
|
136
|
+
}
|
|
137
|
+
if (data.inputPackets !== undefined) {
|
|
138
|
+
session.inputPackets = data.inputPackets;
|
|
139
|
+
}
|
|
140
|
+
if (data.outputPackets !== undefined) {
|
|
141
|
+
session.outputPackets = data.outputPackets;
|
|
142
|
+
}
|
|
143
|
+
if (data.sessionTime !== undefined) {
|
|
144
|
+
session.sessionTime = data.sessionTime;
|
|
145
|
+
}
|
|
146
|
+
session.endTime = Date.now();
|
|
147
|
+
session.lastUpdateTime = session.endTime;
|
|
148
|
+
session.status = 'stopped';
|
|
149
|
+
session.terminateCause = data.terminateCause;
|
|
150
|
+
// Update global stats
|
|
151
|
+
this.stats.totalSessionsStopped++;
|
|
152
|
+
this.stats.totalInputBytes += session.inputOctets;
|
|
153
|
+
this.stats.totalOutputBytes += session.outputOctets;
|
|
154
|
+
if (this.config.detailedLogging) {
|
|
155
|
+
logger.log('info', `Accounting Stop: session=${data.sessionId}, duration=${session.sessionTime}s, in=${session.inputOctets}, out=${session.outputOctets}`);
|
|
156
|
+
}
|
|
157
|
+
// Archive the session
|
|
158
|
+
if (this.storageManager) {
|
|
159
|
+
await this.archiveSession(session);
|
|
160
|
+
}
|
|
161
|
+
// Remove from active sessions
|
|
162
|
+
this.activeSessions.delete(data.sessionId);
|
|
163
|
+
}
|
|
164
|
+
/**
|
|
165
|
+
* Get an active session by ID
|
|
166
|
+
*/
|
|
167
|
+
getSession(sessionId) {
|
|
168
|
+
return this.activeSessions.get(sessionId);
|
|
169
|
+
}
|
|
170
|
+
/**
|
|
171
|
+
* Get all active sessions
|
|
172
|
+
*/
|
|
173
|
+
getActiveSessions() {
|
|
174
|
+
return Array.from(this.activeSessions.values());
|
|
175
|
+
}
|
|
176
|
+
/**
|
|
177
|
+
* Get active sessions by username
|
|
178
|
+
*/
|
|
179
|
+
getSessionsByUsername(username) {
|
|
180
|
+
return Array.from(this.activeSessions.values()).filter(s => s.username === username);
|
|
181
|
+
}
|
|
182
|
+
/**
|
|
183
|
+
* Get active sessions by NAS IP
|
|
184
|
+
*/
|
|
185
|
+
getSessionsByNas(nasIpAddress) {
|
|
186
|
+
return Array.from(this.activeSessions.values()).filter(s => s.nasIpAddress === nasIpAddress);
|
|
187
|
+
}
|
|
188
|
+
/**
|
|
189
|
+
* Get active sessions by VLAN
|
|
190
|
+
*/
|
|
191
|
+
getSessionsByVlan(vlanId) {
|
|
192
|
+
return Array.from(this.activeSessions.values()).filter(s => s.vlanId === vlanId);
|
|
193
|
+
}
|
|
194
|
+
/**
|
|
195
|
+
* Get accounting summary for a time period
|
|
196
|
+
*/
|
|
197
|
+
async getSummary(startTime, endTime) {
|
|
198
|
+
// Get archived sessions for the time period
|
|
199
|
+
const archivedSessions = await this.getArchivedSessions(startTime, endTime);
|
|
200
|
+
// Combine with active sessions that started within the period
|
|
201
|
+
const activeSessions = Array.from(this.activeSessions.values()).filter(s => s.startTime >= startTime && s.startTime <= endTime);
|
|
202
|
+
const allSessions = [...archivedSessions, ...activeSessions];
|
|
203
|
+
// Calculate summary
|
|
204
|
+
let totalInputBytes = 0;
|
|
205
|
+
let totalOutputBytes = 0;
|
|
206
|
+
let totalSessionTime = 0;
|
|
207
|
+
const uniqueUsers = new Set();
|
|
208
|
+
const sessionsByVlan = {};
|
|
209
|
+
const userTraffic = {};
|
|
210
|
+
for (const session of allSessions) {
|
|
211
|
+
totalInputBytes += session.inputOctets;
|
|
212
|
+
totalOutputBytes += session.outputOctets;
|
|
213
|
+
totalSessionTime += session.sessionTime;
|
|
214
|
+
uniqueUsers.add(session.username);
|
|
215
|
+
if (session.vlanId !== undefined) {
|
|
216
|
+
sessionsByVlan[session.vlanId] = (sessionsByVlan[session.vlanId] || 0) + 1;
|
|
217
|
+
}
|
|
218
|
+
const userBytes = session.inputOctets + session.outputOctets;
|
|
219
|
+
userTraffic[session.username] = (userTraffic[session.username] || 0) + userBytes;
|
|
220
|
+
}
|
|
221
|
+
// Top users by traffic
|
|
222
|
+
const topUsersByTraffic = Object.entries(userTraffic)
|
|
223
|
+
.sort((a, b) => b[1] - a[1])
|
|
224
|
+
.slice(0, 10)
|
|
225
|
+
.map(([username, totalBytes]) => ({ username, totalBytes }));
|
|
226
|
+
return {
|
|
227
|
+
periodStart: startTime,
|
|
228
|
+
periodEnd: endTime,
|
|
229
|
+
totalSessions: allSessions.length,
|
|
230
|
+
activeSessions: activeSessions.length,
|
|
231
|
+
totalInputBytes,
|
|
232
|
+
totalOutputBytes,
|
|
233
|
+
totalSessionTime,
|
|
234
|
+
averageSessionDuration: allSessions.length > 0 ? totalSessionTime / allSessions.length : 0,
|
|
235
|
+
uniqueUsers: uniqueUsers.size,
|
|
236
|
+
sessionsByVlan,
|
|
237
|
+
topUsersByTraffic,
|
|
238
|
+
};
|
|
239
|
+
}
|
|
240
|
+
/**
|
|
241
|
+
* Get statistics
|
|
242
|
+
*/
|
|
243
|
+
getStats() {
|
|
244
|
+
return {
|
|
245
|
+
activeSessions: this.activeSessions.size,
|
|
246
|
+
...this.stats,
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
/**
|
|
250
|
+
* Disconnect a session (admin action)
|
|
251
|
+
*/
|
|
252
|
+
async disconnectSession(sessionId, reason = 'AdminReset') {
|
|
253
|
+
const session = this.activeSessions.get(sessionId);
|
|
254
|
+
if (!session) {
|
|
255
|
+
return false;
|
|
256
|
+
}
|
|
257
|
+
await this.handleAccountingStop({
|
|
258
|
+
sessionId,
|
|
259
|
+
terminateCause: reason,
|
|
260
|
+
sessionTime: Math.floor((Date.now() - session.startTime) / 1000),
|
|
261
|
+
});
|
|
262
|
+
return true;
|
|
263
|
+
}
|
|
264
|
+
/**
|
|
265
|
+
* Clean up old archived sessions based on retention policy
|
|
266
|
+
*/
|
|
267
|
+
async cleanupOldSessions() {
|
|
268
|
+
if (!this.storageManager) {
|
|
269
|
+
return 0;
|
|
270
|
+
}
|
|
271
|
+
const cutoffTime = Date.now() - this.config.retentionDays * 24 * 60 * 60 * 1000;
|
|
272
|
+
let deletedCount = 0;
|
|
273
|
+
try {
|
|
274
|
+
const keys = await this.storageManager.list(`${this.config.storagePrefix}/archive/`);
|
|
275
|
+
for (const key of keys) {
|
|
276
|
+
try {
|
|
277
|
+
const session = await this.storageManager.getJSON(key);
|
|
278
|
+
if (session && session.endTime > 0 && session.endTime < cutoffTime) {
|
|
279
|
+
await this.storageManager.delete(key);
|
|
280
|
+
deletedCount++;
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
catch (error) {
|
|
284
|
+
// Ignore individual errors
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
if (deletedCount > 0) {
|
|
288
|
+
logger.log('info', `Cleaned up ${deletedCount} old accounting sessions`);
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
catch (error) {
|
|
292
|
+
logger.log('error', `Failed to cleanup old sessions: ${error.message}`);
|
|
293
|
+
}
|
|
294
|
+
return deletedCount;
|
|
295
|
+
}
|
|
296
|
+
/**
|
|
297
|
+
* Find the oldest active session
|
|
298
|
+
*/
|
|
299
|
+
findOldestSession() {
|
|
300
|
+
let oldestTime = Infinity;
|
|
301
|
+
let oldestSessionId = null;
|
|
302
|
+
for (const [sessionId, session] of this.activeSessions) {
|
|
303
|
+
if (session.lastUpdateTime < oldestTime) {
|
|
304
|
+
oldestTime = session.lastUpdateTime;
|
|
305
|
+
oldestSessionId = sessionId;
|
|
306
|
+
}
|
|
307
|
+
}
|
|
308
|
+
return oldestSessionId;
|
|
309
|
+
}
|
|
310
|
+
/**
|
|
311
|
+
* Evict a session from memory
|
|
312
|
+
*/
|
|
313
|
+
async evictSession(sessionId) {
|
|
314
|
+
const session = this.activeSessions.get(sessionId);
|
|
315
|
+
if (session) {
|
|
316
|
+
session.status = 'terminated';
|
|
317
|
+
session.terminateCause = 'SessionEvicted';
|
|
318
|
+
session.endTime = Date.now();
|
|
319
|
+
if (this.storageManager) {
|
|
320
|
+
await this.archiveSession(session);
|
|
321
|
+
}
|
|
322
|
+
this.activeSessions.delete(sessionId);
|
|
323
|
+
logger.log('warn', `Evicted session ${sessionId} due to capacity limit`);
|
|
324
|
+
}
|
|
325
|
+
}
|
|
326
|
+
/**
|
|
327
|
+
* Load active sessions from storage
|
|
328
|
+
*/
|
|
329
|
+
async loadActiveSessions() {
|
|
330
|
+
if (!this.storageManager) {
|
|
331
|
+
return;
|
|
332
|
+
}
|
|
333
|
+
try {
|
|
334
|
+
const keys = await this.storageManager.list(`${this.config.storagePrefix}/active/`);
|
|
335
|
+
for (const key of keys) {
|
|
336
|
+
try {
|
|
337
|
+
const session = await this.storageManager.getJSON(key);
|
|
338
|
+
if (session && session.status === 'active') {
|
|
339
|
+
this.activeSessions.set(session.sessionId, session);
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
catch (error) {
|
|
343
|
+
// Ignore individual errors
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
catch (error) {
|
|
348
|
+
logger.log('warn', `Failed to load active sessions: ${error.message}`);
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
/**
|
|
352
|
+
* Persist a session to storage
|
|
353
|
+
*/
|
|
354
|
+
async persistSession(session) {
|
|
355
|
+
if (!this.storageManager) {
|
|
356
|
+
return;
|
|
357
|
+
}
|
|
358
|
+
const key = `${this.config.storagePrefix}/active/${session.sessionId}.json`;
|
|
359
|
+
try {
|
|
360
|
+
await this.storageManager.setJSON(key, session);
|
|
361
|
+
}
|
|
362
|
+
catch (error) {
|
|
363
|
+
logger.log('error', `Failed to persist session ${session.sessionId}: ${error.message}`);
|
|
364
|
+
}
|
|
365
|
+
}
|
|
366
|
+
/**
|
|
367
|
+
* Archive a completed session
|
|
368
|
+
*/
|
|
369
|
+
async archiveSession(session) {
|
|
370
|
+
if (!this.storageManager) {
|
|
371
|
+
return;
|
|
372
|
+
}
|
|
373
|
+
try {
|
|
374
|
+
// Remove from active
|
|
375
|
+
const activeKey = `${this.config.storagePrefix}/active/${session.sessionId}.json`;
|
|
376
|
+
await this.storageManager.delete(activeKey);
|
|
377
|
+
// Add to archive with date-based path
|
|
378
|
+
const date = new Date(session.endTime);
|
|
379
|
+
const archiveKey = `${this.config.storagePrefix}/archive/${date.getFullYear()}/${String(date.getMonth() + 1).padStart(2, '0')}/${String(date.getDate()).padStart(2, '0')}/${session.sessionId}.json`;
|
|
380
|
+
await this.storageManager.setJSON(archiveKey, session);
|
|
381
|
+
}
|
|
382
|
+
catch (error) {
|
|
383
|
+
logger.log('error', `Failed to archive session ${session.sessionId}: ${error.message}`);
|
|
384
|
+
}
|
|
385
|
+
}
|
|
386
|
+
/**
|
|
387
|
+
* Get archived sessions for a time period
|
|
388
|
+
*/
|
|
389
|
+
async getArchivedSessions(startTime, endTime) {
|
|
390
|
+
if (!this.storageManager) {
|
|
391
|
+
return [];
|
|
392
|
+
}
|
|
393
|
+
const sessions = [];
|
|
394
|
+
try {
|
|
395
|
+
const keys = await this.storageManager.list(`${this.config.storagePrefix}/archive/`);
|
|
396
|
+
for (const key of keys) {
|
|
397
|
+
try {
|
|
398
|
+
const session = await this.storageManager.getJSON(key);
|
|
399
|
+
if (session &&
|
|
400
|
+
session.endTime > 0 &&
|
|
401
|
+
session.startTime <= endTime &&
|
|
402
|
+
session.endTime >= startTime) {
|
|
403
|
+
sessions.push(session);
|
|
404
|
+
}
|
|
405
|
+
}
|
|
406
|
+
catch (error) {
|
|
407
|
+
// Ignore individual errors
|
|
408
|
+
}
|
|
409
|
+
}
|
|
410
|
+
}
|
|
411
|
+
catch (error) {
|
|
412
|
+
logger.log('warn', `Failed to get archived sessions: ${error.message}`);
|
|
413
|
+
}
|
|
414
|
+
return sessions;
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.accounting.manager.js","sourceRoot":"","sources":["../../../ts/radius/classes.accounting.manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AA+FtC;;;;;;GAMG;AACH,MAAM,OAAO,iBAAiB;IACpB,cAAc,GAAoC,IAAI,GAAG,EAAE,CAAC;IAC5D,MAAM,CAAqC;IAC3C,cAAc,CAAkB;IAExC,0BAA0B;IAClB,KAAK,GAAG;QACd,oBAAoB,EAAE,CAAC;QACvB,oBAAoB,EAAE,CAAC;QACvB,eAAe,EAAE,CAAC;QAClB,gBAAgB,EAAE,CAAC;QACnB,sBAAsB,EAAE,CAAC;KAC1B,CAAC;IAEF,YAAY,MAAiC,EAAE,cAA+B;QAC5E,IAAI,CAAC,MAAM,GAAG;YACZ,aAAa,EAAE,MAAM,EAAE,aAAa,IAAI,oBAAoB;YAC5D,aAAa,EAAE,MAAM,EAAE,aAAa,IAAI,EAAE;YAC1C,eAAe,EAAE,MAAM,EAAE,eAAe,IAAI,KAAK;YACjD,iBAAiB,EAAE,MAAM,EAAE,iBAAiB,IAAI,KAAK;SACtD,CAAC;QACF,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU;QACd,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClC,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sCAAsC,IAAI,CAAC,cAAc,CAAC,IAAI,kBAAkB,CAAC,CAAC;IACvG,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,IAa3B;QACC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,MAAM,OAAO,GAAuB;YAClC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS,EAAE,GAAG;YACd,OAAO,EAAE,CAAC;YACV,cAAc,EAAE,GAAG;YACnB,MAAM,EAAE,QAAQ;YAChB,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;YACf,YAAY,EAAE,CAAC;YACf,aAAa,EAAE,CAAC;YAChB,WAAW,EAAE,CAAC;SACf,CAAC;QAEF,6BAA6B;QAC7B,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAC9D,wBAAwB;YACxB,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACxC,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC;QAElC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YAChC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,IAAI,CAAC,SAAS,UAAU,IAAI,CAAC,QAAQ,SAAS,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QACrH,CAAC;QAED,kBAAkB;QAClB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,sBAAsB,CAAC,IAO5B;QACC,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAExD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uCAAuC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YAC5E,OAAO;QACT,CAAC;QAED,yBAAyB;QACzB,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACzC,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACpC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAC3C,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACpC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAC3C,CAAC;QACD,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACrC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QAC7C,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACzC,CAAC;QAED,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACpC,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YAChC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,+BAA+B,IAAI,CAAC,SAAS,QAAQ,IAAI,CAAC,WAAW,SAAS,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QACzH,CAAC;QAED,2BAA2B;QAC3B,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,oBAAoB,CAAC,IAQ1B;QACC,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAExD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YAClE,OAAO;QACT,CAAC;QAED,uBAAuB;QACvB,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACzC,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACpC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAC3C,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACpC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAC3C,CAAC;QACD,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACrC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QAC7C,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACzC,CAAC;QAED,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;QACzC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;QAC3B,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAE7C,sBAAsB;QACtB,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC;QAClC,IAAI,CAAC,KAAK,CAAC,eAAe,IAAI,OAAO,CAAC,WAAW,CAAC;QAClD,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,OAAO,CAAC,YAAY,CAAC;QAEpD,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YAChC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4BAA4B,IAAI,CAAC,SAAS,cAAc,OAAO,CAAC,WAAW,SAAS,OAAO,CAAC,WAAW,SAAS,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;QAC7J,CAAC;QAED,sBAAsB;QACtB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;QAED,8BAA8B;QAC9B,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,SAAiB;QAC1B,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,qBAAqB,CAAC,QAAgB;QACpC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;IACvF,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,YAAoB;QACnC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,YAAY,CAAC,CAAC;IAC/F,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,MAAc;QAC9B,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;IACnF,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU,CAAC,SAAiB,EAAE,OAAe;QACjD,4CAA4C;QAC5C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAE5E,8DAA8D;QAC9D,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CACpE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,SAAS,IAAI,CAAC,CAAC,SAAS,IAAI,OAAO,CACxD,CAAC;QAEF,MAAM,WAAW,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,cAAc,CAAC,CAAC;QAE7D,oBAAoB;QACpB,IAAI,eAAe,GAAG,CAAC,CAAC;QACxB,IAAI,gBAAgB,GAAG,CAAC,CAAC;QACzB,IAAI,gBAAgB,GAAG,CAAC,CAAC;QACzB,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;QACtC,MAAM,cAAc,GAA2B,EAAE,CAAC;QAClD,MAAM,WAAW,GAA2B,EAAE,CAAC;QAE/C,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;YAClC,eAAe,IAAI,OAAO,CAAC,WAAW,CAAC;YACvC,gBAAgB,IAAI,OAAO,CAAC,YAAY,CAAC;YACzC,gBAAgB,IAAI,OAAO,CAAC,WAAW,CAAC;YACxC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAElC,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBACjC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YAC7E,CAAC;YAED,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;YAC7D,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;QACnF,CAAC;QAED,uBAAuB;QACvB,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;aAClD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3B,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;aACZ,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAE/D,OAAO;YACL,WAAW,EAAE,SAAS;YACtB,SAAS,EAAE,OAAO;YAClB,aAAa,EAAE,WAAW,CAAC,MAAM;YACjC,cAAc,EAAE,cAAc,CAAC,MAAM;YACrC,eAAe;YACf,gBAAgB;YAChB,gBAAgB;YAChB,sBAAsB,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC1F,WAAW,EAAE,WAAW,CAAC,IAAI;YAC7B,cAAc;YACd,iBAAiB;SAClB,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,QAAQ;QAQN,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI;YACxC,GAAG,IAAI,CAAC,KAAK;SACd,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB,CAAC,SAAiB,EAAE,SAAiB,YAAY;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,IAAI,CAAC,oBAAoB,CAAC;YAC9B,SAAS;YACT,cAAc,EAAE,MAAM;YACtB,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;SACjE,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,kBAAkB;QACtB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,OAAO,CAAC,CAAC;QACX,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAChF,IAAI,YAAY,GAAG,CAAC,CAAC;QAErB,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,WAAW,CAAC,CAAC;YAErF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAqB,GAAG,CAAC,CAAC;oBAC3E,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,GAAG,CAAC,IAAI,OAAO,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC;wBACnE,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACtC,YAAY,EAAE,CAAC;oBACjB,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,2BAA2B;gBAC7B,CAAC;YACH,CAAC;YAED,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;gBACrB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,YAAY,0BAA0B,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mCAAmC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAED;;OAEG;IACK,iBAAiB;QACvB,IAAI,UAAU,GAAG,QAAQ,CAAC;QAC1B,IAAI,eAAe,GAAkB,IAAI,CAAC;QAE1C,KAAK,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACvD,IAAI,OAAO,CAAC,cAAc,GAAG,UAAU,EAAE,CAAC;gBACxC,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC;gBACpC,eAAe,GAAG,SAAS,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,YAAY,CAAC,SAAiB;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC;YAC9B,OAAO,CAAC,cAAc,GAAG,gBAAgB,CAAC;YAC1C,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE7B,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACrC,CAAC;YAED,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACtC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,SAAS,wBAAwB,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,kBAAkB;QAC9B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,UAAU,CAAC,CAAC;YAEpF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAqB,GAAG,CAAC,CAAC;oBAC3E,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;wBAC3C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;oBACtD,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,2BAA2B;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,cAAc,CAAC,OAA2B;QACtD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,WAAW,OAAO,CAAC,SAAS,OAAO,CAAC;QAC5E,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,6BAA6B,OAAO,CAAC,SAAS,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1F,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,cAAc,CAAC,OAA2B;QACtD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,qBAAqB;YACrB,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,WAAW,OAAO,CAAC,SAAS,OAAO,CAAC;YAClF,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAE5C,sCAAsC;YACtC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACvC,MAAM,UAAU,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,YAAY,IAAI,CAAC,WAAW,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,OAAO,CAAC,SAAS,OAAO,CAAC;YACrM,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACzD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,6BAA6B,OAAO,CAAC,SAAS,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1F,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB,CAAC,SAAiB,EAAE,OAAe;QAClE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,QAAQ,GAAyB,EAAE,CAAC;QAE1C,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,WAAW,CAAC,CAAC;YAErF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAqB,GAAG,CAAC,CAAC;oBAC3E,IACE,OAAO;wBACP,OAAO,CAAC,OAAO,GAAG,CAAC;wBACnB,OAAO,CAAC,SAAS,IAAI,OAAO;wBAC5B,OAAO,CAAC,OAAO,IAAI,SAAS,EAC5B,CAAC;wBACD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACzB,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,2BAA2B;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oCAAoC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}
|