@serve.zone/dcrouter 12.2.1 → 12.2.4

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 (19) hide show
  1. package/dist_serve/bundle.js +802 -744
  2. package/dist_ts/00_commitinfo_data.js +1 -1
  3. package/dist_ts/classes.dcrouter.js +14 -2
  4. package/dist_ts/config/classes.route-config-manager.d.ts +2 -1
  5. package/dist_ts/config/classes.route-config-manager.js +8 -2
  6. package/dist_ts_web/00_commitinfo_data.js +1 -1
  7. package/dist_ts_web/appstate.d.ts +1 -0
  8. package/dist_ts_web/appstate.js +4 -1
  9. package/dist_ts_web/elements/ops-view-routes.d.ts +1 -0
  10. package/dist_ts_web/elements/ops-view-routes.js +61 -6
  11. package/dist_ts_web/elements/ops-view-securityprofiles.js +11 -19
  12. package/package.json +4 -4
  13. package/ts/00_commitinfo_data.ts +1 -1
  14. package/ts/classes.dcrouter.ts +13 -0
  15. package/ts/config/classes.route-config-manager.ts +7 -0
  16. package/ts_web/00_commitinfo_data.ts +1 -1
  17. package/ts_web/appstate.ts +4 -0
  18. package/ts_web/elements/ops-view-routes.ts +56 -4
  19. package/ts_web/elements/ops-view-securityprofiles.ts +10 -18
