@serve.zone/dcrouter 13.42.3 → 13.43.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 (44) hide show
  1. package/deno.json +11 -11
  2. package/dist_serve/bundle.js +722 -678
  3. package/dist_ts/00_commitinfo_data.js +1 -1
  4. package/dist_ts/classes.dcrouter.js +3 -3
  5. package/dist_ts/config/classes.route-config-manager.d.ts +4 -2
  6. package/dist_ts/config/classes.route-config-manager.js +17 -9
  7. package/dist_ts/config/classes.source-policy-compiler.d.ts +1 -0
  8. package/dist_ts/config/classes.source-policy-compiler.js +24 -2
  9. package/dist_ts/config/helpers.http-redirects.d.ts +10 -0
  10. package/dist_ts/config/helpers.http-redirects.js +387 -0
  11. package/dist_ts/config/index.d.ts +1 -0
  12. package/dist_ts/config/index.js +2 -1
  13. package/dist_ts/opsserver/handlers/route-management.handler.js +10 -1
  14. package/dist_ts_interfaces/data/route-management.d.ts +20 -0
  15. package/dist_ts_interfaces/requests/route-management.d.ts +14 -1
  16. package/dist_ts_web/00_commitinfo_data.js +1 -1
  17. package/dist_ts_web/appstate.d.ts +2 -0
  18. package/dist_ts_web/appstate.js +28 -1
  19. package/dist_ts_web/elements/access/ops-view-apitokens.js +2 -1
  20. package/dist_ts_web/elements/access/ops-view-gatewayclients.js +2 -1
  21. package/dist_ts_web/elements/network/index.d.ts +1 -0
  22. package/dist_ts_web/elements/network/index.js +2 -1
  23. package/dist_ts_web/elements/network/ops-view-redirects.d.ts +18 -0
  24. package/dist_ts_web/elements/network/ops-view-redirects.js +236 -0
  25. package/dist_ts_web/elements/network/ops-view-routes.js +2 -1
  26. package/dist_ts_web/elements/ops-dashboard.js +3 -1
  27. package/dist_ts_web/router.js +2 -2
  28. package/package.json +1 -1
  29. package/ts/00_commitinfo_data.ts +1 -1
  30. package/ts/classes.dcrouter.ts +2 -2
  31. package/ts/config/classes.route-config-manager.ts +22 -10
  32. package/ts/config/classes.source-policy-compiler.ts +33 -1
  33. package/ts/config/helpers.http-redirects.ts +462 -0
  34. package/ts/config/index.ts +1 -0
  35. package/ts/opsserver/handlers/route-management.handler.ts +15 -0
  36. package/ts_web/00_commitinfo_data.ts +1 -1
  37. package/ts_web/appstate.ts +32 -0
  38. package/ts_web/elements/access/ops-view-apitokens.ts +1 -0
  39. package/ts_web/elements/access/ops-view-gatewayclients.ts +1 -0
  40. package/ts_web/elements/network/index.ts +1 -0
  41. package/ts_web/elements/network/ops-view-redirects.ts +202 -0
  42. package/ts_web/elements/network/ops-view-routes.ts +1 -0
  43. package/ts_web/elements/ops-dashboard.ts +2 -0
  44. package/ts_web/router.ts +1 -1
