@serve.zone/dcrouter 12.0.0 → 12.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_serve/bundle.js +1179 -1004
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.dcrouter.d.ts +17 -1
- package/dist_ts/classes.dcrouter.js +16 -3
- package/dist_ts/config/classes.db-seeder.d.ts +25 -0
- package/dist_ts/config/classes.db-seeder.js +69 -0
- package/dist_ts/config/classes.reference-resolver.d.ts +80 -0
- package/dist_ts/config/classes.reference-resolver.js +482 -0
- package/dist_ts/config/classes.route-config-manager.d.ts +13 -3
- package/dist_ts/config/classes.route-config-manager.js +53 -3
- package/dist_ts/config/index.d.ts +2 -0
- package/dist_ts/config/index.js +3 -1
- package/dist_ts/db/documents/classes.network-target.doc.d.ts +15 -0
- package/dist_ts/db/documents/classes.network-target.doc.js +118 -0
- package/dist_ts/db/documents/classes.security-profile.doc.d.ts +16 -0
- package/dist_ts/db/documents/classes.security-profile.doc.js +118 -0
- package/dist_ts/db/documents/classes.stored-route.doc.d.ts +2 -0
- package/dist_ts/db/documents/classes.stored-route.doc.js +8 -2
- package/dist_ts/db/documents/classes.vpn-client.doc.d.ts +8 -0
- package/dist_ts/db/documents/classes.vpn-client.doc.js +50 -2
- package/dist_ts/db/documents/index.d.ts +2 -0
- package/dist_ts/db/documents/index.js +3 -1
- package/dist_ts/opsserver/classes.opsserver.d.ts +2 -0
- package/dist_ts/opsserver/classes.opsserver.js +5 -1
- package/dist_ts/opsserver/handlers/index.d.ts +2 -0
- package/dist_ts/opsserver/handlers/index.js +3 -1
- package/dist_ts/opsserver/handlers/network-target.handler.d.ts +10 -0
- package/dist_ts/opsserver/handlers/network-target.handler.js +117 -0
- package/dist_ts/opsserver/handlers/route-management.handler.js +3 -2
- package/dist_ts/opsserver/handlers/security-profile.handler.d.ts +10 -0
- package/dist_ts/opsserver/handlers/security-profile.handler.js +119 -0
- package/dist_ts/opsserver/handlers/vpn.handler.js +35 -1
- package/dist_ts/vpn/classes.vpn-manager.d.ts +33 -0
- package/dist_ts/vpn/classes.vpn-manager.js +122 -7
- package/dist_ts_interfaces/data/route-management.d.ts +48 -1
- package/dist_ts_interfaces/data/vpn.d.ts +8 -0
- package/dist_ts_interfaces/requests/index.d.ts +2 -0
- package/dist_ts_interfaces/requests/index.js +3 -1
- package/dist_ts_interfaces/requests/network-targets.d.ts +102 -0
- package/dist_ts_interfaces/requests/network-targets.js +2 -0
- package/dist_ts_interfaces/requests/route-management.d.ts +3 -1
- package/dist_ts_interfaces/requests/security-profiles.d.ts +102 -0
- package/dist_ts_interfaces/requests/security-profiles.js +2 -0
- package/dist_ts_interfaces/requests/vpn.d.ts +16 -0
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/appstate.d.ts +59 -0
- package/dist_ts_web/appstate.js +192 -2
- package/dist_ts_web/elements/index.d.ts +2 -0
- package/dist_ts_web/elements/index.js +3 -1
- package/dist_ts_web/elements/ops-dashboard.js +13 -1
- package/dist_ts_web/elements/ops-view-networktargets.d.ts +17 -0
- package/dist_ts_web/elements/ops-view-networktargets.js +246 -0
- package/dist_ts_web/elements/ops-view-securityprofiles.d.ts +17 -0
- package/dist_ts_web/elements/ops-view-securityprofiles.js +275 -0
- package/dist_ts_web/elements/ops-view-vpn.js +155 -3
- package/dist_ts_web/router.d.ts +1 -1
- package/dist_ts_web/router.js +2 -2
- package/package.json +3 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dcrouter.ts +35 -1
- package/ts/config/classes.db-seeder.ts +95 -0
- package/ts/config/classes.reference-resolver.ts +576 -0
- package/ts/config/classes.route-config-manager.ts +64 -1
- package/ts/config/index.ts +3 -1
- package/ts/db/documents/classes.network-target.doc.ts +48 -0
- package/ts/db/documents/classes.security-profile.doc.ts +49 -0
- package/ts/db/documents/classes.stored-route.doc.ts +4 -0
- package/ts/db/documents/classes.vpn-client.doc.ts +24 -0
- package/ts/db/documents/index.ts +2 -0
- package/ts/opsserver/classes.opsserver.ts +4 -0
- package/ts/opsserver/handlers/index.ts +3 -1
- package/ts/opsserver/handlers/network-target.handler.ts +167 -0
- package/ts/opsserver/handlers/route-management.handler.ts +2 -1
- package/ts/opsserver/handlers/security-profile.handler.ts +169 -0
- package/ts/opsserver/handlers/vpn.handler.ts +37 -0
- package/ts/vpn/classes.vpn-manager.ts +143 -6
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate.ts +275 -1
- package/ts_web/elements/index.ts +2 -0
- package/ts_web/elements/ops-dashboard.ts +12 -0
- package/ts_web/elements/ops-view-networktargets.ts +214 -0
- package/ts_web/elements/ops-view-securityprofiles.ts +242 -0
- package/ts_web/elements/ops-view-vpn.ts +153 -2
- package/ts_web/router.ts +1 -1
|
@@ -38,6 +38,36 @@ import * as appstate from '../appstate.js';
|
|
|
38
38
|
import * as interfaces from '../../dist_ts_interfaces/index.js';
|
|
39
39
|
import { viewHostCss } from './shared/css.js';
|
|
40
40
|
import {} from '@design.estate/dees-catalog';
|
|
41
|
+
/**
|
|
42
|
+
* Toggle form field visibility based on checkbox states.
|
|
43
|
+
* Used in Create and Edit VPN client dialogs.
|
|
44
|
+
*/
|
|
45
|
+
function setupFormVisibility(formEl) {
|
|
46
|
+
const show = 'flex'; // match dees-form's flex layout
|
|
47
|
+
const updateVisibility = async () => {
|
|
48
|
+
const data = await formEl.collectFormData();
|
|
49
|
+
const contentEl = formEl.closest('.content') || formEl.parentElement;
|
|
50
|
+
if (!contentEl)
|
|
51
|
+
return;
|
|
52
|
+
const hostIpGroup = contentEl.querySelector('.hostIpGroup');
|
|
53
|
+
const hostIpDetails = contentEl.querySelector('.hostIpDetails');
|
|
54
|
+
const staticIpGroup = contentEl.querySelector('.staticIpGroup');
|
|
55
|
+
const vlanIdGroup = contentEl.querySelector('.vlanIdGroup');
|
|
56
|
+
const aclGroup = contentEl.querySelector('.aclGroup');
|
|
57
|
+
if (hostIpGroup)
|
|
58
|
+
hostIpGroup.style.display = data.forceDestinationSmartproxy ? 'none' : show;
|
|
59
|
+
if (hostIpDetails)
|
|
60
|
+
hostIpDetails.style.display = data.useHostIp ? show : 'none';
|
|
61
|
+
if (staticIpGroup)
|
|
62
|
+
staticIpGroup.style.display = data.useDhcp ? 'none' : show;
|
|
63
|
+
if (vlanIdGroup)
|
|
64
|
+
vlanIdGroup.style.display = data.forceVlan ? show : 'none';
|
|
65
|
+
if (aclGroup)
|
|
66
|
+
aclGroup.style.display = data.allowAdditionalAcls ? show : 'none';
|
|
67
|
+
};
|
|
68
|
+
formEl.changeSubject.subscribe(() => updateVisibility());
|
|
69
|
+
updateVisibility();
|
|
70
|
+
}
|
|
41
71
|
let OpsViewVpn = (() => {
|
|
42
72
|
let _classDecorators = [customElement('ops-view-vpn')];
|
|
43
73
|
let _classDescriptor;
|
|
@@ -317,9 +347,20 @@ let OpsViewVpn = (() => {
|
|
|
317
347
|
else {
|
|
318
348
|
statusHtml = html `<span class="statusBadge enabled" style="background: ${cssManager.bdTheme('#eff6ff', '#172554')}; color: ${cssManager.bdTheme('#1e40af', '#60a5fa')};">offline</span>`;
|
|
319
349
|
}
|
|
350
|
+
let routingHtml;
|
|
351
|
+
if (client.forceDestinationSmartproxy !== false) {
|
|
352
|
+
routingHtml = html `<span class="statusBadge enabled">SmartProxy</span>`;
|
|
353
|
+
}
|
|
354
|
+
else if (client.useHostIp) {
|
|
355
|
+
routingHtml = html `<span class="statusBadge" style="background: ${cssManager.bdTheme('#f3e8ff', '#3b0764')}; color: ${cssManager.bdTheme('#7c3aed', '#c084fc')};">Host IP</span>`;
|
|
356
|
+
}
|
|
357
|
+
else {
|
|
358
|
+
routingHtml = html `<span class="statusBadge" style="background: ${cssManager.bdTheme('#eff6ff', '#172554')}; color: ${cssManager.bdTheme('#1e40af', '#60a5fa')};">Direct</span>`;
|
|
359
|
+
}
|
|
320
360
|
return {
|
|
321
361
|
'Client ID': client.clientId,
|
|
322
362
|
'Status': statusHtml,
|
|
363
|
+
'Routing': routingHtml,
|
|
323
364
|
'VPN IP': client.assignedIp || '-',
|
|
324
365
|
'Tags': client.serverDefinedClientTags?.length
|
|
325
366
|
? html `${client.serverDefinedClientTags.map(t => html `<span class="tagBadge">${t}</span>`)}`
|
|
@@ -335,13 +376,32 @@ let OpsViewVpn = (() => {
|
|
|
335
376
|
type: ['header'],
|
|
336
377
|
actionFunc: async () => {
|
|
337
378
|
const { DeesModal } = await import('@design.estate/dees-catalog');
|
|
338
|
-
await DeesModal.createAndShow({
|
|
379
|
+
const createModal = await DeesModal.createAndShow({
|
|
339
380
|
heading: 'Create VPN Client',
|
|
340
381
|
content: html `
|
|
341
382
|
<dees-form>
|
|
342
383
|
<dees-input-text .key=${'clientId'} .label=${'Client ID'} .required=${true}></dees-input-text>
|
|
343
384
|
<dees-input-text .key=${'description'} .label=${'Description'}></dees-input-text>
|
|
344
385
|
<dees-input-text .key=${'tags'} .label=${'Server-Defined Tags (comma-separated)'}></dees-input-text>
|
|
386
|
+
<dees-input-checkbox .key=${'forceDestinationSmartproxy'} .label=${'Force traffic through SmartProxy'} .value=${true}></dees-input-checkbox>
|
|
387
|
+
<div class="hostIpGroup" style="display: none; flex-direction: column; gap: 16px;">
|
|
388
|
+
<dees-input-checkbox .key=${'useHostIp'} .label=${'Get Host IP'} .value=${false}></dees-input-checkbox>
|
|
389
|
+
<div class="hostIpDetails" style="display: none; flex-direction: column; gap: 16px;">
|
|
390
|
+
<dees-input-checkbox .key=${'useDhcp'} .label=${'Get IP through DHCP'} .value=${false}></dees-input-checkbox>
|
|
391
|
+
<div class="staticIpGroup" style="display: flex; flex-direction: column; gap: 16px;">
|
|
392
|
+
<dees-input-text .key=${'staticIp'} .label=${'Static IP'}></dees-input-text>
|
|
393
|
+
</div>
|
|
394
|
+
<dees-input-checkbox .key=${'forceVlan'} .label=${'Force VLAN'} .value=${false}></dees-input-checkbox>
|
|
395
|
+
<div class="vlanIdGroup" style="display: none; flex-direction: column; gap: 16px;">
|
|
396
|
+
<dees-input-text .key=${'vlanId'} .label=${'VLAN ID'}></dees-input-text>
|
|
397
|
+
</div>
|
|
398
|
+
</div>
|
|
399
|
+
</div>
|
|
400
|
+
<dees-input-checkbox .key=${'allowAdditionalAcls'} .label=${'Allow additional ACLs'} .value=${false}></dees-input-checkbox>
|
|
401
|
+
<div class="aclGroup" style="display: none; flex-direction: column; gap: 16px;">
|
|
402
|
+
<dees-input-text .key=${'destinationAllowList'} .label=${'Destination Allow List (comma-separated IPs/CIDRs)'}></dees-input-text>
|
|
403
|
+
<dees-input-text .key=${'destinationBlockList'} .label=${'Destination Block List (comma-separated IPs/CIDRs)'}></dees-input-text>
|
|
404
|
+
</div>
|
|
345
405
|
</dees-form>
|
|
346
406
|
`,
|
|
347
407
|
menuOptions: [
|
|
@@ -363,16 +423,44 @@ let OpsViewVpn = (() => {
|
|
|
363
423
|
const serverDefinedClientTags = data.tags
|
|
364
424
|
? data.tags.split(',').map((t) => t.trim()).filter(Boolean)
|
|
365
425
|
: undefined;
|
|
426
|
+
// Apply conditional logic based on checkbox states
|
|
427
|
+
const forceSmartproxy = data.forceDestinationSmartproxy ?? true;
|
|
428
|
+
const useHostIp = !forceSmartproxy && (data.useHostIp ?? false);
|
|
429
|
+
const useDhcp = useHostIp && (data.useDhcp ?? false);
|
|
430
|
+
const staticIp = useHostIp && !useDhcp && data.staticIp ? data.staticIp : undefined;
|
|
431
|
+
const forceVlan = useHostIp && (data.forceVlan ?? false);
|
|
432
|
+
const vlanId = forceVlan && data.vlanId ? parseInt(data.vlanId, 10) : undefined;
|
|
433
|
+
const allowAcls = data.allowAdditionalAcls ?? false;
|
|
434
|
+
const destinationAllowList = allowAcls && data.destinationAllowList
|
|
435
|
+
? data.destinationAllowList.split(',').map((s) => s.trim()).filter(Boolean)
|
|
436
|
+
: undefined;
|
|
437
|
+
const destinationBlockList = allowAcls && data.destinationBlockList
|
|
438
|
+
? data.destinationBlockList.split(',').map((s) => s.trim()).filter(Boolean)
|
|
439
|
+
: undefined;
|
|
366
440
|
await appstate.vpnStatePart.dispatchAction(appstate.createVpnClientAction, {
|
|
367
441
|
clientId: data.clientId,
|
|
368
442
|
description: data.description || undefined,
|
|
369
443
|
serverDefinedClientTags,
|
|
444
|
+
forceDestinationSmartproxy: forceSmartproxy,
|
|
445
|
+
useHostIp: useHostIp || undefined,
|
|
446
|
+
useDhcp: useDhcp || undefined,
|
|
447
|
+
staticIp,
|
|
448
|
+
forceVlan: forceVlan || undefined,
|
|
449
|
+
vlanId,
|
|
450
|
+
destinationAllowList,
|
|
451
|
+
destinationBlockList,
|
|
370
452
|
});
|
|
371
453
|
await modalArg.destroy();
|
|
372
454
|
},
|
|
373
455
|
},
|
|
374
456
|
],
|
|
375
457
|
});
|
|
458
|
+
// Setup conditional form visibility after modal renders
|
|
459
|
+
const createForm = createModal?.shadowRoot?.querySelector('.content')?.querySelector('dees-form');
|
|
460
|
+
if (createForm) {
|
|
461
|
+
await createForm.updateComplete;
|
|
462
|
+
setupFormVisibility(createForm);
|
|
463
|
+
}
|
|
376
464
|
},
|
|
377
465
|
},
|
|
378
466
|
{
|
|
@@ -424,6 +512,13 @@ let OpsViewVpn = (() => {
|
|
|
424
512
|
` : ''}
|
|
425
513
|
<div class="infoItem"><span class="infoLabel">Description</span><span class="infoValue">${client.description || '-'}</span></div>
|
|
426
514
|
<div class="infoItem"><span class="infoLabel">Tags</span><span class="infoValue">${client.serverDefinedClientTags?.join(', ') || '-'}</span></div>
|
|
515
|
+
<div class="infoItem"><span class="infoLabel">Routing</span><span class="infoValue">${client.forceDestinationSmartproxy !== false ? 'SmartProxy' : client.useHostIp ? 'Host IP' : 'Direct'}</span></div>
|
|
516
|
+
${client.useHostIp ? html `
|
|
517
|
+
<div class="infoItem"><span class="infoLabel">Host IP</span><span class="infoValue">${client.useDhcp ? 'DHCP' : client.staticIp ? `Static: ${client.staticIp}` : 'Not configured'}</span></div>
|
|
518
|
+
<div class="infoItem"><span class="infoLabel">VLAN</span><span class="infoValue">${client.forceVlan && client.vlanId != null ? `VLAN ${client.vlanId}` : 'No VLAN'}</span></div>
|
|
519
|
+
` : ''}
|
|
520
|
+
<div class="infoItem"><span class="infoLabel">Allow List</span><span class="infoValue">${client.destinationAllowList?.length ? client.destinationAllowList.join(', ') : 'None'}</span></div>
|
|
521
|
+
<div class="infoItem"><span class="infoLabel">Block List</span><span class="infoValue">${client.destinationBlockList?.length ? client.destinationBlockList.join(', ') : 'None'}</span></div>
|
|
427
522
|
<div class="infoItem"><span class="infoLabel">Created</span><span class="infoValue">${new Date(client.createdAt).toLocaleString()}</span></div>
|
|
428
523
|
<div class="infoItem"><span class="infoLabel">Updated</span><span class="infoValue">${new Date(client.updatedAt).toLocaleString()}</span></div>
|
|
429
524
|
</div>
|
|
@@ -575,12 +670,41 @@ let OpsViewVpn = (() => {
|
|
|
575
670
|
const { DeesModal } = await import('@design.estate/dees-catalog');
|
|
576
671
|
const currentDescription = client.description ?? '';
|
|
577
672
|
const currentTags = client.serverDefinedClientTags?.join(', ') ?? '';
|
|
578
|
-
|
|
673
|
+
const currentForceSmartproxy = client.forceDestinationSmartproxy ?? true;
|
|
674
|
+
const currentUseHostIp = client.useHostIp ?? false;
|
|
675
|
+
const currentUseDhcp = client.useDhcp ?? false;
|
|
676
|
+
const currentStaticIp = client.staticIp ?? '';
|
|
677
|
+
const currentForceVlan = client.forceVlan ?? false;
|
|
678
|
+
const currentVlanId = client.vlanId != null ? String(client.vlanId) : '';
|
|
679
|
+
const currentAllowList = client.destinationAllowList?.join(', ') ?? '';
|
|
680
|
+
const currentBlockList = client.destinationBlockList?.join(', ') ?? '';
|
|
681
|
+
const currentAllowAcls = (client.destinationAllowList?.length ?? 0) > 0
|
|
682
|
+
|| (client.destinationBlockList?.length ?? 0) > 0;
|
|
683
|
+
const editModal = await DeesModal.createAndShow({
|
|
579
684
|
heading: `Edit: ${client.clientId}`,
|
|
580
685
|
content: html `
|
|
581
686
|
<dees-form>
|
|
582
687
|
<dees-input-text .key=${'description'} .label=${'Description'} .value=${currentDescription}></dees-input-text>
|
|
583
688
|
<dees-input-text .key=${'tags'} .label=${'Server-Defined Tags (comma-separated)'} .value=${currentTags}></dees-input-text>
|
|
689
|
+
<dees-input-checkbox .key=${'forceDestinationSmartproxy'} .label=${'Force traffic through SmartProxy'} .value=${currentForceSmartproxy}></dees-input-checkbox>
|
|
690
|
+
<div class="hostIpGroup" style="display: ${currentForceSmartproxy ? 'none' : 'flex'}; flex-direction: column; gap: 16px;">
|
|
691
|
+
<dees-input-checkbox .key=${'useHostIp'} .label=${'Get Host IP'} .value=${currentUseHostIp}></dees-input-checkbox>
|
|
692
|
+
<div class="hostIpDetails" style="display: ${currentUseHostIp ? 'flex' : 'none'}; flex-direction: column; gap: 16px;">
|
|
693
|
+
<dees-input-checkbox .key=${'useDhcp'} .label=${'Get IP through DHCP'} .value=${currentUseDhcp}></dees-input-checkbox>
|
|
694
|
+
<div class="staticIpGroup" style="display: ${currentUseDhcp ? 'none' : 'flex'}; flex-direction: column; gap: 16px;">
|
|
695
|
+
<dees-input-text .key=${'staticIp'} .label=${'Static IP'} .value=${currentStaticIp}></dees-input-text>
|
|
696
|
+
</div>
|
|
697
|
+
<dees-input-checkbox .key=${'forceVlan'} .label=${'Force VLAN'} .value=${currentForceVlan}></dees-input-checkbox>
|
|
698
|
+
<div class="vlanIdGroup" style="display: ${currentForceVlan ? 'flex' : 'none'}; flex-direction: column; gap: 16px;">
|
|
699
|
+
<dees-input-text .key=${'vlanId'} .label=${'VLAN ID'} .value=${currentVlanId}></dees-input-text>
|
|
700
|
+
</div>
|
|
701
|
+
</div>
|
|
702
|
+
</div>
|
|
703
|
+
<dees-input-checkbox .key=${'allowAdditionalAcls'} .label=${'Allow additional ACLs'} .value=${currentAllowAcls}></dees-input-checkbox>
|
|
704
|
+
<div class="aclGroup" style="display: ${currentAllowAcls ? 'flex' : 'none'}; flex-direction: column; gap: 16px;">
|
|
705
|
+
<dees-input-text .key=${'destinationAllowList'} .label=${'Destination Allow List (comma-separated IPs/CIDRs)'} .value=${currentAllowList}></dees-input-text>
|
|
706
|
+
<dees-input-text .key=${'destinationBlockList'} .label=${'Destination Block List (comma-separated IPs/CIDRs)'} .value=${currentBlockList}></dees-input-text>
|
|
707
|
+
</div>
|
|
584
708
|
</dees-form>
|
|
585
709
|
`,
|
|
586
710
|
menuOptions: [
|
|
@@ -596,16 +720,44 @@ let OpsViewVpn = (() => {
|
|
|
596
720
|
const serverDefinedClientTags = data.tags
|
|
597
721
|
? data.tags.split(',').map((t) => t.trim()).filter(Boolean)
|
|
598
722
|
: [];
|
|
723
|
+
// Apply conditional logic based on checkbox states
|
|
724
|
+
const forceSmartproxy = data.forceDestinationSmartproxy ?? true;
|
|
725
|
+
const useHostIp = !forceSmartproxy && (data.useHostIp ?? false);
|
|
726
|
+
const useDhcp = useHostIp && (data.useDhcp ?? false);
|
|
727
|
+
const staticIp = useHostIp && !useDhcp && data.staticIp ? data.staticIp : undefined;
|
|
728
|
+
const forceVlan = useHostIp && (data.forceVlan ?? false);
|
|
729
|
+
const vlanId = forceVlan && data.vlanId ? parseInt(data.vlanId, 10) : undefined;
|
|
730
|
+
const allowAcls = data.allowAdditionalAcls ?? false;
|
|
731
|
+
const destinationAllowList = allowAcls && data.destinationAllowList
|
|
732
|
+
? data.destinationAllowList.split(',').map((s) => s.trim()).filter(Boolean)
|
|
733
|
+
: [];
|
|
734
|
+
const destinationBlockList = allowAcls && data.destinationBlockList
|
|
735
|
+
? data.destinationBlockList.split(',').map((s) => s.trim()).filter(Boolean)
|
|
736
|
+
: [];
|
|
599
737
|
await appstate.vpnStatePart.dispatchAction(appstate.updateVpnClientAction, {
|
|
600
738
|
clientId: client.clientId,
|
|
601
739
|
description: data.description || undefined,
|
|
602
740
|
serverDefinedClientTags,
|
|
741
|
+
forceDestinationSmartproxy: forceSmartproxy,
|
|
742
|
+
useHostIp: useHostIp || undefined,
|
|
743
|
+
useDhcp: useDhcp || undefined,
|
|
744
|
+
staticIp,
|
|
745
|
+
forceVlan: forceVlan || undefined,
|
|
746
|
+
vlanId,
|
|
747
|
+
destinationAllowList,
|
|
748
|
+
destinationBlockList,
|
|
603
749
|
});
|
|
604
750
|
await modalArg.destroy();
|
|
605
751
|
},
|
|
606
752
|
},
|
|
607
753
|
],
|
|
608
754
|
});
|
|
755
|
+
// Setup conditional form visibility for edit dialog
|
|
756
|
+
const editForm = editModal?.shadowRoot?.querySelector('.content')?.querySelector('dees-form');
|
|
757
|
+
if (editForm) {
|
|
758
|
+
await editForm.updateComplete;
|
|
759
|
+
setupFormVisibility(editForm);
|
|
760
|
+
}
|
|
609
761
|
},
|
|
610
762
|
},
|
|
611
763
|
{
|
|
@@ -683,4 +835,4 @@ let OpsViewVpn = (() => {
|
|
|
683
835
|
return OpsViewVpn = _classThis;
|
|
684
836
|
})();
|
|
685
837
|
export { OpsViewVpn };
|
|
686
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-vpn.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-view-vpn.ts"],"names":[],"mappings":"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"}
|
|
838
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-vpn.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-view-vpn.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EACL,WAAW,EACX,IAAI,EACJ,aAAa,EAEb,GAAG,EACH,KAAK,EACL,UAAU,GACX,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,UAAU,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAmB,MAAM,6BAA6B,CAAC;AAE9D;;;GAGG;AACH,SAAS,mBAAmB,CAAC,MAAW;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,gCAAgC;IACrD,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAClC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC;QACrE,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,MAAM,WAAW,GAAG,SAAS,CAAC,aAAa,CAAC,cAAc,CAAgB,CAAC;QAC3E,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAgB,CAAC;QAC/E,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAgB,CAAC;QAC/E,MAAM,WAAW,GAAG,SAAS,CAAC,aAAa,CAAC,cAAc,CAAgB,CAAC;QAC3E,MAAM,QAAQ,GAAG,SAAS,CAAC,aAAa,CAAC,WAAW,CAAgB,CAAC;QACrE,IAAI,WAAW;YAAE,WAAW,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7F,IAAI,aAAa;YAAE,aAAa,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;QAChF,IAAI,aAAa;YAAE,aAAa,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9E,IAAI,WAAW;YAAE,WAAW,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;QAC5E,IAAI,QAAQ;YAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IAClF,CAAC,CAAC;IACF,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACzD,gBAAgB,EAAE,CAAC;AACrB,CAAC;IASY,UAAU;4BADtB,aAAa,CAAC,cAAc,CAAC;;;;sBACE,WAAW;;;;0BAAnB,SAAQ,WAAW;;;;oCACxC,KAAK,EAAE;YACR,6KAAS,QAAQ,6BAAR,QAAQ,2FAAyD;YAF5E,6KAwvBC;;;;QAtvBC,6EAAwC,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAG,EAAC;QAA1E,IAAS,QAAQ,8CAAyD;QAA1E,IAAS,QAAQ,oDAAyD;QAE1E;YACE,KAAK,EAAE,CAAC;;YACR,MAAM,GAAG,GAAG,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAChE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC3B,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAChC;QAED,KAAK,CAAC,iBAAiB;YACrB,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAChC,MAAM,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAC5E,CAAC;QAEM,MAAM,CAAC,MAAM,GAAG;YACrB,UAAU,CAAC,aAAa;YACxB,WAAW;YACX,GAAG,CAAA;;;;;;;;;;;;;;;;;;;sBAmBe,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;;;;;sBAKnC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;4BAClC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;;;;;sBAQ9C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;;;;;;;;;;;;iBAe7C,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;;;;;;;;;sBASnC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;4BAElC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;;;;;;;;;;;iBAcnD,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;;;iBAMxC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;KAEpD;SACF,CAAC;QAEF,8DAA8D;QACtD,gBAAgB,CAAC,MAAkC;YACzD,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CACzC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,KAAK,MAAM,CAAC,UAAU,CAAC,CACjG,CAAC;QACJ,CAAC;QAED,MAAM;YACJ,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YACtC,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,IAAI,EAAE,CAAC;YAC9D,MAAM,cAAc,GAAG,gBAAgB,CAAC,MAAM,CAAC;YAC/C,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;YACpC,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;YAE7D,MAAM,UAAU,GAAiB;gBAC/B;oBACE,EAAE,EAAE,cAAc;oBAClB,KAAK,EAAE,eAAe;oBACtB,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,YAAY;oBACnB,IAAI,EAAE,cAAc;oBACpB,WAAW,EAAE,wBAAwB;oBACrC,KAAK,EAAE,SAAS;iBACjB;gBACD;oBACE,EAAE,EAAE,kBAAkB;oBACtB,KAAK,EAAE,WAAW;oBAClB,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,cAAc;oBACrB,IAAI,EAAE,aAAa;oBACnB,WAAW,EAAE,qBAAqB;oBAClC,KAAK,EAAE,SAAS;iBACjB;gBACD;oBACE,EAAE,EAAE,gBAAgB;oBACpB,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,cAAc;oBACrB,IAAI,EAAE,oBAAoB;oBAC1B,WAAW,EAAE,6BAA6B;oBAC1C,KAAK,EAAE,SAAS;iBACjB;gBACD;oBACE,EAAE,EAAE,cAAc;oBAClB,KAAK,EAAE,QAAQ;oBACf,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;oBAC9C,IAAI,EAAE,eAAe;oBACrB,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,wBAAwB;oBAClE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;iBAC/C;aACF,CAAC;YAEF,OAAO,IAAI,CAAA;;;;QAIP,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAA;;;;iBAI3B,IAAI,CAAC,QAAQ,CAAC,eAAe;;qBAEzB,KAAK,IAAI,EAAE;gBAClB,IAAI,SAAS,CAAC,SAAS,IAAI,OAAO,SAAS,CAAC,SAAS,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;oBAC/E,MAAM,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAgB,CAAC,CAAC;gBACtE,CAAC;gBACD,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;gBAClE,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;YACtG,CAAC;;;qBAGQ,GAAG,EAAE;gBACZ,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;gBAChF,MAAM,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBACtC,MAAM,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBACtC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;gBACb,CAAC,CAAC,QAAQ,GAAG,gBAAgB,CAAC;gBAC9B,CAAC,CAAC,KAAK,EAAE,CAAC;gBACV,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YAC3B,CAAC;;;qBAGQ,KAAK,IAAI,EAAE;gBAClB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAC5C,IAAI,CAAC,QAAQ,CAAC,eAAgB,EAC9B,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,CAC1B,CAAC;gBACF,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;gBAClE,SAAS,CAAC,aAAa,CAAC;oBACtB,OAAO,EAAE,mBAAmB;oBAC5B,OAAO,EAAE,IAAI,CAAA;;gCAEG,OAAO;;;;;iBAKtB;oBACD,WAAW,EAAE;wBACX,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE,EAAE;qBACnG;iBACF,CAAC,CAAC;YACL,CAAC;;;qBAGQ,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,0BAA0B,EAAE,IAAI,CAAC;;;OAGnG,CAAC,CAAC,CAAC,EAAE;;+BAEmB,UAAU;;QAEjC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAA;;;;sCAIiB,MAAM,CAAC,MAAM;;;;sCAIb,MAAM,CAAC,YAAY;;YAE7C,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAA;;;wFAG8C,MAAM,CAAC,gBAAgB,CAAC,WAAW;;WAEhH,CAAC,CAAC,CAAC,EAAE;;OAET,CAAC,CAAC,CAAC,EAAE;;;oBAGQ,aAAa;oBACb,oDAAoD;gBACxD,OAAO;2BACI,CAAC,MAAkC,EAAE,EAAE;gBACxD,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBAC3C,IAAI,UAAU,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;oBACpB,UAAU,GAAG,IAAI,CAAA,oDAAoD,CAAC;gBACxE,CAAC;qBAAM,IAAI,IAAI,EAAE,CAAC;oBAChB,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,cAAc,EAAE,CAAC;oBAC7D,UAAU,GAAG,IAAI,CAAA,kDAAkD,KAAK,oBAAoB,CAAC;gBAC/F,CAAC;qBAAM,CAAC;oBACN,UAAU,GAAG,IAAI,CAAA,wDAAwD,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,YAAY,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,mBAAmB,CAAC;gBAC3L,CAAC;gBACD,IAAI,WAAW,CAAC;gBAChB,IAAI,MAAM,CAAC,0BAA0B,KAAK,KAAK,EAAE,CAAC;oBAChD,WAAW,GAAG,IAAI,CAAA,qDAAqD,CAAC;gBAC1E,CAAC;qBAAM,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;oBAC5B,WAAW,GAAG,IAAI,CAAA,gDAAgD,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,YAAY,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,mBAAmB,CAAC;gBACpL,CAAC;qBAAM,CAAC;oBACN,WAAW,GAAG,IAAI,CAAA,gDAAgD,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,YAAY,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,kBAAkB,CAAC;gBACnL,CAAC;gBACD,OAAO;oBACL,WAAW,EAAE,MAAM,CAAC,QAAQ;oBAC5B,QAAQ,EAAE,UAAU;oBACpB,SAAS,EAAE,WAAW;oBACtB,QAAQ,EAAE,MAAM,CAAC,UAAU,IAAI,GAAG;oBAClC,MAAM,EAAE,MAAM,CAAC,uBAAuB,EAAE,MAAM;wBAC5C,CAAC,CAAC,IAAI,CAAA,GAAG,MAAM,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAA,0BAA0B,CAAC,SAAS,CAAC,EAAE;wBAC5F,CAAC,CAAC,GAAG;oBACP,aAAa,EAAE,MAAM,CAAC,WAAW,IAAI,GAAG;oBACxC,SAAS,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,kBAAkB,EAAE;iBAC3D,CAAC;YACJ,CAAC;uBACc;gBACb;oBACE,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE,aAAa;oBACvB,IAAI,EAAE,CAAC,QAAQ,CAAC;oBAChB,UAAU,EAAE,KAAK,IAAI,EAAE;wBACrB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;wBAClE,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,aAAa,CAAC;4BAChD,OAAO,EAAE,mBAAmB;4BAC5B,OAAO,EAAE,IAAI,CAAA;;4CAEe,UAAU,WAAW,WAAW,cAAc,IAAI;4CAClD,aAAa,WAAW,aAAa;4CACrC,MAAM,WAAW,uCAAuC;gDACpD,4BAA4B,WAAW,kCAAkC,WAAW,IAAI;;kDAEtF,WAAW,WAAW,aAAa,WAAW,KAAK;;oDAEjD,SAAS,WAAW,qBAAqB,WAAW,KAAK;;kDAE3D,UAAU,WAAW,WAAW;;oDAE9B,WAAW,WAAW,YAAY,WAAW,KAAK;;kDAEpD,QAAQ,WAAW,SAAS;;;;gDAI9B,qBAAqB,WAAW,uBAAuB,WAAW,KAAK;;8CAEzE,sBAAsB,WAAW,oDAAoD;8CACrF,sBAAsB,WAAW,oDAAoD;;;iBAGlH;4BACD,WAAW,EAAE;gCACX;oCACE,IAAI,EAAE,QAAQ;oCACd,QAAQ,EAAE,UAAU;oCACpB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE;iCAC1D;gCACD;oCACE,IAAI,EAAE,QAAQ;oCACd,QAAQ,EAAE,aAAa;oCACvB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;wCAC9B,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;wCACxF,IAAI,CAAC,IAAI;4CAAE,OAAO;wCAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;wCAC1C,IAAI,CAAC,IAAI,CAAC,QAAQ;4CAAE,OAAO;wCAC3B,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI;4CACvC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;4CACnE,CAAC,CAAC,SAAS,CAAC;wCAEd,mDAAmD;wCACnD,MAAM,eAAe,GAAG,IAAI,CAAC,0BAA0B,IAAI,IAAI,CAAC;wCAChE,MAAM,SAAS,GAAG,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC;wCAChE,MAAM,OAAO,GAAG,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC;wCACrD,MAAM,QAAQ,GAAG,SAAS,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;wCACpF,MAAM,SAAS,GAAG,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC;wCACzD,MAAM,MAAM,GAAG,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;wCAEhF,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,IAAI,KAAK,CAAC;wCACpD,MAAM,oBAAoB,GAAG,SAAS,IAAI,IAAI,CAAC,oBAAoB;4CACjE,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;4CACnF,CAAC,CAAC,SAAS,CAAC;wCACd,MAAM,oBAAoB,GAAG,SAAS,IAAI,IAAI,CAAC,oBAAoB;4CACjE,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;4CACnF,CAAC,CAAC,SAAS,CAAC;wCAEd,MAAM,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,qBAAqB,EAAE;4CACzE,QAAQ,EAAE,IAAI,CAAC,QAAQ;4CACvB,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,SAAS;4CAC1C,uBAAuB;4CACvB,0BAA0B,EAAE,eAAe;4CAC3C,SAAS,EAAE,SAAS,IAAI,SAAS;4CACjC,OAAO,EAAE,OAAO,IAAI,SAAS;4CAC7B,QAAQ;4CACR,SAAS,EAAE,SAAS,IAAI,SAAS;4CACjC,MAAM;4CACN,oBAAoB;4CACpB,oBAAoB;yCACrB,CAAC,CAAC;wCACH,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;oCAC3B,CAAC;iCACF;6BACF;yBACF,CAAC,CAAC;wBACH,wDAAwD;wBACxD,MAAM,UAAU,GAAG,WAAW,EAAE,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,WAAW,CAAQ,CAAC;wBACzG,IAAI,UAAU,EAAE,CAAC;4BACf,MAAM,UAAU,CAAC,cAAc,CAAC;4BAChC,mBAAmB,CAAC,UAAU,CAAC,CAAC;wBAClC,CAAC;oBACH,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,aAAa;oBACvB,IAAI,EAAE,CAAC,aAAa,CAAC;oBACrB,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAkC,CAAC;wBAC7D,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;wBAC3C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;wBAElE,4BAA4B;wBAC5B,IAAI,aAAa,GAAG,IAAI,CAAA,qDAAqD,CAAC;wBAC9E,IAAI,CAAC;4BACH,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAEpE,eAAe,EAAE,uBAAuB,CAAC,CAAC;4BAC5C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;gCAClC,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAG,CAAC,QAAS;gCACvD,QAAQ,EAAE,MAAM,CAAC,QAAQ;6BAC1B,CAAC,CAAC;4BACH,MAAM,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC;4BAC7B,IAAI,CAAC,EAAE,CAAC;gCACN,MAAM,WAAW,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;gCACxI,aAAa,GAAG,IAAI,CAAA;;+GAEyE,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;mHACpB,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC;+GAChC,CAAC,CAAC,kBAAkB;mHAChB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,GAAG;oHACrE,CAAC,CAAC,cAAc;;mBAEjH,CAAC;4BACJ,CAAC;iCAAM,CAAC;gCACN,aAAa,GAAG,IAAI,CAAA,8EAA8E,CAAC;4BACrG,CAAC;wBACH,CAAC;wBAAC,MAAM,CAAC;4BACP,aAAa,GAAG,IAAI,CAAA,sDAAsD,CAAC;wBAC7E,CAAC;wBAED,SAAS,CAAC,aAAa,CAAC;4BACtB,OAAO,EAAE,WAAW,MAAM,CAAC,QAAQ,EAAE;4BACrC,OAAO,EAAE,IAAI,CAAA;;4GAE+E,MAAM,CAAC,QAAQ;yGAClB,MAAM,CAAC,UAAU,IAAI,GAAG;yGACxB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;sBAChJ,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;oHACmF,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,cAAc,EAAE;8GACpD,IAAI,CAAC,SAAS;qBACvG,CAAC,CAAC,CAAC,EAAE;8GACoF,MAAM,CAAC,WAAW,IAAI,GAAG;uGAChC,MAAM,CAAC,uBAAuB,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG;0GAC9C,MAAM,CAAC,0BAA0B,KAAK,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;sBACxL,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAA;4GAC+D,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,gBAAgB;yGAC9F,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS;qBACnK,CAAC,CAAC,CAAC,EAAE;6GACmF,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM;6GACrF,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM;0GACxF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,cAAc,EAAE;0GAC3C,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,cAAc,EAAE;;;oBAGjI,aAAa;iBAChB;4BACD,WAAW,EAAE;gCACX,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;6BACrF;yBACF,CAAC,CAAC;oBACL,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,cAAc;oBACxB,IAAI,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC;oBAC9B,wBAAwB,EAAE,CAAC,UAAe,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO;oBACvE,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAkC,CAAC;wBAC7D,MAAM,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,qBAAqB,EAAE;4BACzE,QAAQ,EAAE,MAAM,CAAC,QAAQ;4BACzB,OAAO,EAAE,IAAI;yBACd,CAAC,CAAC;oBACL,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,cAAc;oBACxB,IAAI,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC;oBAC9B,wBAAwB,EAAE,CAAC,UAAe,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO;oBACtE,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAkC,CAAC;wBAC7D,MAAM,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,qBAAqB,EAAE;4BACzE,QAAQ,EAAE,MAAM,CAAC,QAAQ;4BACzB,OAAO,EAAE,KAAK;yBACf,CAAC,CAAC;oBACL,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE,iBAAiB;oBAC3B,IAAI,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC;oBAC9B,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAkC,CAAC;wBAC7D,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;wBAE7E,MAAM,YAAY,GAAG,KAAK,EAAE,MAAgC,EAAE,EAAE;4BAC9D,IAAI,CAAC;gCACH,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAEpE,eAAe,EAAE,uBAAuB,CAAC,CAAC;gCAC5C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;oCAClC,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAG,CAAC,QAAS;oCACvD,QAAQ,EAAE,MAAM,CAAC,QAAQ;oCACzB,MAAM;iCACP,CAAC,CAAC;gCACH,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;oCACxC,MAAM,GAAG,GAAG,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;oCACrD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;oCACjE,MAAM,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;oCACtC,MAAM,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;oCACtC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;oCACb,CAAC,CAAC,QAAQ,GAAG,GAAG,MAAM,CAAC,QAAQ,IAAI,GAAG,EAAE,CAAC;oCACzC,CAAC,CAAC,KAAK,EAAE,CAAC;oCACV,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;oCACzB,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,oBAAoB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gCACvG,CAAC;qCAAM,CAAC;oCACN,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gCAC3G,CAAC;4BACH,CAAC;4BAAC,OAAO,GAAQ,EAAE,CAAC;gCAClB,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;4BACtG,CAAC;wBACH,CAAC,CAAC;wBAEF,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;4BAC5B,IAAI,CAAC;gCACH,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAEpE,eAAe,EAAE,uBAAuB,CAAC,CAAC;gCAC5C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;oCAClC,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAG,CAAC,QAAS;oCACvD,QAAQ,EAAE,MAAM,CAAC,QAAQ;oCACzB,MAAM,EAAE,WAAW;iCACpB,CAAC,CAAC;gCACH,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;oCACxC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAC5C,QAAQ,CAAC,MAAM,EACf,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,CAC1B,CAAC;oCACF,SAAS,CAAC,aAAa,CAAC;wCACtB,OAAO,EAAE,YAAY,MAAM,CAAC,QAAQ,EAAE;wCACtC,OAAO,EAAE,IAAI,CAAA;;sCAEG,OAAO;;;;;uBAKtB;wCACD,WAAW,EAAE;4CACX,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;yCACrF;qCACF,CAAC,CAAC;gCACL,CAAC;qCAAM,CAAC;oCACN,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gCAC3G,CAAC;4BACH,CAAC;4BAAC,OAAO,GAAQ,EAAE,CAAC;gCAClB,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,sBAAsB,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;4BAC7G,CAAC;wBACH,CAAC,CAAC;wBAEF,SAAS,CAAC,aAAa,CAAC;4BACtB,OAAO,EAAE,kBAAkB,MAAM,CAAC,QAAQ,EAAE;4BAC5C,OAAO,EAAE,IAAI,CAAA,4CAA4C;4BACzD,WAAW,EAAE;gCACX;oCACE,IAAI,EAAE,mBAAmB;oCACzB,QAAQ,EAAE,eAAe;oCACzB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;wCAC9B,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;wCACzB,MAAM,YAAY,CAAC,WAAW,CAAC,CAAC;oCAClC,CAAC;iCACF;gCACD;oCACE,IAAI,EAAE,kBAAkB;oCACxB,QAAQ,EAAE,eAAe;oCACzB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;wCAC9B,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;wCACzB,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC;oCACjC,CAAC;iCACF;gCACD;oCACE,IAAI,EAAE,qBAAqB;oCAC3B,QAAQ,EAAE,gBAAgB;oCAC1B,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;wCAC9B,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;wCACzB,MAAM,UAAU,EAAE,CAAC;oCACrB,CAAC;iCACF;gCACD;oCACE,IAAI,EAAE,QAAQ;oCACd,QAAQ,EAAE,UAAU;oCACpB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE;iCAC1D;6BACF;yBACF,CAAC,CAAC;oBACL,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,eAAe;oBACzB,IAAI,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC;oBAC9B,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAkC,CAAC;wBAC7D,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;wBAClE,MAAM,kBAAkB,GAAG,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;wBACpD,MAAM,WAAW,GAAG,MAAM,CAAC,uBAAuB,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;wBACrE,MAAM,sBAAsB,GAAG,MAAM,CAAC,0BAA0B,IAAI,IAAI,CAAC;wBACzE,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC;wBACnD,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC;wBAC/C,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;wBAC9C,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC;wBACnD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;wBACzE,MAAM,gBAAgB,GAAG,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;wBACvE,MAAM,gBAAgB,GAAG,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;wBACvE,MAAM,gBAAgB,GAAG,CAAC,MAAM,CAAC,oBAAoB,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC;+BAClE,CAAC,MAAM,CAAC,oBAAoB,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;wBACpD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,aAAa,CAAC;4BAC9C,OAAO,EAAE,SAAS,MAAM,CAAC,QAAQ,EAAE;4BACnC,OAAO,EAAE,IAAI,CAAA;;4CAEe,aAAa,WAAW,aAAa,WAAW,kBAAkB;4CAClE,MAAM,WAAW,uCAAuC,WAAW,WAAW;gDAC1E,4BAA4B,WAAW,kCAAkC,WAAW,sBAAsB;+DAC3F,sBAAsB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;kDACrD,WAAW,WAAW,aAAa,WAAW,gBAAgB;mEAC7C,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;oDACjD,SAAS,WAAW,qBAAqB,WAAW,cAAc;qEACjD,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;kDACnD,UAAU,WAAW,WAAW,WAAW,eAAe;;oDAExD,WAAW,WAAW,YAAY,WAAW,gBAAgB;mEAC9C,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;kDACnD,QAAQ,WAAW,SAAS,WAAW,aAAa;;;;gDAItD,qBAAqB,WAAW,uBAAuB,WAAW,gBAAgB;4DACtE,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;8CAChD,sBAAsB,WAAW,oDAAoD,WAAW,gBAAgB;8CAChH,sBAAsB,WAAW,oDAAoD,WAAW,gBAAgB;;;iBAG7I;4BACD,WAAW,EAAE;gCACX,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE,EAAE;gCACnG;oCACE,IAAI,EAAE,MAAM;oCACZ,QAAQ,EAAE,cAAc;oCACxB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;wCAC9B,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;wCACxF,IAAI,CAAC,IAAI;4CAAE,OAAO;wCAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;wCAC1C,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI;4CACvC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;4CACnE,CAAC,CAAC,EAAE,CAAC;wCAEP,mDAAmD;wCACnD,MAAM,eAAe,GAAG,IAAI,CAAC,0BAA0B,IAAI,IAAI,CAAC;wCAChE,MAAM,SAAS,GAAG,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC;wCAChE,MAAM,OAAO,GAAG,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC;wCACrD,MAAM,QAAQ,GAAG,SAAS,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;wCACpF,MAAM,SAAS,GAAG,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC;wCACzD,MAAM,MAAM,GAAG,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;wCAEhF,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,IAAI,KAAK,CAAC;wCACpD,MAAM,oBAAoB,GAAG,SAAS,IAAI,IAAI,CAAC,oBAAoB;4CACjE,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;4CACnF,CAAC,CAAC,EAAE,CAAC;wCACP,MAAM,oBAAoB,GAAG,SAAS,IAAI,IAAI,CAAC,oBAAoB;4CACjE,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;4CACnF,CAAC,CAAC,EAAE,CAAC;wCAEP,MAAM,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,qBAAqB,EAAE;4CACzE,QAAQ,EAAE,MAAM,CAAC,QAAQ;4CACzB,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,SAAS;4CAC1C,uBAAuB;4CACvB,0BAA0B,EAAE,eAAe;4CAC3C,SAAS,EAAE,SAAS,IAAI,SAAS;4CACjC,OAAO,EAAE,OAAO,IAAI,SAAS;4CAC7B,QAAQ;4CACR,SAAS,EAAE,SAAS,IAAI,SAAS;4CACjC,MAAM;4CACN,oBAAoB;4CACpB,oBAAoB;yCACrB,CAAC,CAAC;wCACH,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;oCAC3B,CAAC;iCACF;6BACF;yBACF,CAAC,CAAC;wBACH,oDAAoD;wBACpD,MAAM,QAAQ,GAAG,SAAS,EAAE,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,WAAW,CAAQ,CAAC;wBACrG,IAAI,QAAQ,EAAE,CAAC;4BACb,MAAM,QAAQ,CAAC,cAAc,CAAC;4BAC9B,mBAAmB,CAAC,QAAQ,CAAC,CAAC;wBAChC,CAAC;oBACH,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,aAAa;oBACnB,QAAQ,EAAE,kBAAkB;oBAC5B,IAAI,EAAE,CAAC,aAAa,CAAC;oBACrB,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAkC,CAAC;wBAC7D,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;wBAC7E,SAAS,CAAC,aAAa,CAAC;4BACtB,OAAO,EAAE,oBAAoB;4BAC7B,OAAO,EAAE,IAAI,CAAA,6BAA6B,MAAM,CAAC,QAAQ,+FAA+F;4BACxJ,WAAW,EAAE;gCACX,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE,EAAE;gCACnG;oCACE,IAAI,EAAE,QAAQ;oCACd,QAAQ,EAAE,kBAAkB;oCAC5B,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;wCAC9B,IAAI,CAAC;4CACH,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAEpE,eAAe,EAAE,oBAAoB,CAAC,CAAC;4CACzC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;gDAClC,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAG,CAAC,QAAS;gDACvD,QAAQ,EAAE,MAAM,CAAC,QAAQ;6CAC1B,CAAC,CAAC;4CACH,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,eAAe,EAAE,CAAC;gDACjD,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC;oDAC7B,GAAG,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAG;oDACpC,eAAe,EAAE,QAAQ,CAAC,eAAe;iDAC1C,CAAC,CAAC;4CACL,CAAC;4CACD,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;wCAC3B,CAAC;wCAAC,OAAO,GAAQ,EAAE,CAAC;4CAClB,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;wCACtG,CAAC;oCACH,CAAC;iCACF;6BACF;yBACF,CAAC,CAAC;oBACL,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,eAAe;oBACzB,IAAI,EAAE,CAAC,aAAa,CAAC;oBACrB,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAkC,CAAC;wBAC7D,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;wBAClE,SAAS,CAAC,aAAa,CAAC;4BACtB,OAAO,EAAE,mBAAmB;4BAC5B,OAAO,EAAE,IAAI,CAAA,8CAA8C,MAAM,CAAC,QAAQ,QAAQ;4BAClF,WAAW,EAAE;gCACX,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE,EAAE;gCACnG;oCACE,IAAI,EAAE,QAAQ;oCACd,QAAQ,EAAE,eAAe;oCACzB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;wCAC9B,MAAM,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;wCAC5F,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;oCAC3B,CAAC;iCACF;6BACF;yBACF,CAAC,CAAC;oBACL,CAAC;iBACF;aACF;;;KAGJ,CAAC;QACJ,CAAC;;YAvvBU,uDAAU;;;;;SAAV,UAAU"}
|
package/dist_ts_web/router.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export declare const validViews: readonly ["overview", "network", "emails", "logs", "routes", "apitokens", "configuration", "security", "certificates", "remoteingress", "vpn"];
|
|
1
|
+
export declare const validViews: readonly ["overview", "network", "emails", "logs", "routes", "apitokens", "configuration", "security", "certificates", "remoteingress", "vpn", "securityprofiles", "networktargets"];
|
|
2
2
|
export type TValidView = typeof validViews[number];
|
|
3
3
|
declare class AppRouter {
|
|
4
4
|
private router;
|
package/dist_ts_web/router.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import * as appstate from './appstate.js';
|
|
3
3
|
const SmartRouter = plugins.domtools.plugins.smartrouter.SmartRouter;
|
|
4
|
-
export const validViews = ['overview', 'network', 'emails', 'logs', 'routes', 'apitokens', 'configuration', 'security', 'certificates', 'remoteingress', 'vpn'];
|
|
4
|
+
export const validViews = ['overview', 'network', 'emails', 'logs', 'routes', 'apitokens', 'configuration', 'security', 'certificates', 'remoteingress', 'vpn', 'securityprofiles', 'networktargets'];
|
|
5
5
|
class AppRouter {
|
|
6
6
|
router;
|
|
7
7
|
initialized = false;
|
|
@@ -88,4 +88,4 @@ class AppRouter {
|
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
90
|
export const appRouter = new AppRouter();
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViL3JvdXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssUUFBUSxNQUFNLGVBQWUsQ0FBQztBQUUxQyxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDO0FBRXJFLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxDQUFDLFVBQVUsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLGVBQWUsRUFBRSxVQUFVLEVBQUUsY0FBYyxFQUFFLGVBQWUsRUFBRSxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsZ0JBQWdCLENBQVUsQ0FBQztBQUkvTSxNQUFNLFNBQVM7SUFDTCxNQUFNLENBQW1DO0lBQ3pDLFdBQVcsR0FBRyxLQUFLLENBQUM7SUFDcEIsbUJBQW1CLEdBQUcsS0FBSyxDQUFDO0lBRXBDO1FBQ0UsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLFdBQVcsQ0FBQyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFFTSxJQUFJO1FBQ1QsSUFBSSxJQUFJLENBQUMsV0FBVztZQUFFLE9BQU87UUFDN0IsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ25CLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUN0QixJQUFJLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztRQUMxQixJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQztJQUMxQixDQUFDO0lBRU8sV0FBVztRQUNqQixLQUFLLE1BQU0sSUFBSSxJQUFJLFVBQVUsRUFBRSxDQUFDO1lBQzlCLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLElBQUksSUFBSSxFQUFFLEVBQUUsS0FB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
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/dcrouter",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "12.
|
|
4
|
+
"version": "12.2.0",
|
|
5
5
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"exports": {
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"@api.global/typedserver": "^8.4.6",
|
|
36
36
|
"@api.global/typedsocket": "^4.1.2",
|
|
37
37
|
"@apiclient.xyz/cloudflare": "^7.1.0",
|
|
38
|
-
"@design.estate/dees-catalog": "^3.49.
|
|
38
|
+
"@design.estate/dees-catalog": "^3.49.1",
|
|
39
39
|
"@design.estate/dees-element": "^2.2.4",
|
|
40
40
|
"@push.rocks/lik": "^6.4.0",
|
|
41
41
|
"@push.rocks/projectinfo": "^5.1.0",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"@push.rocks/smartrx": "^3.0.10",
|
|
60
60
|
"@push.rocks/smartstate": "^2.3.0",
|
|
61
61
|
"@push.rocks/smartunique": "^3.0.9",
|
|
62
|
-
"@push.rocks/smartvpn": "1.
|
|
62
|
+
"@push.rocks/smartvpn": "1.19.1",
|
|
63
63
|
"@push.rocks/taskbuffer": "^8.0.2",
|
|
64
64
|
"@serve.zone/catalog": "^2.9.0",
|
|
65
65
|
"@serve.zone/interfaces": "^5.3.0",
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/classes.dcrouter.ts
CHANGED
|
@@ -21,7 +21,7 @@ import { MetricsManager } from './monitoring/index.js';
|
|
|
21
21
|
import { RadiusServer, type IRadiusServerConfig } from './radius/index.js';
|
|
22
22
|
import { RemoteIngressManager, TunnelManager } from './remoteingress/index.js';
|
|
23
23
|
import { VpnManager, type IVpnManagerConfig } from './vpn/index.js';
|
|
24
|
-
import { RouteConfigManager, ApiTokenManager } from './config/index.js';
|
|
24
|
+
import { RouteConfigManager, ApiTokenManager, ReferenceResolver, DbSeeder } from './config/index.js';
|
|
25
25
|
import { SecurityLogger, ContentScanner, IPReputationChecker } from './security/index.js';
|
|
26
26
|
import { type IHttp3Config, augmentRoutesWithHttp3 } from './http3/index.js';
|
|
27
27
|
|
|
@@ -137,6 +137,10 @@ export interface IDcRouterOptions {
|
|
|
137
137
|
dbName?: string;
|
|
138
138
|
/** Cache cleanup interval in hours (default: 1) */
|
|
139
139
|
cleanupIntervalHours?: number;
|
|
140
|
+
/** Seed default security profiles and network targets when DB is empty on first startup. */
|
|
141
|
+
seedOnEmpty?: boolean;
|
|
142
|
+
/** Custom seed data for profiles and targets (overrides built-in defaults). */
|
|
143
|
+
seedData?: import('./config/classes.db-seeder.js').ISeedData;
|
|
140
144
|
};
|
|
141
145
|
|
|
142
146
|
/**
|
|
@@ -205,6 +209,17 @@ export interface IDcRouterOptions {
|
|
|
205
209
|
allowList?: string[];
|
|
206
210
|
blockList?: string[];
|
|
207
211
|
};
|
|
212
|
+
/** Forwarding mode: 'socket' (default, userspace NAT), 'bridge' (L2 bridge to host LAN),
|
|
213
|
+
* or 'hybrid' (socket default, bridge for clients with useHostIp=true) */
|
|
214
|
+
forwardingMode?: 'socket' | 'bridge' | 'hybrid';
|
|
215
|
+
/** LAN subnet CIDR for bridge mode (e.g., '192.168.1.0/24') */
|
|
216
|
+
bridgeLanSubnet?: string;
|
|
217
|
+
/** Physical network interface for bridge mode (auto-detected if omitted) */
|
|
218
|
+
bridgePhysicalInterface?: string;
|
|
219
|
+
/** Start of VPN client IP range in LAN subnet (host offset, default: 200) */
|
|
220
|
+
bridgeIpRangeStart?: number;
|
|
221
|
+
/** End of VPN client IP range in LAN subnet (host offset, default: 250) */
|
|
222
|
+
bridgeIpRangeEnd?: number;
|
|
208
223
|
};
|
|
209
224
|
}
|
|
210
225
|
|
|
@@ -258,6 +273,7 @@ export class DcRouter {
|
|
|
258
273
|
// Programmatic config API
|
|
259
274
|
public routeConfigManager?: RouteConfigManager;
|
|
260
275
|
public apiTokenManager?: ApiTokenManager;
|
|
276
|
+
public referenceResolver?: ReferenceResolver;
|
|
261
277
|
|
|
262
278
|
// Auto-discovered public IP (populated by generateAuthoritativeRecords)
|
|
263
279
|
public detectedPublicIp: string | null = null;
|
|
@@ -445,6 +461,10 @@ export class DcRouter {
|
|
|
445
461
|
.optional()
|
|
446
462
|
.dependsOn('SmartProxy', 'DcRouterDb')
|
|
447
463
|
.withStart(async () => {
|
|
464
|
+
// Initialize reference resolver first (profiles + targets)
|
|
465
|
+
this.referenceResolver = new ReferenceResolver();
|
|
466
|
+
await this.referenceResolver.initialize();
|
|
467
|
+
|
|
448
468
|
this.routeConfigManager = new RouteConfigManager(
|
|
449
469
|
() => this.getConstructorRoutes(),
|
|
450
470
|
() => this.smartProxy,
|
|
@@ -457,14 +477,23 @@ export class DcRouter {
|
|
|
457
477
|
return [this.options.vpnConfig?.subnet || '10.8.0.0/24'];
|
|
458
478
|
}
|
|
459
479
|
: undefined,
|
|
480
|
+
this.referenceResolver,
|
|
460
481
|
);
|
|
461
482
|
this.apiTokenManager = new ApiTokenManager();
|
|
462
483
|
await this.apiTokenManager.initialize();
|
|
463
484
|
await this.routeConfigManager.initialize();
|
|
485
|
+
|
|
486
|
+
// Seed default profiles/targets if DB is empty and seeding is enabled
|
|
487
|
+
const seeder = new DbSeeder(this.referenceResolver);
|
|
488
|
+
await seeder.seedIfEmpty(
|
|
489
|
+
this.options.dbConfig?.seedOnEmpty,
|
|
490
|
+
this.options.dbConfig?.seedData,
|
|
491
|
+
);
|
|
464
492
|
})
|
|
465
493
|
.withStop(async () => {
|
|
466
494
|
this.routeConfigManager = undefined;
|
|
467
495
|
this.apiTokenManager = undefined;
|
|
496
|
+
this.referenceResolver = undefined;
|
|
468
497
|
})
|
|
469
498
|
.withRetry({ maxRetries: 2, baseDelayMs: 1000 }),
|
|
470
499
|
);
|
|
@@ -2085,6 +2114,11 @@ export class DcRouter {
|
|
|
2085
2114
|
serverEndpoint: this.options.vpnConfig.serverEndpoint,
|
|
2086
2115
|
initialClients: this.options.vpnConfig.clients,
|
|
2087
2116
|
destinationPolicy: this.options.vpnConfig.destinationPolicy,
|
|
2117
|
+
forwardingMode: this.options.vpnConfig.forwardingMode,
|
|
2118
|
+
bridgeLanSubnet: this.options.vpnConfig.bridgeLanSubnet,
|
|
2119
|
+
bridgePhysicalInterface: this.options.vpnConfig.bridgePhysicalInterface,
|
|
2120
|
+
bridgeIpRangeStart: this.options.vpnConfig.bridgeIpRangeStart,
|
|
2121
|
+
bridgeIpRangeEnd: this.options.vpnConfig.bridgeIpRangeEnd,
|
|
2088
2122
|
onClientChanged: () => {
|
|
2089
2123
|
// Re-apply routes so tag-based ipAllowLists get updated
|
|
2090
2124
|
this.routeConfigManager?.applyRoutes();
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import { logger } from '../logger.js';
|
|
2
|
+
import type { ReferenceResolver } from './classes.reference-resolver.js';
|
|
3
|
+
import type { IRouteSecurity } from '../../ts_interfaces/data/route-management.js';
|
|
4
|
+
|
|
5
|
+
export interface ISeedData {
|
|
6
|
+
profiles?: Array<{
|
|
7
|
+
name: string;
|
|
8
|
+
description?: string;
|
|
9
|
+
security: IRouteSecurity;
|
|
10
|
+
extendsProfiles?: string[];
|
|
11
|
+
}>;
|
|
12
|
+
targets?: Array<{
|
|
13
|
+
name: string;
|
|
14
|
+
description?: string;
|
|
15
|
+
host: string | string[];
|
|
16
|
+
port: number;
|
|
17
|
+
}>;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export class DbSeeder {
|
|
21
|
+
constructor(private referenceResolver: ReferenceResolver) {}
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Check if DB is empty and seed if configured.
|
|
25
|
+
* Called once during ConfigManagers service startup, after initialize().
|
|
26
|
+
*/
|
|
27
|
+
public async seedIfEmpty(
|
|
28
|
+
seedOnEmpty?: boolean,
|
|
29
|
+
seedData?: ISeedData,
|
|
30
|
+
): Promise<void> {
|
|
31
|
+
if (!seedOnEmpty) return;
|
|
32
|
+
|
|
33
|
+
const existingProfiles = this.referenceResolver.listProfiles();
|
|
34
|
+
const existingTargets = this.referenceResolver.listTargets();
|
|
35
|
+
|
|
36
|
+
if (existingProfiles.length > 0 || existingTargets.length > 0) {
|
|
37
|
+
logger.log('info', 'DB already contains profiles/targets, skipping seed');
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
logger.log('info', 'Seeding database with initial profiles and targets...');
|
|
42
|
+
|
|
43
|
+
const profilesToSeed: NonNullable<ISeedData['profiles']> = seedData?.profiles ?? DEFAULT_PROFILES;
|
|
44
|
+
const targetsToSeed: NonNullable<ISeedData['targets']> = seedData?.targets ?? DEFAULT_TARGETS;
|
|
45
|
+
|
|
46
|
+
for (const p of profilesToSeed) {
|
|
47
|
+
await this.referenceResolver.createProfile({
|
|
48
|
+
name: p.name,
|
|
49
|
+
description: p.description,
|
|
50
|
+
security: p.security,
|
|
51
|
+
extendsProfiles: p.extendsProfiles,
|
|
52
|
+
createdBy: 'system-seed',
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
for (const t of targetsToSeed) {
|
|
57
|
+
await this.referenceResolver.createTarget({
|
|
58
|
+
name: t.name,
|
|
59
|
+
description: t.description,
|
|
60
|
+
host: t.host,
|
|
61
|
+
port: t.port,
|
|
62
|
+
createdBy: 'system-seed',
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
logger.log('info', `Seeded ${profilesToSeed.length} profile(s) and ${targetsToSeed.length} target(s)`);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
const DEFAULT_PROFILES: Array<NonNullable<ISeedData['profiles']>[number]> = [
|
|
71
|
+
{
|
|
72
|
+
name: 'PUBLIC',
|
|
73
|
+
description: 'Allow all traffic — no IP restrictions',
|
|
74
|
+
security: {
|
|
75
|
+
ipAllowList: ['*'],
|
|
76
|
+
},
|
|
77
|
+
},
|
|
78
|
+
{
|
|
79
|
+
name: 'STANDARD',
|
|
80
|
+
description: 'Standard internal access with common private subnets',
|
|
81
|
+
security: {
|
|
82
|
+
ipAllowList: ['192.168.0.0/16', '10.0.0.0/8', '127.0.0.1', '::1'],
|
|
83
|
+
maxConnections: 1000,
|
|
84
|
+
},
|
|
85
|
+
},
|
|
86
|
+
];
|
|
87
|
+
|
|
88
|
+
const DEFAULT_TARGETS: Array<NonNullable<ISeedData['targets']>[number]> = [
|
|
89
|
+
{
|
|
90
|
+
name: 'LOCALHOST',
|
|
91
|
+
description: 'Local machine on port 443',
|
|
92
|
+
host: '127.0.0.1',
|
|
93
|
+
port: 443,
|
|
94
|
+
},
|
|
95
|
+
];
|