@serve.zone/dcrouter 13.15.1 → 13.16.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 (46) hide show
  1. package/dist_serve/bundle.js +510 -517
  2. package/dist_ts/00_commitinfo_data.js +1 -1
  3. package/dist_ts/classes.dcrouter.d.ts +3 -6
  4. package/dist_ts/classes.dcrouter.js +39 -53
  5. package/dist_ts/config/classes.reference-resolver.d.ts +8 -8
  6. package/dist_ts/config/classes.reference-resolver.js +6 -6
  7. package/dist_ts/config/classes.route-config-manager.d.ts +13 -13
  8. package/dist_ts/config/classes.route-config-manager.js +117 -144
  9. package/dist_ts/config/classes.target-profile-manager.d.ts +2 -2
  10. package/dist_ts/config/classes.target-profile-manager.js +7 -18
  11. package/dist_ts/db/documents/{classes.stored-route.doc.d.ts → classes.route.doc.d.ts} +6 -3
  12. package/dist_ts/db/documents/{classes.stored-route.doc.js → classes.route.doc.js} +21 -9
  13. package/dist_ts/db/documents/index.d.ts +1 -2
  14. package/dist_ts/db/documents/index.js +2 -3
  15. package/dist_ts/opsserver/handlers/network-target.handler.js +3 -3
  16. package/dist_ts/opsserver/handlers/route-management.handler.js +3 -23
  17. package/dist_ts/opsserver/handlers/source-profile.handler.js +3 -3
  18. package/dist_ts_apiclient/classes.route.d.ts +2 -5
  19. package/dist_ts_apiclient/classes.route.js +13 -42
  20. package/dist_ts_interfaces/data/route-management.d.ts +8 -17
  21. package/dist_ts_interfaces/requests/route-management.d.ts +6 -37
  22. package/dist_ts_migrations/index.js +23 -1
  23. package/dist_ts_oci_container/plugins.d.ts +3 -0
  24. package/dist_ts_oci_container/plugins.js +4 -0
  25. package/dist_ts_web/00_commitinfo_data.js +1 -1
  26. package/dist_ts_web/appstate.d.ts +0 -5
  27. package/dist_ts_web/appstate.js +1 -38
  28. package/dist_ts_web/elements/network/ops-view-routes.js +60 -110
  29. package/package.json +1 -1
  30. package/ts/00_commitinfo_data.ts +1 -1
  31. package/ts/classes.dcrouter.ts +45 -55
  32. package/ts/config/classes.reference-resolver.ts +13 -13
  33. package/ts/config/classes.route-config-manager.ts +128 -146
  34. package/ts/config/classes.target-profile-manager.ts +7 -20
  35. package/ts/db/documents/{classes.stored-route.doc.ts → classes.route.doc.ts} +16 -5
  36. package/ts/db/documents/index.ts +1 -2
  37. package/ts/opsserver/handlers/network-target.handler.ts +2 -2
  38. package/ts/opsserver/handlers/route-management.handler.ts +2 -34
  39. package/ts/opsserver/handlers/source-profile.handler.ts +2 -2
  40. package/ts_apiclient/classes.route.ts +12 -49
  41. package/ts_web/00_commitinfo_data.ts +1 -1
  42. package/ts_web/appstate.ts +0 -52
  43. package/ts_web/elements/network/ops-view-routes.ts +65 -123
  44. package/dist_ts/db/documents/classes.route-override.doc.d.ts +0 -10
  45. package/dist_ts/db/documents/classes.route-override.doc.js +0 -91
  46. package/ts/db/documents/classes.route-override.doc.ts +0 -32