@@ -0,0 +1,387 @@
1
+ import * as plugins from '../plugins.js';
2
+ const AUTO_REDIRECT_ROUTE_PREFIX = 'dcrouter-auto-http-redirect';
3
+ const REDIRECT_STATUS_CODE = 301;
4
+ const REDIRECT_PRIORITY = 0;
5
+ const REDIRECT_TARGET_TEMPLATE = 'https://{domain}{path}';
6
+ const REDIRECT_INITIAL_DATA_TIMEOUT_MS = 10_000;
7
+ export function deriveHttpRedirectConfiguration(routes) {
8
+ const candidates = collectRedirectCandidates(routes);
9
+ const httpRoutes = routes.filter((route) => isExplicitHttpRoute(route));
10
+ const redirects = [];
11
+ const runtimeRoutes = [];
12
+ for (const candidate of candidates) {
13
+ const conflict = findHttpConflict(candidate, httpRoutes);
14
+ const redirectInfo = {
15
+ id: candidate.id,
16
+ status: conflict ? (conflict.covers ? 'covered' : 'skipped') : 'active',
17
+ domainPattern: candidate.domainPattern,
18
+ pathPattern: candidate.pathPattern,
19
+ fromTemplate: 'http://{domain}{path}',
20
+ toTemplate: REDIRECT_TARGET_TEMPLATE,
21
+ statusCode: REDIRECT_STATUS_CODE,
22
+ priority: REDIRECT_PRIORITY,
23
+ sourceRouteNames: [...candidate.sourceRouteNames].sort(),
24
+ sourceRouteIds: [...candidate.sourceRouteIds].sort(),
25
+ coveredByRouteNames: conflict ? [conflict.routeName] : [],
26
+ remoteIngress: Boolean(candidate.remoteIngress?.enabled),
27
+ notes: conflict
28
+ ? conflict.covers
29
+ ? 'An explicit HTTP route already covers this redirect scope.'
30
+ : 'Skipped because an explicit HTTP route overlaps this redirect scope.'
31
+ : undefined,
32
+ };
33
+ redirects.push(redirectInfo);
34
+ if (redirectInfo.status === 'active') {
35
+ runtimeRoutes.push(buildRuntimeRedirectRoute(candidate));
36
+ }
37
+ }
38
+ return { redirects, runtimeRoutes };
39
+ }
40
+ export function deriveHttpRedirects(routes) {
41
+ return deriveHttpRedirectConfiguration(routes).redirects;
42
+ }
43
+ export function buildHttpRedirectRuntimeRoutes(routes) {
44
+ return deriveHttpRedirectConfiguration(routes).runtimeRoutes;
45
+ }
46
+ function collectRedirectCandidates(routes) {
47
+ const candidates = new Map();
48
+ for (const route of routes) {
49
+ if (!isHttpsRedirectSource(route)) {
50
+ continue;
51
+ }
52
+ for (const domainPattern of getDomainPatterns(route)) {
53
+ const key = createRedirectKey(domainPattern, route.match.path);
54
+ const existing = candidates.get(key);
55
+ if (existing) {
56
+ existing.sourceRouteNames.add(getRouteDisplayName(route));
57
+ if (route.id)
58
+ existing.sourceRouteIds.add(route.id);
59
+ existing.remoteIngress = mergeRemoteIngress(existing.remoteIngress, route.remoteIngress);
60
+ continue;
61
+ }
62
+ const id = createRedirectRouteName(domainPattern, route.match.path);
63
+ candidates.set(key, {
64
+ key,
65
+ id,
66
+ domainPattern,
67
+ pathPattern: route.match.path,
68
+ sourceRouteNames: new Set([getRouteDisplayName(route)]),
69
+ sourceRouteIds: new Set(route.id ? [route.id] : []),
70
+ remoteIngress: mergeRemoteIngress(undefined, route.remoteIngress),
71
+ });
72
+ }
73
+ }
74
+ return [...candidates.values()].sort((a, b) => a.id.localeCompare(b.id));
75
+ }
76
+ function isHttpsRedirectSource(route) {
77
+ if (isGeneratedRedirectRoute(route))
78
+ return false;
79
+ if (route.enabled === false)
80
+ return false;
81
+ if (route.action.type !== 'forward')
82
+ return false;
83
+ if (!route.match.ports)
84
+ return false;
85
+ if (!plugins.smartproxy.portRangeIncludes(route.match.ports, 443))
86
+ return false;
87
+ if (!route.action.tls)
88
+ return false;
89
+ if (!route.match.domains)
90
+ return false;
91
+ if (route.match.transport === 'udp')
92
+ return false;
93
+ if (route.match.protocol && route.match.protocol !== 'http')
94
+ return false;
95
+ if (route.match.clientIp || route.match.headers || route.match.tlsVersion)
96
+ return false;
97
+ return true;
98
+ }
99
+ function isExplicitHttpRoute(route) {
100
+ if (isGeneratedRedirectRoute(route))
101
+ return false;
102
+ if (route.enabled === false)
103
+ return false;
104
+ if (!route.match.ports)
105
+ return false;
106
+ if (!plugins.smartproxy.portRangeIncludes(route.match.ports, 80))
107
+ return false;
108
+ if (route.match.transport === 'udp')
109
+ return false;
110
+ return true;
111
+ }
112
+ function findHttpConflict(candidate, httpRoutes) {
113
+ for (const route of httpRoutes) {
114
+ if (!httpRouteOverlapsCandidate(route, candidate)) {
115
+ continue;
116
+ }
117
+ return {
118
+ routeName: getRouteDisplayName(route),
119
+ covers: httpRouteCoversCandidate(route, candidate),
120
+ };
121
+ }
122
+ return undefined;
123
+ }
124
+ function httpRouteOverlapsCandidate(route, candidate) {
125
+ return routeDomainOverlapsCandidate(route, candidate.domainPattern)
126
+ && pathOverlaps(route.match.path, candidate.pathPattern);
127
+ }
128
+ function httpRouteCoversCandidate(route, candidate) {
129
+ if (route.match.clientIp || route.match.headers || route.match.tlsVersion) {
130
+ return false;
131
+ }
132
+ return routeDomainCoversCandidate(route, candidate.domainPattern)
133
+ && pathCovers(route.match.path, candidate.pathPattern);
134
+ }
135
+ function routeDomainOverlapsCandidate(route, candidatePattern) {
136
+ const routePatterns = getDomainPatterns(route);
137
+ if (routePatterns.length === 0) {
138
+ return true;
139
+ }
140
+ return routePatterns.some((pattern) => domainPatternsOverlap(pattern, candidatePattern));
141
+ }
142
+ function routeDomainCoversCandidate(route, candidatePattern) {
143
+ const routePatterns = getDomainPatterns(route);
144
+ if (routePatterns.length === 0) {
145
+ return true;
146
+ }
147
+ return routePatterns.some((pattern) => domainPatternCovers(pattern, candidatePattern));
148
+ }
149
+ function getDomainPatterns(route) {
150
+ if (!route.match.domains)
151
+ return [];
152
+ return Array.isArray(route.match.domains) ? route.match.domains : [route.match.domains];
153
+ }
154
+ function normalizePattern(pattern) {
155
+ return pattern.trim().toLowerCase().replace(/\.$/, '');
156
+ }
157
+ function domainPatternCovers(coverPattern, candidatePattern) {
158
+ const cover = normalizePattern(coverPattern);
159
+ const candidate = normalizePattern(candidatePattern);
160
+ if (cover === candidate)
161
+ return true;
162
+ if (!candidate.includes('*'))
163
+ return domainPatternMatchesHostname(cover, candidate);
164
+ const coverSuffix = getLeadingWildcardSuffix(cover);
165
+ const candidateSuffix = getLeadingWildcardSuffix(candidate);
166
+ if (coverSuffix && candidateSuffix) {
167
+ return candidateSuffix.endsWith(coverSuffix);
168
+ }
169
+ return false;
170
+ }
171
+ function domainPatternsOverlap(firstPattern, secondPattern) {
172
+ const first = normalizePattern(firstPattern);
173
+ const second = normalizePattern(secondPattern);
174
+ if (first === second)
175
+ return true;
176
+ if (!first.includes('*'))
177
+ return domainPatternMatchesHostname(second, first);
178
+ if (!second.includes('*'))
179
+ return domainPatternMatchesHostname(first, second);
180
+ const firstSuffix = getLeadingWildcardSuffix(first);
181
+ const secondSuffix = getLeadingWildcardSuffix(second);
182
+ if (firstSuffix && secondSuffix) {
183
+ return firstSuffix.endsWith(secondSuffix) || secondSuffix.endsWith(firstSuffix);
184
+ }
185
+ return false;
186
+ }
187
+ function domainPatternMatchesHostname(pattern, hostname) {
188
+ const regex = wildcardPatternToRegex(normalizePattern(pattern));
189
+ return regex.test(normalizePattern(hostname));
190
+ }
191
+ function wildcardPatternToRegex(pattern) {
192
+ const escaped = pattern.replace(/[.+?^${}()|[\]\\]/g, '\\$&');
193
+ return new RegExp(`^${escaped.replace(/\*/g, '.*')}$`, 'i');
194
+ }
195
+ function getLeadingWildcardSuffix(pattern) {
196
+ if (!pattern.startsWith('*'))
197
+ return undefined;
198
+ if (pattern.slice(1).includes('*'))
199
+ return undefined;
200
+ return pattern.slice(1);
201
+ }
202
+ function pathCovers(coverPath, candidatePath) {
203
+ if (!coverPath)
204
+ return true;
205
+ if (!candidatePath)
206
+ return false;
207
+ if (coverPath === candidatePath)
208
+ return true;
209
+ if (!coverPath.includes('*'))
210
+ return false;
211
+ const coverPrefix = coverPath.split('*')[0];
212
+ if (!candidatePath.includes('*'))
213
+ return candidatePath.startsWith(coverPrefix);
214
+ const candidatePrefix = candidatePath.split('*')[0];
215
+ return candidatePrefix.startsWith(coverPrefix);
216
+ }
217
+ function pathOverlaps(firstPath, secondPath) {
218
+ if (!firstPath || !secondPath)
219
+ return true;
220
+ if (firstPath === secondPath)
221
+ return true;
222
+ const firstPrefix = firstPath.split('*')[0];
223
+ const secondPrefix = secondPath.split('*')[0];
224
+ return firstPrefix.startsWith(secondPrefix) || secondPrefix.startsWith(firstPrefix);
225
+ }
226
+ function buildRuntimeRedirectRoute(candidate) {
227
+ return {
228
+ id: candidate.id,
229
+ name: candidate.id,
230
+ description: 'Generated HTTP to HTTPS redirect',
231
+ priority: REDIRECT_PRIORITY,
232
+ tags: ['system', 'redirect', 'auto'],
233
+ match: {
234
+ ports: 80,
235
+ domains: candidate.domainPattern,
236
+ ...(candidate.pathPattern ? { path: candidate.pathPattern } : {}),
237
+ },
238
+ action: {
239
+ type: 'socket-handler',
240
+ socketHandler: createHttpRedirectHandler(REDIRECT_TARGET_TEMPLATE, REDIRECT_STATUS_CODE),
241
+ },
242
+ ...(candidate.remoteIngress ? { remoteIngress: candidate.remoteIngress } : {}),
243
+ };
244
+ }
245
+ function mergeRemoteIngress(current, next) {
246
+ if (!next?.enabled)
247
+ return current;
248
+ if (!current?.enabled) {
249
+ return {
250
+ enabled: true,
251
+ ...(next.edgeFilter?.length ? { edgeFilter: [...next.edgeFilter] } : {}),
252
+ };
253
+ }
254
+ const currentFilter = current.edgeFilter || [];
255
+ const nextFilter = next.edgeFilter || [];
256
+ if (currentFilter.length === 0 || nextFilter.length === 0) {
257
+ return { enabled: true };
258
+ }
259
+ return {
260
+ enabled: true,
261
+ edgeFilter: [...new Set([...currentFilter, ...nextFilter])].sort(),
262
+ };
263
+ }
264
+ function createRedirectKey(domainPattern, pathPattern) {
265
+ return `${normalizePattern(domainPattern)}|${pathPattern || ''}`;
266
+ }
267
+ function createRedirectRouteName(domainPattern, pathPattern) {
268
+ const key = createRedirectKey(domainPattern, pathPattern);
269
+ const slug = key
270
+ .replace(/\*/g, 'wildcard')
271
+ .replace(/[^a-zA-Z0-9]+/g, '-')
272
+ .replace(/^-+|-+$/g, '')
273
+ .slice(0, 48) || 'route';
274
+ const hash = plugins.crypto.createHash('sha1').update(key).digest('hex').slice(0, 8);
275
+ return `${AUTO_REDIRECT_ROUTE_PREFIX}-${slug}-${hash}`;
276
+ }
277
+ function getRouteDisplayName(route) {
278
+ return route.name || route.id || 'unnamed-route';
279
+ }
280
+ function isGeneratedRedirectRoute(route) {
281
+ return Boolean(route.name?.startsWith(AUTO_REDIRECT_ROUTE_PREFIX) || route.id?.startsWith(AUTO_REDIRECT_ROUTE_PREFIX));
282
+ }
283
+ function createHttpRedirectHandler(locationTemplate, statusCode) {
284
+ return (socket, context) => {
285
+ const cleanup = () => {
286
+ clearTimeout(timeout);
287
+ socket.removeListener('data', handleData);
288
+ socket.removeListener('error', cleanup);
289
+ socket.removeListener('close', cleanup);
290
+ };
291
+ const handleData = (data) => {
292
+ cleanup();
293
+ const request = parseHttpRequest(data);
294
+ if (!request) {
295
+ socket.end('HTTP/1.1 400 Bad Request\r\nConnection: close\r\n\r\n');
296
+ return;
297
+ }
298
+ const domain = normalizeHostHeader(request.headers.host) || context.domain || 'localhost';
299
+ const finalLocation = locationTemplate
300
+ .replace('{domain}', domain)
301
+ .replace('{port}', String(context.port))
302
+ .replace('{path}', request.path || '/')
303
+ .replace('{clientIp}', context.clientIp);
304
+ const message = `Redirecting to ${finalLocation}`;
305
+ const response = [
306
+ `HTTP/1.1 ${statusCode} ${getHttpStatusText(statusCode)}`,
307
+ `Location: ${finalLocation}`,
308
+ 'Content-Type: text/plain',
309
+ `Content-Length: ${message.length}`,
310
+ 'Connection: close',
311
+ '',
312
+ message,
313
+ ].join('\r\n');
314
+ socket.end(response);
315
+ };
316
+ const timeout = setTimeout(() => {
317
+ cleanup();
318
+ socket.end('HTTP/1.1 408 Request Timeout\r\nConnection: close\r\n\r\n');
319
+ }, REDIRECT_INITIAL_DATA_TIMEOUT_MS);
320
+ timeout.unref?.();
321
+ socket.once('data', handleData);
322
+ socket.once('error', cleanup);
323
+ socket.once('close', cleanup);
324
+ };
325
+ }
326
+ function parseHttpRequest(data) {
327
+ const requestText = typeof data === 'string' ? data : new TextDecoder().decode(data);
328
+ const headerEnd = requestText.indexOf('\r\n\r\n');
329
+ const headerText = headerEnd >= 0 ? requestText.slice(0, headerEnd) : requestText;
330
+ const lines = headerText.split('\r\n');
331
+ const [method, rawPath] = (lines[0] || '').split(' ');
332
+ if (!method || !rawPath)
333
+ return undefined;
334
+ const headers = {};
335
+ for (const line of lines.slice(1)) {
336
+ const colonIndex = line.indexOf(':');
337
+ if (colonIndex <= 0)
338
+ continue;
339
+ const key = line.slice(0, colonIndex).trim().toLowerCase();
340
+ const value = line.slice(colonIndex + 1).trim();
341
+ headers[key] = value;
342
+ }
343
+ return {
344
+ method,
345
+ path: normalizeRequestPath(rawPath),
346
+ headers,
347
+ };
348
+ }
349
+ function normalizeRequestPath(rawPath) {
350
+ if (rawPath.startsWith('http://') || rawPath.startsWith('https://')) {
351
+ try {
352
+ const url = new URL(rawPath);
353
+ return `${url.pathname}${url.search}` || '/';
354
+ }
355
+ catch {
356
+ return '/';
357
+ }
358
+ }
359
+ return rawPath.startsWith('/') ? rawPath : '/';
360
+ }
361
+ function normalizeHostHeader(hostHeader) {
362
+ if (!hostHeader)
363
+ return undefined;
364
+ const host = hostHeader.split(',')[0].trim();
365
+ if (!host || /[\s\x00-\x1f\x7f]/.test(host))
366
+ return undefined;
367
+ if (host.startsWith('[')) {
368
+ const bracketIndex = host.indexOf(']');
369
+ return bracketIndex > 0 ? host.slice(0, bracketIndex + 1) : undefined;
370
+ }
371
+ return host.replace(/:(80|443)$/, '');
372
+ }
373
+ function getHttpStatusText(statusCode) {
374
+ switch (statusCode) {
375
+ case 301:
376
+ return 'Moved Permanently';
377
+ case 302:
378
+ return 'Found';
379
+ case 307:
380
+ return 'Temporary Redirect';
381
+ case 308:
382
+ return 'Permanent Redirect';
383
+ default:
384
+ return 'Redirect';
385
+ }
386
+ }
387
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.http-redirects.js","sourceRoot":"","sources":["../../../ts/config/helpers.http-redirects.ts"],"names":[],"mappings":"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"}
@@ -4,5 +4,6 @@ export { ApiTokenManager } from './classes.api-token-manager.js';
4
4
  export { GatewayClientManager } from './classes.gateway-client-manager.js';
