v0.1.1

Author: Student Main

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pacfw",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"description": "A simple PAC",
 	"main": "dist/index.js",
 	"private": true,

src/ip.ts

@@ -1,5 +1,8 @@
 type IPRange = [string, string];
-
+const zero32 = '00000000000000000000000000000000';
+const ffff32 = 'ffffffffffffffffffffffffffffffff';
+const zero8 = '00000000';
+const ffff8 = 'ffffffff';
 // check a ip string or unified address is ipv6
 function isV6(s: string): boolean {
 	// 255.255.255.255/32 , 18
@@ -16,7 +19,8 @@ function convertAddr4(ip4: string): string {
 		(parseInt(m[1], 10) << 16) +
 		(parseInt(m[2], 10) << 8) +
 		parseInt(m[3], 10);
-	return ipnum.toString(16);
+	const ret = ipnum.toString(16);
+	return zero8.substr(ret.length) + ret;
 }
 function convertAddr6(ip6: string): string {
 	const ipstr = ip6.split(':');
@@ -107,10 +111,7 @@ const hmask = [
 	'33337777bbbbffff',
 	'1133557799bbddff'
 ];
-const zero32 = '00000000000000000000000000000000';
-const ffff32 = 'ffffffffffffffffffffffffffffffff';
-const zero8 = '00000000';
-const ffff8 = 'ffffffff';
+
 function cidrRange(cidr46: string): IPRange {
 	const v6 = isV6(cidr46);
 

test/ip.test.ts

@@ -1,4 +1,8 @@
 ///../src/ip.ts
+test('ipv4', convertAddr('127.0.0.1')).equal('7f000001');
+test('ipv4', convertAddr('10.11.12.13')).equal('0a0b0c0d');
+test('ipv4', convertAddr('255.1.3.99')).equal('ff010363');
+
 test('ipv6 to 32 character string', convertAddr6('abcd::efff')).equal(
 	'abcd000000000000000000000000efff'
 );
@@ -10,14 +14,8 @@ test(
 	convertAddr6('abcd:1234:1::2:127.0.0.1')
 ).equal('abcd123400010000000000027f000001');
 
-test('cidr6', cidr6Range('abcd:aaaa::1234:5678/24')).equal([
-	'abcdaa00000000000000000000000000',
-	'abcdaaffffffffffffffffffffffffff'
-]);
-test('cidr6', cidr6Range('abcd:aaaa::1234:5678/25')).equal([
-	'abcdaa80000000000000000000000000',
-	'abcdaaffffffffffffffffffffffffff'
-]);
+test('cidr4', cidrRange('10.0.0.1/8')).equal(['0a000000', '0affffff']);
+test('cidr4', cidrRange('172.16.100.64/22')).equal(['ac106400', 'ac1067ff']);
 
 test('compare', convertAddr6('abcd:1234:1::2:127.0.0.1')).bigger(
 	convertAddr6('abcd:1234:1::')