pmcf 1.102.4 → 1.102.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.102.4",
+  "version": "1.102.6",
   "publishConfig": {
     "access": "public"
   },
@@ -43,7 +43,7 @@
     "pkg-dir": "^8.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.13.14",
+    "@types/node": "^22.13.16",
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/services/dhcp.mjs

@@ -34,6 +34,7 @@ export class DHCPService extends Service {
   }
 
   async *preparePackages(dir) {
+    const network = this.network;
     const name = this.owner.owner.name;
     const packageData = {
       dir,
@@ -134,7 +135,7 @@ export class DHCPService extends Service {
     const hwmap = new Map();
     const hostNames = new Set();
 
-    for await (const { networkInterface } of this.network.networkAddresses()) {
+    for await (const { networkInterface } of network.networkAddresses()) {
       if (networkInterface.hwaddr) {
         if (!hostNames.has(networkInterface.hostName)) {
           hwmap.set(networkInterface.hwaddr, networkInterface);
@@ -183,14 +184,10 @@ export class DHCPService extends Service {
             "option-data": [
               {
                 name: "routers",
-                data: "192.168.1.254"
+                data: network.gateway.rawAddress
               }
             ],
-            reservations /*: [
-              {
-                "client-id": "01:11:22:33:44:55:66",
-              }
-            ]*/
+            reservations
           }
         ],
         loggers

package/src/utils.mjs

@@ -123,8 +123,7 @@ const ipv4 = {
   segmentLength: 8,
   segmentMask: 0xffn,
   mask: 0xffffffffn,
-  base: 10,
-  pad: 0
+  base: 10
 };
 const ipv6 = {
   separator: ":",
@@ -133,19 +132,18 @@ const ipv6 = {
   segmentLength: 16,
   segmentMask: 0xffffn,
   mask: 0xffffffffffffffffffffffffffffffffn,
-  base: 16,
-  pad: 4
+  base: 16
 };
 
 function _decode(definition, address, length = definition.length) {
   let result = "";
   let compressed = 0;
   let shift = definition.length;
-  let j, word;
+  let word;
   const last = length / definition.segmentLength;
 
-  for (let i = 0; i < last; i = j + 1) {
-    for (j = i; j < last; j++) {
+  for (let i = 0, j = 0; i < last; j = j + 1, i = j) {
+    for (; j < last; j++) {
       shift -= definition.segmentLength;
       word = (address >> BigInt(shift)) & definition.segmentMask;
 
@@ -164,7 +162,7 @@ function _decode(definition, address, length = definition.length) {
     }
 
     if (j < last) {
-      result += word.toString(definition.base).padStart(definition.pad, "0");
+      result += word.toString(definition.base);
     }
   }