mybase 1.1.30 → 1.1.31

package/package.json

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

package/ts/models/IPAddress.js

@@ -15,9 +15,13 @@ dbg.enabled = true;
 class IPAddress {
     constructor(ip) {
         if (ip === '-')
-            ip = '0.0.0.0';
+            ip = '0.0.0.0'; // is this really required?
         try {
             this._ip = ip6addr_1.default.parse(ip);
+            if (this._ip._attrs.ipv4Mapped) {
+                // we wany to convert it to ipv4
+                this._ip = ip6addr_1.default.parse(this._ip.toString({ format: 'v4' }));
+            }
         }
         catch (err) {
             if (err instanceof Error)
@@ -25,6 +29,9 @@ class IPAddress {
             throw err;
         }
     }
+    abbreviated() {
+        return this.toString(); // default behaviour of ip6addr
+    }
     toString(opts = { format: 'auto', zeroElide: false, zeroPad: false }) {
         return this._ip.toString();
     }
@@ -181,11 +188,6 @@ class IPAddress {
             return this._ip.toString();
         return ip6.normalize(this._ip.toString());
     }
-    abbreviated() {
-        if (this.kind() === 4)
-            return this._ip.toString();
-        return ip6.abbreviate(this._ip.toString());
-    }
     padIp6() {
         const hextets = this.normalized().split(':'); // we need to have the full form
         const paddedHextets = hextets.map(hextet => {

package/ts/models/IPAddress.test.ts

@@ -110,6 +110,92 @@ describe('IPAddress', () => {
     }
   })
 
+  it('normalized should normalize ipv4 ips properly', () => {
+    expect(new IPAddress('127.0.0.1').normalized()).toBe('127.0.0.1')
+    expect(new IPAddress('127.00.0.1').normalized()).toBe('127.0.0.1')
+    expect(new IPAddress('127.000.00.1').normalized()).toBe('127.0.0.1')
+    expect(new IPAddress('127.0.00.00001').normalized()).toBe('127.0.0.1')
+  })
+
+  it('normalized should normalize ipv6 ips properly', () => {
+    expect(new IPAddress('::1').normalized()).toBe('0000:0000:0000:0000:0000:0000:0000:0001')
+    expect(new IPAddress('::01').normalized()).toBe('0000:0000:0000:0000:0000:0000:0000:0001')
+    expect(new IPAddress('::001').normalized()).toBe('0000:0000:0000:0000:0000:0000:0000:0001')
+    expect(new IPAddress('::0001').normalized()).toBe('0000:0000:0000:0000:0000:0000:0000:0001')
+    expect(new IPAddress('::000001').normalized()).toBe('0000:0000:0000:0000:0000:0000:0000:0001')
+    expect(new IPAddress('::1:1').normalized()).toBe('0000:0000:0000:0000:0000:0000:0001:0001')
+    expect(new IPAddress('::2:1').normalized()).toBe('0000:0000:0000:0000:0000:0000:0002:0001')
+
+
+    expect(new IPAddress('1::1').normalized()).toBe('0001:0000:0000:0000:0000:0000:0000:0001')
+    expect(new IPAddress('2::01').normalized()).toBe('0002:0000:0000:0000:0000:0000:0000:0001')
+    expect(new IPAddress('3::001').normalized()).toBe('0003:0000:0000:0000:0000:0000:0000:0001')
+    expect(new IPAddress('4::0001').normalized()).toBe('0004:0000:0000:0000:0000:0000:0000:0001')
+    expect(new IPAddress('5::000001').normalized()).toBe('0005:0000:0000:0000:0000:0000:0000:0001')
+    expect(new IPAddress('6::1:1').normalized()).toBe('0006:0000:0000:0000:0000:0000:0001:0001')
+    expect(new IPAddress('7::2:1').normalized()).toBe('0007:0000:0000:0000:0000:0000:0002:0001')
+  })
+
+
+  it('abbreviated should abbreviate ipv6 ips properly', () => {
+    expect(new IPAddress('::1').abbreviated()).toBe('::1')
+    expect(new IPAddress('::01').abbreviated()).toBe('::1')
+    expect(new IPAddress('::001').abbreviated()).toBe('::1')
+    expect(new IPAddress('::0001').abbreviated()).toBe('::1')
+    expect(new IPAddress('::000001').abbreviated()).toBe('::1')
+    expect(new IPAddress('0000:0000:0000:0000:0000:0000:0001:0001').abbreviated()).toBe('::1:1')
+    expect(new IPAddress('0000:0000:0000:0000:0000:0000:0002:0001').abbreviated()).toBe('::2:1')
+
+    expect(new IPAddress('2001:0db8:0001:0002:0003:0004:0005:0006').abbreviated()).toBe('2001:db8:1:2:3:4:5:6')
+    expect(new IPAddress('1:0000:0000::0000:0000:0000:0001').abbreviated()).toBe('1::1')
+    expect(new IPAddress('0001:0000:0000:0000:0000:0000:0000:0001').abbreviated()).toBe('1::1')
+    expect(new IPAddress('0002:0000:0000:0000:0000::0000:0001').abbreviated()).toBe('2::1')
+    expect(new IPAddress('0003:0000:0000:0000:0000:0000:0000:0001').abbreviated()).toBe('3::1')
+    expect(new IPAddress('0004::0000:0000:0000:0000:0000:0001').abbreviated()).toBe('4::1')
+    expect(new IPAddress('0005:0000:0000:0000:0000:0000:0000:0001').abbreviated()).toBe('5::1')
+    expect(new IPAddress('0006:0000:0000::0000:0000:0001:0001').abbreviated()).toBe('6::1:1')
+    expect(new IPAddress('0007:0000:0000:0000:0000::0002:0001').abbreviated()).toBe('7::2:1')
+  })
+
+  it('abbreviated should abbreviate ipv4 ips properly', () => {
+    expect(new IPAddress('127.00.000.1').abbreviated()).toBe('127.0.0.1')
+    expect(new IPAddress('127.0.00.00001').abbreviated()).toBe('127.0.0.1')
+    expect(new IPAddress('127.0000.0.00001').abbreviated()).toBe('127.0.0.1')
+    expect(new IPAddress('0.0000.0.00000').abbreviated()).toBe('0.0.0.0')
+  })
+  it('abbreviated should abbreviate ipv4-mapped ips properly', () => {
+    expect(new IPAddress('::ffff:127.00.000.1').abbreviated()).toBe('127.0.0.1')
+    expect(new IPAddress('::ffff:127.0.00.00001').abbreviated()).toBe('127.0.0.1')
+    expect(new IPAddress('::ffff:127.0000.0.00001').abbreviated()).toBe('127.0.0.1')
+    expect(new IPAddress('0::ffff:127.0000.0.00001').abbreviated()).toBe('127.0.0.1')
+    expect(new IPAddress('0:0:0::ffff:127.0000.0.00001').abbreviated()).toBe('127.0.0.1')
+    expect(new IPAddress('::ffff:0.0000.0.00000').abbreviated()).toBe('0.0.0.0')
+  })
+
+  it('toString() IPv4-mapped IPv6 address should be returned as ipv4', () => {
+    expect(new IPAddress('::ffff:127.0.00.00001').toString()).toBe('127.0.0.1')
+    expect(new IPAddress('0::ffff:127.0.00.00001').toString()).toBe('127.0.0.1')
+    expect(new IPAddress('00::ffff:127.0.00.00001').toString()).toBe('127.0.0.1')
+    expect(new IPAddress('0:00::ffff:127.0.00.00001').toString()).toBe('127.0.0.1')
+    expect(new IPAddress('0:0:0::ffff:127.0.00.00001').toString()).toBe('127.0.0.1')
+  })
+
+  it('kind() IPv4-mapped IPv6 address should be returned as ipv4', () => {
+    expect(new IPAddress('::ffff:127.0.00.00001').kind()).toBe(4)
+    expect(new IPAddress('0::ffff:127.0.00.00001').kind()).toBe(4)
+    expect(new IPAddress('00::ffff:127.0.00.00001').kind()).toBe(4)
+    expect(new IPAddress('0:00::ffff:127.0.00.00001').kind()).toBe(4)
+    expect(new IPAddress('0:0:0::ffff:127.0.00.00001').kind()).toBe(4)
+  })
+
+  it('IPv4-mapps Addresses should be converted to Ipv4 at constructor', () => {  
+    expect(new IPAddress('::ffff:127.0.00.00001').toString()).toBe('127.0.0.1')
+    expect(new IPAddress('0::ffff:127.0.00.00001').toString()).toBe('127.0.0.1')
+    expect(new IPAddress('00::ffff:127.0.00.00001').toString()).toBe('127.0.0.1')
+    expect(new IPAddress('0:00::ffff:127.0.00.00001').toString()).toBe('127.0.0.1')
+    expect(new IPAddress('0:0:0::ffff:127.0.00.00001').toString()).toBe('127.0.0.1')
+  })
+
 });
 
 describe('IPAddress IPv6', () => {

package/ts/models/IPAddress.ts

@@ -39,10 +39,13 @@ export class IPAddress {
 
 
     constructor(ip: string) { // may throw
-        if (ip === '-') ip = '0.0.0.0'
-
+        if (ip === '-') ip = '0.0.0.0' // is this really required?
         try {
             this._ip = ip6addr.parse(ip)
+            if (this._ip._attrs.ipv4Mapped) {
+                // we wany to convert it to ipv4
+                this._ip = ip6addr.parse(this._ip.toString({ format: 'v4' }))
+            }
         } catch (err) {
             if (err instanceof Error)
                 throw new Error(`IPAddress: '${ip}' Error: ${err.message}`)
@@ -50,7 +53,12 @@ export class IPAddress {
         }
     }
 
-    public toString(opts: ToStringOpts = { format: 'auto', zeroElide: false, zeroPad: false }): string {
+
+    public abbreviated(): string {
+        return this.toString() // default behaviour of ip6addr
+    }
+
+    public toString(opts: ToStringOpts = { format: 'auto', zeroElide: false, zeroPad: false }): string {        
         return this._ip.toString()
     }
 
@@ -213,10 +221,6 @@ export class IPAddress {
         return ip6.normalize(this._ip.toString())
     }
 
-    public abbreviated(): string {
-        if (this.kind() === 4) return this._ip.toString()
-        return ip6.abbreviate(this._ip.toString())
-    }
 
     private padIp6(): string {
         const hextets = this.normalized().split(':') // we need to have the full form

package/types/ip6addr.d.ts

@@ -4,8 +4,14 @@ declare module 'ip6addr' {
         zeroElide?: boolean | undefined;
         zeroPad?: boolean | undefined;
     }
+
+    export interface AddrAttributes {
+        ipv4Bare:boolean;
+        ipv4Mapped: boolean;
+    }
     
     export interface Addr {
+        _attrs: AddrAttributes;
         kind: () => "ipv4" | "ipv6";
         toString: (opts?: ToStringOpts) => string;
         toBuffer: (buff?: Uint8Array) => Uint8Array;