@@ -185,9 +185,9 @@ let OpsViewRoutes = (() => {
185
185
  ];
186
186
  render() {
187
187
  const { mergedRoutes, warnings } = this.routeState;
188
- const hardcodedCount = mergedRoutes.filter((mr) => mr.source === 'hardcoded').length;
189
- const programmaticCount = mergedRoutes.filter((mr) => mr.source === 'programmatic').length;
190
188
  const disabledCount = mergedRoutes.filter((mr) => !mr.enabled).length;
189
+ const configCount = mergedRoutes.filter((mr) => mr.origin !== 'api').length;
190
+ const apiCount = mergedRoutes.filter((mr) => mr.origin === 'api').length;
191
191
  const statsTiles = [
192
192
  {
193
193
  id: 'totalRoutes',
@@ -199,19 +199,19 @@ let OpsViewRoutes = (() => {
199
199
  color: '#3b82f6',
200
200
  },
201
201
  {
202
- id: 'hardcoded',
203
- title: 'Hardcoded',
202
+ id: 'configRoutes',
203
+ title: 'From Config',
204
204
  type: 'number',
205
- value: hardcodedCount,
206
- icon: 'lucide:lock',
207
- description: 'Routes from constructor config',
205
+ value: configCount,
206
+ icon: 'lucide:settings',
207
+ description: 'Seeded from config/email/DNS',
208
208
  color: '#8b5cf6',
209
209
  },
210
210
  {
211
- id: 'programmatic',
212
- title: 'Programmatic',
211
+ id: 'apiRoutes',
212
+ title: 'API Created',
213
213
  type: 'number',
214
- value: programmaticCount,
214
+ value: apiCount,
215
215
  icon: 'lucide:code',
216
216
  description: 'Routes added via API',
217
217
  color: '#0ea5e9',
@@ -229,16 +229,14 @@ let OpsViewRoutes = (() => {
229
229
  // Map merged routes to sz-route-list-view format
230
230
  const szRoutes = mergedRoutes.map((mr) => {
231
231
  const tags = [...(mr.route.tags || [])];
232
- tags.push(mr.source);
232
+ tags.push(mr.origin);
233
233
  if (!mr.enabled)
234
234
  tags.push('disabled');
235
- if (mr.overridden)
236
- tags.push('overridden');
237
235
  return {
238
236
  ...mr.route,
239
237
  enabled: mr.enabled,
240
238
  tags,
241
- id: mr.storedRouteId || mr.route.name || undefined,
239
+ id: mr.id || mr.route.name || undefined,
242
240
  metadata: mr.metadata,
243
241
  };
244
242
  });
@@ -279,7 +277,6 @@ let OpsViewRoutes = (() => {
279
277
  ? html `
280
278
  <sz-route-list-view
281
279
  .routes=${szRoutes}
282
- .showActionsFilter=${(route) => route.tags?.includes('programmatic') ?? false}
283
280
  @route-click=${(e) => this.handleRouteClick(e)}
284
281
  @route-edit=${(e) => this.handleRouteEdit(e)}
285
282
  @route-delete=${(e) => this.handleRouteDelete(e)}
@@ -288,7 +285,7 @@ let OpsViewRoutes = (() => {
288
285
  : html `
289
286
  <div class="empty-state">
290
287
  <p>No routes configured</p>
291
- <p>Add a programmatic route or check your constructor configuration.</p>
288
+ <p>Add a route to get started.</p>
292
289
  </div>
293
290
  `}
294
291
  </div>
@@ -303,104 +300,57 @@ let OpsViewRoutes = (() => {
303
300
  if (!merged)
304
301
  return;
305
302
  const { DeesModal } = await import('@design.estate/dees-catalog');
306
- if (merged.source === 'hardcoded') {
307
- const menuOptions = merged.enabled
308
- ? [
309
- {
310
- name: 'Disable Route',
311
- iconName: 'lucide:pause',
312
- action: async (modalArg) => {
313
- await appstate.routeManagementStatePart.dispatchAction(appstate.setRouteOverrideAction, { routeName: merged.route.name, enabled: false });
314
- await modalArg.destroy();
315
- },
316
- },
317
- {
318
- name: 'Close',
319
- iconName: 'lucide:x',
320
- action: async (modalArg) => await modalArg.destroy(),
321
- },
322
- ]
323
- : [
324
- {
325
- name: 'Enable Route',
326
- iconName: 'lucide:play',
327
- action: async (modalArg) => {
328
- await appstate.routeManagementStatePart.dispatchAction(appstate.setRouteOverrideAction, { routeName: merged.route.name, enabled: true });
329
- await modalArg.destroy();
330
- },
331
- },
332
- {
333
- name: 'Remove Override',
334
- iconName: 'lucide:undo',
335
- action: async (modalArg) => {
336
- await appstate.routeManagementStatePart.dispatchAction(appstate.removeRouteOverrideAction, merged.route.name);
337
- await modalArg.destroy();
338
- },
339
- },
340
- {
341
- name: 'Close',
342
- iconName: 'lucide:x',
343
- action: async (modalArg) => await modalArg.destroy(),
344
- },
345
- ];
346
- await DeesModal.createAndShow({
347
- heading: `Route: ${merged.route.name}`,
348
- content: html `
349
- <div style="color: #ccc; padding: 8px 0;">
350
- <p>Source: <strong style="color: #88f;">hardcoded</strong></p>
351
- <p>Status: <strong>${merged.enabled ? 'Enabled' : 'Disabled (overridden)'}</strong></p>
352
- <p style="color: #888; font-size: 13px;">Hardcoded routes cannot be edited or deleted, but they can be disabled via an override.</p>
353
- </div>
354
- `,
355
- menuOptions,
356
- });
357
- }
358
- else {
359
- // Programmatic route
360
- const meta = merged.metadata;
361
- await DeesModal.createAndShow({
362
- heading: `Route: ${merged.route.name}`,
363
- content: html `
364
- <div style="color: #ccc; padding: 8px 0;">
365
- <p>Source: <strong style="color: #0af;">programmatic</strong></p>
366
- <p>Status: <strong>${merged.enabled ? 'Enabled' : 'Disabled'}</strong></p>
367
- <p>ID: <code style="color: #888;">${merged.storedRouteId}</code></p>
368
- ${meta?.sourceProfileName ? html `<p>Source Profile: <strong style="color: #a78bfa;">${meta.sourceProfileName}</strong></p>` : ''}
369
- ${meta?.networkTargetName ? html `<p>Network Target: <strong style="color: #a78bfa;">${meta.networkTargetName}</strong></p>` : ''}
370
- </div>
371
- `,
372
- menuOptions: [
373
- {
374
- name: merged.enabled ? 'Disable' : 'Enable',
375
- iconName: merged.enabled ? 'lucide:pause' : 'lucide:play',
376
- action: async (modalArg) => {
377
- await appstate.routeManagementStatePart.dispatchAction(appstate.toggleRouteAction, { id: merged.storedRouteId, enabled: !merged.enabled });
378
- await modalArg.destroy();
379
- },
303
+ const meta = merged.metadata;
304
+ await DeesModal.createAndShow({
305
+ heading: `Route: ${merged.route.name}`,
306
+ content: html `
307
+ <div style="color: #ccc; padding: 8px 0;">
308
+ <p>Origin: <strong style="color: #0af;">${merged.origin}</strong></p>
309
+ <p>Status: <strong>${merged.enabled ? 'Enabled' : 'Disabled'}</strong></p>
310
+ <p>ID: <code style="color: #888;">${merged.id}</code></p>
311
+ ${meta?.sourceProfileName ? html `<p>Source Profile: <strong style="color: #a78bfa;">${meta.sourceProfileName}</strong></p>` : ''}
312
+ ${meta?.networkTargetName ? html `<p>Network Target: <strong style="color: #a78bfa;">${meta.networkTargetName}</strong></p>` : ''}
313
+ </div>
314
+ `,
315
+ menuOptions: [
316
+ {
317
+ name: merged.enabled ? 'Disable' : 'Enable',
318
+ iconName: merged.enabled ? 'lucide:pause' : 'lucide:play',
319
+ action: async (modalArg) => {
320
+ await appstate.routeManagementStatePart.dispatchAction(appstate.toggleRouteAction, { id: merged.id, enabled: !merged.enabled });
321
+ await modalArg.destroy();
380
322
  },
381
- {
382
- name: 'Delete',
383
- iconName: 'lucide:trash-2',
384
- action: async (modalArg) => {
385
- await appstate.routeManagementStatePart.dispatchAction(appstate.deleteRouteAction, merged.storedRouteId);
386
- await modalArg.destroy();
387
- },
323
+ },
324
+ {
325
+ name: 'Edit',
326
+ iconName: 'lucide:pencil',
327
+ action: async (modalArg) => {
328
+ await modalArg.destroy();
329
+ this.showEditRouteDialog(merged);
388
330
  },
389
- {
390
- name: 'Close',
391
- iconName: 'lucide:x',
392
- action: async (modalArg) => await modalArg.destroy(),
331
+ },
332
+ {
333
+ name: 'Delete',
334
+ iconName: 'lucide:trash-2',
335
+ action: async (modalArg) => {
336
+ await appstate.routeManagementStatePart.dispatchAction(appstate.deleteRouteAction, merged.id);
337
+ await modalArg.destroy();
393
338
  },
394
- ],
395
- });
396
- }
339
+ },
340
+ {
341
+ name: 'Close',
342
+ iconName: 'lucide:x',
343
+ action: async (modalArg) => await modalArg.destroy(),
344
+ },
345
+ ],
346
+ });
397
347
  }
398
348
  async handleRouteEdit(e) {
399
349
  const clickedRoute = e.detail;
400
350
  if (!clickedRoute)
401
351
  return;
402
352
  const merged = this.routeState.mergedRoutes.find((mr) => mr.route.name === clickedRoute.name);
403
- if (!merged || !merged.storedRouteId)
353
+ if (!merged)
404
354
  return;
405
355
  this.showEditRouteDialog(merged);
406
356
  }
@@ -409,7 +359,7 @@ let OpsViewRoutes = (() => {
409
359
  if (!clickedRoute)
410
360
  return;
411
361
  const merged = this.routeState.mergedRoutes.find((mr) => mr.route.name === clickedRoute.name);
412
- if (!merged || !merged.storedRouteId)
362
+ if (!merged)
413
363
  return;
414
364
  const { DeesModal } = await import('@design.estate/dees-catalog');
415
365
  await DeesModal.createAndShow({
@@ -429,7 +379,7 @@ let OpsViewRoutes = (() => {
429
379
  name: 'Delete',
430
380
  iconName: 'lucide:trash-2',
431
381
  action: async (modalArg) => {
432
- await appstate.routeManagementStatePart.dispatchAction(appstate.deleteRouteAction, merged.storedRouteId);
382
+ await appstate.routeManagementStatePart.dispatchAction(appstate.deleteRouteAction, merged.id);
433
383
  await modalArg.destroy();
434
384
  },
435
385
  },
@@ -568,7 +518,7 @@ let OpsViewRoutes = (() => {
568
518
  metadata.networkTargetRef = targetKey;
569
519
  }
570
520
  await appstate.routeManagementStatePart.dispatchAction(appstate.updateRouteAction, {
571
- id: merged.storedRouteId,
521
+ id: merged.id,
572
522
  route: updatedRoute,
573
523
  metadata: Object.keys(metadata).length > 0 ? metadata : undefined,
574
524
  });
@@ -604,7 +554,7 @@ let OpsViewRoutes = (() => {
604
554
  })),
605
555
  ];
606
556
  const createModal = await DeesModal.createAndShow({
607
- heading: 'Add Programmatic Route',
557
+ heading: 'Add Route',
608
558
  content: html `
609
559
  <dees-form>
610
560
  <dees-input-text .key=${'name'} .label=${'Route Name'} .required=${true}></dees-input-text>
@@ -721,4 +671,4 @@ let OpsViewRoutes = (() => {
721
671
  return OpsViewRoutes = _classThis;
722
672
  })();
723
673
  export { OpsViewRoutes };
724
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-routes.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-routes.ts"],"names":[],"mappings":"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"}
674
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-routes.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/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": "13.15.1",
4
+ "version": "13.16.1",
5
5
  "description": "A multifaceted routing service handling mail and SMS delivery functions.",
6
6
  "type": "module",
7
7
  "exports": {
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '13.15.1',
6
+ version: '13.16.1',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
@@ -312,8 +312,10 @@ export class DcRouter {
312
312
  // TypedRouter for API endpoints
313
313
  public typedrouter = new plugins.typedrequest.TypedRouter();
314
314
 
315
- // Cached constructor routes (computed once during setupSmartProxy, used by RouteConfigManager)
316
- private constructorRoutes: plugins.smartproxy.IRouteConfig[] = [];
315
+ // Seed routes assembled during setupSmartProxy, passed to RouteConfigManager for DB seeding
316
+ private seedConfigRoutes: plugins.smartproxy.IRouteConfig[] = [];
317
+ private seedEmailRoutes: plugins.smartproxy.IRouteConfig[] = [];
318
+ private seedDnsRoutes: plugins.smartproxy.IRouteConfig[] = [];
317
319
 
318
320
  // Environment access
319
321
  private qenv = new plugins.qenv.Qenv('./', '.nogit/');
@@ -549,7 +551,6 @@ export class DcRouter {
549
551
  await this.targetProfileManager.initialize();
550
552
 
551
553
  this.routeConfigManager = new RouteConfigManager(
552
- () => this.getConstructorRoutes(),
553
554
  () => this.smartProxy,
554
555
  () => this.options.http3,
555
556
  this.options.vpnConfig?.enabled
@@ -564,7 +565,7 @@ export class DcRouter {
564
565
  }
565
566
  : undefined,
566
567
  this.referenceResolver,
567
- // Sync merged routes to RemoteIngressManager whenever routes change,
568
+ // Sync routes to RemoteIngressManager whenever routes change,
568
569
  // then push updated derived ports to the Rust hub binary
569
570
  (routes) => {
570
571
  if (this.remoteIngressManager) {
@@ -577,7 +578,11 @@ export class DcRouter {
577
578
  );
578
579
  this.apiTokenManager = new ApiTokenManager();
579
580
  await this.apiTokenManager.initialize();
580
- await this.routeConfigManager.initialize();
581
+ await this.routeConfigManager.initialize(
582
+ this.seedConfigRoutes as import('../ts_interfaces/data/remoteingress.js').IDcRouterRouteConfig[],
583
+ this.seedEmailRoutes as import('../ts_interfaces/data/remoteingress.js').IDcRouterRouteConfig[],
584
+ this.seedDnsRoutes as import('../ts_interfaces/data/remoteingress.js').IDcRouterRouteConfig[],
585
+ );
581
586
 
582
587
  // Seed default profiles/targets if DB is empty and seeding is enabled
583
588
  const seeder = new DbSeeder(this.referenceResolver);
@@ -881,31 +886,30 @@ export class DcRouter {
881
886
  this.smartProxy = undefined;
882
887
  }
883
888
 
884
- let routes: plugins.smartproxy.IRouteConfig[] = [];
885
-
886
- // If user provides full SmartProxy config, use its routes.
887
- // NOTE: `smartProxyConfig.acme` is now seed-only — consumed by
888
- // AcmeConfigManager on first boot. The live ACME config always comes
889
- // from the DB via `this.acmeConfigManager.getConfig()`.
890
- if (this.options.smartProxyConfig) {
891
- routes = this.options.smartProxyConfig.routes || [];
892
- logger.log('info', `Found ${routes.length} routes in config`);
893
- }
889
+ // Assemble seed routes from constructor config — these will be seeded into DB
890
+ // by RouteConfigManager.initialize() when the ConfigManagers service starts.
891
+ this.seedConfigRoutes = (this.options.smartProxyConfig?.routes || []) as plugins.smartproxy.IRouteConfig[];
892
+ logger.log('info', `Found ${this.seedConfigRoutes.length} routes in config`);
894
893
 
895
- // If email config exists, automatically add email routes
894
+ this.seedEmailRoutes = [];
896
895
  if (this.options.emailConfig) {
897
- const emailRoutes = this.generateEmailRoutes(this.options.emailConfig);
898
- logger.log('debug', 'Email routes generated', { routes: JSON.stringify(emailRoutes) });
899
- routes = [...routes, ...emailRoutes]; // Enable email routing through SmartProxy
896
+ this.seedEmailRoutes = this.generateEmailRoutes(this.options.emailConfig);
897
+ logger.log('debug', 'Email routes generated', { routes: JSON.stringify(this.seedEmailRoutes) });
900
898
  }
901
899
 
902
- // If DNS is configured, add DNS routes
900
+ this.seedDnsRoutes = [];
903
901
  if (this.options.dnsNsDomains && this.options.dnsNsDomains.length > 0) {
904
- const dnsRoutes = this.generateDnsRoutes();
905
- logger.log('debug', `DNS routes for nameservers ${this.options.dnsNsDomains.join(', ')}`, { routes: JSON.stringify(dnsRoutes) });
906
- routes = [...routes, ...dnsRoutes];
902
+ this.seedDnsRoutes = this.generateDnsRoutes();
903
+ logger.log('debug', `DNS routes for nameservers ${this.options.dnsNsDomains.join(', ')}`, { routes: JSON.stringify(this.seedDnsRoutes) });
907
904
  }
908
905
 
906
+ // Combined routes for SmartProxy bootstrap (before DB routes are loaded)
907
+ let routes: plugins.smartproxy.IRouteConfig[] = [
908
+ ...this.seedConfigRoutes,
909
+ ...this.seedEmailRoutes,
910
+ ...this.seedDnsRoutes,
911
+ ];
912
+
909
913
  // Build the ACME options for SmartProxy from the DB-backed AcmeConfigManager.
910
914
  // If no config exists or it's disabled, SmartProxy's own ACME is turned off
911
915
  // and dcrouter's SmartAcme / certProvisionFunction are not wired.
@@ -952,10 +956,6 @@ export class DcRouter {
952
956
  logger.log('info', 'HTTP/3: Augmented qualifying HTTPS routes with QUIC/H3 configuration');
953
957
  }
954
958
 
955
- // Cache constructor routes for RouteConfigManager (without VPN security baked in —
956
- // applyRoutes() injects VPN security dynamically so it stays current with client changes)
957
- this.constructorRoutes = [...routes];
958
-
959
959
  // If we have routes or need a basic SmartProxy instance, create it
960
960
  if (routes.length > 0 || this.options.smartProxyConfig) {
961
961
  logger.log('info', 'Setting up SmartProxy with combined configuration');
@@ -1406,14 +1406,6 @@ export class DcRouter {
1406
1406
  return names;
1407
1407
  }
1408
1408
 
1409
- /**
1410
- * Get the routes derived from constructor config (smartProxy + email + DNS).
1411
- * Used by RouteConfigManager as the "hardcoded" base.
1412
- */
1413
- public getConstructorRoutes(): plugins.smartproxy.IRouteConfig[] {
1414
- return this.constructorRoutes;
1415
- }
1416
-
1417
1409
  public async stop() {
1418
1410
  logger.log('info', 'Stopping DcRouter services...');
1419
1411
 
@@ -1457,17 +1449,16 @@ export class DcRouter {
1457
1449
  // Update configuration
1458
1450
  this.options.smartProxyConfig = config;
1459
1451
 
1460
- // Update routes on RemoteIngressManager so derived ports stay in sync
1461
- if (this.remoteIngressManager && config.routes) {
1462
- this.remoteIngressManager.setRoutes(config.routes as any[]);
1463
- }
1464
-
1465
- // Start new SmartProxy with updated configuration (will include email routes if configured)
1452
+ // Start new SmartProxy with updated configuration (rebuilds seed routes)
1466
1453
  await this.setupSmartProxy();
1467
1454
 
1468
- // Re-apply programmatic routes and overrides after SmartProxy restart
1455
+ // Re-seed and re-apply all routes after SmartProxy restart
1469
1456
  if (this.routeConfigManager) {
1470
- await this.routeConfigManager.initialize();
1457
+ await this.routeConfigManager.initialize(
1458
+ this.seedConfigRoutes as import('../ts_interfaces/data/remoteingress.js').IDcRouterRouteConfig[],
1459
+ this.seedEmailRoutes as import('../ts_interfaces/data/remoteingress.js').IDcRouterRouteConfig[],
1460
+ this.seedDnsRoutes as import('../ts_interfaces/data/remoteingress.js').IDcRouterRouteConfig[],
1461
+ );
1471
1462
  }
1472
1463
 
1473
1464
  logger.log('info', 'SmartProxy configuration updated');
@@ -2185,13 +2176,14 @@ export class DcRouter {
2185
2176
  this.remoteIngressManager = new RemoteIngressManager();
2186
2177
  await this.remoteIngressManager.initialize();
2187
2178
 
2188
- // Pass current routes so the manager can derive edge ports from remoteIngress-tagged routes
2189
- const currentRoutes = this.constructorRoutes;
2190
- this.remoteIngressManager.setRoutes(currentRoutes as any[]);
2179
+ // Pass current bootstrap routes so the manager can derive edge ports initially.
2180
+ // Once RouteConfigManager applies the full DB set, the onRoutesApplied callback
2181
+ // will push the complete merged routes here.
2182
+ const bootstrapRoutes = [...this.seedConfigRoutes, ...this.seedEmailRoutes, ...this.seedDnsRoutes];
2183
+ this.remoteIngressManager.setRoutes(bootstrapRoutes as any[]);
2191
2184
 
2192
- // Race-condition fix: if ConfigManagers finished before us, re-apply routes
2193
- // so the callback delivers the full merged set (including DB-stored routes)
2194
- // to our newly-created remoteIngressManager.
2185
+ // If ConfigManagers finished before us, re-apply routes
2186
+ // so the callback delivers the full DB set to our newly-created remoteIngressManager.
2195
2187
  if (this.routeConfigManager) {
2196
2188
  await this.routeConfigManager.applyRoutes();
2197
2189
  }
@@ -2278,11 +2270,10 @@ export class DcRouter {
2278
2270
 
2279
2271
  if (!this.targetProfileManager) return [...ips];
2280
2272
 
2281
- const routes = (this.options.smartProxyConfig?.routes || []) as import('../ts_interfaces/data/remoteingress.js').IDcRouterRouteConfig[];
2282
- const storedRoutes = this.routeConfigManager?.getStoredRoutes() || new Map();
2273
+ const allRoutes = this.routeConfigManager?.getRoutes() || new Map();
2283
2274
 
2284
2275
  const { domains, targetIps } = this.targetProfileManager.getClientAccessSpec(
2285
- targetProfileIds, routes, storedRoutes,
2276
+ targetProfileIds, allRoutes,
2286
2277
  );
2287
2278
 
2288
2279
  // Add target IPs directly
@@ -2305,9 +2296,8 @@ export class DcRouter {
2305
2296
 
2306
2297
  await this.vpnManager.start();
2307
2298
 
2308
- // Re-apply routes now that VPN clients are loaded — ensures hardcoded routes
2309
- // get correct profile-based ipAllowLists (not possible during setupSmartProxy since
2310
- // VPN server wasn't ready yet)
2299
+ // Re-apply routes now that VPN clients are loaded — ensures vpnOnly routes
2300
+ // get correct profile-based ipAllowLists
2311
2301
  await this.routeConfigManager?.applyRoutes();
2312
2302
  }
2313
2303