package/dist_ts_web/elements/ops-view-securityprofiles.js CHANGED
@@ -162,8 +162,8 @@ let OpsViewSecurityProfiles = (() => {
162
162
  <dees-form>
163
163
  <dees-input-text .key=${'name'} .label=${'Name'} .required=${true}></dees-input-text>
164
164
  <dees-input-text .key=${'description'} .label=${'Description'}></dees-input-text>
165
- <dees-input-text .key=${'ipAllowList'} .label=${'IP Allow List (comma-separated)'}></dees-input-text>
166
- <dees-input-text .key=${'ipBlockList'} .label=${'IP Block List (comma-separated)'}></dees-input-text>
165
+ <dees-input-list .key=${'ipAllowList'} .label=${'IP Allow List'} .placeholder=${'Add IP or CIDR...'}></dees-input-list>
166
+ <dees-input-list .key=${'ipBlockList'} .label=${'IP Block List'} .placeholder=${'Add IP or CIDR...'}></dees-input-list>
167
167
  <dees-input-text .key=${'maxConnections'} .label=${'Max Connections'}></dees-input-text>
168
168
  </dees-form>
169
169
  `,
@@ -173,19 +173,15 @@ let OpsViewSecurityProfiles = (() => {
173
173
  action: async (modalArg) => {
174
174
  const form = modalArg.shadowRoot.querySelector('dees-form');
175
175
  const data = await form.collectFormData();
176
- const ipAllowList = data.ipAllowList
177
- ? String(data.ipAllowList).split(',').map((s) => s.trim()).filter(Boolean)
178
- : undefined;
179
- const ipBlockList = data.ipBlockList
180
- ? String(data.ipBlockList).split(',').map((s) => s.trim()).filter(Boolean)
181
- : undefined;
176
+ const ipAllowList = Array.isArray(data.ipAllowList) ? data.ipAllowList : [];
177
+ const ipBlockList = Array.isArray(data.ipBlockList) ? data.ipBlockList : [];
182
178
  const maxConnections = data.maxConnections ? parseInt(String(data.maxConnections)) : undefined;
183
179
  await appstate.profilesTargetsStatePart.dispatchAction(appstate.createProfileAction, {
184
180
  name: String(data.name),
185
181
  description: data.description ? String(data.description) : undefined,
186
182
  security: {
187
- ...(ipAllowList ? { ipAllowList } : {}),
188
- ...(ipBlockList ? { ipBlockList } : {}),
183
+ ...(ipAllowList.length > 0 ? { ipAllowList } : {}),
184
+ ...(ipBlockList.length > 0 ? { ipBlockList } : {}),
189
185
  ...(maxConnections ? { maxConnections } : {}),
190
186
  },
191
187
  });
@@ -204,8 +200,8 @@ let OpsViewSecurityProfiles = (() => {
204
200
  <dees-form>
205
201
  <dees-input-text .key=${'name'} .label=${'Name'} .value=${profile.name}></dees-input-text>
206
202
  <dees-input-text .key=${'description'} .label=${'Description'} .value=${profile.description || ''}></dees-input-text>
207
- <dees-input-text .key=${'ipAllowList'} .label=${'IP Allow List (comma-separated)'} .value=${(profile.security?.ipAllowList || []).join(', ')}></dees-input-text>
208
- <dees-input-text .key=${'ipBlockList'} .label=${'IP Block List (comma-separated)'} .value=${(profile.security?.ipBlockList || []).join(', ')}></dees-input-text>
203
+ <dees-input-list .key=${'ipAllowList'} .label=${'IP Allow List'} .placeholder=${'Add IP or CIDR...'} .value=${profile.security?.ipAllowList || []}></dees-input-list>
204
+ <dees-input-list .key=${'ipBlockList'} .label=${'IP Block List'} .placeholder=${'Add IP or CIDR...'} .value=${profile.security?.ipBlockList || []}></dees-input-list>
209
205
  <dees-input-text .key=${'maxConnections'} .label=${'Max Connections'} .value=${String(profile.security?.maxConnections || '')}></dees-input-text>
210
206
  </dees-form>
211
207
  `,
@@ -215,12 +211,8 @@ let OpsViewSecurityProfiles = (() => {
215
211
  action: async (modalArg) => {
216
212
  const form = modalArg.shadowRoot.querySelector('dees-form');
217
213
  const data = await form.collectFormData();
218
- const ipAllowList = data.ipAllowList
219
- ? String(data.ipAllowList).split(',').map((s) => s.trim()).filter(Boolean)
220
- : [];
221
- const ipBlockList = data.ipBlockList
222
- ? String(data.ipBlockList).split(',').map((s) => s.trim()).filter(Boolean)
223
- : [];
214
+ const ipAllowList = Array.isArray(data.ipAllowList) ? data.ipAllowList : [];
215
+ const ipBlockList = Array.isArray(data.ipBlockList) ? data.ipBlockList : [];
224
216
  const maxConnections = data.maxConnections ? parseInt(String(data.maxConnections)) : undefined;
225
217
  await appstate.profilesTargetsStatePart.dispatchAction(appstate.updateProfileAction, {
226
218
  id: profile.id,
@@ -273,4 +265,4 @@ let OpsViewSecurityProfiles = (() => {
273
265
  return OpsViewSecurityProfiles = _classThis;
274
266
  })();
275
267
  export { OpsViewSecurityProfiles };
276
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-securityprofiles.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-view-securityprofiles.ts"],"names":[],"mappings":"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"}
268
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-securityprofiles.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-view-securityprofiles.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.2.1",
4
+ "version": "12.2.4",
5
5
  "description": "A multifaceted routing service handling mail and SMS delivery functions.",
6
6
  "type": "module",
7
7
  "exports": {
@@ -35,14 +35,14 @@
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.1",
38
+ "@design.estate/dees-catalog": "^3.49.2",
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
43
  "@push.rocks/smartacme": "^9.3.1",
44
44
  "@push.rocks/smartdata": "^7.1.3",
45
- "@push.rocks/smartdb": "^2.0.0",
45
+ "@push.rocks/smartdb": "^2.1.1",
46
46
  "@push.rocks/smartdns": "^7.9.0",
47
47
  "@push.rocks/smartfs": "^1.5.0",
48
48
  "@push.rocks/smartguard": "^3.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.9.0",
64
+ "@serve.zone/catalog": "^2.9.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
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '12.2.1',
6
+ version: '12.2.4',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
package/ts/classes.dcrouter.ts CHANGED
@@ -478,6 +478,12 @@ export class DcRouter {
478
478
  }
479
479
  : undefined,
480
480
  this.referenceResolver,
481
+ // Sync merged routes to RemoteIngressManager whenever routes change
482
+ (routes) => {
483
+ if (this.remoteIngressManager) {
484
+ this.remoteIngressManager.setRoutes(routes as any[]);
485
+ }
486
+ },
481
487
  );
482
488
  this.apiTokenManager = new ApiTokenManager();
483
489
  await this.apiTokenManager.initialize();
@@ -2054,6 +2060,13 @@ export class DcRouter {
2054
2060
  const currentRoutes = this.constructorRoutes;
2055
2061
  this.remoteIngressManager.setRoutes(currentRoutes as any[]);
2056
2062
 
2063
+ // Race-condition fix: if ConfigManagers finished before us, re-apply routes
2064
+ // so the callback delivers the full merged set (including DB-stored routes)
2065
+ // to our newly-created remoteIngressManager.
2066
+ if (this.routeConfigManager) {
2067
+ await this.routeConfigManager.applyRoutes();
2068
+ }
2069
+
2057
2070
  // Resolve TLS certs for tunnel: explicit paths > ACME for hubDomain > self-signed (Rust default)
2058
2071
  const riCfg = this.options.remoteIngressConfig;
2059
2072
  let tlsConfig: { certPem: string; keyPem: string } | undefined;
package/ts/config/classes.route-config-manager.ts CHANGED
@@ -23,6 +23,7 @@ export class RouteConfigManager {
23
23
  private getHttp3Config?: () => IHttp3Config | undefined,
24
24
  private getVpnAllowList?: (tags?: string[]) => string[],
25
25
  private referenceResolver?: ReferenceResolver,
26
+ private onRoutesApplied?: (routes: plugins.smartproxy.IRouteConfig[]) => void,
26
27
  ) {}
27
28
 
28
29
  /** Expose stored routes map for reference resolution lookups. */
@@ -393,6 +394,12 @@ export class RouteConfigManager {
393
394
  }
394
395
 
395
396
  await smartProxy.updateRoutes(enabledRoutes);
397
+
398
+ // Notify listeners (e.g. RemoteIngressManager) of the merged route set
399
+ if (this.onRoutesApplied) {
400
+ this.onRoutesApplied(enabledRoutes);
401
+ }
402
+
396
403
  logger.log('info', `Applied ${enabledRoutes.length} routes to SmartProxy (${this.storedRoutes.size} programmatic, ${this.overrides.size} overrides)`);
397
404
  }
398
405
  }
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.2.1',
6
+ version: '12.2.4',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
package/ts_web/appstate.ts CHANGED
@@ -427,6 +427,8 @@ export const setActiveViewAction = uiStatePart.createAction<string>(async (state
427
427
  if (viewName === 'routes' && currentState.activeView !== 'routes') {
428
428
  setTimeout(() => {
429
429
  routeManagementStatePart.dispatchAction(fetchMergedRoutesAction, null);
430
+ // Also fetch profiles/targets for the Create Route dropdowns
431
+ profilesTargetsStatePart.dispatchAction(fetchProfilesAndTargetsAction, null);
430
432
  }, 100);
431
433
  }
432
434
 
@@ -1413,6 +1415,7 @@ export const fetchMergedRoutesAction = routeManagementStatePart.createAction(asy
1413
1415
  export const createRouteAction = routeManagementStatePart.createAction<{
1414
1416
  route: any;
1415
1417
  enabled?: boolean;
1418
+ metadata?: any;
1416
1419
  }>(async (statePartArg, dataArg, actionContext): Promise<IRouteManagementState> => {
1417
1420
  const context = getActionContext();
1418
1421
  const currentState = statePartArg.getState()!;
@@ -1426,6 +1429,7 @@ export const createRouteAction = routeManagementStatePart.createAction<{
1426
1429
  identity: context.identity!,
1427
1430
  route: dataArg.route,
1428
1431
  enabled: dataArg.enabled,
1432
+ metadata: dataArg.metadata,
1429
1433
  });
1430
1434
 
1431
1435
  return await actionContext!.dispatch(fetchMergedRoutesAction, null);
package/ts_web/elements/ops-view-routes.ts CHANGED
@@ -24,6 +24,14 @@ export class OpsViewRoutes extends DeesElement {
24
24
  lastUpdated: 0,
25
25
  };
26
26
 
27
+ @state() accessor profilesTargetsState: appstate.IProfilesTargetsState = {
28
+ profiles: [],
29
+ targets: [],
30
+ isLoading: false,
31
+ error: null,
32
+ lastUpdated: 0,
33
+ };
34
+
27
35
  constructor() {
28
36
  super();
29
37
  const sub = appstate.routeManagementStatePart
@@ -33,6 +41,13 @@ export class OpsViewRoutes extends DeesElement {
33
41
  });
34
42
  this.rxSubscriptions.push(sub);
35
43
 
44
+ const ptSub = appstate.profilesTargetsStatePart
45
+ .select((s) => s)
46
+ .subscribe((ptState) => {
47
+ this.profilesTargetsState = ptState;
48
+ });
49
+ this.rxSubscriptions.push(ptSub);
50
+
36
51
  // Re-fetch routes when user logs in (fixes race condition where
37
52
  // the view is created before authentication completes)
38
53
  const loginSub = appstate.loginStatePart
@@ -40,6 +55,7 @@ export class OpsViewRoutes extends DeesElement {
40
55
  .subscribe((isLoggedIn) => {
41
56
  if (isLoggedIn) {
42
57
  appstate.routeManagementStatePart.dispatchAction(appstate.fetchMergedRoutesAction, null);
58
+ appstate.profilesTargetsStatePart.dispatchAction(appstate.fetchProfilesAndTargetsAction, null);
43
59
  }
44
60
  });
45
61
  this.rxSubscriptions.push(loginSub);
@@ -145,6 +161,7 @@ export class OpsViewRoutes extends DeesElement {
145
161
  enabled: mr.enabled,
146
162
  tags,
147
163
  id: mr.storedRouteId || mr.route.name || undefined,
164
+ metadata: mr.metadata,
148
165
  };
149
166
  });
150
167
 
@@ -275,6 +292,7 @@ export class OpsViewRoutes extends DeesElement {
275
292
  });
276
293
  } else {
277
294
  // Programmatic route
295
+ const meta = merged.metadata;
278
296
  await DeesModal.createAndShow({
279
297
  heading: `Route: ${merged.route.name}`,
280
298
  content: html`
@@ -282,6 +300,8 @@ export class OpsViewRoutes extends DeesElement {
282
300
  <p>Source: <strong style="color: #0af;">programmatic</strong></p>
283
301
  <p>Status: <strong>${merged.enabled ? 'Enabled' : 'Disabled'}</strong></p>
284
302
  <p>ID: <code style="color: #888;">${merged.storedRouteId}</code></p>
303
+ ${meta?.securityProfileName ? html`<p>Security Profile: <strong style="color: #a78bfa;">${meta.securityProfileName}</strong></p>` : ''}
304
+ ${meta?.networkTargetName ? html`<p>Network Target: <strong style="color: #a78bfa;">${meta.networkTargetName}</strong></p>` : ''}
285
305
  </div>
286
306
  `,
287
307
  menuOptions: [
@@ -319,6 +339,24 @@ export class OpsViewRoutes extends DeesElement {
319
339
 
320
340
  private async showCreateRouteDialog() {
321
341
  const { DeesModal } = await import('@design.estate/dees-catalog');
342
+ const profiles = this.profilesTargetsState.profiles;
343
+ const targets = this.profilesTargetsState.targets;
344
+
345
+ // Build dropdown options for profiles and targets
346
+ const profileOptions = [
347
+ { key: '', option: '(none — inline security)' },
348
+ ...profiles.map((p) => ({
349
+ key: p.id,
350
+ option: `${p.name}${p.description ? ' — ' + p.description : ''}`,
351
+ })),
352
+ ];
353
+ const targetOptions = [
354
+ { key: '', option: '(none — inline target)' },
355
+ ...targets.map((t) => ({
356
+ key: t.id,
357
+ option: `${t.name} (${Array.isArray(t.host) ? t.host.join(',') : t.host}:${t.port})`,
358
+ })),
359
+ ];
322
360
 
323
361
  await DeesModal.createAndShow({
324
362
  heading: 'Add Programmatic Route',
@@ -327,8 +365,10 @@ export class OpsViewRoutes extends DeesElement {
327
365
  <dees-input-text .key=${'name'} .label=${'Route Name'} .required=${true}></dees-input-text>
328
366
  <dees-input-text .key=${'ports'} .label=${'Ports (comma-separated)'} .required=${true}></dees-input-text>
329
367
  <dees-input-text .key=${'domains'} .label=${'Domains (comma-separated, optional)'}></dees-input-text>
330
- <dees-input-text .key=${'targetHost'} .label=${'Target Host'} .value=${'localhost'} .required=${true}></dees-input-text>
331
- <dees-input-text .key=${'targetPort'} .label=${'Target Port'} .required=${true}></dees-input-text>
368
+ <dees-input-dropdown .key=${'securityProfileRef'} .label=${'Security Profile'} .options=${profileOptions} .selectedKey=${''}></dees-input-dropdown>
369
+ <dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions} .selectedKey=${''}></dees-input-dropdown>
370
+ <dees-input-text .key=${'targetHost'} .label=${'Target Host (if no target selected)'} .value=${'localhost'}></dees-input-text>
371
+ <dees-input-text .key=${'targetPort'} .label=${'Target Port (if no target selected)'}></dees-input-text>
332
372
  </dees-form>
333
373
  `,
334
374
  menuOptions: [
@@ -362,15 +402,27 @@ export class OpsViewRoutes extends DeesElement {
362
402
  targets: [
363
403
  {
364
404
  host: formData.targetHost || 'localhost',
365
- port: parseInt(formData.targetPort, 10),
405
+ port: parseInt(formData.targetPort, 10) || 443,
366
406
  },
367
407
  ],
368
408
  },
369
409
  };
370
410
 
411
+ // Build metadata if profile/target selected
412
+ const metadata: any = {};
413
+ if (formData.securityProfileRef) {
414
+ metadata.securityProfileRef = formData.securityProfileRef;
415
+ }
416
+ if (formData.networkTargetRef) {
417
+ metadata.networkTargetRef = formData.networkTargetRef;
418
+ }
419
+
371
420
  await appstate.routeManagementStatePart.dispatchAction(
372
421
  appstate.createRouteAction,
373
- { route },
422
+ {
423
+ route,
424
+ metadata: Object.keys(metadata).length > 0 ? metadata : undefined,
425
+ },
374
426
  );
375
427
  await modalArg.destroy();
376
428
  },
package/ts_web/elements/ops-view-securityprofiles.ts CHANGED
@@ -131,8 +131,8 @@ export class OpsViewSecurityProfiles extends DeesElement {
131
131
  <dees-form>
132
132
  <dees-input-text .key=${'name'} .label=${'Name'} .required=${true}></dees-input-text>
133
133
  <dees-input-text .key=${'description'} .label=${'Description'}></dees-input-text>
134
- <dees-input-text .key=${'ipAllowList'} .label=${'IP Allow List (comma-separated)'}></dees-input-text>
135
- <dees-input-text .key=${'ipBlockList'} .label=${'IP Block List (comma-separated)'}></dees-input-text>
134
+ <dees-input-list .key=${'ipAllowList'} .label=${'IP Allow List'} .placeholder=${'Add IP or CIDR...'}></dees-input-list>
135
+ <dees-input-list .key=${'ipBlockList'} .label=${'IP Block List'} .placeholder=${'Add IP or CIDR...'}></dees-input-list>
136
136
  <dees-input-text .key=${'maxConnections'} .label=${'Max Connections'}></dees-input-text>
137
137
  </dees-form>
138
138
  `,
@@ -142,20 +142,16 @@ export class OpsViewSecurityProfiles extends DeesElement {
142
142
  action: async (modalArg: any) => {
143
143
  const form = modalArg.shadowRoot!.querySelector('dees-form');
144
144
  const data = await form.collectFormData();
145
- const ipAllowList = data.ipAllowList
146
- ? String(data.ipAllowList).split(',').map((s: string) => s.trim()).filter(Boolean)
147
- : undefined;
148
- const ipBlockList = data.ipBlockList
149
- ? String(data.ipBlockList).split(',').map((s: string) => s.trim()).filter(Boolean)
150
- : undefined;
145
+ const ipAllowList: string[] = Array.isArray(data.ipAllowList) ? data.ipAllowList : [];
146
+ const ipBlockList: string[] = Array.isArray(data.ipBlockList) ? data.ipBlockList : [];
151
147
  const maxConnections = data.maxConnections ? parseInt(String(data.maxConnections)) : undefined;
152
148
 
153
149
  await appstate.profilesTargetsStatePart.dispatchAction(appstate.createProfileAction, {
154
150
  name: String(data.name),
155
151
  description: data.description ? String(data.description) : undefined,
156
152
  security: {
157
- ...(ipAllowList ? { ipAllowList } : {}),
158
- ...(ipBlockList ? { ipBlockList } : {}),
153
+ ...(ipAllowList.length > 0 ? { ipAllowList } : {}),
154
+ ...(ipBlockList.length > 0 ? { ipBlockList } : {}),
159
155
  ...(maxConnections ? { maxConnections } : {}),
160
156
  },
161
157
  });
@@ -175,8 +171,8 @@ export class OpsViewSecurityProfiles extends DeesElement {
175
171
  <dees-form>
176
172
  <dees-input-text .key=${'name'} .label=${'Name'} .value=${profile.name}></dees-input-text>
177
173
  <dees-input-text .key=${'description'} .label=${'Description'} .value=${profile.description || ''}></dees-input-text>
178
- <dees-input-text .key=${'ipAllowList'} .label=${'IP Allow List (comma-separated)'} .value=${(profile.security?.ipAllowList || []).join(', ')}></dees-input-text>
179
- <dees-input-text .key=${'ipBlockList'} .label=${'IP Block List (comma-separated)'} .value=${(profile.security?.ipBlockList || []).join(', ')}></dees-input-text>
174
+ <dees-input-list .key=${'ipAllowList'} .label=${'IP Allow List'} .placeholder=${'Add IP or CIDR...'} .value=${profile.security?.ipAllowList || []}></dees-input-list>
175
+ <dees-input-list .key=${'ipBlockList'} .label=${'IP Block List'} .placeholder=${'Add IP or CIDR...'} .value=${profile.security?.ipBlockList || []}></dees-input-list>
180
176
  <dees-input-text .key=${'maxConnections'} .label=${'Max Connections'} .value=${String(profile.security?.maxConnections || '')}></dees-input-text>
181
177
  </dees-form>
182
178
  `,
@@ -186,12 +182,8 @@ export class OpsViewSecurityProfiles extends DeesElement {
186
182
  action: async (modalArg: any) => {
187
183
  const form = modalArg.shadowRoot!.querySelector('dees-form');
188
184
  const data = await form.collectFormData();
189
- const ipAllowList = data.ipAllowList
190
- ? String(data.ipAllowList).split(',').map((s: string) => s.trim()).filter(Boolean)
191
- : [];
192
- const ipBlockList = data.ipBlockList
193
- ? String(data.ipBlockList).split(',').map((s: string) => s.trim()).filter(Boolean)
194
- : [];
185
+ const ipAllowList: string[] = Array.isArray(data.ipAllowList) ? data.ipAllowList : [];
186
+ const ipBlockList: string[] = Array.isArray(data.ipBlockList) ? data.ipBlockList : [];
195
187
  const maxConnections = data.maxConnections ? parseInt(String(data.maxConnections)) : undefined;
196
188
 
197
189
  await appstate.profilesTargetsStatePart.dispatchAction(appstate.updateProfileAction, {