@serve.zone/dcrouter 13.42.2 → 13.42.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.
- package/deno.json +11 -11
- package/dist_serve/bundle.js +692 -692
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/config/classes.source-policy-compiler.d.ts +1 -0
- package/dist_ts/config/classes.source-policy-compiler.js +24 -2
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/package.json +10 -10
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/config/classes.source-policy-compiler.ts +33 -1
- package/ts_web/00_commitinfo_data.ts +1 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '13.42.
|
|
6
|
+
version: '13.42.4',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLDBFQUEwRTtDQUN4RixDQUFBIn0=
|
|
@@ -22,6 +22,7 @@ export declare class SourcePolicyCompiler {
|
|
|
22
22
|
private static getPathPatterns;
|
|
23
23
|
private static calculatePathPriorityOffset;
|
|
24
24
|
private static calculateSourcePriority;
|
|
25
|
+
private static applyIntegerPriorities;
|
|
25
26
|
private static clampPriority;
|
|
26
27
|
private static getExpandedPortCount;
|
|
27
28
|
private static normalizeMaxConnections;
|
|
@@ -112,7 +112,7 @@ export class SourcePolicyCompiler {
|
|
|
112
112
|
}));
|
|
113
113
|
}
|
|
114
114
|
});
|
|
115
|
-
return compiledRoutes;
|
|
115
|
+
return this.applyIntegerPriorities(compiledRoutes, basePriority);
|
|
116
116
|
}
|
|
117
117
|
static validateSourcePolicyPayload(sourcePolicy) {
|
|
118
118
|
if (!sourcePolicy) {
|
|
@@ -356,6 +356,28 @@ export class SourcePolicyCompiler {
|
|
|
356
356
|
const sourceStep = SOURCE_PRIORITY_BAND / (sourceCount + 1);
|
|
357
357
|
return safeBasePriority + ((sourceCount - sourceIndex) * sourceStep);
|
|
358
358
|
}
|
|
359
|
+
static applyIntegerPriorities(routes, basePriority) {
|
|
360
|
+
if (routes.length === 0) {
|
|
361
|
+
return routes;
|
|
362
|
+
}
|
|
363
|
+
const priorityOrder = routes
|
|
364
|
+
.map((route, originalIndex) => ({
|
|
365
|
+
originalIndex,
|
|
366
|
+
priority: typeof route.priority === 'number' && Number.isFinite(route.priority)
|
|
367
|
+
? route.priority
|
|
368
|
+
: basePriority,
|
|
369
|
+
}))
|
|
370
|
+
.sort((a, b) => (b.priority - a.priority) || (a.originalIndex - b.originalIndex));
|
|
371
|
+
const topPriority = Math.trunc(this.clampPriority(basePriority + routes.length - 1, MIN_ROUTE_PRIORITY + routes.length - 1, MAX_ROUTE_PRIORITY));
|
|
372
|
+
const integerPriorities = new Map();
|
|
373
|
+
priorityOrder.forEach((entry, index) => {
|
|
374
|
+
integerPriorities.set(entry.originalIndex, topPriority - index);
|
|
375
|
+
});
|
|
376
|
+
return routes.map((route, index) => ({
|
|
377
|
+
...route,
|
|
378
|
+
priority: integerPriorities.get(index) ?? MIN_ROUTE_PRIORITY,
|
|
379
|
+
}));
|
|
380
|
+
}
|
|
359
381
|
static clampPriority(priority, min = MIN_ROUTE_PRIORITY, max = MAX_ROUTE_PRIORITY) {
|
|
360
382
|
if (!Number.isFinite(priority)) {
|
|
361
383
|
return min;
|
|
@@ -494,4 +516,4 @@ export class SourcePolicyCompiler {
|
|
|
494
516
|
return this.sanitizeSourcePolicySecurity(controls);
|
|
495
517
|
}
|
|
496
518
|
}
|
|
497
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.source-policy-compiler.js","sourceRoot":"","sources":["../../../ts/config/classes.source-policy-compiler.ts"],"names":[],"mappings":"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"}
|
|
519
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.source-policy-compiler.js","sourceRoot":"","sources":["../../../ts/config/classes.source-policy-compiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '13.42.
|
|
6
|
+
version: '13.42.4',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsc0JBQXNCO0lBQzVCLE9BQU8sRUFBRSxTQUFTO0lBQ2xCLFdBQVcsRUFBRSwwRUFBMEU7Q0FDeEYsQ0FBQSJ9
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/dcrouter",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "13.42.
|
|
4
|
+
"version": "13.42.4",
|
|
5
5
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"bin": {
|
|
@@ -18,27 +18,27 @@
|
|
|
18
18
|
"@git.zone/tsbuild": "^4.4.2",
|
|
19
19
|
"@git.zone/tsbundle": "^2.10.4",
|
|
20
20
|
"@git.zone/tsdeno": "^1.5.0",
|
|
21
|
-
"@git.zone/tsdocker": "^2.4.
|
|
21
|
+
"@git.zone/tsdocker": "^2.4.2",
|
|
22
22
|
"@git.zone/tsrun": "^2.0.4",
|
|
23
23
|
"@git.zone/tstest": "^3.6.6",
|
|
24
24
|
"@git.zone/tswatch": "^3.3.5",
|
|
25
25
|
"@types/node": "^25.9.1"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@api.global/typedrequest": "^3.3.
|
|
28
|
+
"@api.global/typedrequest": "^3.3.2",
|
|
29
29
|
"@api.global/typedrequest-interfaces": "^3.0.19",
|
|
30
|
-
"@api.global/typedserver": "^8.4.
|
|
31
|
-
"@api.global/typedsocket": "^4.1.
|
|
30
|
+
"@api.global/typedserver": "^8.4.7",
|
|
31
|
+
"@api.global/typedsocket": "^4.1.4",
|
|
32
32
|
"@apiclient.xyz/cloudflare": "^7.1.0",
|
|
33
33
|
"@design.estate/dees-catalog": "^3.83.0",
|
|
34
34
|
"@design.estate/dees-element": "^2.2.4",
|
|
35
|
-
"@idp.global/sdk": "^1.
|
|
35
|
+
"@idp.global/sdk": "^1.4.0",
|
|
36
36
|
"@push.rocks/lik": "^6.4.1",
|
|
37
37
|
"@push.rocks/projectinfo": "^5.1.0",
|
|
38
38
|
"@push.rocks/qenv": "^6.1.4",
|
|
39
39
|
"@push.rocks/smartacme": "^9.5.0",
|
|
40
40
|
"@push.rocks/smartdata": "^7.1.7",
|
|
41
|
-
"@push.rocks/smartdb": "^2.10.
|
|
41
|
+
"@push.rocks/smartdb": "^2.10.2",
|
|
42
42
|
"@push.rocks/smartdns": "^7.9.3",
|
|
43
43
|
"@push.rocks/smartfs": "^1.5.1",
|
|
44
44
|
"@push.rocks/smartguard": "^3.1.0",
|
|
@@ -58,12 +58,12 @@
|
|
|
58
58
|
"@push.rocks/smartunique": "^3.0.9",
|
|
59
59
|
"@push.rocks/smartvpn": "1.20.0",
|
|
60
60
|
"@push.rocks/taskbuffer": "^8.0.2",
|
|
61
|
-
"@serve.zone/catalog": "^2.12.
|
|
62
|
-
"@serve.zone/interfaces": "^
|
|
61
|
+
"@serve.zone/catalog": "^2.12.7",
|
|
62
|
+
"@serve.zone/interfaces": "^6.2.1",
|
|
63
63
|
"@serve.zone/remoteingress": "^4.22.5",
|
|
64
64
|
"@tsclass/tsclass": "^9.5.1",
|
|
65
65
|
"@types/qrcode": "^1.5.6",
|
|
66
|
-
"lru-cache": "^11.
|
|
66
|
+
"lru-cache": "^11.5.1",
|
|
67
67
|
"qrcode": "^1.5.4",
|
|
68
68
|
"uuid": "^14.0.0"
|
|
69
69
|
},
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -140,7 +140,7 @@ export class SourcePolicyCompiler {
|
|
|
140
140
|
}
|
|
141
141
|
});
|
|
142
142
|
|
|
143
|
-
return compiledRoutes;
|
|
143
|
+
return this.applyIntegerPriorities(compiledRoutes, basePriority);
|
|
144
144
|
}
|
|
145
145
|
|
|
146
146
|
public static validateSourcePolicyPayload(sourcePolicy?: Partial<IRouteSourcePolicy>): string | undefined {
|
|
@@ -452,6 +452,38 @@ export class SourcePolicyCompiler {
|
|
|
452
452
|
return safeBasePriority + ((sourceCount - sourceIndex) * sourceStep);
|
|
453
453
|
}
|
|
454
454
|
|
|
455
|
+
private static applyIntegerPriorities(
|
|
456
|
+
routes: plugins.smartproxy.IRouteConfig[],
|
|
457
|
+
basePriority: number,
|
|
458
|
+
): plugins.smartproxy.IRouteConfig[] {
|
|
459
|
+
if (routes.length === 0) {
|
|
460
|
+
return routes;
|
|
461
|
+
}
|
|
462
|
+
|
|
463
|
+
const priorityOrder = routes
|
|
464
|
+
.map((route, originalIndex) => ({
|
|
465
|
+
originalIndex,
|
|
466
|
+
priority: typeof route.priority === 'number' && Number.isFinite(route.priority)
|
|
467
|
+
? route.priority
|
|
468
|
+
: basePriority,
|
|
469
|
+
}))
|
|
470
|
+
.sort((a, b) => (b.priority - a.priority) || (a.originalIndex - b.originalIndex));
|
|
471
|
+
const topPriority = Math.trunc(this.clampPriority(
|
|
472
|
+
basePriority + routes.length - 1,
|
|
473
|
+
MIN_ROUTE_PRIORITY + routes.length - 1,
|
|
474
|
+
MAX_ROUTE_PRIORITY,
|
|
475
|
+
));
|
|
476
|
+
const integerPriorities = new Map<number, number>();
|
|
477
|
+
priorityOrder.forEach((entry, index) => {
|
|
478
|
+
integerPriorities.set(entry.originalIndex, topPriority - index);
|
|
479
|
+
});
|
|
480
|
+
|
|
481
|
+
return routes.map((route, index) => ({
|
|
482
|
+
...route,
|
|
483
|
+
priority: integerPriorities.get(index) ?? MIN_ROUTE_PRIORITY,
|
|
484
|
+
}));
|
|
485
|
+
}
|
|
486
|
+
|
|
455
487
|
private static clampPriority(
|
|
456
488
|
priority: number,
|
|
457
489
|
min = MIN_ROUTE_PRIORITY,
|