@serve.zone/dcrouter 12.9.4 → 12.10.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 +553 -537
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/config/classes.route-config-manager.js +13 -2
- package/dist_ts_web/00_commitinfo_data.js +2 -2
- package/dist_ts_web/elements/ops-view-routes.js +113 -3
- package/package.json +3 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/config/classes.route-config-manager.ts +12 -1
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/elements/ops-view-routes.ts +111 -2
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '12.
|
|
6
|
+
version: '12.10.0',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLDBFQUEwRTtDQUN4RixDQUFBIn0=
|
|
@@ -101,7 +101,18 @@ export class RouteConfigManager {
|
|
|
101
101
|
if (!stored)
|
|
102
102
|
return false;
|
|
103
103
|
if (patch.route) {
|
|
104
|
-
|
|
104
|
+
const mergedAction = patch.route.action
|
|
105
|
+
? { ...stored.route.action, ...patch.route.action }
|
|
106
|
+
: stored.route.action;
|
|
107
|
+
// Handle explicit null to remove nested action properties (e.g., tls: null)
|
|
108
|
+
if (patch.route.action) {
|
|
109
|
+
for (const [key, val] of Object.entries(patch.route.action)) {
|
|
110
|
+
if (val === null) {
|
|
111
|
+
delete mergedAction[key];
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
stored.route = { ...stored.route, ...patch.route, action: mergedAction };
|
|
105
116
|
}
|
|
106
117
|
if (patch.enabled !== undefined) {
|
|
107
118
|
stored.enabled = patch.enabled;
|
|
@@ -352,4 +363,4 @@ export class RouteConfigManager {
|
|
|
352
363
|
logger.log('info', `Applied ${enabledRoutes.length} routes to SmartProxy (${this.storedRoutes.size} programmatic, ${this.overrides.size} overrides)`);
|
|
353
364
|
}
|
|
354
365
|
}
|
|
355
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.route-config-manager.js","sourceRoot":"","sources":["../../../ts/config/classes.route-config-manager.ts"],"names":[],"mappings":"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"}
|
|
366
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.route-config-manager.js","sourceRoot":"","sources":["../../../ts/config/classes.route-config-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '12.
|
|
6
|
+
version: '12.10.0',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsc0JBQXNCO0lBQzVCLE9BQU8sRUFBRSxTQUFTO0lBQ2xCLFdBQVcsRUFBRSwwRUFBMEU7Q0FDeEYsQ0FBQSJ9
|
|
@@ -37,6 +37,41 @@ import * as interfaces from '../../dist_ts_interfaces/index.js';
|
|
|
37
37
|
import { viewHostCss } from './shared/css.js';
|
|
38
38
|
import {} from '@design.estate/dees-catalog';
|
|
39
39
|
import { DeesElement, css, cssManager, customElement, html, state, } from '@design.estate/dees-element';
|
|
40
|
+
// TLS dropdown options shared by create and edit dialogs
|
|
41
|
+
const tlsModeOptions = [
|
|
42
|
+
{ key: 'none', option: '(none — no TLS)' },
|
|
43
|
+
{ key: 'passthrough', option: 'Passthrough' },
|
|
44
|
+
{ key: 'terminate', option: 'Terminate' },
|
|
45
|
+
{ key: 'terminate-and-reencrypt', option: 'Terminate & Re-encrypt' },
|
|
46
|
+
];
|
|
47
|
+
const tlsCertOptions = [
|
|
48
|
+
{ key: 'auto', option: 'Auto (ACME/Let\'s Encrypt)' },
|
|
49
|
+
{ key: 'custom', option: 'Custom certificate' },
|
|
50
|
+
];
|
|
51
|
+
/**
|
|
52
|
+
* Toggle TLS form field visibility based on selected TLS mode and certificate type.
|
|
53
|
+
*/
|
|
54
|
+
function setupTlsVisibility(formEl) {
|
|
55
|
+
const updateVisibility = async () => {
|
|
56
|
+
const data = await formEl.collectFormData();
|
|
57
|
+
const contentEl = formEl.closest('.content') || formEl.parentElement;
|
|
58
|
+
if (!contentEl)
|
|
59
|
+
return;
|
|
60
|
+
const tlsModeValue = data.tlsMode;
|
|
61
|
+
const modeKey = typeof tlsModeValue === 'string' ? tlsModeValue : tlsModeValue?.key;
|
|
62
|
+
const needsCert = modeKey === 'terminate' || modeKey === 'terminate-and-reencrypt';
|
|
63
|
+
const certGroup = contentEl.querySelector('.tlsCertificateGroup');
|
|
64
|
+
if (certGroup)
|
|
65
|
+
certGroup.style.display = needsCert ? 'flex' : 'none';
|
|
66
|
+
const tlsCertValue = data.tlsCertificate;
|
|
67
|
+
const certKey = typeof tlsCertValue === 'string' ? tlsCertValue : tlsCertValue?.key;
|
|
68
|
+
const customGroup = contentEl.querySelector('.tlsCustomCertGroup');
|
|
69
|
+
if (customGroup)
|
|
70
|
+
customGroup.style.display = (needsCert && certKey === 'custom') ? 'flex' : 'none';
|
|
71
|
+
};
|
|
72
|
+
formEl.changeSubject.subscribe(() => updateVisibility());
|
|
73
|
+
updateVisibility();
|
|
74
|
+
}
|
|
40
75
|
let OpsViewRoutes = (() => {
|
|
41
76
|
let _classDecorators = [customElement('ops-view-routes')];
|
|
42
77
|
let _classDescriptor;
|
|
@@ -431,7 +466,17 @@ let OpsViewRoutes = (() => {
|
|
|
431
466
|
? (Array.isArray(firstTarget.host) ? firstTarget.host[0] : firstTarget.host)
|
|
432
467
|
: '';
|
|
433
468
|
const currentTargetPort = firstTarget?.port != null ? String(firstTarget.port) : '';
|
|
434
|
-
|
|
469
|
+
// Compute current TLS state for pre-population
|
|
470
|
+
const currentTls = route.action.tls;
|
|
471
|
+
const currentTlsMode = currentTls?.mode || 'none';
|
|
472
|
+
const currentTlsCert = currentTls
|
|
473
|
+
? (currentTls.certificate === 'auto' || !currentTls.certificate ? 'auto' : 'custom')
|
|
474
|
+
: 'auto';
|
|
475
|
+
const currentCustomKey = (typeof currentTls?.certificate === 'object') ? currentTls.certificate.key : '';
|
|
476
|
+
const currentCustomCert = (typeof currentTls?.certificate === 'object') ? currentTls.certificate.cert : '';
|
|
477
|
+
const needsCert = currentTlsMode === 'terminate' || currentTlsMode === 'terminate-and-reencrypt';
|
|
478
|
+
const isCustom = currentTlsCert === 'custom';
|
|
479
|
+
const editModal = await DeesModal.createAndShow({
|
|
435
480
|
heading: `Edit Route: ${route.name}`,
|
|
436
481
|
content: html `
|
|
437
482
|
<dees-form>
|
|
@@ -443,6 +488,14 @@ let OpsViewRoutes = (() => {
|
|
|
443
488
|
<dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions} .selectedOption=${targetOptions.find((o) => o.key === (merged.metadata?.networkTargetRef || '')) || null}></dees-input-dropdown>
|
|
444
489
|
<dees-input-text .key=${'targetHost'} .label=${'Target Host (if no target selected)'} .value=${currentTargetHost}></dees-input-text>
|
|
445
490
|
<dees-input-text .key=${'targetPort'} .label=${'Target Port (if no target selected)'} .value=${currentTargetPort}></dees-input-text>
|
|
491
|
+
<dees-input-dropdown .key=${'tlsMode'} .label=${'TLS Mode'} .options=${tlsModeOptions} .selectedOption=${tlsModeOptions.find((o) => o.key === currentTlsMode) || tlsModeOptions[0]}></dees-input-dropdown>
|
|
492
|
+
<div class="tlsCertificateGroup" style="display: ${needsCert ? 'flex' : 'none'}; flex-direction: column; gap: 16px;">
|
|
493
|
+
<dees-input-dropdown .key=${'tlsCertificate'} .label=${'Certificate'} .options=${tlsCertOptions} .selectedOption=${tlsCertOptions.find((o) => o.key === currentTlsCert) || tlsCertOptions[0]}></dees-input-dropdown>
|
|
494
|
+
<div class="tlsCustomCertGroup" style="display: ${needsCert && isCustom ? 'flex' : 'none'}; flex-direction: column; gap: 16px;">
|
|
495
|
+
<dees-input-text .key=${'tlsCertKey'} .label=${'Private Key (PEM)'} .value=${currentCustomKey}></dees-input-text>
|
|
496
|
+
<dees-input-text .key=${'tlsCertCert'} .label=${'Certificate (PEM)'} .value=${currentCustomCert}></dees-input-text>
|
|
497
|
+
</div>
|
|
498
|
+
</div>
|
|
446
499
|
</dees-form>
|
|
447
500
|
`,
|
|
448
501
|
menuOptions: [
|
|
@@ -483,6 +536,26 @@ let OpsViewRoutes = (() => {
|
|
|
483
536
|
},
|
|
484
537
|
...(priority != null && !isNaN(priority) ? { priority } : {}),
|
|
485
538
|
};
|
|
539
|
+
// Build TLS config from form
|
|
540
|
+
const tlsModeValue = formData.tlsMode;
|
|
541
|
+
const tlsModeKey = typeof tlsModeValue === 'string' ? tlsModeValue : tlsModeValue?.key;
|
|
542
|
+
if (tlsModeKey && tlsModeKey !== 'none') {
|
|
543
|
+
const tls = { mode: tlsModeKey };
|
|
544
|
+
if (tlsModeKey !== 'passthrough') {
|
|
545
|
+
const tlsCertValue = formData.tlsCertificate;
|
|
546
|
+
const tlsCertKey = typeof tlsCertValue === 'string' ? tlsCertValue : tlsCertValue?.key;
|
|
547
|
+
if (tlsCertKey === 'custom' && formData.tlsCertKey && formData.tlsCertCert) {
|
|
548
|
+
tls.certificate = { key: formData.tlsCertKey, cert: formData.tlsCertCert };
|
|
549
|
+
}
|
|
550
|
+
else {
|
|
551
|
+
tls.certificate = 'auto';
|
|
552
|
+
}
|
|
553
|
+
}
|
|
554
|
+
updatedRoute.action.tls = tls;
|
|
555
|
+
}
|
|
556
|
+
else {
|
|
557
|
+
updatedRoute.action.tls = null; // explicit removal
|
|
558
|
+
}
|
|
486
559
|
const metadata = {};
|
|
487
560
|
const profileRefValue = formData.securityProfileRef;
|
|
488
561
|
const profileKey = typeof profileRefValue === 'string' ? profileRefValue : profileRefValue?.key;
|
|
@@ -504,6 +577,12 @@ let OpsViewRoutes = (() => {
|
|
|
504
577
|
},
|
|
505
578
|
],
|
|
506
579
|
});
|
|
580
|
+
// Setup conditional TLS field visibility after modal renders
|
|
581
|
+
const editForm = editModal?.shadowRoot?.querySelector('.content')?.querySelector('dees-form');
|
|
582
|
+
if (editForm) {
|
|
583
|
+
await editForm.updateComplete;
|
|
584
|
+
setupTlsVisibility(editForm);
|
|
585
|
+
}
|
|
507
586
|
}
|
|
508
587
|
async showCreateRouteDialog() {
|
|
509
588
|
const { DeesModal } = await import('@design.estate/dees-catalog');
|
|
@@ -524,7 +603,7 @@ let OpsViewRoutes = (() => {
|
|
|
524
603
|
option: `${t.name} (${Array.isArray(t.host) ? t.host.join(',') : t.host}:${t.port})`,
|
|
525
604
|
})),
|
|
526
605
|
];
|
|
527
|
-
await DeesModal.createAndShow({
|
|
606
|
+
const createModal = await DeesModal.createAndShow({
|
|
528
607
|
heading: 'Add Programmatic Route',
|
|
529
608
|
content: html `
|
|
530
609
|
<dees-form>
|
|
@@ -536,6 +615,14 @@ let OpsViewRoutes = (() => {
|
|
|
536
615
|
<dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions}></dees-input-dropdown>
|
|
537
616
|
<dees-input-text .key=${'targetHost'} .label=${'Target Host (if no target selected)'} .value=${'localhost'}></dees-input-text>
|
|
538
617
|
<dees-input-text .key=${'targetPort'} .label=${'Target Port (if no target selected)'}></dees-input-text>
|
|
618
|
+
<dees-input-dropdown .key=${'tlsMode'} .label=${'TLS Mode'} .options=${tlsModeOptions} .selectedOption=${tlsModeOptions[0]}></dees-input-dropdown>
|
|
619
|
+
<div class="tlsCertificateGroup" style="display: none; flex-direction: column; gap: 16px;">
|
|
620
|
+
<dees-input-dropdown .key=${'tlsCertificate'} .label=${'Certificate'} .options=${tlsCertOptions} .selectedOption=${tlsCertOptions[0]}></dees-input-dropdown>
|
|
621
|
+
<div class="tlsCustomCertGroup" style="display: none; flex-direction: column; gap: 16px;">
|
|
622
|
+
<dees-input-text .key=${'tlsCertKey'} .label=${'Private Key (PEM)'}></dees-input-text>
|
|
623
|
+
<dees-input-text .key=${'tlsCertCert'} .label=${'Certificate (PEM)'}></dees-input-text>
|
|
624
|
+
</div>
|
|
625
|
+
</div>
|
|
539
626
|
</dees-form>
|
|
540
627
|
`,
|
|
541
628
|
menuOptions: [
|
|
@@ -576,6 +663,23 @@ let OpsViewRoutes = (() => {
|
|
|
576
663
|
},
|
|
577
664
|
...(priority != null && !isNaN(priority) ? { priority } : {}),
|
|
578
665
|
};
|
|
666
|
+
// Build TLS config from form
|
|
667
|
+
const tlsModeValue = formData.tlsMode;
|
|
668
|
+
const tlsModeKey = typeof tlsModeValue === 'string' ? tlsModeValue : tlsModeValue?.key;
|
|
669
|
+
if (tlsModeKey && tlsModeKey !== 'none') {
|
|
670
|
+
const tls = { mode: tlsModeKey };
|
|
671
|
+
if (tlsModeKey !== 'passthrough') {
|
|
672
|
+
const tlsCertValue = formData.tlsCertificate;
|
|
673
|
+
const tlsCertKey = typeof tlsCertValue === 'string' ? tlsCertValue : tlsCertValue?.key;
|
|
674
|
+
if (tlsCertKey === 'custom' && formData.tlsCertKey && formData.tlsCertCert) {
|
|
675
|
+
tls.certificate = { key: formData.tlsCertKey, cert: formData.tlsCertCert };
|
|
676
|
+
}
|
|
677
|
+
else {
|
|
678
|
+
tls.certificate = 'auto';
|
|
679
|
+
}
|
|
680
|
+
}
|
|
681
|
+
route.action.tls = tls;
|
|
682
|
+
}
|
|
579
683
|
// Build metadata if profile/target selected
|
|
580
684
|
const metadata = {};
|
|
581
685
|
const profileRefValue = formData.securityProfileRef;
|
|
@@ -597,6 +701,12 @@ let OpsViewRoutes = (() => {
|
|
|
597
701
|
},
|
|
598
702
|
],
|
|
599
703
|
});
|
|
704
|
+
// Setup conditional TLS field visibility after modal renders
|
|
705
|
+
const createForm = createModal?.shadowRoot?.querySelector('.content')?.querySelector('dees-form');
|
|
706
|
+
if (createForm) {
|
|
707
|
+
await createForm.updateComplete;
|
|
708
|
+
setupTlsVisibility(createForm);
|
|
709
|
+
}
|
|
600
710
|
}
|
|
601
711
|
refreshData() {
|
|
602
712
|
appstate.routeManagementStatePart.dispatchAction(appstate.fetchMergedRoutesAction, null);
|
|
@@ -611,4 +721,4 @@ let OpsViewRoutes = (() => {
|
|
|
611
721
|
return OpsViewRoutes = _classThis;
|
|
612
722
|
})();
|
|
613
723
|
export { OpsViewRoutes };
|
|
614
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-routes.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-view-routes.ts"],"names":[],"mappings":"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"}
|
|
724
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-routes.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-view-routes.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/dcrouter",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "12.
|
|
4
|
+
"version": "12.10.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.55.
|
|
38
|
+
"@design.estate/dees-catalog": "^3.55.6",
|
|
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",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"@push.rocks/smartunique": "^3.0.9",
|
|
62
62
|
"@push.rocks/smartvpn": "1.19.1",
|
|
63
63
|
"@push.rocks/taskbuffer": "^8.0.2",
|
|
64
|
-
"@serve.zone/catalog": "^2.11.
|
|
64
|
+
"@serve.zone/catalog": "^2.11.1",
|
|
65
65
|
"@serve.zone/interfaces": "^5.3.0",
|
|
66
66
|
"@serve.zone/remoteingress": "^4.15.3",
|
|
67
67
|
"@tsclass/tsclass": "^9.5.0",
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -132,7 +132,18 @@ export class RouteConfigManager {
|
|
|
132
132
|
if (!stored) return false;
|
|
133
133
|
|
|
134
134
|
if (patch.route) {
|
|
135
|
-
|
|
135
|
+
const mergedAction = patch.route.action
|
|
136
|
+
? { ...stored.route.action, ...patch.route.action }
|
|
137
|
+
: stored.route.action;
|
|
138
|
+
// Handle explicit null to remove nested action properties (e.g., tls: null)
|
|
139
|
+
if (patch.route.action) {
|
|
140
|
+
for (const [key, val] of Object.entries(patch.route.action)) {
|
|
141
|
+
if (val === null) {
|
|
142
|
+
delete (mergedAction as any)[key];
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
stored.route = { ...stored.route, ...patch.route, action: mergedAction } as IDcRouterRouteConfig;
|
|
136
147
|
}
|
|
137
148
|
if (patch.enabled !== undefined) {
|
|
138
149
|
stored.enabled = patch.enabled;
|