pmcf 2.51.4 → 2.51.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.51.4",
+  "version": "2.51.6",
   "publishConfig": {
     "access": "public"
   },

package/src/endpoint.mjs

@@ -93,20 +93,32 @@ export class HTTPEndpoint extends PortEndpoint {
   constructor(service, address, data) {
     super(service, data);
 
-    for (const name of ["path"]) {
-      if (data[name] !== undefined) {
-        this[name] = data[name];
-      }
-    }
-
     if (typeof address === "string") {
+      this.url = new URL(address);
+    } else if (address instanceof URL) {
       this.url = address;
     } else {
-      this.url = "http://" + address.address + ":" + data.port + data.path;
-      this.host = address.address;
+      this.url = new URL(
+        "http://" +
+          (address.family === "IPv6"
+            ? "[" + address.address + "]"
+            : address.address) +
+          ":" +
+          data.port +
+          data.path
+      );
+      this.hostname = address.address;
     }
   }
 
+  get port() {
+    return this.url.port || 80;
+  }
+
+  get pathname() {
+    return this.url.pathname;
+  }
+
   get address() {
     return this.url;
   }

package/src/service.mjs

@@ -38,7 +38,7 @@ const ServiceTypes = {
   ssh: { endpoints: [{ protocol: "tcp", port: 22, tls: false }] },
   imap: { endpoints: [{ protocol: "tcp", port: 143, tls: false }] },
   imaps: { endpoints: [{ protocol: "tcp", port: 993, tls: true }] },
-  dhcp: { endpoints: [{ port: 547, protocol: "udp", tls: false }] },
+  dhcp: { endpoints: [{ protocol: "udp", port: 547, tls: false }] },
   "dhcpv6-client": {
     endpoints: [
       { protocol: "tcp", port: 546, tls: false },
@@ -208,7 +208,7 @@ export class Service extends Base {
 
     return filter ? result.filter(filter) : result;
   }
-  
+
   endpoint(filter) {
     return this.endpoints(filter)[0];
   }
@@ -216,7 +216,7 @@ export class Service extends Base {
   address(
     options = {
       endpoints: e => e.networkInterface?.kind !== "loopbak",
-      select: e => e.domainName||e.address,
+      select: e => e.domainName || e.address,
       limit: 1,
       join: ""
     }
@@ -275,7 +275,10 @@ export class Service extends Base {
 
     if (hasSVRRecords) {
       for (const ep of this.endpoints(
-        e => e.protocol && e.networkInterface && e.networkInterface.kind !== "loopback"
+        e =>
+          e.protocol &&
+          e.networkInterface &&
+          e.networkInterface.kind !== "loopback"
       )) {
         records.push(
           DNSRecord(

package/src/services/dhcp.mjs

@@ -24,7 +24,7 @@ const DHCPServiceTypeDefinition = {
 
 const controlAgentEndpoint = {
   type: "kea-control-agent",
-  port: 8000,
+  port: 53002,
   path: "/",
   method: "get",
   protocol: "tcp",
@@ -183,6 +183,21 @@ export class DHCPService extends Service {
         "renew-timer": 900,
         "rebind-timer": 1800,
         "valid-lifetime": 3600,
+        "preferred-lifetime": 3000,
+
+        "option-data": [
+          {
+            name: "dns-servers",
+            data: dnsServerEndpoints
+              .filter(endpoint => endpoint.family === `IPv${family}`)
+              .map(endpoint => endpoint.address)
+              .join(",")
+          },
+          {
+            name: "domain-search",
+            data: [...this.domains].join(",")
+          }
+        ],
         "hooks-libraries": [
           {
             library: "/usr/lib/kea/hooks/libdhcp_lease_cmds.so"
@@ -308,26 +323,15 @@ export class DHCPService extends Service {
     const dhcp4 = {
       Dhcp4: {
         ...commonConfig("4"),
-        "option-data": [
-          {
-            name: "domain-name-servers",
-            data: dnsServerEndpoints
-              .filter(endpoint => endpoint.family === "IPv4")
-              .map(endpoint => endpoint.address)
-              .join(",")
-          },
-          {
-            name: "domain-search",
-            data: [...this.domains].join(",")
-          }
-        ],
         subnet4: subnets
           .filter(s => s.family === "IPv4")
           .map((subnet, index) => {
             return {
               id: index + 1,
               subnet: subnet.longAddress,
-              pools: [{ pool: subnet.dhcpUsableAddressRange.join(" - ") }],
+              pools: subnet.dhcpPools.map(range => {
+                return { pool: range.join(" - ") };
+              }),
               "option-data": [
                 {
                   name: "routers",
@@ -342,23 +346,15 @@ export class DHCPService extends Service {
     const dhcp6 = {
       Dhcp6: {
         ...commonConfig("6"),
-        "preferred-lifetime": 3000,
-        "option-data": [
-          {
-            name: "dns-servers",
-            data: dnsServerEndpoints
-              .filter(endpoint => endpoint.family === "IPv6")
-              .map(endpoint => endpoint.address)
-              .join(",")
-          }
-        ],
         subnet6: subnets
           .filter(s => s.family === "IPv6")
           .map((subnet, index) => {
             return {
               id: index + 1,
               subnet: subnet.longAddress,
-              pools: [{ pool: subnet.addressRange.join(" - ") }],
+              pools: subnet.dhcpPools.map(range => {
+                return { pool: range.join(" - ") };
+              }),
 
               /*"pd-pools": [
                 {

package/src/subnet.mjs

@@ -64,10 +64,11 @@ export class Subnet extends Base {
     return rangeIP(this.prefix, this.prefixLength, 1, 1).map(a => decodeIP(a));
   }
 
-  get dhcpUsableAddressRange()
-  {
+  get dhcpPools() {
     /* TODO where to take values from ? */
-    return rangeIP(this.prefix, this.prefixLength, 51, 6).map(a => decodeIP(a));
+    return [
+      rangeIP(this.prefix, this.prefixLength, 51, 6).map(a => decodeIP(a))
+    ];
   }
 
   get address() {

package/types/endpoint.d.mts

@@ -16,9 +16,11 @@ export class DomainNameEndpoint extends PortEndpoint {
 }
 export class HTTPEndpoint extends PortEndpoint {
     constructor(service: any, address: any, data: any);
-    url: string;
-    host: any;
-    get address(): string;
+    url: URL;
+    hostname: any;
+    get port(): string | 80;
+    get pathname(): string;
+    get address(): URL;
 }
 export class UnixEndpoint extends BaseEndpoint {
     constructor(service: any, path: any, data: any);

package/types/subnet.d.mts

@@ -33,7 +33,7 @@ export class Subnet extends Base {
     matchesAddress(address: any): any;
     get isLinkLocal(): any;
     get addressRange(): any;
-    get dhcpUsableAddressRange(): any;
+    get dhcpPools(): any[];
     get address(): string;
     get longAddress(): string;
     _traverse(...args: any[]): boolean;