pmcf 2.51.5 → 2.51.7

package/package.json

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

package/src/endpoint.mjs

@@ -89,7 +89,7 @@ export class DomainNameEndpoint extends PortEndpoint {
   }
 }
 
-export class HTTPEndpoint extends PortEndpoint {
+export class HTTPEndpoint extends BaseEndpoint {
   constructor(service, address, data) {
     super(service, data);
 
@@ -98,21 +98,24 @@ export class HTTPEndpoint extends PortEndpoint {
     } else if (address instanceof URL) {
       this.url = address;
     } else {
+      this.family = address.family;
       this.url = new URL(
-        "http://" +
+        (data.tls ? "https://" : "http://") +
           (address.family === "IPv6"
             ? "[" + address.address + "]"
             : address.address) +
           ":" +
           data.port +
-          data.path
+          (data.pathname || "/")
       );
       this.hostname = address.address;
     }
   }
 
   get port() {
-    return this.url.port || 80;
+    return (
+      this.url.port || (this.url.toString().startsWith("https:") ? 443 : 80)
+    );
   }
 
   get pathname() {
@@ -123,6 +126,14 @@ export class HTTPEndpoint extends PortEndpoint {
     return this.url;
   }
 
+  get protocol() {
+    return "tcp";
+  }
+
+  get tls() {
+    return this.url.toString().startsWith("https:");
+  }
+
   toString() {
     return `${this.type}:${this.url}`;
   }

package/src/services/dhcp.mjs

@@ -24,8 +24,8 @@ const DHCPServiceTypeDefinition = {
 
 const controlAgentEndpoint = {
   type: "kea-control-agent",
-  port: 8000,
-  path: "/",
+  port: 53002,
+  pathname: "/",
   method: "get",
   protocol: "tcp",
   tls: false
@@ -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

@@ -14,13 +14,16 @@ export class DomainNameEndpoint extends PortEndpoint {
     get networkInterface(): {};
     get address(): any;
 }
-export class HTTPEndpoint extends PortEndpoint {
+export class HTTPEndpoint extends BaseEndpoint {
     constructor(service: any, address: any, data: any);
     url: URL;
+    family: any;
     hostname: any;
-    get port(): string | 80;
+    get port(): string | 80 | 443;
     get pathname(): string;
     get address(): URL;
+    get protocol(): string;
+    get tls(): boolean;
 }
 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;