5
5
  export { ReferenceResolver } from './classes.reference-resolver.js';
6
6
  export { SourcePolicyCompiler } from './classes.source-policy-compiler.js';
7
+ export * from './helpers.http-redirects.js';
7
8
  export { DbSeeder } from './classes.db-seeder.js';
8
9
  export { TargetProfileManager } from './classes.target-profile-manager.js';
@@ -5,6 +5,7 @@ export { ApiTokenManager } from './classes.api-token-manager.js';
5
5
  export { GatewayClientManager } from './classes.gateway-client-manager.js';
6
6
  export { ReferenceResolver } from './classes.reference-resolver.js';
7
7
  export { SourcePolicyCompiler } from './classes.source-policy-compiler.js';
8
+ export * from './helpers.http-redirects.js';
8
9
  export { DbSeeder } from './classes.db-seeder.js';
9
10
  export { TargetProfileManager } from './classes.target-profile-manager.js';
10
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsK0JBQStCO0FBQy9CLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDdkUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ2pFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQzNFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3BFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQzNFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQyJ9
11
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsK0JBQStCO0FBQy9CLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDdkUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ2pFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQzNFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3BFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQzNFLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ2xELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDIn0=
@@ -30,6 +30,15 @@ export class RouteManagementHandler {
30
30
  }
