@serve.zone/dcrouter 11.0.4 → 11.0.5

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.
Files changed (118) hide show
  1. package/dist_serve/bundle.js +1 -1
  2. package/package.json +1 -1
  3. package/ts/00_commitinfo_data.ts +1 -1
  4. package/ts_web/00_commitinfo_data.ts +1 -1
  5. package/dist_ts/00_commitinfo_data.d.ts +0 -8
  6. package/dist_ts/00_commitinfo_data.js +0 -9
  7. package/dist_ts/cache/classes.cache.cleaner.d.ts +0 -47
  8. package/dist_ts/cache/classes.cache.cleaner.js +0 -130
  9. package/dist_ts/cache/documents/classes.cached.email.d.ts +0 -125
  10. package/dist_ts/cache/documents/classes.cached.email.js +0 -337
  11. package/dist_ts/cache/documents/classes.cached.ip.reputation.d.ts +0 -119
  12. package/dist_ts/cache/documents/classes.cached.ip.reputation.js +0 -323
  13. package/dist_ts/cache/documents/index.d.ts +0 -2
  14. package/dist_ts/cache/documents/index.js +0 -3
  15. package/dist_ts/cache/index.d.ts +0 -4
  16. package/dist_ts/cache/index.js +0 -7
  17. package/dist_ts/classes.cert-provision-scheduler.d.ts +0 -53
  18. package/dist_ts/classes.cert-provision-scheduler.js +0 -110
  19. package/dist_ts/classes.dcrouter.d.ts +0 -337
  20. package/dist_ts/classes.dcrouter.js +0 -1405
  21. package/dist_ts/classes.storage-cert-manager.d.ts +0 -18
  22. package/dist_ts/classes.storage-cert-manager.js +0 -43
  23. package/dist_ts/config/classes.api-token-manager.d.ts +0 -46
  24. package/dist_ts/config/classes.api-token-manager.js +0 -150
  25. package/dist_ts/config/classes.route-config-manager.d.ts +0 -35
  26. package/dist_ts/config/classes.route-config-manager.js +0 -231
  27. package/dist_ts/config/index.d.ts +0 -3
  28. package/dist_ts/config/index.js +0 -5
  29. package/dist_ts/config/validator.d.ts +0 -104
  30. package/dist_ts/config/validator.js +0 -152
  31. package/dist_ts/errors/base.errors.d.ts +0 -224
  32. package/dist_ts/errors/base.errors.js +0 -320
  33. package/dist_ts/errors/error-handler.d.ts +0 -98
  34. package/dist_ts/errors/error-handler.js +0 -282
  35. package/dist_ts/errors/error.codes.d.ts +0 -115
  36. package/dist_ts/errors/error.codes.js +0 -136
  37. package/dist_ts/errors/index.d.ts +0 -54
  38. package/dist_ts/errors/index.js +0 -136
  39. package/dist_ts/errors/reputation.errors.d.ts +0 -183
  40. package/dist_ts/errors/reputation.errors.js +0 -292
  41. package/dist_ts/index.d.ts +0 -7
  42. package/dist_ts/index.js +0 -11
  43. package/dist_ts/logger.d.ts +0 -21
  44. package/dist_ts/logger.js +0 -81
  45. package/dist_ts/monitoring/classes.metricscache.d.ts +0 -32
  46. package/dist_ts/monitoring/classes.metricscache.js +0 -63
  47. package/dist_ts/monitoring/classes.metricsmanager.d.ts +0 -178
  48. package/dist_ts/monitoring/classes.metricsmanager.js +0 -642
  49. package/dist_ts/monitoring/index.d.ts +0 -1
  50. package/dist_ts/monitoring/index.js +0 -2
  51. package/dist_ts/opsserver/classes.opsserver.d.ts +0 -37
  52. package/dist_ts/opsserver/classes.opsserver.js +0 -85
  53. package/dist_ts/opsserver/handlers/admin.handler.d.ts +0 -31
  54. package/dist_ts/opsserver/handlers/admin.handler.js +0 -180
  55. package/dist_ts/opsserver/handlers/api-token.handler.d.ts +0 -6
  56. package/dist_ts/opsserver/handlers/api-token.handler.js +0 -62
  57. package/dist_ts/opsserver/handlers/certificate.handler.d.ts +0 -32
  58. package/dist_ts/opsserver/handlers/certificate.handler.js +0 -421
  59. package/dist_ts/opsserver/handlers/config.handler.d.ts +0 -7
  60. package/dist_ts/opsserver/handlers/config.handler.js +0 -192
  61. package/dist_ts/opsserver/handlers/email-ops.handler.d.ts +0 -30
  62. package/dist_ts/opsserver/handlers/email-ops.handler.js +0 -227
  63. package/dist_ts/opsserver/handlers/index.d.ts +0 -11
  64. package/dist_ts/opsserver/handlers/index.js +0 -12
  65. package/dist_ts/opsserver/handlers/logs.handler.d.ts +0 -25
  66. package/dist_ts/opsserver/handlers/logs.handler.js +0 -256
  67. package/dist_ts/opsserver/handlers/radius.handler.d.ts +0 -6
  68. package/dist_ts/opsserver/handlers/radius.handler.js +0 -295
  69. package/dist_ts/opsserver/handlers/remoteingress.handler.d.ts +0 -6
  70. package/dist_ts/opsserver/handlers/remoteingress.handler.js +0 -156
  71. package/dist_ts/opsserver/handlers/route-management.handler.d.ts +0 -14
  72. package/dist_ts/opsserver/handlers/route-management.handler.js +0 -117
  73. package/dist_ts/opsserver/handlers/security.handler.d.ts +0 -9
  74. package/dist_ts/opsserver/handlers/security.handler.js +0 -231
  75. package/dist_ts/opsserver/handlers/stats.handler.d.ts +0 -11
  76. package/dist_ts/opsserver/handlers/stats.handler.js +0 -399
  77. package/dist_ts/opsserver/helpers/guards.d.ts +0 -27
  78. package/dist_ts/opsserver/helpers/guards.js +0 -43
  79. package/dist_ts/opsserver/index.d.ts +0 -1
  80. package/dist_ts/opsserver/index.js +0 -2
  81. package/dist_ts/paths.d.ts +0 -26
  82. package/dist_ts/paths.js +0 -45
  83. package/dist_ts/plugins.d.ts +0 -79
  84. package/dist_ts/plugins.js +0 -113
  85. package/dist_ts/radius/classes.accounting.manager.d.ts +0 -218
  86. package/dist_ts/radius/classes.accounting.manager.js +0 -417
  87. package/dist_ts/radius/classes.radius.server.d.ts +0 -171
  88. package/dist_ts/radius/classes.radius.server.js +0 -385
  89. package/dist_ts/radius/classes.vlan.manager.d.ts +0 -128
  90. package/dist_ts/radius/classes.vlan.manager.js +0 -279
  91. package/dist_ts/radius/index.d.ts +0 -13
  92. package/dist_ts/radius/index.js +0 -14
  93. package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +0 -82
  94. package/dist_ts/remoteingress/classes.remoteingress-manager.js +0 -227
  95. package/dist_ts/remoteingress/classes.tunnel-manager.d.ts +0 -59
  96. package/dist_ts/remoteingress/classes.tunnel-manager.js +0 -165
  97. package/dist_ts/remoteingress/index.d.ts +0 -2
  98. package/dist_ts/remoteingress/index.js +0 -3
  99. package/dist_ts/security/classes.contentscanner.d.ts +0 -164
  100. package/dist_ts/security/classes.contentscanner.js +0 -642
  101. package/dist_ts/security/classes.ipreputationchecker.d.ts +0 -160
  102. package/dist_ts/security/classes.ipreputationchecker.js +0 -537
  103. package/dist_ts/security/classes.securitylogger.d.ts +0 -144
  104. package/dist_ts/security/classes.securitylogger.js +0 -233
  105. package/dist_ts/security/index.d.ts +0 -3
  106. package/dist_ts/security/index.js +0 -4
  107. package/dist_ts/sms/classes.smsservice.d.ts +0 -15
  108. package/dist_ts/sms/classes.smsservice.js +0 -72
  109. package/dist_ts/sms/config/sms.config.d.ts +0 -93
  110. package/dist_ts/sms/config/sms.config.js +0 -2
  111. package/dist_ts/sms/config/sms.schema.d.ts +0 -5
  112. package/dist_ts/sms/config/sms.schema.js +0 -121
  113. package/dist_ts/sms/index.d.ts +0 -1
  114. package/dist_ts/sms/index.js +0 -2
  115. package/dist_ts/storage/classes.storagemanager.d.ts +0 -83
  116. package/dist_ts/storage/classes.storagemanager.js +0 -350
  117. package/dist_ts/storage/index.d.ts +0 -1
  118. package/dist_ts/storage/index.js +0 -3
