@serve.zone/dcrouter 13.28.0 → 13.30.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.
Files changed (39) hide show
  1. package/.smartconfig.json +32 -10
  2. package/dist_serve/bundle.js +609 -592
  3. package/dist_ts/00_commitinfo_data.js +1 -1
  4. package/dist_ts/classes.dcrouter.d.ts +7 -0
  5. package/dist_ts/classes.dcrouter.js +12 -2
  6. package/dist_ts/config/classes.route-config-manager.js +8 -7
  7. package/dist_ts/opsserver/classes.opsserver.js +4 -1
  8. package/dist_ts/opsserver/handlers/admin.handler.d.ts +21 -6
  9. package/dist_ts/opsserver/handlers/admin.handler.js +188 -29
  10. package/dist_ts/opsserver/handlers/target-profile.handler.js +3 -1
  11. package/dist_ts/opsserver/handlers/users.handler.js +2 -2
  12. package/dist_ts/plugins.d.ts +2 -0
  13. package/dist_ts/plugins.js +4 -1
  14. package/dist_ts/vpn/classes.vpn-manager.d.ts +2 -0
  15. package/dist_ts/vpn/classes.vpn-manager.js +41 -20
  16. package/dist_ts_interfaces/requests/admin.d.ts +38 -0
  17. package/dist_ts_interfaces/requests/users.d.ts +2 -5
  18. package/dist_ts_web/00_commitinfo_data.js +1 -1
  19. package/dist_ts_web/appstate.d.ts +17 -0
  20. package/dist_ts_web/appstate.js +27 -1
  21. package/dist_ts_web/elements/ops-dashboard.d.ts +4 -0
  22. package/dist_ts_web/elements/ops-dashboard.js +100 -3
  23. package/package.json +27 -34
  24. package/readme.md +15 -3
  25. package/ts/00_commitinfo_data.ts +1 -1
  26. package/ts/classes.dcrouter.ts +20 -1
  27. package/ts/config/classes.route-config-manager.ts +8 -6
  28. package/ts/opsserver/classes.opsserver.ts +3 -0
  29. package/ts/opsserver/handlers/admin.handler.ts +244 -32
  30. package/ts/opsserver/handlers/target-profile.handler.ts +2 -0
  31. package/ts/opsserver/handlers/users.handler.ts +1 -1
  32. package/ts/plugins.ts +7 -0
  33. package/ts/readme.md +1 -1
  34. package/ts/vpn/classes.vpn-manager.ts +56 -25
  35. package/ts_apiclient/readme.md +4 -4
  36. package/ts_web/00_commitinfo_data.ts +1 -1
  37. package/ts_web/appstate.ts +49 -0
  38. package/ts_web/elements/ops-dashboard.ts +100 -0
  39. package/ts_web/readme.md +5 -3
@@ -102,14 +102,16 @@ let OpsDashboard = (() => {
102
102
  });