31
31
  return manager.getMergedRoutes();
32
32
  }));
33
+ // Get generated HTTP redirects
34
+ this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getHttpRedirects', async (dataArg) => {
35
+ await this.requireAuth(dataArg, 'routes:read');
36
+ const manager = this.opsServerRef.dcRouterRef.routeConfigManager;
37
+ if (!manager) {
38
+ return { redirects: [] };
39
+ }
40
+ return { redirects: manager.getHttpRedirects() };
41
+ }));
33
42
  // Create route
34
43
  this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('createRoute', async (dataArg) => {
35
44
  const userId = await this.requireAuth(dataArg, 'routes:write');
@@ -74,4 +83,4 @@ export class RouteManagementHandler {
74
83
  }));
75
84
  }
76
85
  }
77
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUtbWFuYWdlbWVudC5oYW5kbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvb3Bzc2VydmVyL2hhbmRsZXJzL3JvdXRlLW1hbmFnZW1lbnQuaGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBRTVDLE9BQU8sS0FBSyxVQUFVLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXBELE1BQU0sT0FBTyxzQkFBc0I7SUFHYjtJQUZiLFdBQVcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsV0FBVyxFQUFFLENBQUM7SUFFNUQsWUFBb0IsWUFBdUI7UUFBdkIsaUJBQVksR0FBWixZQUFZLENBQVc7UUFDekMsSUFBSSxDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUMvRCxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztJQUMxQixDQUFDO0lBRUQ7OztPQUdHO0lBQ0ssS0FBSyxDQUFDLFdBQVcsQ0FDdkIsT0FBb0UsRUFDcEUsYUFBOEM7UUFFOUMsTUFBTSxJQUFJLEdBQUcsTUFBTSxjQUFjLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxPQUFPLEVBQUU7WUFDNUQsS0FBSyxFQUFFLGFBQWE7WUFDcEIsb0JBQW9CLEVBQUUsYUFBYSxFQUFFLFFBQVEsQ0FBQyxRQUFRLENBQUM7U0FDeEQsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQ3JCLENBQUM7SUFFTyxnQkFBZ0I7UUFDdEIsb0JBQW9CO1FBQ3BCLElBQUksQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUM5QixJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUNuQyxpQkFBaUIsRUFDakIsS0FBSyxFQUFFLE9BQU8s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
86
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUtbWFuYWdlbWVudC5oYW5kbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvb3Bzc2VydmVyL2hhbmRsZXJzL3JvdXRlLW1hbmFnZW1lbnQuaGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBRTVDLE9BQU8sS0FBSyxVQUFVLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXBELE1BQU0sT0FBTyxzQkFBc0I7SUFHYjtJQUZiLFdBQVcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsV0FBVyxFQUFFLENBQUM7SUFFNUQsWUFBb0IsWUFBdUI7UUFBdkIsaUJBQVksR0FBWixZQUFZLENBQVc7UUFDekMsSUFBSSxDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUMvRCxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztJQUMxQixDQUFDO0lBRUQ7OztPQUdHO0lBQ0ssS0FBSyxDQUFDLFdBQVcsQ0FDdkIsT0FBb0UsRUFDcEUsYUFBOEM7UUFFOUMsTUFBTSxJQUFJLEdBQUcsTUFBTSxjQUFjLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxPQUFPLEVBQUU7WUFDNUQsS0FBSyxFQUFFLGFBQWE7WUFDcEIsb0JBQW9CLEVBQUUsYUFBYSxFQUFFLFFBQVEsQ0FBQyxRQUFRLENBQUM7U0FDeEQsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQ3JCLENBQUM7SUFFTyxnQkFBZ0I7UUFDdEIsb0JBQW9CO1FBQ3BCLElBQUksQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUM5QixJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUNuQyxpQkFBaUIsRUFDakIsS0FBSyxFQUFFLE9BQU8s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
@@ -145,6 +145,26 @@ export interface IRouteWarning {
145
145
  routeName: string;
146
146
  message: string;
147
147
  }
