pmcf 2.73.9 → 2.73.11
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/bin/pmcf-package +1 -1
- package/package.json +4 -4
- package/src/services/kea.mjs +13 -11
- package/types/services/kea.d.mts +10 -1
package/bin/pmcf-package
CHANGED
|
@@ -4,7 +4,7 @@ import { join, resolve } from "node:path";
|
|
|
4
4
|
import { readFile, mkdtemp } from "node:fs/promises";
|
|
5
5
|
import { tmpdir } from "node:os";
|
|
6
6
|
import { cwd, env } from "node:process";
|
|
7
|
-
import { packageDirectory } from "
|
|
7
|
+
import { packageDirectory } from "package-directory";
|
|
8
8
|
import { createPublishingDetails } from "npm-pkgbuild";
|
|
9
9
|
import { prepare } from "../src/cli.mjs";
|
|
10
10
|
import { asArray } from "../src/utils.mjs";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pmcf",
|
|
3
|
-
"version": "2.73.
|
|
3
|
+
"version": "2.73.11",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -52,11 +52,11 @@
|
|
|
52
52
|
"dependencies": {
|
|
53
53
|
"ip-utilties": "^1.4.7",
|
|
54
54
|
"npm-pkgbuild": "^18.2.12",
|
|
55
|
-
"pacc": "^3.
|
|
56
|
-
"
|
|
55
|
+
"pacc": "^3.11.1",
|
|
56
|
+
"package-directory": "^8.1.0"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@types/node": "^24.0
|
|
59
|
+
"@types/node": "^24.1.0",
|
|
60
60
|
"ava": "^6.4.1",
|
|
61
61
|
"c8": "^10.1.3",
|
|
62
62
|
"documentation": "^14.0.3",
|
package/src/services/kea.mjs
CHANGED
|
@@ -32,7 +32,7 @@ const KeaServiceTypeDefinition = {
|
|
|
32
32
|
}
|
|
33
33
|
]
|
|
34
34
|
},
|
|
35
|
-
"kea-control-agent": {
|
|
35
|
+
/*"kea-control-agent": {
|
|
36
36
|
endpoints: [
|
|
37
37
|
{
|
|
38
38
|
family: "IPv4",
|
|
@@ -42,8 +42,7 @@ const KeaServiceTypeDefinition = {
|
|
|
42
42
|
tls: false
|
|
43
43
|
}
|
|
44
44
|
]
|
|
45
|
-
}
|
|
46
|
-
/*
|
|
45
|
+
},*/
|
|
47
46
|
"kea-ha-4": {
|
|
48
47
|
endpoints: [
|
|
49
48
|
{
|
|
@@ -65,7 +64,7 @@ const KeaServiceTypeDefinition = {
|
|
|
65
64
|
tls: false
|
|
66
65
|
}
|
|
67
66
|
]
|
|
68
|
-
}
|
|
67
|
+
},
|
|
69
68
|
"kea-control-dhcp4": {
|
|
70
69
|
endpoints: [
|
|
71
70
|
{
|
|
@@ -94,7 +93,7 @@ const KeaServiceTypeDefinition = {
|
|
|
94
93
|
}
|
|
95
94
|
};
|
|
96
95
|
|
|
97
|
-
const keaVersion =
|
|
96
|
+
const keaVersion = 3.0;
|
|
98
97
|
export const fetureHasHTTPEndpoints = keaVersion > 2.7;
|
|
99
98
|
|
|
100
99
|
export class KeaService extends Service {
|
|
@@ -116,7 +115,9 @@ export class KeaService extends Service {
|
|
|
116
115
|
}
|
|
117
116
|
|
|
118
117
|
async *preparePackages(dir) {
|
|
119
|
-
const ctrlAgentEndpoint = this.endpoint(
|
|
118
|
+
const ctrlAgentEndpoint = this.endpoint(
|
|
119
|
+
fetureHasHTTPEndpoints ? "kea-ha-4" : "kea-control-agent"
|
|
120
|
+
);
|
|
120
121
|
|
|
121
122
|
if (!ctrlAgentEndpoint) {
|
|
122
123
|
return;
|
|
@@ -197,7 +198,7 @@ export class KeaService extends Service {
|
|
|
197
198
|
"lfc-interval": 3600
|
|
198
199
|
},
|
|
199
200
|
"multi-threading": {
|
|
200
|
-
"enable-multi-threading":
|
|
201
|
+
"enable-multi-threading": true
|
|
201
202
|
},
|
|
202
203
|
"expired-leases-processing": {
|
|
203
204
|
"reclaim-timer-wait-time": 10,
|
|
@@ -241,6 +242,8 @@ export class KeaService extends Service {
|
|
|
241
242
|
}
|
|
242
243
|
],
|
|
243
244
|
"dhcp-ddns": dhcpServerDdns,
|
|
245
|
+
"ddns-send-updates": true,
|
|
246
|
+
|
|
244
247
|
loggers,
|
|
245
248
|
"option-data": [
|
|
246
249
|
{
|
|
@@ -265,7 +268,7 @@ export class KeaService extends Service {
|
|
|
265
268
|
};
|
|
266
269
|
};
|
|
267
270
|
|
|
268
|
-
const ctrlAgent = {
|
|
271
|
+
/*const ctrlAgent = {
|
|
269
272
|
"Control-agent": {
|
|
270
273
|
"http-host": ctrlAgentEndpoint.hostname,
|
|
271
274
|
"http-port": ctrlAgentEndpoint.port,
|
|
@@ -276,7 +279,7 @@ export class KeaService extends Service {
|
|
|
276
279
|
},
|
|
277
280
|
loggers
|
|
278
281
|
}
|
|
279
|
-
}
|
|
282
|
+
};*/
|
|
280
283
|
|
|
281
284
|
const dnsServersSlot = names =>
|
|
282
285
|
names.map(name => {
|
|
@@ -323,7 +326,7 @@ export class KeaService extends Service {
|
|
|
323
326
|
"enable-updates": true,
|
|
324
327
|
"server-ip": ddnsEndpoint.address,
|
|
325
328
|
"server-port": ddnsEndpoint.port,
|
|
326
|
-
"max-queue-size":
|
|
329
|
+
"max-queue-size": 16,
|
|
327
330
|
"ncr-protocol": "UDP",
|
|
328
331
|
"ncr-format": "JSON"
|
|
329
332
|
};
|
|
@@ -418,7 +421,6 @@ export class KeaService extends Service {
|
|
|
418
421
|
};
|
|
419
422
|
|
|
420
423
|
for (const [name, data] of Object.entries({
|
|
421
|
-
"kea-ctrl-agent": ctrlAgent,
|
|
422
424
|
"kea-dhcp-ddns": ddns,
|
|
423
425
|
"kea-dhcp4": dhcp4,
|
|
424
426
|
"kea-dhcp6": dhcp6
|
package/types/services/kea.d.mts
CHANGED
|
@@ -276,7 +276,16 @@ export class KeaService extends Service {
|
|
|
276
276
|
tls: boolean;
|
|
277
277
|
}[];
|
|
278
278
|
};
|
|
279
|
-
"kea-
|
|
279
|
+
"kea-ha-4": {
|
|
280
|
+
endpoints: {
|
|
281
|
+
family: string;
|
|
282
|
+
port: number;
|
|
283
|
+
pathname: string;
|
|
284
|
+
protocol: string;
|
|
285
|
+
tls: boolean;
|
|
286
|
+
}[];
|
|
287
|
+
};
|
|
288
|
+
"kea-ha-6": {
|
|
280
289
|
endpoints: {
|
|
281
290
|
family: string;
|
|
282
291
|
port: number;
|