@@ -1,385 +0,0 @@
1
- import * as plugins from '../plugins.js';
2
- import { logger } from '../logger.js';
3
- import { VlanManager } from './classes.vlan.manager.js';
4
- import { AccountingManager } from './classes.accounting.manager.js';
5
- /**
6
- * RADIUS Server wrapper that provides:
7
- * - MAC Authentication Bypass (MAB) for network devices
8
- * - VLAN assignment based on MAC address
9
- * - Accounting for session tracking and billing
10
- * - Integration with SmartProxy routing
11
- */
12
- export class RadiusServer {
13
- radiusServer;
14
- vlanManager;
15
- accountingManager;
16
- config;
17
- storageManager;
18
- clientSecrets = new Map();
19
- running = false;
20
- // Statistics
21
- stats = {
22
- authRequests: 0,
23
- authAccepts: 0,
24
- authRejects: 0,
25
- accountingRequests: 0,
26
- startTime: 0,
27
- };
28
- constructor(config, storageManager) {
29
- this.config = {
30
- authPort: config.authPort ?? 1812,
31
- acctPort: config.acctPort ?? 1813,
32
- bindAddress: config.bindAddress ?? '0.0.0.0',
33
- ...config,
34
- };
35
- this.storageManager = storageManager;
36
- // Initialize VLAN manager
37
- this.vlanManager = new VlanManager(config.vlanAssignment, storageManager);
38
- // Initialize accounting manager
39
- this.accountingManager = new AccountingManager(config.accounting, storageManager);
40
- }
41
- /**
42
- * Start the RADIUS server
43
- */
44
- async start() {
45
- if (this.running) {
46
- logger.log('warn', 'RADIUS server is already running');
47
- return;
48
- }
49
- logger.log('info', `Starting RADIUS server on ${this.config.bindAddress}:${this.config.authPort} (auth) and ${this.config.acctPort} (acct)`);
50
- // Initialize managers
51
- await this.vlanManager.initialize();
52
- await this.accountingManager.initialize();
53
- // Import static VLAN mappings if provided
54
- if (this.config.vlanAssignment?.mappings) {
55
- await this.vlanManager.importMappings(this.config.vlanAssignment.mappings);
56
- }
57
- // Build client secrets map
58
- this.buildClientSecretsMap();
59
- // Create the RADIUS server
60
- this.radiusServer = new plugins.smartradius.RadiusServer({
61
- authPort: this.config.authPort,
62
- acctPort: this.config.acctPort,
63
- bindAddress: this.config.bindAddress,
64
- defaultSecret: this.getDefaultSecret(),
65
- authenticationHandler: this.handleAuthentication.bind(this),
66
- accountingHandler: this.handleAccounting.bind(this),
67
- });
68
- // Configure per-client secrets
69
- for (const [ip, secret] of this.clientSecrets) {
70
- this.radiusServer.setClientSecret(ip, secret);
71
- }
72
- // Start the server
73
- await this.radiusServer.start();
74
- this.running = true;
75
- this.stats.startTime = Date.now();
76
- logger.log('info', `RADIUS server started with ${this.config.clients.length} configured clients`);
77
- }
78
- /**
79
- * Stop the RADIUS server
80
- */
81
- async stop() {
82
- if (!this.running) {
83
- return;
84
- }
85
- logger.log('info', 'Stopping RADIUS server...');
86
- if (this.radiusServer) {
87
- await this.radiusServer.stop();
88
- this.radiusServer = undefined;
89
- }
90
- this.running = false;
91
- logger.log('info', 'RADIUS server stopped');
92
- }
93
- /**
94
- * Handle authentication request
95
- */
96
- async handleAuthentication(request) {
97
- this.stats.authRequests++;
98
- const authData = {
99
- username: request.attributes?.UserName || '',
100
- password: request.attributes?.UserPassword,
101
- nasIpAddress: request.attributes?.NasIpAddress || request.source?.address || '',
102
- nasPort: request.attributes?.NasPort,
103
- nasPortType: request.attributes?.NasPortType,
104
- nasIdentifier: request.attributes?.NasIdentifier,
105
- calledStationId: request.attributes?.CalledStationId,
106
- callingStationId: request.attributes?.CallingStationId,
107
- serviceType: request.attributes?.ServiceType,
108
- };
109
- logger.log('debug', `RADIUS Auth Request: user=${authData.username}, NAS=${authData.nasIpAddress}`);
110
- // Perform MAC Authentication Bypass (MAB)
111
- // In MAB, the username is typically the MAC address
112
- const result = await this.performMabAuthentication(authData);
113
- if (result.success) {
114
- this.stats.authAccepts++;
115
- logger.log('info', `RADIUS Auth Accept: user=${authData.username}, VLAN=${result.vlanId}`);
116
- // Build response with VLAN attributes
117
- const response = {
118
- code: plugins.smartradius.ERadiusCode.AccessAccept,
119
- replyMessage: result.replyMessage,
120
- };
121
- // Add VLAN attributes if assigned
122
- if (result.vlanId !== undefined) {
123
- response.tunnelType = 13; // VLAN
124
- response.tunnelMediumType = 6; // IEEE 802
125
- response.tunnelPrivateGroupId = String(result.vlanId);
126
- }
127
- // Add session timeout if specified
128
- if (result.sessionTimeout) {
129
- response.sessionTimeout = result.sessionTimeout;
130
- }
131
- // Add idle timeout if specified
132
- if (result.idleTimeout) {
133
- response.idleTimeout = result.idleTimeout;
134
- }
135
- // Add framed IP if specified
136
- if (result.framedIpAddress) {
137
- response.framedIpAddress = result.framedIpAddress;
138
- }
139
- return response;
140
- }
141
- else {
142
- this.stats.authRejects++;
143
- logger.log('warn', `RADIUS Auth Reject: user=${authData.username}, reason=${result.rejectReason}`);
144
- return {
145
- code: plugins.smartradius.ERadiusCode.AccessReject,
146
- replyMessage: result.rejectReason || 'Access Denied',
147
- };
148
- }
149
- }
150
- /**
151
- * Handle accounting request
152
- */
153
- async handleAccounting(request) {
154
- this.stats.accountingRequests++;
155
- if (!this.config.accounting?.enabled) {
156
- // Still respond even if not tracking
157
- return { code: plugins.smartradius.ERadiusCode.AccountingResponse };
158
- }
159
- const statusType = request.attributes?.AcctStatusType;
160
- const sessionId = request.attributes?.AcctSessionId || '';
161
- const accountingData = {
162
- sessionId,
163
- username: request.attributes?.UserName || '',
164
- macAddress: request.attributes?.CallingStationId,
165
- nasIpAddress: request.attributes?.NasIpAddress || request.source?.address || '',
166
- nasPort: request.attributes?.NasPort,
167
- nasPortType: request.attributes?.NasPortType,
168
- nasIdentifier: request.attributes?.NasIdentifier,
169
- calledStationId: request.attributes?.CalledStationId,
170
- callingStationId: request.attributes?.CallingStationId,
171
- inputOctets: request.attributes?.AcctInputOctets,
172
- outputOctets: request.attributes?.AcctOutputOctets,
173
- inputPackets: request.attributes?.AcctInputPackets,
174
- outputPackets: request.attributes?.AcctOutputPackets,
175
- sessionTime: request.attributes?.AcctSessionTime,
176
- terminateCause: request.attributes?.AcctTerminateCause,
177
- serviceType: request.attributes?.ServiceType,
178
- };
179
- try {
180
- switch (statusType) {
181
- case plugins.smartradius.EAcctStatusType.Start:
182
- logger.log('debug', `RADIUS Acct Start: session=${sessionId}, user=${accountingData.username}`);
183
- await this.accountingManager.handleAccountingStart(accountingData);
184
- break;
185
- case plugins.smartradius.EAcctStatusType.Stop:
186
- logger.log('debug', `RADIUS Acct Stop: session=${sessionId}`);
187
- await this.accountingManager.handleAccountingStop(accountingData);
188
- break;
189
- case plugins.smartradius.EAcctStatusType.InterimUpdate:
190
- logger.log('debug', `RADIUS Acct Interim: session=${sessionId}`);
191
- await this.accountingManager.handleAccountingUpdate(accountingData);
192
- break;
193
- default:
194
- logger.log('debug', `RADIUS Acct Unknown status type: ${statusType}`);
195
- }
196
- }
197
- catch (error) {
198
- logger.log('error', `RADIUS accounting error: ${error.message}`);
199
- }
200
- return { code: plugins.smartradius.ERadiusCode.AccountingResponse };
201
- }
202
- /**
203
- * Perform MAC Authentication Bypass
204
- */
205
- async performMabAuthentication(data) {
206
- // Extract MAC address from username or CallingStationId
207
- const macAddress = this.extractMacAddress(data);
208
- if (!macAddress) {
209
- return {
210
- success: false,
211
- rejectReason: 'No MAC address found',
212
- };
213
- }
214
- // Look up VLAN assignment
215
- const vlanResult = this.vlanManager.assignVlan(macAddress);
216
- if (!vlanResult.assigned) {
217
- return {
218
- success: false,
219
- rejectReason: 'Unknown MAC address',
220
- };
221
- }
222
- // Build successful result
223
- const result = {
224
- success: true,
225
- vlanId: vlanResult.vlan,
226
- replyMessage: vlanResult.isDefault
227
- ? `Assigned to default VLAN ${vlanResult.vlan}`
228
- : `Assigned to VLAN ${vlanResult.vlan}`,
229
- };
230
- // Apply any additional settings from the matched rule
231
- if (vlanResult.matchedRule) {
232
- // Future: Add session timeout, idle timeout, etc. from rule
233
- }
234
- return result;
235
- }
236
- /**
237
- * Extract MAC address from authentication data
238
- */
239
- extractMacAddress(data) {
240
- // Try CallingStationId first (most common for MAB)
241
- if (data.callingStationId) {
242
- return this.normalizeMac(data.callingStationId);
243
- }
244
- // Try username (often MAC address in MAB)
245
- if (data.username && this.looksLikeMac(data.username)) {
246
- return this.normalizeMac(data.username);
247
- }
248
- return null;
249
- }
250
- /**
251
- * Check if a string looks like a MAC address
252
- */
253
- looksLikeMac(value) {
254
- // Remove common separators and check length
255
- const cleaned = value.replace(/[-:. ]/g, '');
256
- return /^[0-9a-fA-F]{12}$/.test(cleaned);
257
- }
258
- /**
259
- * Normalize MAC address format
260
- */
261
- normalizeMac(mac) {
262
- return this.vlanManager.normalizeMac(mac);
263
- }
264
- /**
265
- * Build client secrets map from configuration
266
- */
267
- buildClientSecretsMap() {
268
- this.clientSecrets.clear();
269
- for (const client of this.config.clients) {
270
- if (!client.enabled) {
271
- continue;
272
- }
273
- // Handle CIDR ranges
274
- if (client.ipRange.includes('/')) {
275
- // For CIDR ranges, we'll use the network address as key
276
- // In practice, smartradius may handle this differently
277
- const [network] = client.ipRange.split('/');
278
- this.clientSecrets.set(network, client.secret);
279
- }
280
- else {
281
- this.clientSecrets.set(client.ipRange, client.secret);
282
- }
283
- }
284
- }
285
- /**
286
- * Get default secret for unknown clients
287
- */
288
- getDefaultSecret() {
289
- // Use first enabled client's secret as default, or a random one
290
- for (const client of this.config.clients) {
291
- if (client.enabled) {
292
- return client.secret;
293
- }
294
- }
295
- return plugins.crypto.randomBytes(16).toString('hex');
296
- }
297
- /**
298
- * Add a RADIUS client
299
- */
300
- async addClient(client) {
301
- // Check if client already exists
302
- const existingIndex = this.config.clients.findIndex(c => c.name === client.name);
303
- if (existingIndex >= 0) {
304
- this.config.clients[existingIndex] = client;
305
- }
306
- else {
307
- this.config.clients.push(client);
308
- }
309
- // Update client secrets if running
310
- if (this.running && this.radiusServer && client.enabled) {
311
- if (client.ipRange.includes('/')) {
312
- const [network] = client.ipRange.split('/');
313
- this.radiusServer.setClientSecret(network, client.secret);
314
- this.clientSecrets.set(network, client.secret);
315
- }
316
- else {
317
- this.radiusServer.setClientSecret(client.ipRange, client.secret);
318
- this.clientSecrets.set(client.ipRange, client.secret);
319
- }
320
- }
321
- logger.log('info', `RADIUS client ${client.enabled ? 'added' : 'disabled'}: ${client.name} (${client.ipRange})`);
322
- }
323
- /**
324
- * Remove a RADIUS client
325
- */
326
- removeClient(name) {
327
- const index = this.config.clients.findIndex(c => c.name === name);
328
- if (index >= 0) {
329
- const client = this.config.clients[index];
330
- this.config.clients.splice(index, 1);
331
- // Remove from secrets map
332
- if (client.ipRange.includes('/')) {
333
- const [network] = client.ipRange.split('/');
334
- this.clientSecrets.delete(network);
335
- }
336
- else {
337
- this.clientSecrets.delete(client.ipRange);
338
- }
339
- logger.log('info', `RADIUS client removed: ${name}`);
340
- return true;
341
- }
342
- return false;
343
- }
344
- /**
345
- * Get configured clients
346
- */
347
- getClients() {
348
- return [...this.config.clients];
349
- }
350
- /**
351
- * Get VLAN manager for direct access to VLAN operations
352
- */
353
- getVlanManager() {
354
- return this.vlanManager;
355
- }
356
- /**
357
- * Get accounting manager for direct access to accounting operations
358
- */
359
- getAccountingManager() {
360
- return this.accountingManager;
361
- }
362
- /**
363
- * Get server statistics
364
- */
365
- getStats() {
366
- return {
367
- running: this.running,
368
- uptime: this.running ? Date.now() - this.stats.startTime : 0,
369
- authRequests: this.stats.authRequests,
370
- authAccepts: this.stats.authAccepts,
371
- authRejects: this.stats.authRejects,
372
- accountingRequests: this.stats.accountingRequests,
373
- activeSessions: this.accountingManager.getStats().activeSessions,
374
- vlanMappings: this.vlanManager.getStats().totalMappings,
375
- clients: this.config.clients.filter(c => c.enabled).length,
376
- };
377
- }
378
- /**
379
- * Check if server is running
380
- */
381
- isRunning() {
382
- return this.running;
383
- }
384
- }
385
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.radius.server.js","sourceRoot":"","sources":["../../../ts/radius/classes.radius.server.ts"],"names":[],"mappings":"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"}
@@ -1,128 +0,0 @@
1
- import type { StorageManager } from '../storage/index.js';
2
- /**
3
- * MAC address to VLAN mapping
4
- */
5
- export interface IMacVlanMapping {
6
- /** MAC address (full) or OUI pattern (e.g., "00:11:22" for vendor prefix) */
7
- mac: string;
8
- /** VLAN ID to assign */
9
- vlan: number;
10
- /** Optional description */
11
- description?: string;
12
- /** Whether this mapping is enabled */
13
- enabled: boolean;
14
- /** Creation timestamp */
15
- createdAt: number;
16
- /** Last update timestamp */
17
- updatedAt: number;
18
- }
19
- /**
20
- * VLAN assignment result
21
- */
22
- export interface IVlanAssignmentResult {
23
- /** Whether a VLAN was successfully assigned */
24
- assigned: boolean;
25
- /** The assigned VLAN ID (or default if not matched) */
26
- vlan: number;
27
- /** The matching rule (if any) */
28
- matchedRule?: IMacVlanMapping;
29
- /** Whether default VLAN was used */
30
- isDefault: boolean;
31
- }
32
- /**
33
- * VlanManager configuration
34
- */
35
- export interface IVlanManagerConfig {
36
- /** Default VLAN for unknown MACs */
37
- defaultVlan?: number;
38
- /** Whether to allow unknown MACs (assign default VLAN) or reject */
39
- allowUnknownMacs?: boolean;
40
- /** Storage key prefix for persistence */
41
- storagePrefix?: string;
42
- }
43
- /**
44
- * Manages MAC address to VLAN mappings with support for:
45
- * - Exact MAC address matching
46
- * - OUI (vendor prefix) pattern matching
47
- * - Wildcard patterns
48
- * - Default VLAN for unknown devices
49
- */
50
- export declare class VlanManager {
51
- private mappings;
52
- private config;
53
- private storageManager?;
54
- private normalizedMacCache;
55
- constructor(config?: IVlanManagerConfig, storageManager?: StorageManager);
56
- /**
57
- * Initialize the VLAN manager and load persisted mappings
58
- */
59
- initialize(): Promise<void>;
60
- /**
61
- * Normalize a MAC address to lowercase with colons
62
- * Accepts formats: 00:11:22:33:44:55, 00-11-22-33-44-55, 001122334455
63
- */
64
- normalizeMac(mac: string): string;
65
- /**
66
- * Check if a MAC address matches a pattern
67
- * Supports:
68
- * - Exact match: "00:11:22:33:44:55"
69
- * - OUI match: "00:11:22" (matches any device with this vendor prefix)
70
- * - Wildcard: "*" (matches all)
71
- */
72
- macMatchesPattern(mac: string, pattern: string): boolean;
73
- /**
74
- * Add or update a MAC to VLAN mapping
75
- */
76
- addMapping(mapping: Omit<IMacVlanMapping, 'createdAt' | 'updatedAt'>): Promise<IMacVlanMapping>;
77
- /**
78
- * Remove a MAC to VLAN mapping
79
- */
80
- removeMapping(mac: string): Promise<boolean>;
81
- /**
82
- * Get a specific mapping by MAC
83
- */
84
- getMapping(mac: string): IMacVlanMapping | undefined;
85
- /**
86
- * Get all mappings
87
- */
88
- getAllMappings(): IMacVlanMapping[];
89
- /**
90
- * Determine VLAN assignment for a MAC address
91
- * Returns the most specific matching rule (exact > OUI > wildcard > default)
92
- */
93
- assignVlan(mac: string): IVlanAssignmentResult;
94
- /**
95
- * Bulk import mappings
96
- */
97
- importMappings(mappings: Array<Omit<IMacVlanMapping, 'createdAt' | 'updatedAt'>>): Promise<number>;
98
- /**
99
- * Export all mappings
100
- */
101
- exportMappings(): IMacVlanMapping[];
102
- /**
103
- * Update configuration
104
- */
105
- updateConfig(config: Partial<IVlanManagerConfig>): void;
106
- /**
107
- * Get current configuration
108
- */
109
- getConfig(): Required<IVlanManagerConfig>;
110
- /**
111
- * Get statistics
112
- */
113
- getStats(): {
114
- totalMappings: number;
115
- enabledMappings: number;
116
- exactMatches: number;
117
- ouiPatterns: number;
118
- wildcardPatterns: number;
119
- };
120
- /**
121
- * Load mappings from storage
122
- */
123
- private loadMappings;
124
- /**
125
- * Save mappings to storage
126
- */
127
- private saveMappings;
128
- }