103
103
  get loginState() { return this.#loginState_accessor_storage; }
104
104
  set loginState(value) { this.#loginState_accessor_storage = value; }
105
- #uiState_accessor_storage = (__runInitializers(this, _loginState_extraInitializers), __runInitializers(this, _uiState_initializers, {
105
+ bootstrapStepper = __runInitializers(this, _loginState_extraInitializers);
106
+ bootstrapCheckPromise;
107
+ #uiState_accessor_storage = __runInitializers(this, _uiState_initializers, {
106
108
  activeView: 'overview',
107
109
  activeSubview: null,
108
110
  sidebarCollapsed: false,
109
111
  autoRefresh: true,
110
112
  refreshInterval: 1000,
111
113
  theme: 'light',
112
- }));
114
+ });
113
115
  get uiState() { return this.#uiState_accessor_storage; }
114
116
  set uiState(value) { this.#uiState_accessor_storage = value; }
115
117
  #configState_accessor_storage = (__runInitializers(this, _uiState_extraInitializers), __runInitializers(this, _configState_initializers, {
@@ -356,6 +358,7 @@ let OpsDashboard = (() => {
356
358
  await simpleLogin.switchToSlottedContent();
357
359
  await appstate.statsStatePart.dispatchAction(appstate.fetchAllStatsAction, null);
358
360
  await appstate.configStatePart.dispatchAction(appstate.fetchConfigurationAction, null);
361
+ await this.ensureAdminBootstrap();
359
362
  }
360
363
  else {
361
364
  // Server rejected the JWT — clear state, show login
@@ -390,6 +393,7 @@ let OpsDashboard = (() => {
390
393
  await simpleLogin.switchToSlottedContent();
391
394
  await appstate.statsStatePart.dispatchAction(appstate.fetchAllStatsAction, null);
392
395
  await appstate.configStatePart.dispatchAction(appstate.fetchConfigurationAction, null);
396
+ await this.ensureAdminBootstrap();
393
397
  }
394
398
  else {
395
399
  form.setStatus('error', 'Login failed!');
@@ -397,6 +401,99 @@ let OpsDashboard = (() => {
397
401
  form.reset();
398
402
  }
399
403
  }
404
+ async ensureAdminBootstrap() {
405
+ if (!this.loginState.identity || this.bootstrapStepper?.isConnected) {
406
+ return;
407
+ }
408
+ if (this.bootstrapCheckPromise) {
409
+ return this.bootstrapCheckPromise;
410
+ }
411
+ this.bootstrapCheckPromise = (async () => {
412
+ try {
413
+ const status = await appstate.getAdminBootstrapStatus();
414
+ if (status.needsBootstrap) {
415
+ await this.showAdminBootstrapStepper(status);
416
+ }
417
+ }
418
+ catch (error) {
419
+ console.error('Admin bootstrap status check failed:', error);
420
+ }
421
+ finally {
422
+ this.bootstrapCheckPromise = undefined;
423
+ }
424
+ })();
425
+ return this.bootstrapCheckPromise;
426
+ }
427
+ async showAdminBootstrapStepper(statusArg) {
428
+ const { DeesStepper } = await import('@design.estate/dees-catalog');
429
+ this.bootstrapStepper = await DeesStepper.createAndShow({
430
+ cancelable: false,
431
+ steps: [
432
+ {
433
+ title: 'Create Persisted Admin',
434
+ content: html `
435
+ <div style="display: grid; gap: 16px; color: var(--dees-color-text-secondary); font-size: 14px; line-height: 1.5;">
436
+ <p style="margin: 0;">
437
+ This router is currently using the temporary bootstrap admin. Create the first persisted admin account to continue.
438
+ </p>
439
+ <dees-form>
440
+ <dees-input-text .key=${'email'} .label=${'Admin email'} .required=${true}></dees-input-text>
441
+ <dees-input-text .key=${'name'} .label=${'Display name'}></dees-input-text>
442
+ <dees-input-text .key=${'password'} .label=${'Password'} .required=${true} .isPasswordBool=${true}></dees-input-text>
443
+ <dees-input-text .key=${'passwordConfirm'} .label=${'Confirm password'} .required=${true} .isPasswordBool=${true}></dees-input-text>
444
+ <dees-input-checkbox
445
+ .key=${'enableIdpGlobalAuth'}
446
+ .label=${'Allow idp.global login for this email'}
447
+ .description=${statusArg.idpGlobalConfigured
448
+ ? 'The local account remains authoritative; idp.global only verifies identity.'
449
+ : 'Requires DCROUTER_IDP_GLOBAL_URL before idp.global logins can work.'}
450
+ ></dees-input-checkbox>
451
+ </dees-form>
452
+ </div>
453
+ `,
454
+ menuOptions: [
455
+ {
456
+ name: 'Create admin',
457
+ action: async (stepperArg) => {
458
+ const form = stepperArg.shadowRoot?.querySelector('.selected dees-form');
459
+ if (!form)
460
+ return;
461
+ const formData = await form.collectFormData();
462
+ const email = String(formData.email || '').trim();
463
+ const name = String(formData.name || '').trim();
464
+ const password = String(formData.password || '');
465
+ const passwordConfirm = String(formData.passwordConfirm || '');
466
+ if (!email || !password) {
467
+ form.setStatus?.('error', 'Email and password are required.');
468
+ return;
469
+ }
470
+ if (password !== passwordConfirm) {
471
+ form.setStatus?.('error', 'Passwords do not match.');
472
+ return;
473
+ }
474
+ try {
475
+ form.setStatus?.('pending', 'Creating persisted admin...');
476
+ await appstate.createInitialAdminUser({
477
+ email,
478
+ name,
479
+ password,
480
+ enableIdpGlobalAuth: Boolean(formData.enableIdpGlobalAuth),
481
+ });
482
+ form.setStatus?.('success', 'Persisted admin created.');
483
+ await stepperArg.destroy();
484
+ this.bootstrapStepper = undefined;
485
+ await appstate.usersStatePart.dispatchAction(appstate.fetchUsersAction, null);
486
+ }
487
+ catch (error) {
488
+ form.setStatus?.('error', error instanceof Error ? error.message : 'Failed to create admin.');
489
+ }
490
+ },
491
+ },
492
+ ],
493
+ },
494
+ ],
495
+ });
496
+ }
400
497
  static {
401
498
  __runInitializers(_classThis, _classExtraInitializers);
402
499
  }
@@ -404,4 +501,4 @@ let OpsDashboard = (() => {
404
501
  return OpsDashboard = _classThis;
405
502
  })();
406
503
  export { OpsDashboard };
407
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-dashboard.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-dashboard.ts"],"names":[],"mappings":"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"}
504
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-dashboard.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-dashboard.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.28.0",
4
+ "version": "13.30.0",
5
5
  "description": "A multifaceted routing service handling mail and SMS delivery functions.",
6
6
  "type": "module",
7
7
  "exports": {
@@ -11,33 +11,24 @@
11
11
  },
12
12
  "author": "Task Venture Capital GmbH",
13
13
  "license": "MIT",
14
- "scripts": {
15
- "test": "(tstest test/ --verbose --logfile --timeout 60)",
16
- "start": "(node ./cli.js)",
17
- "startTs": "(node cli.ts.js)",
18
- "build": "(tsbuild tsfolders --allowimplicitany && npm run bundle)",
19
- "build:docker": "tsdocker build --verbose",
20
- "release:docker": "tsdocker push --verbose",
21
- "bundle": "(tsbundle)",
22
- "watch": "tswatch"
23
- },
24
14
  "devDependencies": {
25
- "@git.zone/tsbuild": "^4.4.0",
26
- "@git.zone/tsbundle": "^2.10.1",
27
- "@git.zone/tsdocker": "^2.2.5",
28
- "@git.zone/tsrun": "^2.0.3",
29
- "@git.zone/tstest": "^3.6.3",
30
- "@git.zone/tswatch": "^3.3.3",
31
- "@types/node": "^25.6.1"
15
+ "@git.zone/tsbuild": "^4.4.1",
16
+ "@git.zone/tsbundle": "^2.10.4",
17
+ "@git.zone/tsdocker": "^2.3.0",
18
+ "@git.zone/tsrun": "^2.0.4",
19
+ "@git.zone/tstest": "^3.6.6",
20
+ "@git.zone/tswatch": "^3.3.5",
21
+ "@types/node": "^25.9.0"
32
22
  },
33
23
  "dependencies": {
34
- "@api.global/typedrequest": "^3.3.0",
24
+ "@api.global/typedrequest": "^3.3.1",
35
25
  "@api.global/typedrequest-interfaces": "^3.0.19",
36
26
  "@api.global/typedserver": "^8.4.6",
37
- "@api.global/typedsocket": "^4.1.2",
27
+ "@api.global/typedsocket": "^4.1.3",
38
28
  "@apiclient.xyz/cloudflare": "^7.1.0",
39
29
  "@design.estate/dees-catalog": "^3.81.0",
40
30
  "@design.estate/dees-element": "^2.2.4",
31
+ "@idp.global/sdk": "^1.3.0",
41
32
  "@push.rocks/lik": "^6.4.1",
42
33
  "@push.rocks/projectinfo": "^5.1.0",
43
34
  "@push.rocks/qenv": "^6.1.4",
@@ -55,20 +46,20 @@
55
46
  "@push.rocks/smartnetwork": "^4.7.1",
56
47
  "@push.rocks/smartpath": "^6.0.0",
57
48
  "@push.rocks/smartpromise": "^4.2.4",
58
- "@push.rocks/smartproxy": "^27.10.0",
49
+ "@push.rocks/smartproxy": "^27.10.2",
59
50
  "@push.rocks/smartradius": "^1.1.2",
60
51
  "@push.rocks/smartrequest": "^5.0.3",
61
52
  "@push.rocks/smartrx": "^3.0.10",
62
53
  "@push.rocks/smartstate": "^2.3.1",
63
54
  "@push.rocks/smartunique": "^3.0.9",
64
- "@push.rocks/smartvpn": "1.19.2",
55
+ "@push.rocks/smartvpn": "1.19.4",
65
56
  "@push.rocks/taskbuffer": "^8.0.2",
66
57
  "@serve.zone/catalog": "^2.12.4",
67
- "@serve.zone/interfaces": "^5.5.0",
58
+ "@serve.zone/interfaces": "^5.8.0",
68
59
  "@serve.zone/remoteingress": "^4.17.1",
69
60
  "@tsclass/tsclass": "^9.5.1",
70
61
  "@types/qrcode": "^1.5.6",
71
- "lru-cache": "^11.3.6",
62
+ "lru-cache": "^11.4.0",
72
63
  "qrcode": "^1.5.4",
73
64
  "uuid": "^14.0.0"
74
65
  },
@@ -98,14 +89,6 @@
98
89
  "VLAN assignment",
99
90
  "MAC authentication"
100
91
  ],
101
- "pnpm": {
102
- "onlyBuiltDependencies": [
103
- "esbuild",
104
- "mongodb-memory-server",
105
- "puppeteer"
106
- ]
107
- },
108
- "packageManager": "pnpm@10.11.0",
109
92
  "files": [
110
93
  "ts/**/*",
111
94
  "ts_web/**/*",
@@ -119,5 +102,15 @@
119
102
  "cli.js",
120
103
  ".smartconfig.json",
121
104
  "readme.md"
122
- ]
123
- }
105
+ ],
106
+ "scripts": {
107
+ "test": "(tstest test/ --verbose --logfile --timeout 60)",
108
+ "start": "(node ./cli.js)",
109
+ "startTs": "(node cli.ts.js)",
110
+ "build": "(tsbuild tsfolders --allowimplicitany && npm run bundle)",
111
+ "build:docker": "tsdocker build --verbose",
112
+ "release:docker": "tsdocker push --verbose",
113
+ "bundle": "(tsbundle)",
114
+ "watch": "tswatch"
115
+ }
116
+ }
package/readme.md CHANGED
@@ -73,10 +73,22 @@ await router.start();
73
73
  After startup:
74
74
 
75
75
  - open the dashboard at `http://localhost:3000`
76
- - log in with the current built-in development credentials `admin` / `admin`
76
+ - complete the first-admin bootstrap flow if no persisted admin account exists yet
77
77
  - send proxied traffic to `http://localhost:18080`
78
78
  - stop gracefully with `await router.stop()`
79
79
 
80
+ ## Initial Admin Bootstrap
81
+
82
+ When DB-backed persistence is enabled and no persisted admin exists, dcrouter does not auto-create an admin account. The Ops dashboard exposes a non-cancelable first-admin bootstrap flow that must be completed explicitly.
83
+
84
+ Bootstrap behavior:
85
+
86
+ - `getAdminBootstrapStatus` reports whether persistence is ready and whether a first admin is required.
87
+ - The temporary env/config admin identity is only used to authorize bootstrap access while no persisted admin exists.
88
+ - `createInitialAdminUser` creates the first persisted admin with normalized email and local password authentication.
89
+ - Optional `idp.global` authentication can be enabled for that local account; the local dcrouter role remains authoritative and the IdP email must match the local account email.
90
+ - After a persisted admin exists, temporary bootstrap admin login is rejected and normal persisted-account authentication is used.
91
+
80
92
  ## Configuration Model
81
93
 
82
94
  `DcRouter` is configured with `IDcRouterOptions` from `@serve.zone/dcrouter`.
@@ -199,7 +211,7 @@ const client = new DcRouterApiClient({
199
211
  baseUrl: 'https://dcrouter.example.com',
200
212
  });
201
213
 
202
- await client.login('admin', 'admin');
214
+ await client.login('admin@example.com', 'strong-password');
203
215
 
204
216
  const route = await client.routes.build()
205
217
  .setName('api-gateway')
@@ -279,7 +291,7 @@ Use of these trademarks must comply with Task Venture Capital GmbH's Trademark G
279
291
 
280
292
  ### Company Information
281
293
 
282
- Task Venture Capital GmbH
294
+ Task Venture Capital GmbH
283
295
  Registered at District Court Bremen HRB 35230 HB, Germany
284
296
 
285
297
  For any legal inquiries or further information, please contact us via email at hello@task.vc.
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '13.28.0',
6
+ version: '13.30.0',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
@@ -167,6 +167,14 @@ export interface IDcRouterOptions {
167
167
  /** Port for the OpsServer web UI (default: 3000) */
168
168
  opsServerPort?: number;
169
169
 
170
+ /** Optional OpsServer account authentication settings. */
171
+ adminAuth?: {
172
+ /** Base URL for idp.global password authentication. Can also be set through DCROUTER_IDP_GLOBAL_URL. */
173
+ idpGlobalUrl?: string;
174
+ /** Test/integration hook for injecting an idp.global-compatible password client. */
175
+ idpClient?: Pick<plugins.idpSdkServer.IdpGlobalServerClient, 'loginWithEmailAndPassword' | 'stop'>;
176
+ };
177
+
170
178
  remoteIngressConfig?: {
171
179
  /** Enable remote ingress hub (default: false) */
172
180
  enabled?: boolean;
@@ -740,10 +748,14 @@ export class DcRouter {
740
748
 
741
749
  // VPN Server: optional, depends on SmartProxy
742
750
  if (this.options.vpnConfig?.enabled) {
751
+ const vpnServiceDeps = ['SmartProxy'];
752
+ if (this.options.dbConfig?.enabled !== false) {
753
+ vpnServiceDeps.push('ConfigManagers');
754
+ }
743
755
  this.serviceManager.addService(
744
756
  new plugins.taskbuffer.Service('VpnServer')
745
757
  .optional()
746
- .dependsOn('SmartProxy')
758
+ .dependsOn(...vpnServiceDeps)
747
759
  .withStart(async () => {
748
760
  await this.setupVpnServer();
749
761
  })
@@ -2418,6 +2430,13 @@ export class DcRouter {
2418
2430
  return;
2419
2431
  }
2420
2432
 
2433
+ if (this.options.dbConfig?.enabled === false) {
2434
+ throw new Error('VPN requires dbConfig.enabled because clients, keys, routes, and target profiles are persisted in DcRouterDb');
2435
+ }
2436
+ if (!this.routeConfigManager || !this.targetProfileManager) {
2437
+ throw new Error('VPN requires initialized route and target profile managers');
2438
+ }
2439
+
2421
2440
  logger.log('info', 'Setting up VPN server...');
2422
2441
 
2423
2442
  this.vpnManager = new VpnManager({
@@ -607,19 +607,21 @@ export class RouteConfigManager {
607
607
  route: plugins.smartproxy.IRouteConfig,
608
608
  routeId?: string,
609
609
  ): plugins.smartproxy.IRouteConfig {
610
- const vpnCallback = this.getVpnClientIpsForRoute;
611
- if (!vpnCallback) return route;
612
-
613
610
  const dcRoute = route as IDcRouterRouteConfig;
614
611
  if (!dcRoute.vpnOnly) return route;
615
612
 
616
- const vpnEntries = vpnCallback(dcRoute, routeId);
617
- const existingEntries = route.security?.ipAllowList || [];
613
+ const vpnEntries = this.getVpnClientIpsForRoute?.(dcRoute, routeId) || [];
614
+ const existingBlockList = route.security?.ipBlockList || [];
615
+ const ipBlockList = vpnEntries.length
616
+ ? existingBlockList
617
+ : [...new Set([...existingBlockList, '*'])];
618
+
618
619
  return {
619
620
  ...route,
620
621
  security: {
621
622
  ...route.security,
622
- ipAllowList: [...existingEntries, ...vpnEntries],
623
+ ipAllowList: vpnEntries,
624
+ ipBlockList,
623
625
  },
624
626
  };
625
627
  }
@@ -113,6 +113,9 @@ export class OpsServer {
113
113
  }
114
114
 
115
115
  public async stop() {
116
+ if (this.adminHandler) {
117
+ await this.adminHandler.stop();
118
+ }
116
119
  // Clean up log handler streams and push destination before stopping the server
117
120
  if (this.logsHandler) {
118
121
  this.logsHandler.cleanup();