@rjweb/utils - npm Package Compare versions

Comparing version 1.11.3 to 1.11.4

CHANGELOG.md

@@ -0,1 +1,6 @@
+## 1.11.4
+
+- Make subnet parser fix the initial ip
+- Rename `<Subnet>.mask` to `<Subnet>.subnetmask`
+
 ## 1.11.3
@@ -2,0 +7,0 @@

lib/cjs/network.js

@@ -75,2 +75,3 @@ "use strict";
       this.type = subnet.type;
+      this.subnetmask = subnet.subnetmask;
       return;
@@ -89,2 +90,17 @@ }
         this.iFirst = new IPAddress(content);
+        const subnetmask = new Uint8Array(4);
+        let netmask = this.netmask;
+        for (let i = 0; i < 4; i++) {
+          if (netmask > 0) {
+            let bits = netmask > 8 ? 8 : netmask;
+            subnetmask[i] = (1 << bits) - 1 << 8 - bits;
+            netmask -= bits;
+          } else {
+            subnetmask[i] = 0;
+          }
+        }
+        this.subnetmask = subnetmask;
+        for (let i = 0; i < this.iFirst.rawData.length; i++) {
+          this.iFirst.rawData[i] &= subnetmask[i];
+        }
         break;
@@ -99,2 +115,17 @@ }
         this.iFirst = new IPAddress(content);
+        const subnetmask = new Uint16Array(8);
+        let netmask = this.netmask;
+        for (let i = 0; i < 8; i++) {
+          if (netmask > 0) {
+            let bits = netmask > 16 ? 16 : netmask;
+            subnetmask[i] = (1 << bits) - 1 << 16 - bits;
+            netmask -= bits;
+          } else {
+            subnetmask[i] = 0;
+          }
+        }
+        this.subnetmask = subnetmask;
+        for (let i = 0; i < this.iFirst.rawData.length; i++) {
+          this.iFirst.rawData[i] &= subnetmask[i];
+        }
         break;