148
+ export type THttpRedirectStatus = 'active' | 'covered' | 'skipped';
149
+ /**
150
+ * Derived HTTP-to-HTTPS redirect shown in the Ops UI.
151
+ * These entries are generated from configured HTTPS routes and are not stored as routes.
152
+ */
153
+ export interface IHttpRedirectInfo {
154
+ id: string;
155
+ status: THttpRedirectStatus;
156
+ domainPattern: string;
157
+ pathPattern?: string;
158
+ fromTemplate: string;
159
+ toTemplate: string;
160
+ statusCode: number;
161
+ priority: number;
162
+ sourceRouteNames: string[];
163
+ sourceRouteIds: string[];
164
+ coveredByRouteNames: string[];
165
+ remoteIngress: boolean;
166
+ notes?: string;
167
+ }
148
168
  /**
149
169
  * Public info about an API token (never includes the hash).
150
170
  */
@@ -1,6 +1,6 @@
1
1
  import * as plugins from '../plugins.js';
2
2
  import type * as authInterfaces from '../data/auth.js';
3
- import type { IMergedRoute, IRouteWarning, IRouteMetadata } from '../data/route-management.js';
3
+ import type { IHttpRedirectInfo, IMergedRoute, IRouteWarning, IRouteMetadata } from '../data/route-management.js';
4
4
  import type { IDcRouterRouteConfig } from '../data/remoteingress.js';
