Added support for PX5 to PX8 packages

Author: ip2location

LICENSE.TXT

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 IP2Location.com
+Copyright (c) 2019 IP2Location.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,9 +1,9 @@
 # IP2Proxy Node.js Module
 
-This module allows user to query an IP address if it was being used as open proxy, web proxy, VPN anonymizer and TOR exits. It lookup the proxy IP address from **IP2Proxy BIN Data** file. This data file can be downloaded at
+This module allows user to query an IP address if it was being used as VPN anonymizer, open proxies, web proxies, Tor exits, data center, web hosting (DCH) range and search engine robots (SES). It lookup the proxy IP address from **IP2Proxy BIN Data** file. This data file can be downloaded at
 
 * Free IP2Proxy BIN Data: https://lite.ip2location.com
-* Commercial IP2Proxy BIN Data: https://www.ip2location.com/proxy-database
+* Commercial IP2Proxy BIN Data: https://www.ip2location.com/database/ip2proxy
 
 
 ## Installation
@@ -23,25 +23,30 @@ Below are the methods supported in this class.
 |---|---|
 |Open|Open the IP2Proxy BIN data for lookup.|
 |Close|Close and clean up the file pointer.|
-|getPackageVersion|Get the package version (1 to 4 for PX1 to PX4 respectively).|
+|getPackageVersion|Get the package version (1 to 8 for PX1 to PX8 respectively).|
 |getModuleVersion|Get the module version.|
 |getDatabaseVersion|Get the database version.|
-|isProxy|Check whether if an IP address was a proxy. Returned value:<ul><li>-1 : errors</li><li>0 : not a proxy</li><li>1 : a proxy</li><li>2 : a data center IP address</li></ul>|
+|isProxy|Check whether if an IP address was a proxy. Returned value:<ul><li>-1 : errors</li><li>0 : not a proxy</li><li>1 : a proxy</li><li>2 : a data center IP address or search engine robot</li></ul>|
 |getAll|Return the proxy information in an object.|
-|getProxyType|Return the proxy type. Please visit <a href="https://www.ip2location.com/databases/px4-ip-proxytype-country-region-city-isp" target="_blank">IP2Location</a> for the list of proxy types supported|
+|getProxyType|Return the proxy type. Please visit <a href="https://www.ip2location.com/database/px8-ip-proxytype-country-region-city-isp-domain-usagetype-asn-lastseen" target="_blank">IP2Location</a> for the list of proxy types supported|
 |getCountryShort|Return the ISO3166-1 country code (2-digits) of the proxy.|
 |getCountryLong|Return the ISO3166-1 country name of the proxy.|
 |getRegion|Return the ISO3166-2 region name of the proxy. Please visit <a href="https://www.ip2location.com/free/iso3166-2" target="_blank">ISO3166-2 Subdivision Code</a> for the information of ISO3166-2 supported|
 |getCity|Return the city name of the proxy.|
 |getISP|Return the ISP name of the proxy.|
