mybase 1.1.15 → 1.1.16

package/mybase.js

@@ -14,8 +14,10 @@ const ip6addr = require('ip6addr')
 const private_network_cidrs = [ip6addr.createCIDR('10.0.0.0/8')
             ,ip6addr.createCIDR('172.16.0.0/12')
             ,ip6addr.createCIDR('192.168.0.0/16')
-            ,ip6addr.createCIDR('fd00::/8')
+            ,ip6addr.createCIDR('fd00::/8'), // Reserved by IETF for future use, but not currently in active use.
+            ,ip6addr.createCIDR('fc00::/8'), // The range currently in use for local communications within a site or organization.
         ]
+
 const local_network_cidrs = [ip6addr.createCIDR('127.0.0.0/8')
         ,ip6addr.createCIDR('::1/128')]
 
@@ -47,7 +49,7 @@ function normalizeIp(ip) {
 }
 
 
-function isLoopbackIP(ip) {
+function isLoopbackIP(ip) { // ported
     ip=normalizeIp(ip)
     if (net.isIP(ip) === 0) return false
     try {
@@ -66,13 +68,14 @@ function isLoopbackIP(ip) {
     return false
 }
 
-function isLANIp(ip) {
+function isLANIp(ip) { // ported
     ip=normalizeIp(ip)
     if (net.isIP(ip) === 0) return false
     try {
         // speed optimized
         let ipVersion = net.isIPv4(ip) ? 'ipv4' : 'ipv6'
         for (let cidr of private_network_cidrs) {
+            if (!cidr) continue
             let first = cidr.first()
             if (first.kind() !== ipVersion) continue
             if (cidr.contains(ip))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mybase",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "description": "",
   "main": "mybase.js",
   "scripts": {

package/ts/funcs/isLANIp.d.ts

@@ -0,0 +1 @@
+export declare function isLANIp(ip: string): boolean;

package/ts/funcs/isLANIp.js

@@ -0,0 +1,46 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLANIp = void 0;
+const ip6addr_1 = __importDefault(require("ip6addr"));
+const net_1 = __importDefault(require("net"));
+const private_network_cidrs = [ip6addr_1.default.createCIDR('10.0.0.0/8'),
+    ip6addr_1.default.createCIDR('172.16.0.0/12'),
+    ip6addr_1.default.createCIDR('192.168.0.0/16'),
+    ip6addr_1.default.createCIDR('fd00::/8'), // Reserved by IETF for future use, but not currently in active use.
+    ,
+    ip6addr_1.default.createCIDR('fc00::/8'), // The range currently in use for local communications within a site or organization.
+];
+function normalizeIp(ip) {
+    // also support ipv6
+    if (net_1.default.isIP(ip) === 0)
+        return '';
+    if (net_1.default.isIPv6(ip))
+        return ip.toLowerCase().replace(/^::ffff:/, '');
+    return ip;
+}
+function isLANIp(ip) {
+    ip = normalizeIp(ip);
+    if (net_1.default.isIP(ip) === 0)
+        return false;
+    try {
+        // speed optimized
+        let ipVersion = net_1.default.isIPv4(ip) ? 'ipv4' : 'ipv6';
+        for (let cidr of private_network_cidrs) {
+            if (!cidr)
+                continue;
+            let first = cidr.first();
+            if (first.kind() !== ipVersion)
+                continue;
+            if (cidr.contains(ip))
+                return true;
+        }
+    }
+    catch (err) {
+        console.log(err);
+    }
+    return false;
+}
+exports.isLANIp = isLANIp;

package/ts/funcs/isLANIp.test.ts

@@ -0,0 +1,59 @@
+import { isLANIp } from './isLANIp';
+
+describe('isLANIp', () => {
+  it('should return true for LAN IP addresses', () => {
+    expect(isLANIp('192.168.0.1')).toBe(true);
+    expect(isLANIp('10.0.0.1')).toBe(true);
+    expect(isLANIp('172.16.0.1')).toBe(true);
+    
+    // Add more test cases for LAN IP addresses
+  });
+
+  it('should return false for non-LAN IP addresses', () => {
+    expect(isLANIp('8.8.8.8')).toBe(false);
+    expect(isLANIp('2001:0db8:85a3:0000:0000:8a2e:0370:7334')).toBe(false);
+    // Add more test cases for non-LAN IP addresses
+  });
+
+  it('should return false for invalid IP addresses', () => {
+    expect(isLANIp('')).toBe(false);
+    expect(isLANIp('192.168.0.')).toBe(false);
+    expect(isLANIp('256.0.0.1')).toBe(false);
+    // Add more test cases for invalid IP addresses
+  });
+
+  test('should return true for private IPv4', () => {
+    const ip = '192.168.1.1';
+    expect(isLANIp(ip)).toBe(true);
+});
+
+test('should return true for private IPv6', () => {
+    const ip = 'fd00::';
+    expect(isLANIp(ip)).toBe(true);
+});
+
+test('should return null for public IPv4', () => {
+    const ip = '8.8.8.8';
+    expect(isLANIp(ip)).toBe(false);
+});
+
+test('should return false for public IPv6', () => {
+    const ip = '2001:4860:4860::8888';
+    expect(isLANIp(ip)).toBe(false);
+});
+
+test('should return false for invalid IP', () => {
+    const ip = 'invalid';
+    expect(isLANIp(ip)).toBe(false);
+});
+
+test('should return false for invalid IP', () => {
+    const ip = '1.2.3';
+    expect(isLANIp(ip)).toBe(false);
+});
+
+test('should return null for non private IPv6', () => {
+    const ip = '::2';
+    expect(isLANIp(ip)).toBe(false);
+});
+});

package/ts/funcs/isLANIp.ts

@@ -0,0 +1,38 @@
+import ip6addr from 'ip6addr'
+import net from 'net'
+
+const private_network_cidrs = [ip6addr.createCIDR('10.0.0.0/8')
+            ,ip6addr.createCIDR('172.16.0.0/12')
+            ,ip6addr.createCIDR('192.168.0.0/16')
+            ,ip6addr.createCIDR('fd00::/8'), // Reserved by IETF for future use, but not currently in active use.
+            ,ip6addr.createCIDR('fc00::/8'), // The range currently in use for local communications within a site or organization.
+        ]
+
+
+function normalizeIp(ip:string):string {
+    // also support ipv6
+    if (net.isIP(ip) === 0) return ''
+    if (net.isIPv6(ip)) return ip.toLowerCase().replace(/^::ffff:/, '')
+    return ip
+}
+
+
+export function isLANIp(ip:string) : boolean { 
+    ip=normalizeIp(ip)
+    if (net.isIP(ip) === 0) return false
+    try {
+        // speed optimized
+        let ipVersion = net.isIPv4(ip) ? 'ipv4' : 'ipv6'
+        for (let cidr of private_network_cidrs) {
+            if (!cidr) continue
+            
+            let first = cidr.first()
+            if (first.kind() !== ipVersion) continue
+            if (cidr.contains(ip))
+                return true
+        }
+    } catch (err) {
+        console.log(err)
+    }
+    return false
+}

package/ts/funcs/isLoopbackIP.js

@@ -30,7 +30,6 @@ function isLoopbackIP(ip) {
             if (cidr.contains(ip))
                 return true;
         }
-        return false;
     }
     catch (err) {
         console.log(err);

package/ts/funcs/isLoopbackIP.ts

@@ -25,7 +25,6 @@ export function isLoopbackIP(ip:string) : boolean {
             if (cidr.contains(ip))
                 return true
         }
-        return false
     } catch (err) {
         console.log(err)
     }

package/ts/index.d.ts

@@ -17,3 +17,4 @@ export * from "./funcs/randomIP6";
 export * from "./funcs/randomTCPPort";
 export * from "./funcs/validEmail";
 export * from "./funcs/isLoopbackIP";
+export * from "./funcs/isLANIp";

package/ts/index.js

@@ -33,3 +33,4 @@ __exportStar(require("./funcs/randomIP6"), exports);
 __exportStar(require("./funcs/randomTCPPort"), exports);
 __exportStar(require("./funcs/validEmail"), exports);
 __exportStar(require("./funcs/isLoopbackIP"), exports);
+__exportStar(require("./funcs/isLANIp"), exports);

package/ts/index.ts

@@ -17,4 +17,4 @@ export * from "./funcs/randomIP6"
 export * from "./funcs/randomTCPPort"
 export * from "./funcs/validEmail"
 export * from "./funcs/isLoopbackIP"
-
+export * from "./funcs/isLANIp"