5
5
  /**
6
6
  * Get all routes with warnings.
@@ -16,6 +16,19 @@ export interface IReq_GetMergedRoutes extends plugins.typedrequestInterfaces.imp
16
16
  warnings: IRouteWarning[];
17
17
  };
18
18
  }
19
+ /**
20
+ * Get derived HTTP-to-HTTPS redirects.
21
+ */
22
+ export interface IReq_GetHttpRedirects extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_GetHttpRedirects> {
23
+ method: 'getHttpRedirects';
24
+ request: {
25
+ identity?: authInterfaces.IIdentity;
26
+ apiToken?: string;
27
+ };
28
+ response: {
29
+ redirects: IHttpRedirectInfo[];
30
+ };
31
+ }
19
32
  /**
20
33
  * Create a new route.
21
34
  */
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '13.42.3',
6
+ version: '13.43.0',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsc0JBQXNCO0lBQzVCLE9BQU8sRUFBRSxTQUFTO0lBQ2xCLFdBQVcsRUFBRSwwRUFBMEU7Q0FDeEYsQ0FBQSJ9
@@ -142,6 +142,7 @@ export declare const remoteIngressStatePart: plugins.deesElement.domtools.plugin
142
142
  export interface IRouteManagementState {
143
143
  mergedRoutes: interfaces.data.IMergedRoute[];
144
144
  warnings: interfaces.data.IRouteWarning[];
145
+ httpRedirects: interfaces.data.IHttpRedirectInfo[];
145
146
  apiTokens: interfaces.data.IApiTokenInfo[];
146
147
  gatewayClients: interfaces.data.IGatewayClient[];
147
148
  isLoading: boolean;
@@ -476,6 +477,7 @@ export declare const updateAcmeConfigAction: plugins.deesElement.domtools.plugin
476
477
  renewThresholdDays?: number;
477
478
  }>;
478
479
  export declare const fetchMergedRoutesAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<IRouteManagementState, unknown>;
480
+ export declare const fetchHttpRedirectsAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<IRouteManagementState, unknown>;
479
481
  export declare const createRouteAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<IRouteManagementState, {
480
482
  route: any;
481
483
  enabled?: boolean;