+|getDomain|Return the domain name of the proxy.|
+|getUsageType|Return the usage type classification of the proxy. Please visit <a href="https://www.ip2location.com/database/px8-ip-proxytype-country-region-city-isp-domain-usagetype-asn-lastseen" target="_blank">IP2Location</a> for the list of usage types supported.|
+|getASN|Return the autonomous system number of the proxy.|
+|getAS|Return the autonomous system name of the proxy.|
+|getLastSeen|Return the number of days that the proxy was last seen.|
 
 ## Usage
 
 ```javascript
 
 var ip2proxy = require("ip2proxy-nodejs");
 
-if (ip2proxy.Open("./IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.BIN") == 0) {
+if (ip2proxy.Open("./IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP-DOMAIN-USAGETYPE-ASN-LASTSEEN.BIN") == 0) {
 	ip = '199.83.103.79';
 
 	console.log("GetModuleVersion: " + ip2proxy.getModuleVersion());
@@ -56,7 +61,12 @@ if (ip2proxy.Open("./IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.BIN") == 0) {
 	console.log("Region: " + ip2proxy.getRegion(ip));
 	console.log("City: " + ip2proxy.getCity(ip));
 	console.log("ISP: " + ip2proxy.getISP(ip));
-
+	console.log("Domain: " + ip2proxy.getDomain(ip));
+	console.log("UsageType: " + ip2proxy.getUsageType(ip));
+	console.log("ASN: " + ip2proxy.getASN(ip));
+	console.log("AS: " + ip2proxy.getAS(ip));
+	console.log("LastSeen: " + ip2proxy.getLastSeen(ip));
+	
 	// function for all fields
 	var all = ip2proxy.getAll(ip);
 	console.log("isProxy: " + all.Is_Proxy);
@@ -66,6 +76,11 @@ if (ip2proxy.Open("./IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.BIN") == 0) {
 	console.log("Region: " + all.Region);
 	console.log("City: " + all.City);
 	console.log("ISP: " + all.ISP);
+	console.log("Domain: " + all.Domain);
+	console.log("UsageType: " + all.Usage_Type);
+	console.log("ASN: " + all.ASN);
+	console.log("AS: " + all.AS);
+	console.log("LastSeen: " + all.Last_Seen);
 }
 else {
 	console.log("Error reading BIN file.");

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ip2proxy-nodejs",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "IP2Proxy proxy detection component",
   "keywords": [
     "vpn-detection",
@@ -12,19 +12,19 @@
     "tor",
     "proxy"
   ],
-  "homepage": "http://www.ip2location.com/ip2proxy/developers/nodejs",
+  "homepage": "https://www.ip2location.com/development-libraries/ip2proxy/nodejs",
   "author": {
     "name": "IP2Location.com",
     "email": "[email protected]",
-    "url": "http://www.ip2location.com/"
+    "url": "https://www.ip2location.com/"
   },
   "files": [
     "src/ip2proxy.js",
     "src/test.js",
     "./README.md"
   ],
   "main": "src/ip2proxy.js",
-  "license": "LGPL",
+  "license": "MIT",
   "dependencies": {
     "big-integer": ">=1.6.8"
   },

src/ip2proxy.js

@@ -4,7 +4,7 @@ var bigInt = require("big-integer");
 
 var fd;
 
-var version = "1.1.0";
+var version = "2.0.0";
 var binfile = "";
 var IPv4ColumnSize = 0;
 var IPv6ColumnSize = 0;
@@ -16,23 +16,39 @@ var maxindex = 65536;
 var IndexArrayIPv4 = Array(maxindex);
 var IndexArrayIPv6 = Array(maxindex);
 
-var country_pos = [0, 2, 3, 3, 3];
-var region_pos = [0, 0, 0, 4, 4];
-var city_pos = [0, 0, 0, 5, 5];
-var isp_pos = [0, 0, 0, 0, 6];
-var proxytype_pos = [0, 0, 2, 2, 2];
+var country_pos = [0, 2, 3, 3, 3, 3, 3, 3, 3];
+var region_pos = [0, 0, 0, 4, 4, 4, 4, 4, 4];
+var city_pos = [0, 0, 0, 5, 5, 5, 5, 5, 5];
+var isp_pos = [0, 0, 0, 0, 6, 6, 6, 6, 6];
+var proxytype_pos = [0, 0, 2, 2, 2, 2, 2, 2, 2];
+var domain_pos = [0, 0, 0, 0, 0, 7, 7, 7, 7];
+var usagetype_pos = [0, 0, 0, 0, 0, 0, 8, 8, 8];
+var asn_pos = [0, 0, 0, 0, 0, 0, 0, 9, 9];
+var as_pos = [0, 0, 0, 0, 0, 0, 0, 10, 10];
+var lastseen_pos = [0, 0, 0, 0, 0, 0, 0, 0, 11];
+
 
 var country_pos_offset = 0;
 var region_pos_offset = 0;
 var city_pos_offset = 0;
 var isp_pos_offset = 0;
 var proxytype_pos_offset = 0;
+var domain_pos_offset = 0;
+var usagetype_pos_offset = 0;
+var asn_pos_offset = 0;
+var as_pos_offset = 0;
+var lastseen_pos_offset = 0;
 
 var country_enabled = 0;
 var region_enabled = 0;
 var city_enabled = 0;
 var isp_enabled = 0;
 var proxytype_enabled = 0;
+var domain_enabled = 0;
+var usagetype_enabled = 0;
+var asn_enabled = 0;
+var as_enabled = 0;
+var lastseen_enabled = 0;
 
 var MAX_IPV4_RANGE = bigInt(4294967295);
 var MAX_IPV6_RANGE = bigInt("340282366920938463463374607431768211455");
@@ -59,6 +75,11 @@ var modes = {
 	"ISP": 5,
 	"PROXY_TYPE": 6,
 	"IS_PROXY": 7,
+	"DOMAIN": 8,
+	"USAGE_TYPE": 9,
+	"ASN": 10,
+	"AS": 11,
+	"LAST_SEEN": 12,
 	"ALL": 100
 };
 
@@ -215,12 +236,22 @@ function loadbin() {
 			city_pos_offset = (city_pos[dbt] != 0) ? (city_pos[dbt] - 1) << 2 : 0;
 			isp_pos_offset = (isp_pos[dbt] != 0) ? (isp_pos[dbt] - 1) << 2 : 0;
 			proxytype_pos_offset = (proxytype_pos[dbt] != 0) ? (proxytype_pos[dbt] - 1) << 2 : 0;
+			domain_pos_offset = (domain_pos[dbt] != 0) ? (domain_pos[dbt] - 1) << 2 : 0;
+			usagetype_pos_offset = (usagetype_pos[dbt] != 0) ? (usagetype_pos[dbt] - 1) << 2 : 0;
+			asn_pos_offset = (asn_pos[dbt] != 0) ? (asn_pos[dbt] - 1) << 2 : 0;
+			as_pos_offset = (as_pos[dbt] != 0) ? (as_pos[dbt] - 1) << 2 : 0;
+			lastseen_pos_offset = (lastseen_pos[dbt] != 0) ? (lastseen_pos[dbt] - 1) << 2 : 0;
 
 			country_enabled = (country_pos[dbt] != 0) ? 1 : 0;
 			region_enabled = (region_pos[dbt] != 0) ? 1 : 0;
 			city_enabled = (city_pos[dbt] != 0) ? 1 : 0;
 			isp_enabled = (isp_pos[dbt] != 0) ? 1 : 0;
 			proxytype_enabled = (proxytype_pos[dbt] != 0) ? 1 : 0;
+			domain_enabled = (domain_pos[dbt] != 0) ? 1 : 0;
+			usagetype_enabled = (usagetype_pos[dbt] != 0) ? 1 : 0;
+			asn_enabled = (asn_pos[dbt] != 0) ? 1 : 0;
+			as_enabled = (as_pos[dbt] != 0) ? 1 : 0;
+			lastseen_enabled = (lastseen_pos[dbt] != 0) ? 1 : 0;
 
 			var pointer = mydb._IndexBaseAddr;
 
@@ -387,12 +418,37 @@ function proxyquery_data(myIP, iptype, data, mode) {
 					data.ISP = readstr(read32(rowoffset + isp_pos_offset));
 				}
 			}
+			if (domain_enabled) {
+				if (mode == modes.ALL || mode == modes.DOMAIN) {
+					data.Domain = readstr(read32(rowoffset + domain_pos_offset));
+				}
+			}
+			if (usagetype_enabled) {
+				if (mode == modes.ALL || mode == modes.USAGE_TYPE) {
+					data.Usage_Type = readstr(read32(rowoffset + usagetype_pos_offset));
+				}
+			}
+			if (asn_enabled) {
+				if (mode == modes.ALL || mode == modes.ASN) {
+					data.ASN = readstr(read32(rowoffset + asn_pos_offset));
+				}
+			}
+			if (as_enabled) {
+				if (mode == modes.ALL || mode == modes.AS) {
+					data.AS = readstr(read32(rowoffset + as_pos_offset));
+				}
+			}
+			if (lastseen_enabled) {
+				if (mode == modes.ALL || mode == modes.LAST_SEEN) {
+					data.Last_Seen = readstr(read32(rowoffset + lastseen_pos_offset));
+				}
+			}
 
 			if (data.Country_Short == "-" || data.Proxy_Type == "-") {
 				data.Is_Proxy = 0;
 			}
 			else {
-				if (data.Proxy_Type == "DCH") {
+				if ((data.Proxy_Type == "DCH") || (data.Proxy_Type == "SES")) {
 					data.Is_Proxy = 2;
 				}
 				else {
@@ -423,7 +479,12 @@ function proxyquery(myIP, mode) {
 		"Country_Long": "?",
 		"Region": "?",
 		"City": "?",
-		"ISP": "?"
+		"ISP": "?",
+		"Domain": "?",
+		"Usage_Type": "?",
+		"ASN": "?",
+		"AS": "?",
+		"Last_Seen": "?"
 	};
 
 	if (/^[:0]+:F{4}:(\d+\.){3}\d+$/i.test(myIP)) {
@@ -476,8 +537,8 @@ exports.getDatabaseVersion = function getDatabaseVersion() {
 exports.isProxy = function isProxy(myIP) {
 	// -1 is error
 	// 0 is not a proxy
-	// 1 is proxy except DCH
-	// 2 is proxy and DCH
+	// 1 is proxy except DCH and SES
+	// 2 is proxy and DCH or SES
 	data = proxyquery(myIP, modes.IS_PROXY);
 	return data.Is_Proxy;
 }
@@ -518,6 +579,36 @@ exports.getProxyType = function getProxyType(myIP) {
 	return data.Proxy_Type;
 }
 
+// Returns a string for the domain
+exports.getDomain = function getDomain(myIP) {
+	data = proxyquery(myIP, modes.DOMAIN);
+	return data.Domain;
+}
+
+// Returns a string for the usage type
+exports.getUsageType = function getUsageType(myIP) {
+	data = proxyquery(myIP, modes.USAGE_TYPE);
+	return data.Usage_Type;
+}
+
+// Returns a string for the ASN
+exports.getASN = function getASN(myIP) {
+	data = proxyquery(myIP, modes.ASN);
+	return data.ASN;
+}
+
+// Returns a string for the AS
+exports.getAS = function getAS(myIP) {
+	data = proxyquery(myIP, modes.AS);
+	return data.AS;
+}
+
+// Returns a string for the last seen
+exports.getLastSeen = function getLastSeen(myIP) {
+	data = proxyquery(myIP, modes.LAST_SEEN);
+	return data.Last_Seen;
+}
+
 // Returns all results
 exports.getAll = function getAll(myIP) {
 	data = proxyquery(myIP, modes.ALL);

src/test.js

@@ -1,7 +1,7 @@
 // var ip2proxy = require("./ip2proxy.js");
 var ip2proxy = require("ip2proxy-nodejs");
 
-ip2proxy.Open("PX4.BIN");
+ip2proxy.Open("PX8.BIN");
 
 testip = ['8.8.8.8', '199.83.103.79'];