@serve.zone/dcrouter 12.7.0 → 12.8.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/dist_serve/bundle.js +1480 -1310
  2. package/dist_ts/00_commitinfo_data.js +1 -1
  3. package/dist_ts/opsserver/handlers/certificate.handler.js +5 -5
  4. package/dist_ts_interfaces/requests/certificate.d.ts +1 -0
  5. package/dist_ts_web/00_commitinfo_data.js +1 -1
  6. package/dist_ts_web/appstate.d.ts +4 -1
  7. package/dist_ts_web/appstate.js +4 -3
  8. package/dist_ts_web/elements/ops-view-certificates.js +7 -5
  9. package/dist_ts_web/elements/ops-view-routes.js +21 -13
  10. package/package.json +3 -3
  11. package/readme.md +1 -1
  12. package/ts/00_commitinfo_data.ts +1 -1
  13. package/ts/opsserver/handlers/certificate.handler.ts +4 -4
  14. package/ts_web/00_commitinfo_data.ts +1 -1
  15. package/ts_web/appstate.ts +4 -3
  16. package/ts_web/elements/ops-view-certificates.ts +6 -4
  17. package/ts_web/elements/ops-view-routes.ts +20 -12
  18. package/ts_web/readme.md +1 -1
package/dist_ts_web/elements/ops-view-routes.js CHANGED
@@ -439,8 +439,8 @@ let OpsViewRoutes = (() => {
439
439
  <dees-input-text .key=${'ports'} .label=${'Ports (comma-separated)'} .value=${currentPorts} .required=${true}></dees-input-text>
440
440
  <dees-input-list .key=${'domains'} .label=${'Domains'} .placeholder=${'Add domain...'} .value=${currentDomains}></dees-input-list>
441
441
  <dees-input-text .key=${'priority'} .label=${'Priority (higher = matched first)'} .value=${route.priority != null ? String(route.priority) : ''}></dees-input-text>
442
- <dees-input-dropdown .key=${'securityProfileRef'} .label=${'Security Profile'} .options=${profileOptions} .selectedKey=${merged.metadata?.securityProfileRef || ''}></dees-input-dropdown>
443
- <dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions} .selectedKey=${merged.metadata?.networkTargetRef || ''}></dees-input-dropdown>
442
+ <dees-input-dropdown .key=${'securityProfileRef'} .label=${'Security Profile'} .options=${profileOptions} .selectedOption=${profileOptions.find((o) => o.key === (merged.metadata?.securityProfileRef || '')) || null}></dees-input-dropdown>
443
+ <dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions} .selectedOption=${targetOptions.find((o) => o.key === (merged.metadata?.networkTargetRef || '')) || null}></dees-input-dropdown>
444
444
  <dees-input-text .key=${'targetHost'} .label=${'Target Host (if no target selected)'} .value=${currentTargetHost}></dees-input-text>
445
445
  <dees-input-text .key=${'targetPort'} .label=${'Target Port (if no target selected)'} .value=${currentTargetPort}></dees-input-text>
446
446
  </dees-form>
