@serve.zone/dcrouter 13.0.5 → 13.0.6
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 +123 -122
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.dcrouter.js +5 -2
- package/dist_ts/opsserver/handlers/certificate.handler.js +31 -23
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/elements/ops-view-targetprofiles.d.ts +1 -0
- package/dist_ts_web/elements/ops-view-targetprofiles.js +50 -51
- package/package.json +3 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dcrouter.ts +4 -1
- package/ts/opsserver/handlers/certificate.handler.ts +30 -22
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/elements/ops-view-targetprofiles.ts +50 -47
|
@@ -179,17 +179,25 @@ let OpsViewTargetProfiles = (() => {
|
|
|
179
179
|
</div>
|
|
180
180
|
`;
|
|
181
181
|
}
|
|
182
|
+
getRouteCandidates() {
|
|
183
|
+
const routeState = appstate.routeManagementStatePart.getState();
|
|
184
|
+
const routes = routeState?.mergedRoutes || [];
|
|
185
|
+
return routes
|
|
186
|
+
.filter((mr) => mr.route.name)
|
|
187
|
+
.map((mr) => ({ viewKey: mr.route.name }));
|
|
188
|
+
}
|
|
182
189
|
async showCreateProfileDialog() {
|
|
183
190
|
const { DeesModal } = await import('@design.estate/dees-catalog');
|
|
191
|
+
const routeCandidates = this.getRouteCandidates();
|
|
184
192
|
DeesModal.createAndShow({
|
|
185
193
|
heading: 'Create Target Profile',
|
|
186
194
|
content: html `
|
|
187
195
|
<dees-form>
|
|
188
196
|
<dees-input-text .key=${'name'} .label=${'Name'} .required=${true}></dees-input-text>
|
|
189
197
|
<dees-input-text .key=${'description'} .label=${'Description'}></dees-input-text>
|
|
190
|
-
<dees-input-
|
|
191
|
-
<dees-input-
|
|
192
|
-
<dees-input-
|
|
198
|
+
<dees-input-list .key=${'domains'} .label=${'Domains'} .placeholder=${'e.g. *.example.com'} .allowFreeform=${true}></dees-input-list>
|
|
199
|
+
<dees-input-list .key=${'targets'} .label=${'Targets (host:port)'} .placeholder=${'e.g. 10.0.0.1:443'} .allowFreeform=${true}></dees-input-list>
|
|
200
|
+
<dees-input-list .key=${'routeRefs'} .label=${'Route Refs'} .placeholder=${'Type to search routes...'} .candidates=${routeCandidates} .allowFreeform=${true}></dees-input-list>
|
|
193
201
|
</dees-form>
|
|
194
202
|
`,
|
|
195
203
|
menuOptions: [
|
|
@@ -204,30 +212,26 @@ let OpsViewTargetProfiles = (() => {
|
|
|
204
212
|
const data = await form.collectFormData();
|
|
205
213
|
if (!data.name)
|
|
206
214
|
return;
|
|
207
|
-
const domains = data.domains
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
: undefined;
|
|
222
|
-
const routeRefs = data.routeRefs
|
|
223
|
-
? String(data.routeRefs).split(',').map((s) => s.trim()).filter(Boolean)
|
|
224
|
-
: undefined;
|
|
215
|
+
const domains = Array.isArray(data.domains) ? data.domains : [];
|
|
216
|
+
const targetStrings = Array.isArray(data.targets) ? data.targets : [];
|
|
217
|
+
const targets = targetStrings
|
|
218
|
+
.map((s) => {
|
|
219
|
+
const lastColon = s.lastIndexOf(':');
|
|
220
|
+
if (lastColon === -1)
|
|
221
|
+
return null;
|
|
222
|
+
return {
|
|
223
|
+
host: s.substring(0, lastColon),
|
|
224
|
+
port: parseInt(s.substring(lastColon + 1), 10),
|
|
225
|
+
};
|
|
226
|
+
})
|
|
227
|
+
.filter((t) => t !== null && !isNaN(t.port));
|
|
228
|
+
const routeRefs = Array.isArray(data.routeRefs) ? data.routeRefs : [];
|
|
225
229
|
await appstate.targetProfilesStatePart.dispatchAction(appstate.createTargetProfileAction, {
|
|
226
230
|
name: String(data.name),
|
|
227
231
|
description: data.description ? String(data.description) : undefined,
|
|
228
|
-
domains,
|
|
229
|
-
targets,
|
|
230
|
-
routeRefs,
|
|
232
|
+
domains: domains.length > 0 ? domains : undefined,
|
|
233
|
+
targets: targets.length > 0 ? targets : undefined,
|
|
234
|
+
routeRefs: routeRefs.length > 0 ? routeRefs : undefined,
|
|
231
235
|
});
|
|
232
236
|
modalArg.destroy();
|
|
233
237
|
},
|
|
@@ -236,19 +240,20 @@ let OpsViewTargetProfiles = (() => {
|
|
|
236
240
|
});
|
|
237
241
|
}
|
|
238
242
|
async showEditProfileDialog(profile) {
|
|
239
|
-
const currentDomains = profile.domains
|
|
240
|
-
const currentTargets = profile.targets?.map(t => `${t.host}:${t.port}`)
|
|
241
|
-
const currentRouteRefs = profile.routeRefs
|
|
243
|
+
const currentDomains = profile.domains || [];
|
|
244
|
+
const currentTargets = profile.targets?.map(t => `${t.host}:${t.port}`) || [];
|
|
245
|
+
const currentRouteRefs = profile.routeRefs || [];
|
|
242
246
|
const { DeesModal } = await import('@design.estate/dees-catalog');
|
|
247
|
+
const routeCandidates = this.getRouteCandidates();
|
|
243
248
|
DeesModal.createAndShow({
|
|
244
249
|
heading: `Edit Profile: ${profile.name}`,
|
|
245
250
|
content: html `
|
|
246
251
|
<dees-form>
|
|
247
252
|
<dees-input-text .key=${'name'} .label=${'Name'} .value=${profile.name}></dees-input-text>
|
|
248
253
|
<dees-input-text .key=${'description'} .label=${'Description'} .value=${profile.description || ''}></dees-input-text>
|
|
249
|
-
<dees-input-
|
|
250
|
-
<dees-input-
|
|
251
|
-
<dees-input-
|
|
254
|
+
<dees-input-list .key=${'domains'} .label=${'Domains'} .placeholder=${'e.g. *.example.com'} .allowFreeform=${true} .value=${currentDomains}></dees-input-list>
|
|
255
|
+
<dees-input-list .key=${'targets'} .label=${'Targets (host:port)'} .placeholder=${'e.g. 10.0.0.1:443'} .allowFreeform=${true} .value=${currentTargets}></dees-input-list>
|
|
256
|
+
<dees-input-list .key=${'routeRefs'} .label=${'Route Refs'} .placeholder=${'Type to search routes...'} .candidates=${routeCandidates} .allowFreeform=${true} .value=${currentRouteRefs}></dees-input-list>
|
|
252
257
|
</dees-form>
|
|
253
258
|
`,
|
|
254
259
|
menuOptions: [
|
|
@@ -261,26 +266,20 @@ let OpsViewTargetProfiles = (() => {
|
|
|
261
266
|
if (!form)
|
|
262
267
|
return;
|
|
263
268
|
const data = await form.collectFormData();
|
|
264
|
-
const domains = data.domains
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
};
|
|
279
|
-
}).filter((t) => t !== null && !isNaN(t.port))
|
|
280
|
-
: [];
|
|
281
|
-
const routeRefs = data.routeRefs
|
|
282
|
-
? String(data.routeRefs).split(',').map((s) => s.trim()).filter(Boolean)
|
|
283
|
-
: [];
|
|
269
|
+
const domains = Array.isArray(data.domains) ? data.domains : [];
|
|
270
|
+
const targetStrings = Array.isArray(data.targets) ? data.targets : [];
|
|
271
|
+
const targets = targetStrings
|
|
272
|
+
.map((s) => {
|
|
273
|
+
const lastColon = s.lastIndexOf(':');
|
|
274
|
+
if (lastColon === -1)
|
|
275
|
+
return null;
|
|
276
|
+
return {
|
|
277
|
+
host: s.substring(0, lastColon),
|
|
278
|
+
port: parseInt(s.substring(lastColon + 1), 10),
|
|
279
|
+
};
|
|
280
|
+
})
|
|
281
|
+
.filter((t) => t !== null && !isNaN(t.port));
|
|
282
|
+
const routeRefs = Array.isArray(data.routeRefs) ? data.routeRefs : [];
|
|
284
283
|
await appstate.targetProfilesStatePart.dispatchAction(appstate.updateTargetProfileAction, {
|
|
285
284
|
id: profile.id,
|
|
286
285
|
name: String(data.name),
|
|
@@ -409,4 +408,4 @@ let OpsViewTargetProfiles = (() => {
|
|
|
409
408
|
return OpsViewTargetProfiles = _classThis;
|
|
410
409
|
})();
|
|
411
410
|
export { OpsViewTargetProfiles };
|
|
412
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-targetprofiles.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-view-targetprofiles.ts"],"names":[],"mappings":"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"}
|
|
411
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-targetprofiles.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-view-targetprofiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EACL,WAAW,EACX,IAAI,EACJ,aAAa,EAEb,GAAG,EACH,KAAK,EACL,UAAU,GACX,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,UAAU,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAmB,MAAM,6BAA6B,CAAC;IASjD,qBAAqB;4BADjC,aAAa,CAAC,yBAAyB,CAAC;;;;sBACE,WAAW;;;;qCAAnB,SAAQ,WAAW;;;;+CACnD,KAAK,EAAE;YACR,8MAAS,mBAAmB,6BAAnB,mBAAmB,iHAA+E;YAF7G,6KAuWC;;;;QArWC,mGAA8D,QAAQ,CAAC,uBAAuB,CAAC,QAAQ,EAAG,EAAC;QAA3G,IAAS,mBAAmB,yDAA+E;QAA3G,IAAS,mBAAmB,+DAA+E;QAE3G;YACE,KAAK,EAAE,CAAC;;YACR,MAAM,GAAG,GAAG,QAAQ,CAAC,uBAAuB,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAC3E,IAAI,CAAC,mBAAmB,GAAG,QAAQ,CAAC;YACtC,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAChC;QAED,KAAK,CAAC,iBAAiB;YACrB,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAChC,MAAM,QAAQ,CAAC,uBAAuB,CAAC,cAAc,CAAC,QAAQ,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAC;QAClG,CAAC;QAEM,MAAM,CAAC,MAAM,GAAG;YACrB,UAAU,CAAC,aAAa;YACxB,WAAW;YACX,GAAG,CAAA;;;;;;;;;;;;;sBAae,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;iBAC7C,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;;;KAIpD;SACF,CAAC;QAEK,MAAM;YACX,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC;YAEnD,MAAM,UAAU,GAAiB;gBAC/B;oBACE,EAAE,EAAE,eAAe;oBACnB,KAAK,EAAE,gBAAgB;oBACvB,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,QAAQ,CAAC,MAAM;oBACtB,IAAI,EAAE,eAAe;oBACrB,WAAW,EAAE,0BAA0B;oBACvC,KAAK,EAAE,SAAS;iBACjB;aACF,CAAC;YAEF,OAAO,IAAI,CAAA;;;iCAGkB,UAAU;;sBAErB,iBAAiB;sBACjB,8CAA8C;kBAClD,QAAQ;6BACG,CAAC,OAAuC,EAAE,EAAE,CAAC,CAAC;gBAC/D,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,GAAG;gBACvC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM;oBAC9B,CAAC,CAAC,IAAI,CAAA,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAA,0BAA0B,CAAC,SAAS,CAAC,EAAE;oBAC7E,CAAC,CAAC,GAAG;gBACP,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM;oBAC9B,CAAC,CAAC,IAAI,CAAA,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAA,0BAA0B,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,SAAS,CAAC,EAAE;oBAC5F,CAAC,CAAC,GAAG;gBACP,YAAY,EAAE,OAAO,CAAC,SAAS,EAAE,MAAM;oBACrC,CAAC,CAAC,IAAI,CAAA,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAA,0BAA0B,CAAC,SAAS,CAAC,EAAE;oBAC/E,CAAC,CAAC,GAAG;gBACP,OAAO,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,kBAAkB,EAAE;aAC1D,CAAC;yBACa;gBACb;oBACE,IAAI,EAAE,gBAAgB;oBACtB,QAAQ,EAAE,aAAa;oBACvB,IAAI,EAAE,CAAC,QAAiB,CAAC;oBACzB,UAAU,EAAE,KAAK,IAAI,EAAE;wBACrB,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;oBACvC,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,iBAAiB;oBAC3B,IAAI,EAAE,CAAC,QAAiB,CAAC;oBACzB,UAAU,EAAE,KAAK,IAAI,EAAE;wBACrB,MAAM,QAAQ,CAAC,uBAAuB,CAAC,cAAc,CAAC,QAAQ,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAC;oBAClG,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,aAAa;oBACvB,IAAI,EAAE,CAAC,aAAa,CAAQ;oBAC5B,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAsC,CAAC;wBAClE,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;oBACvC,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,eAAe;oBACzB,IAAI,EAAE,CAAC,OAAO,EAAE,aAAa,CAAQ;oBACrC,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAsC,CAAC;wBAClE,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;oBAC5C,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,eAAe;oBACzB,IAAI,EAAE,CAAC,OAAO,EAAE,aAAa,CAAQ;oBACrC,UAAU,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;wBACpC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAsC,CAAC;wBAClE,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;oBACpC,CAAC;iBACF;aACF;;;KAGN,CAAC;QACJ,CAAC;QAEO,kBAAkB;YACxB,MAAM,UAAU,GAAG,QAAQ,CAAC,wBAAwB,CAAC,QAAQ,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,UAAU,EAAE,YAAY,IAAI,EAAE,CAAC;YAC9C,OAAO,MAAM;iBACV,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;iBAC7B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,IAAK,EAAE,CAAC,CAAC,CAAC;QAChD,CAAC;QAEO,KAAK,CAAC,uBAAuB;YACnC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAClE,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAElD,SAAS,CAAC,aAAa,CAAC;gBACtB,OAAO,EAAE,uBAAuB;gBAChC,OAAO,EAAE,IAAI,CAAA;;kCAEe,MAAM,WAAW,MAAM,cAAc,IAAI;kCACzC,aAAa,WAAW,aAAa;kCACrC,SAAS,WAAW,SAAS,iBAAiB,oBAAoB,mBAAmB,IAAI;kCACzF,SAAS,WAAW,qBAAqB,iBAAiB,mBAAmB,mBAAmB,IAAI;kCACpG,WAAW,WAAW,YAAY,iBAAiB,0BAA0B,gBAAgB,eAAe,mBAAmB,IAAI;;OAE9J;gBACD,WAAW,EAAE;oBACX,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE;oBAC7F;wBACE,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,aAAa;wBACvB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;4BAC9B,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;4BACxF,IAAI,CAAC,IAAI;gCAAE,OAAO;4BAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;4BAC1C,IAAI,CAAC,IAAI,CAAC,IAAI;gCAAE,OAAO;4BAEvB,MAAM,OAAO,GAAa,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;4BAC1E,MAAM,aAAa,GAAa,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;4BAChF,MAAM,OAAO,GAAG,aAAa;iCAC1B,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE;gCACjB,MAAM,SAAS,GAAG,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gCACrC,IAAI,SAAS,KAAK,CAAC,CAAC;oCAAE,OAAO,IAAI,CAAC;gCAClC,OAAO;oCACL,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC;oCAC/B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;iCAC/C,CAAC;4BACJ,CAAC,CAAC;iCACD,MAAM,CAAC,CAAC,CAAC,EAAuC,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;4BACpF,MAAM,SAAS,GAAa,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;4BAEhF,MAAM,QAAQ,CAAC,uBAAuB,CAAC,cAAc,CAAC,QAAQ,CAAC,yBAAyB,EAAE;gCACxF,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gCACvB,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;gCACpE,OAAO,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;gCACjD,OAAO,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;gCACjD,SAAS,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;6BACxD,CAAC,CAAC;4BACH,QAAQ,CAAC,OAAO,EAAE,CAAC;wBACrB,CAAC;qBACF;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QAEO,KAAK,CAAC,qBAAqB,CAAC,OAAuC;YACzE,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;YAC7C,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;YAC9E,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;YAEjD,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAClE,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAElD,SAAS,CAAC,aAAa,CAAC;gBACtB,OAAO,EAAE,iBAAiB,OAAO,CAAC,IAAI,EAAE;gBACxC,OAAO,EAAE,IAAI,CAAA;;kCAEe,MAAM,WAAW,MAAM,WAAW,OAAO,CAAC,IAAI;kCAC9C,aAAa,WAAW,aAAa,WAAW,OAAO,CAAC,WAAW,IAAI,EAAE;kCACzE,SAAS,WAAW,SAAS,iBAAiB,oBAAoB,mBAAmB,IAAI,WAAW,cAAc;kCAClH,SAAS,WAAW,qBAAqB,iBAAiB,mBAAmB,mBAAmB,IAAI,WAAW,cAAc;kCAC7H,WAAW,WAAW,YAAY,iBAAiB,0BAA0B,gBAAgB,eAAe,mBAAmB,IAAI,WAAW,gBAAgB;;OAEzL;gBACD,WAAW,EAAE;oBACX,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE;oBAC7F;wBACE,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,cAAc;wBACxB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;4BAC9B,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;4BACxF,IAAI,CAAC,IAAI;gCAAE,OAAO;4BAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;4BAE1C,MAAM,OAAO,GAAa,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;4BAC1E,MAAM,aAAa,GAAa,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;4BAChF,MAAM,OAAO,GAAG,aAAa;iCAC1B,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE;gCACjB,MAAM,SAAS,GAAG,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gCACrC,IAAI,SAAS,KAAK,CAAC,CAAC;oCAAE,OAAO,IAAI,CAAC;gCAClC,OAAO;oCACL,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC;oCAC/B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;iCAC/C,CAAC;4BACJ,CAAC,CAAC;iCACD,MAAM,CAAC,CAAC,CAAC,EAAuC,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;4BACpF,MAAM,SAAS,GAAa,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;4BAEhF,MAAM,QAAQ,CAAC,uBAAuB,CAAC,cAAc,CAAC,QAAQ,CAAC,yBAAyB,EAAE;gCACxF,EAAE,EAAE,OAAO,CAAC,EAAE;gCACd,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gCACvB,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;gCACpE,OAAO;gCACP,OAAO;gCACP,SAAS;6BACV,CAAC,CAAC;4BACH,QAAQ,CAAC,OAAO,EAAE,CAAC;wBACrB,CAAC;qBACF;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QAEO,KAAK,CAAC,gBAAgB,CAAC,OAAuC;YACpE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAElE,yDAAyD;YACzD,IAAI,SAAS,GAAG,IAAI,CAAA,iDAAiD,CAAC;YACtE,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAEpE,eAAe,EAAE,uBAAuB,CAAC,CAAC;gBAC5C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;oBAClC,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAG,CAAC,QAAS;oBACvD,EAAE,EAAE,OAAO,CAAC,EAAE;iBACf,CAAC,CAAC;gBACH,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAChC,SAAS,GAAG,IAAI,CAAA;;cAEV,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAA;;0BAElB,CAAC,CAAC,QAAQ,YAAY,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAA,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE;;aAEjF,CAAC;;SAEL,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,SAAS,GAAG,IAAI,CAAA,wFAAwF,CAAC;gBAC3G,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS,GAAG,IAAI,CAAA,wDAAwD,CAAC;YAC3E,CAAC;YAED,SAAS,CAAC,aAAa,CAAC;gBACtB,OAAO,EAAE,mBAAmB,OAAO,CAAC,IAAI,EAAE;gBAC1C,OAAO,EAAE,IAAI,CAAA;;;uHAGoG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;6DAClG,OAAO,CAAC,WAAW,IAAI,GAAG;;;uHAGgC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;gBAE/I,OAAO,CAAC,OAAO,EAAE,MAAM;oBACvB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAA,0BAA0B,CAAC,SAAS,CAAC;oBACpE,CAAC,CAAC,GAAG;;;;uHAIkG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;gBAE/I,OAAO,CAAC,OAAO,EAAE,MAAM;oBACvB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAA,0BAA0B,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,SAAS,CAAC;oBACnF,CAAC,CAAC,GAAG;;;;uHAIkG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;;gBAE/I,OAAO,CAAC,SAAS,EAAE,MAAM;oBACzB,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAA,0BAA0B,CAAC,SAAS,CAAC;oBACtE,CAAC,CAAC,GAAG;;;;uHAIkG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;6DAClG,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,cAAc,EAAE,OAAO,OAAO,CAAC,SAAS;;;uHAGV,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;6DAClG,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,cAAc,EAAE;;;uHAGc,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;cACjJ,SAAS;;;OAGhB;gBACD,WAAW,EAAE;oBACX,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;iBACrF;aACF,CAAC,CAAC;QACL,CAAC;QAEO,KAAK,CAAC,aAAa,CAAC,OAAuC;YACjE,MAAM,QAAQ,CAAC,uBAAuB,CAAC,cAAc,CAAC,QAAQ,CAAC,yBAAyB,EAAE;gBACxF,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,KAAK,EAAE,KAAK;aACb,CAAC,CAAC;YAEH,MAAM,YAAY,GAAG,QAAQ,CAAC,uBAAuB,CAAC,QAAQ,EAAG,CAAC;YAClE,IAAI,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC3C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;gBAClE,SAAS,CAAC,aAAa,CAAC;oBACtB,OAAO,EAAE,gBAAgB;oBACzB,OAAO,EAAE,IAAI,CAAA,MAAM,YAAY,CAAC,KAAK,oBAAoB;oBACzD,WAAW,EAAE;wBACX;4BACE,IAAI,EAAE,cAAc;4BACpB,QAAQ,EAAE,eAAe;4BACzB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;gCAC9B,MAAM,QAAQ,CAAC,uBAAuB,CAAC,cAAc,CAAC,QAAQ,CAAC,yBAAyB,EAAE;oCACxF,EAAE,EAAE,OAAO,CAAC,EAAE;oCACd,KAAK,EAAE,IAAI;iCACZ,CAAC,CAAC;gCACH,QAAQ,CAAC,OAAO,EAAE,CAAC;4BACrB,CAAC;yBACF;wBACD,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE;qBAC9F;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;;YAtWU,uDAAqB;;;;;SAArB,qBAAqB"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/dcrouter",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "13.0.
|
|
4
|
+
"version": "13.0.6",
|
|
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.61.
|
|
38
|
+
"@design.estate/dees-catalog": "^3.61.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.
|
|
43
|
+
"@push.rocks/smartacme": "^9.5.0",
|
|
44
44
|
"@push.rocks/smartdata": "^7.1.6",
|
|
45
45
|
"@push.rocks/smartdb": "^2.5.9",
|
|
46
46
|
"@push.rocks/smartdns": "^7.9.0",
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/classes.dcrouter.ts
CHANGED
|
@@ -1076,7 +1076,10 @@ export class DcRouter {
|
|
|
1076
1076
|
if (!expiryDate) {
|
|
1077
1077
|
try {
|
|
1078
1078
|
const cleanDomain = entry.domain.replace(/^\*\.?/, '');
|
|
1079
|
-
const
|
|
1079
|
+
const domParts = cleanDomain.split('.');
|
|
1080
|
+
const baseDomain = domParts.length > 2 ? domParts.slice(-2).join('.') : cleanDomain;
|
|
1081
|
+
const certDoc = await AcmeCertDoc.findByDomain(baseDomain)
|
|
1082
|
+
|| (baseDomain !== cleanDomain ? await AcmeCertDoc.findByDomain(cleanDomain) : null);
|
|
1080
1083
|
if (certDoc?.validUntil) {
|
|
1081
1084
|
expiryDate = new Date(certDoc.validUntil).toISOString();
|
|
1082
1085
|
}
|
|
@@ -191,7 +191,11 @@ export class CertificateHandler {
|
|
|
191
191
|
// Check persisted cert data from smartdata document classes
|
|
192
192
|
if (status === 'unknown') {
|
|
193
193
|
const cleanDomain = domain.replace(/^\*\.?/, '');
|
|
194
|
-
|
|
194
|
+
// SmartAcme stores certs under the base domain (e.g. example.com for api.example.com)
|
|
195
|
+
const parts = cleanDomain.split('.');
|
|
196
|
+
const baseDomain = parts.length > 2 ? parts.slice(-2).join('.') : cleanDomain;
|
|
197
|
+
const acmeDoc = await AcmeCertDoc.findByDomain(baseDomain)
|
|
198
|
+
|| (baseDomain !== cleanDomain ? await AcmeCertDoc.findByDomain(cleanDomain) : null);
|
|
195
199
|
const proxyDoc = !acmeDoc ? await ProxyCertDoc.findByDomain(domain) : null;
|
|
196
200
|
|
|
197
201
|
if (acmeDoc?.validUntil) {
|
|
@@ -331,31 +335,32 @@ export class CertificateHandler {
|
|
|
331
335
|
await dcRouter.certProvisionScheduler.clearBackoff(domain);
|
|
332
336
|
}
|
|
333
337
|
|
|
334
|
-
//
|
|
335
|
-
dcRouter.
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
if (dcRouter.smartAcme) {
|
|
339
|
-
try {
|
|
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
|
-
} catch (err: unknown) {
|
|
343
|
-
return { success: false, message: (err as Error).message || `Failed to reprovision certificate for ${domain}` };
|
|
344
|
-
}
|
|
338
|
+
// Find routes matching this domain — needed to provision through SmartProxy
|
|
339
|
+
const routeNames = dcRouter.findRouteNamesForDomain(domain);
|
|
340
|
+
if (routeNames.length === 0) {
|
|
341
|
+
return { success: false, message: `No routes found for domain '${domain}'` };
|
|
345
342
|
}
|
|
346
343
|
|
|
347
|
-
//
|
|
348
|
-
|
|
349
|
-
if (routeNames.length > 0) {
|
|
344
|
+
// If forceRenew, invalidate SmartAcme's cache so the next provision gets a fresh cert
|
|
345
|
+
if (forceRenew && dcRouter.smartAcme) {
|
|
350
346
|
try {
|
|
351
|
-
await
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
return { success: false, message: (err as Error).message || `Failed to reprovision certificate for ${domain}` };
|
|
347
|
+
await dcRouter.smartAcme.getCertificateForDomain(domain, { forceRenew: true });
|
|
348
|
+
} catch {
|
|
349
|
+
// Cache invalidation failed — proceed with provisioning anyway
|
|
355
350
|
}
|
|
356
351
|
}
|
|
357
352
|
|
|
358
|
-
|
|
353
|
+
// Clear status map entry so it gets refreshed by the certificate-issued event
|
|
354
|
+
dcRouter.certificateStatusMap.delete(domain);
|
|
355
|
+
|
|
356
|
+
// Provision through SmartProxy — this triggers the full pipeline:
|
|
357
|
+
// certProvisionFunction → bridge.loadCertificate → certificate-issued event → status map updated
|
|
358
|
+
try {
|
|
359
|
+
await smartProxy.provisionCertificate(routeNames[0]);
|
|
360
|
+
return { success: true, message: forceRenew ? `Certificate force-renewed for domain '${domain}'` : `Certificate reprovisioning triggered for domain '${domain}'` };
|
|
361
|
+
} catch (err: unknown) {
|
|
362
|
+
return { success: false, message: (err as Error).message || `Failed to reprovision certificate for ${domain}` };
|
|
363
|
+
}
|
|
359
364
|
}
|
|
360
365
|
|
|
361
366
|
/**
|
|
@@ -364,9 +369,12 @@ export class CertificateHandler {
|
|
|
364
369
|
private async deleteCertificate(domain: string): Promise<{ success: boolean; message?: string }> {
|
|
365
370
|
const dcRouter = this.opsServerRef.dcRouterRef;
|
|
366
371
|
const cleanDomain = domain.replace(/^\*\.?/, '');
|
|
372
|
+
const parts = cleanDomain.split('.');
|
|
373
|
+
const baseDomain = parts.length > 2 ? parts.slice(-2).join('.') : cleanDomain;
|
|
367
374
|
|
|
368
|
-
// Delete from smartdata document classes
|
|
369
|
-
const acmeDoc = await AcmeCertDoc.findByDomain(
|
|
375
|
+
// Delete from smartdata document classes (try base domain first, then exact)
|
|
376
|
+
const acmeDoc = await AcmeCertDoc.findByDomain(baseDomain)
|
|
377
|
+
|| (baseDomain !== cleanDomain ? await AcmeCertDoc.findByDomain(cleanDomain) : null);
|
|
370
378
|
if (acmeDoc) {
|
|
371
379
|
await acmeDoc.delete();
|
|
372
380
|
}
|
|
@@ -148,17 +148,27 @@ export class OpsViewTargetProfiles extends DeesElement {
|
|
|
148
148
|
`;
|
|
149
149
|
}
|
|
150
150
|
|
|
151
|
+
private getRouteCandidates() {
|
|
152
|
+
const routeState = appstate.routeManagementStatePart.getState();
|
|
153
|
+
const routes = routeState?.mergedRoutes || [];
|
|
154
|
+
return routes
|
|
155
|
+
.filter((mr) => mr.route.name)
|
|
156
|
+
.map((mr) => ({ viewKey: mr.route.name! }));
|
|
157
|
+
}
|
|
158
|
+
|
|
151
159
|
private async showCreateProfileDialog() {
|
|
152
160
|
const { DeesModal } = await import('@design.estate/dees-catalog');
|
|
161
|
+
const routeCandidates = this.getRouteCandidates();
|
|
162
|
+
|
|
153
163
|
DeesModal.createAndShow({
|
|
154
164
|
heading: 'Create Target Profile',
|
|
155
165
|
content: html`
|
|
156
166
|
<dees-form>
|
|
157
167
|
<dees-input-text .key=${'name'} .label=${'Name'} .required=${true}></dees-input-text>
|
|
158
168
|
<dees-input-text .key=${'description'} .label=${'Description'}></dees-input-text>
|
|
159
|
-
<dees-input-
|
|
160
|
-
<dees-input-
|
|
161
|
-
<dees-input-
|
|
169
|
+
<dees-input-list .key=${'domains'} .label=${'Domains'} .placeholder=${'e.g. *.example.com'} .allowFreeform=${true}></dees-input-list>
|
|
170
|
+
<dees-input-list .key=${'targets'} .label=${'Targets (host:port)'} .placeholder=${'e.g. 10.0.0.1:443'} .allowFreeform=${true}></dees-input-list>
|
|
171
|
+
<dees-input-list .key=${'routeRefs'} .label=${'Route Refs'} .placeholder=${'Type to search routes...'} .candidates=${routeCandidates} .allowFreeform=${true}></dees-input-list>
|
|
162
172
|
</dees-form>
|
|
163
173
|
`,
|
|
164
174
|
menuOptions: [
|
|
@@ -172,30 +182,26 @@ export class OpsViewTargetProfiles extends DeesElement {
|
|
|
172
182
|
const data = await form.collectFormData();
|
|
173
183
|
if (!data.name) return;
|
|
174
184
|
|
|
175
|
-
const domains = data.domains
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
: undefined;
|
|
189
|
-
const routeRefs = data.routeRefs
|
|
190
|
-
? String(data.routeRefs).split(',').map((s: string) => s.trim()).filter(Boolean)
|
|
191
|
-
: undefined;
|
|
185
|
+
const domains: string[] = Array.isArray(data.domains) ? data.domains : [];
|
|
186
|
+
const targetStrings: string[] = Array.isArray(data.targets) ? data.targets : [];
|
|
187
|
+
const targets = targetStrings
|
|
188
|
+
.map((s: string) => {
|
|
189
|
+
const lastColon = s.lastIndexOf(':');
|
|
190
|
+
if (lastColon === -1) return null;
|
|
191
|
+
return {
|
|
192
|
+
host: s.substring(0, lastColon),
|
|
193
|
+
port: parseInt(s.substring(lastColon + 1), 10),
|
|
194
|
+
};
|
|
195
|
+
})
|
|
196
|
+
.filter((t): t is { host: string; port: number } => t !== null && !isNaN(t.port));
|
|
197
|
+
const routeRefs: string[] = Array.isArray(data.routeRefs) ? data.routeRefs : [];
|
|
192
198
|
|
|
193
199
|
await appstate.targetProfilesStatePart.dispatchAction(appstate.createTargetProfileAction, {
|
|
194
200
|
name: String(data.name),
|
|
195
201
|
description: data.description ? String(data.description) : undefined,
|
|
196
|
-
domains,
|
|
197
|
-
targets,
|
|
198
|
-
routeRefs,
|
|
202
|
+
domains: domains.length > 0 ? domains : undefined,
|
|
203
|
+
targets: targets.length > 0 ? targets : undefined,
|
|
204
|
+
routeRefs: routeRefs.length > 0 ? routeRefs : undefined,
|
|
199
205
|
});
|
|
200
206
|
modalArg.destroy();
|
|
201
207
|
},
|
|
@@ -205,20 +211,22 @@ export class OpsViewTargetProfiles extends DeesElement {
|
|
|
205
211
|
}
|
|
206
212
|
|
|
207
213
|
private async showEditProfileDialog(profile: interfaces.data.ITargetProfile) {
|
|
208
|
-
const currentDomains = profile.domains
|
|
209
|
-
const currentTargets = profile.targets?.map(t => `${t.host}:${t.port}`)
|
|
210
|
-
const currentRouteRefs = profile.routeRefs
|
|
214
|
+
const currentDomains = profile.domains || [];
|
|
215
|
+
const currentTargets = profile.targets?.map(t => `${t.host}:${t.port}`) || [];
|
|
216
|
+
const currentRouteRefs = profile.routeRefs || [];
|
|
211
217
|
|
|
212
218
|
const { DeesModal } = await import('@design.estate/dees-catalog');
|
|
219
|
+
const routeCandidates = this.getRouteCandidates();
|
|
220
|
+
|
|
213
221
|
DeesModal.createAndShow({
|
|
214
222
|
heading: `Edit Profile: ${profile.name}`,
|
|
215
223
|
content: html`
|
|
216
224
|
<dees-form>
|
|
217
225
|
<dees-input-text .key=${'name'} .label=${'Name'} .value=${profile.name}></dees-input-text>
|
|
218
226
|
<dees-input-text .key=${'description'} .label=${'Description'} .value=${profile.description || ''}></dees-input-text>
|
|
219
|
-
<dees-input-
|
|
220
|
-
<dees-input-
|
|
221
|
-
<dees-input-
|
|
227
|
+
<dees-input-list .key=${'domains'} .label=${'Domains'} .placeholder=${'e.g. *.example.com'} .allowFreeform=${true} .value=${currentDomains}></dees-input-list>
|
|
228
|
+
<dees-input-list .key=${'targets'} .label=${'Targets (host:port)'} .placeholder=${'e.g. 10.0.0.1:443'} .allowFreeform=${true} .value=${currentTargets}></dees-input-list>
|
|
229
|
+
<dees-input-list .key=${'routeRefs'} .label=${'Route Refs'} .placeholder=${'Type to search routes...'} .candidates=${routeCandidates} .allowFreeform=${true} .value=${currentRouteRefs}></dees-input-list>
|
|
222
230
|
</dees-form>
|
|
223
231
|
`,
|
|
224
232
|
menuOptions: [
|
|
@@ -231,24 +239,19 @@ export class OpsViewTargetProfiles extends DeesElement {
|
|
|
231
239
|
if (!form) return;
|
|
232
240
|
const data = await form.collectFormData();
|
|
233
241
|
|
|
234
|
-
const domains = data.domains
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
}).filter((t): t is { host: string; port: number } => t !== null && !isNaN(t.port))
|
|
248
|
-
: [];
|
|
249
|
-
const routeRefs = data.routeRefs
|
|
250
|
-
? String(data.routeRefs).split(',').map((s: string) => s.trim()).filter(Boolean)
|
|
251
|
-
: [];
|
|
242
|
+
const domains: string[] = Array.isArray(data.domains) ? data.domains : [];
|
|
243
|
+
const targetStrings: string[] = Array.isArray(data.targets) ? data.targets : [];
|
|
244
|
+
const targets = targetStrings
|
|
245
|
+
.map((s: string) => {
|
|
246
|
+
const lastColon = s.lastIndexOf(':');
|
|
247
|
+
if (lastColon === -1) return null;
|
|
248
|
+
return {
|
|
249
|
+
host: s.substring(0, lastColon),
|
|
250
|
+
port: parseInt(s.substring(lastColon + 1), 10),
|
|
251
|
+
};
|
|
252
|
+
})
|
|
253
|
+
.filter((t): t is { host: string; port: number } => t !== null && !isNaN(t.port));
|
|
254
|
+
const routeRefs: string[] = Array.isArray(data.routeRefs) ? data.routeRefs : [];
|
|
252
255
|
|
|
253
256
|
await appstate.targetProfilesStatePart.dispatchAction(appstate.updateTargetProfileAction, {
|
|
254
257
|
id: profile.id,
|