pmcf 2.10.0 → 2.10.1

package/package.json

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

package/src/host-utils.mjs

@@ -1,4 +1,4 @@
-import { writeFile, mkdir, copyFile, glob, chmod } from "node:fs/promises";
+import { writeFile, mkdir, copyFile, glob, chmod, stat } from "node:fs/promises";
 import { join } from "node:path";
 import { writeLines, sectionLines } from "../src/utils.mjs";
 import { addHook } from "./hooks.mjs";
@@ -142,8 +142,11 @@ export async function copySshKeys(host, packageData) {
     await copyFile(join(host.directory, file), destinationFileName);
     await chmod(
       destinationFileName,
-      destinationFileName.endsWith(".pub") ? 0o0644 : 0o0600
+      destinationFileName.endsWith(".pub") ? 0o644 : 0o600
     );
+
+    const s = await stat(destinationFileName);
+    console.log(destinationFileName,s.mode)
   }
 }
 

package/src/services/dhcp.mjs

@@ -201,7 +201,7 @@ export class DHCPService extends Service {
           .map((subnet, index) => {
             return {
               id: index + 1,
-              subnet: subnet.address,
+              subnet: subnet.longAddress,
               pools: [{ pool: subnet.addressRange.join(" - ") }],
               "option-data": [
                 {

package/src/subnet.mjs

@@ -61,10 +61,24 @@ export class Subnet extends Base {
     return isIPv6Address(this.address);
   }
 
-  get addressRange()
-  {
+  get addressRange() {
     const l = this.prefixLength;
-    return l === 24 ? [this.prefix + '.0', this.prefix + '.255'] : [this.prefix + '.0.0', this.prefix + '.255.255']
+    return l === 24
+      ? [this.prefix + ".0", this.prefix + ".255"]
+      : [this.prefix + ".0.0", this.prefix + ".255.255"];
+  }
+
+  get longPrefix() {
+    const prefix = this.prefix;
+
+    switch (this.prefixLength) {
+      case 24:
+        return prefix + ".0";
+      case 16:
+        return prefix + ".0.0";
+    }
+
+    return prefix;
   }
 
   get prefix() {
@@ -83,6 +97,10 @@ export class Subnet extends Base {
     return this.name;
   }
 
+  get longAddress() {
+    return `${this.longPrefix}/${this.prefixLength}`;
+  }
+
   _traverse(...args) {
     if (super._traverse(...args)) {
       for (const network of this.networks) {

package/types/subnet.d.mts

@@ -31,9 +31,11 @@ export class Subnet extends Base {
     get isIPv4(): boolean;
     get isIPv6(): boolean;
     get addressRange(): string[];
+    get longPrefix(): string;
     get prefix(): string;
     get prefixLength(): number;
     get address(): string;
+    get longAddress(): string;
     _traverse(...args: any[]): boolean;
 }
 import { Base } from "./base.mjs";