@@ -484,11 +484,15 @@ let OpsViewRoutes = (() => {
484
484
  ...(priority != null && !isNaN(priority) ? { priority } : {}),
485
485
  };
486
486
  const metadata = {};
487
- if (formData.securityProfileRef) {
488
- metadata.securityProfileRef = formData.securityProfileRef;
487
+ const profileRefValue = formData.securityProfileRef;
488
+ const profileKey = typeof profileRefValue === 'string' ? profileRefValue : profileRefValue?.key;
489
+ if (profileKey) {
490
+ metadata.securityProfileRef = profileKey;
489
491
  }
490
- if (formData.networkTargetRef) {
491
- metadata.networkTargetRef = formData.networkTargetRef;
492
+ const targetRefValue = formData.networkTargetRef;
493
+ const targetKey = typeof targetRefValue === 'string' ? targetRefValue : targetRefValue?.key;
494
+ if (targetKey) {
495
+ metadata.networkTargetRef = targetKey;
492
496
  }
493
497
  await appstate.routeManagementStatePart.dispatchAction(appstate.updateRouteAction, {
494
498
  id: merged.storedRouteId,
@@ -528,8 +532,8 @@ let OpsViewRoutes = (() => {
528
532
  <dees-input-text .key=${'ports'} .label=${'Ports (comma-separated)'} .required=${true}></dees-input-text>
529
533
  <dees-input-list .key=${'domains'} .label=${'Domains'} .placeholder=${'Add domain...'}></dees-input-list>
530
534
  <dees-input-text .key=${'priority'} .label=${'Priority (higher = matched first)'}></dees-input-text>
531
- <dees-input-dropdown .key=${'securityProfileRef'} .label=${'Security Profile'} .options=${profileOptions} .selectedKey=${''}></dees-input-dropdown>
532
- <dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions} .selectedKey=${''}></dees-input-dropdown>
535
+ <dees-input-dropdown .key=${'securityProfileRef'} .label=${'Security Profile'} .options=${profileOptions}></dees-input-dropdown>
536
+ <dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions}></dees-input-dropdown>
533
537
  <dees-input-text .key=${'targetHost'} .label=${'Target Host (if no target selected)'} .value=${'localhost'}></dees-input-text>
534
538
  <dees-input-text .key=${'targetPort'} .label=${'Target Port (if no target selected)'}></dees-input-text>
535
539
  </dees-form>
@@ -574,11 +578,15 @@ let OpsViewRoutes = (() => {
574
578
  };
575
579
  // Build metadata if profile/target selected
576
580
  const metadata = {};
577
- if (formData.securityProfileRef) {
578
- metadata.securityProfileRef = formData.securityProfileRef;
581
+ const profileRefValue = formData.securityProfileRef;
582
+ const profileKey = typeof profileRefValue === 'string' ? profileRefValue : profileRefValue?.key;
583
+ if (profileKey) {
584
+ metadata.securityProfileRef = profileKey;
579
585
  }
580
- if (formData.networkTargetRef) {
581
- metadata.networkTargetRef = formData.networkTargetRef;
586
+ const targetRefValue = formData.networkTargetRef;
587
+ const targetKey = typeof targetRefValue === 'string' ? targetRefValue : targetRefValue?.key;
588
+ if (targetKey) {
589
+ metadata.networkTargetRef = targetKey;
582
590
  }
583
591
  await appstate.routeManagementStatePart.dispatchAction(appstate.createRouteAction, {
584
592
  route,
@@ -603,4 +611,4 @@ let OpsViewRoutes = (() => {
603
611
  return OpsViewRoutes = _classThis;
604
612
  })();
605
613
  export { OpsViewRoutes };
606
- //# 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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"}
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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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@serve.zone/dcrouter",
3
3
  "private": false,
4
- "version": "12.7.0",
4
+ "version": "12.8.1",
5
5
  "description": "A multifaceted routing service handling mail and SMS delivery functions.",
6
6
  "type": "module",
7
7
  "exports": {
@@ -35,12 +35,12 @@
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.52.3",
38
+ "@design.estate/dees-catalog": "^3.55.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",
42
42
  "@push.rocks/qenv": "^6.1.3",
43
- "@push.rocks/smartacme": "^9.3.1",
43
+ "@push.rocks/smartacme": "^9.4.0",
44
44
  "@push.rocks/smartdata": "^7.1.3",
45
45
  "@push.rocks/smartdb": "^2.1.1",
46
46
  "@push.rocks/smartdns": "^7.9.0",
package/readme.md CHANGED
@@ -25,7 +25,7 @@ For reporting bugs, issues, or security vulnerabilities, please visit [community
25
25
  - [Remote Ingress](#remote-ingress)
26
26
  - [VPN Access Control](#vpn-access-control)
27
27
  - [Certificate Management](#certificate-management)
28
- - [Storage & Caching](#storage--caching)
28
+ - [Storage & Database](#storage--database)
29
29
  - [Security Features](#security-features)
30
30
  - [OpsServer Dashboard](#opsserver-dashboard)
31
31
  - [API Client](#api-client)
package/ts/00_commitinfo_data.ts CHANGED
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '12.7.0',
6
+ version: '12.8.1',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
package/ts/opsserver/handlers/certificate.handler.ts CHANGED
@@ -43,7 +43,7 @@ export class CertificateHandler {
43
43
  new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_ReprovisionCertificateDomain>(
44
44
  'reprovisionCertificateDomain',
45
45
  async (dataArg) => {
46
- return this.reprovisionCertificateDomain(dataArg.domain);
46
+ return this.reprovisionCertificateDomain(dataArg.domain, dataArg.forceRenew);
47
47
  }
48
48
  )
49
49
  );
@@ -318,7 +318,7 @@ export class CertificateHandler {
318
318
  /**
319
319
  * Domain-based reprovisioning — clears backoff first, then triggers provision
320
320
  */
321
- private async reprovisionCertificateDomain(domain: string): Promise<{ success: boolean; message?: string }> {
321
+ private async reprovisionCertificateDomain(domain: string, forceRenew?: boolean): Promise<{ success: boolean; message?: string }> {
322
322
  const dcRouter = this.opsServerRef.dcRouterRef;
323
323
  const smartProxy = dcRouter.smartProxy;
324
324
 
@@ -337,8 +337,8 @@ export class CertificateHandler {
337
337
  // Try to provision via SmartAcme directly
338
338
  if (dcRouter.smartAcme) {
339
339
  try {
340
- await dcRouter.smartAcme.getCertificateForDomain(domain);
341
- return { success: true, message: `Certificate reprovisioning triggered for domain '${domain}'` };
340
+ await dcRouter.smartAcme.getCertificateForDomain(domain, { forceRenew: forceRenew ?? false });
341
+ return { success: true, message: forceRenew ? `Certificate force-renewed for domain '${domain}'` : `Certificate reprovisioning triggered for domain '${domain}'` };
342
342
  } catch (err: unknown) {
343
343
  return { success: false, message: (err as Error).message || `Failed to reprovision certificate for ${domain}` };
344
344
  }
package/ts_web/00_commitinfo_data.ts CHANGED
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '12.7.0',
6
+ version: '12.8.1',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
package/ts_web/appstate.ts CHANGED
@@ -605,8 +605,8 @@ export const fetchCertificateOverviewAction = certificateStatePart.createAction(
605
605
  }
606
606
  });
607
607
 
608
- export const reprovisionCertificateAction = certificateStatePart.createAction<string>(
609
- async (statePartArg, domain, actionContext): Promise<ICertificateState> => {
608
+ export const reprovisionCertificateAction = certificateStatePart.createAction<{ domain: string; forceRenew?: boolean }>(
609
+ async (statePartArg, dataArg, actionContext): Promise<ICertificateState> => {
610
610
  const context = getActionContext();
611
611
  const currentState = statePartArg.getState()!;
612
612
 
@@ -617,7 +617,8 @@ export const reprovisionCertificateAction = certificateStatePart.createAction<st
617
617
 
618
618
  await request.fire({
619
619
  identity: context.identity!,
620
- domain,
620
+ domain: dataArg.domain,
621
+ forceRenew: dataArg.forceRenew,
621
622
  });
622
623
 
623
624
  // Re-fetch overview after reprovisioning
package/ts_web/elements/ops-view-certificates.ts CHANGED
@@ -312,14 +312,16 @@ export class OpsViewCertificates extends DeesElement {
312
312
  return;
313
313
  }
314
314
 
315
- const doReprovision = async () => {
315
+ const doReprovision = async (forceRenew = false) => {
316
316
  await appstate.certificateStatePart.dispatchAction(
317
317
  appstate.reprovisionCertificateAction,
318
- cert.domain,
318
+ { domain: cert.domain, forceRenew },
319
319
  );
320
320
  const { DeesToast } = await import('@design.estate/dees-catalog');
321
321
  DeesToast.show({
322
- message: `Reprovisioning triggered for ${cert.domain}`,
322
+ message: forceRenew
323
+ ? `Force renewal triggered for ${cert.domain}`
324
+ : `Reprovisioning triggered for ${cert.domain}`,
323
325
  type: 'success',
324
326
  duration: 3000,
325
327
  });
@@ -336,7 +338,7 @@ export class OpsViewCertificates extends DeesElement {
336
338
  name: 'Force Renew',
337
339
  action: async (modalArg: any) => {
338
340
  await modalArg.destroy();
339
- await doReprovision();
341
+ await doReprovision(true);
340
342
  },
341
343
  },
342
344
  ],
package/ts_web/elements/ops-view-routes.ts CHANGED
@@ -431,8 +431,8 @@ export class OpsViewRoutes extends DeesElement {
431
431
  <dees-input-text .key=${'ports'} .label=${'Ports (comma-separated)'} .value=${currentPorts} .required=${true}></dees-input-text>
432
432
  <dees-input-list .key=${'domains'} .label=${'Domains'} .placeholder=${'Add domain...'} .value=${currentDomains}></dees-input-list>
433
433
  <dees-input-text .key=${'priority'} .label=${'Priority (higher = matched first)'} .value=${route.priority != null ? String(route.priority) : ''}></dees-input-text>
434
- <dees-input-dropdown .key=${'securityProfileRef'} .label=${'Security Profile'} .options=${profileOptions} .selectedKey=${merged.metadata?.securityProfileRef || ''}></dees-input-dropdown>
435
- <dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions} .selectedKey=${merged.metadata?.networkTargetRef || ''}></dees-input-dropdown>
434
+ <dees-input-dropdown .key=${'securityProfileRef'} .label=${'Security Profile'} .options=${profileOptions} .selectedOption=${profileOptions.find((o) => o.key === (merged.metadata?.securityProfileRef || '')) || null}></dees-input-dropdown>
435
+ <dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions} .selectedOption=${targetOptions.find((o) => o.key === (merged.metadata?.networkTargetRef || '')) || null}></dees-input-dropdown>
436
436
  <dees-input-text .key=${'targetHost'} .label=${'Target Host (if no target selected)'} .value=${currentTargetHost}></dees-input-text>
437
437
  <dees-input-text .key=${'targetPort'} .label=${'Target Port (if no target selected)'} .value=${currentTargetPort}></dees-input-text>
438
438
  </dees-form>
@@ -477,11 +477,15 @@ export class OpsViewRoutes extends DeesElement {
477
477
  };
478
478
 
479
479
  const metadata: any = {};
480
- if (formData.securityProfileRef) {
481
- metadata.securityProfileRef = formData.securityProfileRef;
480
+ const profileRefValue = formData.securityProfileRef as any;
481
+ const profileKey = typeof profileRefValue === 'string' ? profileRefValue : profileRefValue?.key;
482
+ if (profileKey) {
483
+ metadata.securityProfileRef = profileKey;
482
484
  }
483
- if (formData.networkTargetRef) {
484
- metadata.networkTargetRef = formData.networkTargetRef;
485
+ const targetRefValue = formData.networkTargetRef as any;
486
+ const targetKey = typeof targetRefValue === 'string' ? targetRefValue : targetRefValue?.key;
487
+ if (targetKey) {
488
+ metadata.networkTargetRef = targetKey;
485
489
  }
486
490
 
487
491
  await appstate.routeManagementStatePart.dispatchAction(
@@ -528,8 +532,8 @@ export class OpsViewRoutes extends DeesElement {
528
532
  <dees-input-text .key=${'ports'} .label=${'Ports (comma-separated)'} .required=${true}></dees-input-text>
529
533
  <dees-input-list .key=${'domains'} .label=${'Domains'} .placeholder=${'Add domain...'}></dees-input-list>
530
534
  <dees-input-text .key=${'priority'} .label=${'Priority (higher = matched first)'}></dees-input-text>
531
- <dees-input-dropdown .key=${'securityProfileRef'} .label=${'Security Profile'} .options=${profileOptions} .selectedKey=${''}></dees-input-dropdown>
532
- <dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions} .selectedKey=${''}></dees-input-dropdown>
535
+ <dees-input-dropdown .key=${'securityProfileRef'} .label=${'Security Profile'} .options=${profileOptions}></dees-input-dropdown>
536
+ <dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions}></dees-input-dropdown>
533
537
  <dees-input-text .key=${'targetHost'} .label=${'Target Host (if no target selected)'} .value=${'localhost'}></dees-input-text>
534
538
  <dees-input-text .key=${'targetPort'} .label=${'Target Port (if no target selected)'}></dees-input-text>
535
539
  </dees-form>
@@ -575,11 +579,15 @@ export class OpsViewRoutes extends DeesElement {
575
579
 
576
580
  // Build metadata if profile/target selected
577
581
  const metadata: any = {};
578
- if (formData.securityProfileRef) {
579
- metadata.securityProfileRef = formData.securityProfileRef;
582
+ const profileRefValue = formData.securityProfileRef as any;
583
+ const profileKey = typeof profileRefValue === 'string' ? profileRefValue : profileRefValue?.key;
584
+ if (profileKey) {
585
+ metadata.securityProfileRef = profileKey;
580
586
  }
581
- if (formData.networkTargetRef) {
582
- metadata.networkTargetRef = formData.networkTargetRef;
587
+ const targetRefValue = formData.networkTargetRef as any;
588
+ const targetKey = typeof targetRefValue === 'string' ? targetRefValue : targetRefValue?.key;
589
+ if (targetKey) {
590
+ metadata.networkTargetRef = targetKey;
583
591
  }
584
592
 
585
593
  await appstate.routeManagementStatePart.dispatchAction(
package/ts_web/readme.md CHANGED
@@ -131,7 +131,7 @@ The app uses `@push.rocks/smartstate` v2.3+ with multiple state parts, scheduled
131
131
  | State Part | Mode | Description |
132
132
  |-----------|------|-------------|
133
133
  | `loginStatePart` | Persistent (IndexedDB) | JWT identity and login status |
134
- | `statsStatePart` | Soft (memory) | Server, email, DNS, security metrics |
134
+ | `statsStatePart` | Soft (memory) | Server, email, DNS, security, RADIUS, VPN metrics |
135
135
  | `configStatePart` | Soft | Current system configuration |
136
136
  | `uiStatePart` | Soft | Active view, sidebar, auto-refresh, theme |
137
137
  | `logStatePart` | Soft | Recent logs, streaming status, filters |