@@ -131,3 +162,3 @@ }
     if (this.type === 4) {
-      const mask = this.mask();
+      const mask = this.subnetmask;
       const net2 = new Uint8Array(4);
@@ -139,3 +170,3 @@ for (let i = 0; i < 4; i++) {
     } else {
-      const mask = this.mask();
+      const mask = this.subnetmask;
       const net2 = new Uint16Array(8);
@@ -160,35 +191,2 @@ for (let i = 0; i < 8; i++) {
   /**
-   * Get the Subnet Mask
-   * @since 1.11.0
-  */
-  mask() {
-    if (this.type === 4) {
-      const mask = new Uint8Array(4);
-      let subnet = this.netmask;
-      for (let i = 0; i < 4; i++) {
-        if (subnet > 0) {
-          let bits = subnet > 8 ? 8 : subnet;
-          mask[i] = (1 << bits) - 1 << 8 - bits;
-          subnet -= bits;
-        } else {
-          mask[i] = 0;
-        }
-      }
-      return mask;
-    } else {
-      const mask = new Uint16Array(8);
-      let subnet = this.netmask;
-      for (let i = 0; i < 8; i++) {
-        if (subnet > 0) {
-          let bits = subnet > 16 ? 16 : subnet;
-          mask[i] = (1 << bits) - 1 << 16 - bits;
-          subnet -= bits;
-        } else {
-          mask[i] = 0;
-        }
-      }
-      return mask;
-    }
-  }
-  /**
    * Check if the Subnet includes another IP address or subnet
@@ -195,0 +193,0 @@ * @since 1.11.0

lib/cjs/pckg.json

 {
   "name": "@rjweb/utils",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "description": "Easy and Lightweight Utilities",
@@ -5,0 +5,0 @@ "module": "lib/esm/index.js",

lib/esm/network.js

@@ -33,2 +33,3 @@ import * as net from "net";
       this.type = subnet.type;
+      this.subnetmask = subnet.subnetmask;
       return;
@@ -47,2 +48,17 @@ }
         this.iFirst = new IPAddress(content);
+        const subnetmask = new Uint8Array(4);
+        let netmask = this.netmask;
+        for (let i = 0; i < 4; i++) {
+          if (netmask > 0) {
+            let bits = netmask > 8 ? 8 : netmask;
+            subnetmask[i] = (1 << bits) - 1 << 8 - bits;
+            netmask -= bits;
+          } else {
+            subnetmask[i] = 0;
+          }
+        }
+        this.subnetmask = subnetmask;
+        for (let i = 0; i < this.iFirst.rawData.length; i++) {
+          this.iFirst.rawData[i] &= subnetmask[i];
+        }
         break;
@@ -57,2 +73,17 @@ }
         this.iFirst = new IPAddress(content);
+        const subnetmask = new Uint16Array(8);
+        let netmask = this.netmask;
+        for (let i = 0; i < 8; i++) {
+          if (netmask > 0) {
+            let bits = netmask > 16 ? 16 : netmask;
+            subnetmask[i] = (1 << bits) - 1 << 16 - bits;
+            netmask -= bits;
+          } else {
+            subnetmask[i] = 0;
+          }
+        }
+        this.subnetmask = subnetmask;
+        for (let i = 0; i < this.iFirst.rawData.length; i++) {
+          this.iFirst.rawData[i] &= subnetmask[i];
+        }
         break;
@@ -89,3 +120,3 @@ }
     if (this.type === 4) {
-      const mask = this.mask();
+      const mask = this.subnetmask;
       const net2 = new Uint8Array(4);
@@ -97,3 +128,3 @@ for (let i = 0; i < 4; i++) {
     } else {
-      const mask = this.mask();
+      const mask = this.subnetmask;
       const net2 = new Uint16Array(8);
@@ -118,35 +149,2 @@ for (let i = 0; i < 8; i++) {
   /**
-   * Get the Subnet Mask
-   * @since 1.11.0
-  */
-  mask() {
-    if (this.type === 4) {
-      const mask = new Uint8Array(4);
-      let subnet = this.netmask;
-      for (let i = 0; i < 4; i++) {
-        if (subnet > 0) {
-          let bits = subnet > 8 ? 8 : subnet;
-          mask[i] = (1 << bits) - 1 << 8 - bits;
-          subnet -= bits;
-        } else {
-          mask[i] = 0;
-        }
-      }
-      return mask;
-    } else {
-      const mask = new Uint16Array(8);
-      let subnet = this.netmask;
-      for (let i = 0; i < 8; i++) {
-        if (subnet > 0) {
-          let bits = subnet > 16 ? 16 : subnet;
-          mask[i] = (1 << bits) - 1 << 16 - bits;
-          subnet -= bits;
-        } else {
-          mask[i] = 0;
-        }
-      }
-      return mask;
-    }
-  }
-  /**
    * Check if the Subnet includes another IP address or subnet
@@ -153,0 +151,0 @@ * @since 1.11.0

lib/esm/pckg.json

 {
   "name": "@rjweb/utils",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "description": "Easy and Lightweight Utilities",
@@ -5,0 +5,0 @@ "module": "lib/esm/index.js",

lib/typings/network.d.ts

@@ -51,2 +51,6 @@ /// <reference types="node" />
     /**
+     * The Subnet Mask of the Subnet
+     * @since 1.11.4
+    */ subnetmask: Type extends 4 ? Type extends 6 ? Uint8Array | Uint16Array : Uint8Array : Uint16Array;
+    /**
      * Whether this is an IPv4 Subnet
@@ -72,6 +76,2 @@ * @since 1.7.0
     /**
-     * Get the Subnet Mask
-     * @since 1.11.0
-    */ mask(): Type extends 4 ? Type extends 6 ? Uint8Array | Uint16Array : Uint8Array : Uint16Array;
-    /**
      * Check if the Subnet includes another IP address or subnet
@@ -78,0 +78,0 @@ * @since 1.11.0

package.json

 {
   "name": "@rjweb/utils",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "description": "Easy and Lightweight Utilities",
@@ -5,0 +5,0 @@ "module": "lib/esm/index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1842295

increased by0.04%

Worsened metrics

Lines of code

6541

decreased by-0.06%

No dependency changes