pmcf 2.51.3 → 2.51.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.51.3",
+  "version": "2.51.5",
   "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

@@ -143,45 +143,7 @@ export class DHCPService extends Service {
         };
       });
 
-      peers.length = 2;
-      
-    const commonConfig = {
-      "lease-database": {
-        type: "memfile",
-        "lfc-interval": 3600
-      },
-      "multi-threading": {
-        "enable-multi-threading": false
-      },
-      "expired-leases-processing": {
-        "reclaim-timer-wait-time": 10,
-        "flush-reclaimed-timer-wait-time": 25,
-        "hold-reclaimed-time": 3600,
-        "max-reclaim-leases": 100,
-        "max-reclaim-time": 250,
-        "unwarned-reclaim-cycles": 5
-      },
-      "renew-timer": 900,
-      "rebind-timer": 1800,
-      "valid-lifetime": 3600,
-      "hooks-libraries": [
-        {
-          library: "/usr/lib/kea/hooks/libdhcp_lease_cmds.so"
-        },
-        {
-          library: "/usr/lib/kea/hooks/libdhcp_ha.so",
-          parameters: {
-            "high-availability": [
-              {
-                "this-server-name": name,
-                mode: "hot-standby",
-                peers
-              }
-            ]
-          }
-        }
-      ]
-    };
+    peers.length = 2;
 
     const loggers = [
       {
@@ -195,6 +157,54 @@ export class DHCPService extends Service {
       }
     ];
 
+    const commonConfig = family => {
+      return {
+        "interfaces-config": {
+          interfaces: listenInterfaces(`IPv${family}`)
+        },
+        "control-socket": toUnix(
+          this.endpoint(e => e.type === `kea-control-dhcp${family}`)
+        ),
+        "lease-database": {
+          type: "memfile",
+          "lfc-interval": 3600
+        },
+        "multi-threading": {
+          "enable-multi-threading": false
+        },
+        "expired-leases-processing": {
+          "reclaim-timer-wait-time": 10,
+          "flush-reclaimed-timer-wait-time": 25,
+          "hold-reclaimed-time": 3600,
+          "max-reclaim-leases": 100,
+          "max-reclaim-time": 250,
+          "unwarned-reclaim-cycles": 5
+        },
+        "renew-timer": 900,
+        "rebind-timer": 1800,
+        "valid-lifetime": 3600,
+        "hooks-libraries": [
+          {
+            library: "/usr/lib/kea/hooks/libdhcp_lease_cmds.so"
+          },
+          {
+            library: "/usr/lib/kea/hooks/libdhcp_ha.so",
+            parameters: {
+              "high-availability": [
+                {
+                  "this-server-name": name,
+                  mode: "hot-standby",
+                  peers
+                }
+              ]
+            }
+          }
+        ],
+        "dhcp-ddns": dhcpServerDdns,
+        loggers
+      };
+    };
+
     const toUnix = endpoint => {
       return {
         "socket-type": "unix",
@@ -251,7 +261,7 @@ export class DHCPService extends Service {
 
     const dhcpServerDdns = {
       "enable-updates": true,
-      "server-address": ddnsEndpoint.address,
+      "server-ip": ddnsEndpoint.address,
       "server-port": ddnsEndpoint.port,
       "max-queue-size": 64,
       "ncr-protocol": "UDP",
@@ -297,14 +307,7 @@ export class DHCPService extends Service {
     );
     const dhcp4 = {
       Dhcp4: {
-        ...commonConfig,
-        "interfaces-config": {
-          interfaces: listenInterfaces("IPv4")
-        },
-        "control-socket": {
-          "socket-type": "unix",
-          "socket-name": "/run/kea/4-ctrl-socket"
-        },
+        ...commonConfig("4"),
         "option-data": [
           {
             name: "domain-name-servers",
@@ -333,21 +336,12 @@ export class DHCPService extends Service {
               ],
               reservations
             };
-          }),
-        "dhcp-ddns": dhcpServerDdns,
-        loggers
+          })
       }
     };
     const dhcp6 = {
       Dhcp6: {
-        ...commonConfig,
-        "interfaces-config": {
-          interfaces: listenInterfaces("IPv6")
-        },
-        "control-socket": {
-          "socket-type": "unix",
-          "socket-name": "/run/kea/6-ctrl-socket"
-        },
+        ...commonConfig("6"),
         "preferred-lifetime": 3000,
         "option-data": [
           {
@@ -380,9 +374,7 @@ export class DHCPService extends Service {
                 }*/
               ]
             };
-          }),
-        "dhcp-ddns": dhcpServerDdns,
-        loggers
+          })
       }
     };
 

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);