pmcf 2.9.1 → 2.10.0

package/package.json

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

package/src/service.mjs

@@ -89,7 +89,12 @@ export const ServiceTypeDefinition = {
     alias: { type: "string", collection: false, writeable: true },
     type: { type: "string", collection: false, writeable: true },
     weight: { type: "number", collection: false, writeable: true, default: 1 },
-    tls: { type: "string", collection: false, writeable: false, default: false },
+    tls: {
+      type: "string",
+      collection: false,
+      writeable: false,
+      default: false
+    },
     systemd: { type: "string", collection: true, writeable: true }
   }
 };
@@ -147,14 +152,18 @@ export class Service extends Base {
     return this.rawAddresses.map(a => `${a}:${this.port}`);
   }
 
+  get networks() {
+    return this.server.networks;
+  }
+
   get endpoints() {
     if (!ServiceTypes[this.type]) {
-      return [
-        { address: this.rawAddress, port: this._port, tls: false }
-      ];
+      return [{ address: this.rawAddress, port: this._port, tls: false }];
     }
 
-    return ServiceTypes[this.type].endpoints;
+    return ServiceTypes[this.type].endpoints.map(e =>
+      Object.assign({ address: this.rawAddress }, e)
+    );
   }
 
   set port(value) {

package/src/services/dhcp.mjs

@@ -63,7 +63,7 @@ export class DHCPService extends Service {
       "interfaces-config": {
         interfaces: [...host.networkInterfaces.values()]
           .filter(ni => ni.kind !== "loopback")
-          .map(ni => ni.name)
+          .map(ni => `${ni.name}/${ni.rawAddress}`)
       },
       "lease-database": {
         type: "memfile",
@@ -147,17 +147,14 @@ export class DHCPService extends Service {
       }
     };
 
-    // console.log(this.owner.name,this.owner.networks());
-    /*
     const subnets = new Set();
 
-    for (const network of this.owner.networks()) {
+    for (const network of this.networks) {
       for (const subnet of network.subnets()) {
         subnets.add(subnet);
       }
     }
-    console.log([...subnets].map(s => s.address));
-    */
+    //console.log([...subnets].filter(s => s.isIPv4).map(s => s.address));
 
     const hwmap = new Map();
     const hostNames = new Set();
@@ -199,24 +196,22 @@ export class DHCPService extends Service {
             data: [...this.domains].join(",")
           }
         ],
-        subnet4: [
-          {
-            id: 1,
-            subnet: "192.168.1.0/24",
-            pools: [
-              {
-                pool: "192.168.1.100 - 192.168.1.200"
-              }
-            ],
-            "option-data": [
-              {
-                name: "routers",
-                data: network.gateway.rawAddress
-              }
-            ],
-            reservations
-          }
-        ],
+        subnet4: [...subnets]
+          .filter(s => s.isIPv4)
+          .map((subnet, index) => {
+            return {
+              id: index + 1,
+              subnet: subnet.address,
+              pools: [{ pool: subnet.addressRange.join(" - ") }],
+              "option-data": [
+                {
+                  name: "routers",
+                  data: network.gateway.rawAddress
+                }
+              ],
+              reservations
+            };
+          }),
         loggers
       }
     };

package/src/subnet.mjs

@@ -1,4 +1,9 @@
-import { normalizeCIDR, isLinkLocal } from "./utils.mjs";
+import {
+  normalizeCIDR,
+  isLinkLocal,
+  isIPv4Address,
+  isIPv6Address
+} from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
 
@@ -48,6 +53,20 @@ export class Subnet extends Base {
     return isLinkLocal(this.address);
   }
 
+  get isIPv4() {
+    return isIPv4Address(this.address);
+  }
+
+  get isIPv6() {
+    return isIPv6Address(this.address);
+  }
+
+  get addressRange()
+  {
+    const l = this.prefixLength;
+    return l === 24 ? [this.prefix + '.0', this.prefix + '.255'] : [this.prefix + '.0.0', this.prefix + '.255.255']
+  }
+
   get prefix() {
     const [prefix] = this.name.split("/");
     return prefix;
@@ -76,7 +95,6 @@ export class Subnet extends Base {
   }
 }
 
-
 export function subnets(sources) {
   const all = new Set();
 
@@ -88,4 +106,3 @@ export function subnets(sources) {
 
   return all;
 }
-

package/types/service.d.mts

@@ -262,6 +262,7 @@ export class Service extends Base {
     get rawAddress(): any;
     set ipAddresses(value: any);
     get addresses(): any;
+    get networks(): any;
     get endpoints(): any;
     set port(value: any);
     get port(): any;

package/types/subnet.d.mts

@@ -28,6 +28,9 @@ export class Subnet extends Base {
     get fullName(): string;
     matchesAddress(address: any): any;
     get isLinkLocal(): boolean;
+    get isIPv4(): boolean;
+    get isIPv6(): boolean;
+    get addressRange(): string[];
     get prefix(): string;
     get prefixLength(): number;
     get address(): string;