@serve.zone/dcrouter 11.7.1 → 11.8.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.
- package/dist_serve/bundle.js +1 -1
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +12 -0
- package/dist_ts/remoteingress/classes.remoteingress-manager.js +45 -1
- package/dist_ts_interfaces/data/remoteingress.d.ts +4 -0
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/package.json +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/remoteingress/classes.remoteingress-manager.ts +49 -2
- package/ts_web/00_commitinfo_data.ts +1 -1
package/dist_serve/bundle.js
CHANGED
|
@@ -43149,4 +43149,4 @@ ibantools/jsnext/ibantools.js:
|
|
|
43149
43149
|
* @preferred
|
|
43150
43150
|
*)
|
|
43151
43151
|
*/
|
|
43152
|
-
//# sourceMappingURL=bundle-
|
|
43152
|
+
//# sourceMappingURL=bundle-1773955843358.js.map
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '11.
|
|
6
|
+
version: '11.8.0',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLDBFQUEwRTtDQUN4RixDQUFBIn0=
|
|
@@ -24,11 +24,21 @@ export declare class RemoteIngressManager {
|
|
|
24
24
|
* When edgeFilter is absent, the route applies to all edges.
|
|
25
25
|
*/
|
|
26
26
|
derivePortsForEdge(edgeId: string, edgeTags?: string[]): number[];
|
|
27
|
+
/**
|
|
28
|
+
* Derive UDP listen ports for an edge from routes with transport 'udp' or 'all'.
|
|
29
|
+
* These ports need UDP listeners on the edge (e.g. for QUIC/HTTP3).
|
|
30
|
+
*/
|
|
31
|
+
deriveUdpPortsForEdge(edgeId: string, edgeTags?: string[]): number[];
|
|
27
32
|
/**
|
|
28
33
|
* Get the effective listen ports for an edge.
|
|
29
34
|
* Manual ports are always included. Auto-derived ports are added (union) when autoDerivePorts is true.
|
|
30
35
|
*/
|
|
31
36
|
getEffectiveListenPorts(edge: IRemoteIngress): number[];
|
|
37
|
+
/**
|
|
38
|
+
* Get the effective UDP listen ports for an edge.
|
|
39
|
+
* Manual UDP ports are always included. Auto-derived UDP ports are added when autoDerivePorts is true.
|
|
40
|
+
*/
|
|
41
|
+
getEffectiveListenPortsUdp(edge: IRemoteIngress): number[];
|
|
32
42
|
/**
|
|
33
43
|
* Get manual and derived port breakdown for an edge (used in API responses).
|
|
34
44
|
* Derived ports exclude any ports already present in the manual list.
|
|
@@ -73,10 +83,12 @@ export declare class RemoteIngressManager {
|
|
|
73
83
|
verifySecret(id: string, secret: string): boolean;
|
|
74
84
|
/**
|
|
75
85
|
* Get the list of allowed edges (enabled only) for the Rust hub.
|
|
86
|
+
* Includes listenPortsUdp when routes with transport 'udp' or 'all' are present.
|
|
76
87
|
*/
|
|
77
88
|
getAllowedEdges(): Array<{
|
|
78
89
|
id: string;
|
|
79
90
|
secret: string;
|
|
80
91
|
listenPorts: number[];
|
|
92
|
+
listenPortsUdp?: number[];
|
|
81
93
|
}>;
|
|
82
94
|
}
|
|
@@ -84,6 +84,35 @@ export class RemoteIngressManager {
|
|
|
84
84
|
}
|
|
85
85
|
return [...ports].sort((a, b) => a - b);
|
|
86
86
|
}
|
|
87
|
+
/**
|
|
88
|
+
* Derive UDP listen ports for an edge from routes with transport 'udp' or 'all'.
|
|
89
|
+
* These ports need UDP listeners on the edge (e.g. for QUIC/HTTP3).
|
|
90
|
+
*/
|
|
91
|
+
deriveUdpPortsForEdge(edgeId, edgeTags) {
|
|
92
|
+
const ports = new Set();
|
|
93
|
+
for (const route of this.routes) {
|
|
94
|
+
if (!route.remoteIngress?.enabled)
|
|
95
|
+
continue;
|
|
96
|
+
// Apply edge filter if present
|
|
97
|
+
const filter = route.remoteIngress.edgeFilter;
|
|
98
|
+
if (filter && filter.length > 0) {
|
|
99
|
+
const idMatch = filter.includes(edgeId);
|
|
100
|
+
const tagMatch = edgeTags?.some((tag) => filter.includes(tag)) ?? false;
|
|
101
|
+
if (!idMatch && !tagMatch)
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
// Only include ports from routes that listen on UDP
|
|
105
|
+
const transport = route.match?.transport;
|
|
106
|
+
if (transport === 'udp' || transport === 'all') {
|
|
107
|
+
if (route.match?.ports) {
|
|
108
|
+
for (const p of extractPorts(route.match.ports)) {
|
|
109
|
+
ports.add(p);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
return [...ports].sort((a, b) => a - b);
|
|
115
|
+
}
|
|
87
116
|
/**
|
|
88
117
|
* Get the effective listen ports for an edge.
|
|
89
118
|
* Manual ports are always included. Auto-derived ports are added (union) when autoDerivePorts is true.
|
|
@@ -96,6 +125,18 @@ export class RemoteIngressManager {
|
|
|
96
125
|
const derivedPorts = this.derivePortsForEdge(edge.id, edge.tags);
|
|
97
126
|
return [...new Set([...manualPorts, ...derivedPorts])].sort((a, b) => a - b);
|
|
98
127
|
}
|
|
128
|
+
/**
|
|
129
|
+
* Get the effective UDP listen ports for an edge.
|
|
130
|
+
* Manual UDP ports are always included. Auto-derived UDP ports are added when autoDerivePorts is true.
|
|
131
|
+
*/
|
|
132
|
+
getEffectiveListenPortsUdp(edge) {
|
|
133
|
+
const manualPorts = edge.listenPortsUdp || [];
|
|
134
|
+
const shouldDerive = edge.autoDerivePorts !== false;
|
|
135
|
+
if (!shouldDerive)
|
|
136
|
+
return [...manualPorts].sort((a, b) => a - b);
|
|
137
|
+
const derivedPorts = this.deriveUdpPortsForEdge(edge.id, edge.tags);
|
|
138
|
+
return [...new Set([...manualPorts, ...derivedPorts])].sort((a, b) => a - b);
|
|
139
|
+
}
|
|
99
140
|
/**
|
|
100
141
|
* Get manual and derived port breakdown for an edge (used in API responses).
|
|
101
142
|
* Derived ports exclude any ports already present in the manual list.
|
|
@@ -209,19 +250,22 @@ export class RemoteIngressManager {
|
|
|
209
250
|
}
|
|
210
251
|
/**
|
|
211
252
|
* Get the list of allowed edges (enabled only) for the Rust hub.
|
|
253
|
+
* Includes listenPortsUdp when routes with transport 'udp' or 'all' are present.
|
|
212
254
|
*/
|
|
213
255
|
getAllowedEdges() {
|
|
214
256
|
const result = [];
|
|
215
257
|
for (const edge of this.edges.values()) {
|
|
216
258
|
if (edge.enabled) {
|
|
259
|
+
const listenPortsUdp = this.getEffectiveListenPortsUdp(edge);
|
|
217
260
|
result.push({
|
|
218
261
|
id: edge.id,
|
|
219
262
|
secret: edge.secret,
|
|
220
263
|
listenPorts: this.getEffectiveListenPorts(edge),
|
|
264
|
+
...(listenPortsUdp.length > 0 ? { listenPortsUdp } : {}),
|
|
221
265
|
});
|
|
222
266
|
}
|
|
223
267
|
}
|
|
224
268
|
return result;
|
|
225
269
|
}
|
|
226
270
|
}
|
|
227
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.remoteingress-manager.js","sourceRoot":"","sources":["../../../ts/remoteingress/classes.remoteingress-manager.ts"],"names":[],"mappings":"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"}
|
|
271
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.remoteingress-manager.js","sourceRoot":"","sources":["../../../ts/remoteingress/classes.remoteingress-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,8 @@ export interface IRemoteIngress {
|
|
|
7
7
|
name: string;
|
|
8
8
|
secret: string;
|
|
9
9
|
listenPorts: number[];
|
|
10
|
+
/** UDP listen ports (e.g. for QUIC/HTTP3). Derived from routes with transport 'udp' or 'all'. */
|
|
11
|
+
listenPortsUdp?: number[];
|
|
10
12
|
enabled: boolean;
|
|
11
13
|
/** Whether to auto-derive ports from remoteIngress-tagged routes. Defaults to true. */
|
|
12
14
|
autoDerivePorts: boolean;
|
|
@@ -19,6 +21,8 @@ export interface IRemoteIngress {
|
|
|
19
21
|
manualPorts?: number[];
|
|
20
22
|
/** Ports auto-derived from route configs — only present in API responses. */
|
|
21
23
|
derivedPorts?: number[];
|
|
24
|
+
/** Effective UDP ports (union of manual + derived) — only present in API responses. */
|
|
25
|
+
effectiveListenPortsUdp?: number[];
|
|
22
26
|
}
|
|
23
27
|
/**
|
|
24
28
|
* Runtime status of a remote ingress edge.
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '11.
|
|
6
|
+
version: '11.8.0',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsc0JBQXNCO0lBQzVCLE9BQU8sRUFBRSxRQUFRO0lBQ2pCLFdBQVcsRUFBRSwwRUFBMEU7Q0FDeEYsQ0FBQSJ9
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/dcrouter",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "11.
|
|
4
|
+
"version": "11.8.0",
|
|
5
5
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"exports": {
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"@push.rocks/smartnetwork": "^4.4.0",
|
|
54
54
|
"@push.rocks/smartpath": "^6.0.0",
|
|
55
55
|
"@push.rocks/smartpromise": "^4.2.3",
|
|
56
|
-
"@push.rocks/smartproxy": "^25.16.
|
|
56
|
+
"@push.rocks/smartproxy": "^25.16.2",
|
|
57
57
|
"@push.rocks/smartradius": "^1.1.1",
|
|
58
58
|
"@push.rocks/smartrequest": "^5.0.1",
|
|
59
59
|
"@push.rocks/smartrx": "^3.0.10",
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -94,6 +94,38 @@ export class RemoteIngressManager {
|
|
|
94
94
|
return [...ports].sort((a, b) => a - b);
|
|
95
95
|
}
|
|
96
96
|
|
|
97
|
+
/**
|
|
98
|
+
* Derive UDP listen ports for an edge from routes with transport 'udp' or 'all'.
|
|
99
|
+
* These ports need UDP listeners on the edge (e.g. for QUIC/HTTP3).
|
|
100
|
+
*/
|
|
101
|
+
public deriveUdpPortsForEdge(edgeId: string, edgeTags?: string[]): number[] {
|
|
102
|
+
const ports = new Set<number>();
|
|
103
|
+
|
|
104
|
+
for (const route of this.routes) {
|
|
105
|
+
if (!route.remoteIngress?.enabled) continue;
|
|
106
|
+
|
|
107
|
+
// Apply edge filter if present
|
|
108
|
+
const filter = route.remoteIngress.edgeFilter;
|
|
109
|
+
if (filter && filter.length > 0) {
|
|
110
|
+
const idMatch = filter.includes(edgeId);
|
|
111
|
+
const tagMatch = edgeTags?.some((tag) => filter.includes(tag)) ?? false;
|
|
112
|
+
if (!idMatch && !tagMatch) continue;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
// Only include ports from routes that listen on UDP
|
|
116
|
+
const transport = route.match?.transport;
|
|
117
|
+
if (transport === 'udp' || transport === 'all') {
|
|
118
|
+
if (route.match?.ports) {
|
|
119
|
+
for (const p of extractPorts(route.match.ports)) {
|
|
120
|
+
ports.add(p);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
return [...ports].sort((a, b) => a - b);
|
|
127
|
+
}
|
|
128
|
+
|
|
97
129
|
/**
|
|
98
130
|
* Get the effective listen ports for an edge.
|
|
99
131
|
* Manual ports are always included. Auto-derived ports are added (union) when autoDerivePorts is true.
|
|
@@ -106,6 +138,18 @@ export class RemoteIngressManager {
|
|
|
106
138
|
return [...new Set([...manualPorts, ...derivedPorts])].sort((a, b) => a - b);
|
|
107
139
|
}
|
|
108
140
|
|
|
141
|
+
/**
|
|
142
|
+
* Get the effective UDP listen ports for an edge.
|
|
143
|
+
* Manual UDP ports are always included. Auto-derived UDP ports are added when autoDerivePorts is true.
|
|
144
|
+
*/
|
|
145
|
+
public getEffectiveListenPortsUdp(edge: IRemoteIngress): number[] {
|
|
146
|
+
const manualPorts = edge.listenPortsUdp || [];
|
|
147
|
+
const shouldDerive = edge.autoDerivePorts !== false;
|
|
148
|
+
if (!shouldDerive) return [...manualPorts].sort((a, b) => a - b);
|
|
149
|
+
const derivedPorts = this.deriveUdpPortsForEdge(edge.id, edge.tags);
|
|
150
|
+
return [...new Set([...manualPorts, ...derivedPorts])].sort((a, b) => a - b);
|
|
151
|
+
}
|
|
152
|
+
|
|
109
153
|
/**
|
|
110
154
|
* Get manual and derived port breakdown for an edge (used in API responses).
|
|
111
155
|
* Derived ports exclude any ports already present in the manual list.
|
|
@@ -241,15 +285,18 @@ export class RemoteIngressManager {
|
|
|
241
285
|
|
|
242
286
|
/**
|
|
243
287
|
* Get the list of allowed edges (enabled only) for the Rust hub.
|
|
288
|
+
* Includes listenPortsUdp when routes with transport 'udp' or 'all' are present.
|
|
244
289
|
*/
|
|
245
|
-
public getAllowedEdges(): Array<{ id: string; secret: string; listenPorts: number[] }> {
|
|
246
|
-
const result: Array<{ id: string; secret: string; listenPorts: number[] }> = [];
|
|
290
|
+
public getAllowedEdges(): Array<{ id: string; secret: string; listenPorts: number[]; listenPortsUdp?: number[] }> {
|
|
291
|
+
const result: Array<{ id: string; secret: string; listenPorts: number[]; listenPortsUdp?: number[] }> = [];
|
|
247
292
|
for (const edge of this.edges.values()) {
|
|
248
293
|
if (edge.enabled) {
|
|
294
|
+
const listenPortsUdp = this.getEffectiveListenPortsUdp(edge);
|
|
249
295
|
result.push({
|
|
250
296
|
id: edge.id,
|
|
251
297
|
secret: edge.secret,
|
|
252
298
|
listenPorts: this.getEffectiveListenPorts(edge),
|
|
299
|
+
...(listenPortsUdp.length > 0 ? { listenPortsUdp } : {}),
|
|
253
300
|
});
|
|
254
301
|
}
|
|
255
302
|
}
|