Async API call

ahsannawaz111 · ahsannawaz111 · commit 09313644eb8b · 2018-10-22T19:53:22.000+05:00
diff --git a/GeolocationParams.ts b/GeolocationParams.ts
@@ -1,39 +1,40 @@
 export class GeolocationParams  {
-	ip: string;
-	fields: string;
-	ips: any;
- 
-	constructor() {
-		this.ip = "";
-		this.fields = "";
-		this.ips = "";
-	}
 
-	setIp(ip = "") {
-		this.ip = ip;
-	}
+      ip: string;
+      fields: string;
+      ips: any;
+      
+    constructor() {
+	 this.ip = "";
+	 this.fields = "";
+     this.ips = "";
+    }
 
-	getIp() {
-		return this.ip;
-	}
+    setIP(ip = "") {
+      this.ip = ip;
+    }
 
-	setFields(fields = "") {
-		this.fields = fields;
-	}
+    getIP() {
+        return this.ip;
+    }
 
-	getFields() {
-		return this.fields;
-	}
+    setFields(fields = "") {
+        this.fields = fields;
+    }
 
-	setIps(ips : any = null) {
-		if(ips.length > 50) {
-			console.log("Max. number of IP addresses cannot be more than 50.");
-		} else {
-			this.ips = ips;
-		}
-	}
+    getFields() {
+        return this.fields;
+    }
 
-	getIps() {
-		return this.ips;
-	}
+    setIPList(ips : any = null) {
+        if(ips.length > 50) {
+            console.log("Max. number of IP addresses cannot be more than 50.");
+        } else {
+            this.ips = ips;
+        }
+    }
+
+    getIPList() {
+        return this.ips;
+    }
 }
diff --git a/IPGeolocationAPI.ts b/IPGeolocationAPI.ts
@@ -1,122 +1,149 @@
 import {GeolocationParams} from './GeolocationParams';
 import {TimezoneParams} from './TimezoneParams';
-import {XMLHttpRequest} from './node_modules/xmlhttprequest';
-
+import {XMLHttpRequest} from 'xmlhttprequest';
 export class IPGeolocationAPI {
+
     apiKey: string;
 
-    constructor(apiKey: string) {
+    constructor(apiKey: string = null) {
         this.apiKey = apiKey;
     }
 
     public getApiKey() {
         return this.apiKey;
     }
 
-    public getGeolocation(params : GeolocationParams = null) {
-        if(params.getIps()) {
-            return this.postRequest("ipgeo-bulk", params, this.apiKey);
-         } else {
-             return this.getRequest("ipgeo", this.buildGeolocationUrlParams(params, this.apiKey));
+    public getGeolocation(params : GeolocationParams = null, callback) {
+        if(params && params.getIPList())
+        { return this.postRequest("ipgeo-bulk", params, this.apiKey, callback);
+         }else {
+          return this.getRequest("ipgeo", this.buildGeolocationUrlParams(params, this.apiKey), callback);
          }
     }
      
-    public getTimezone(params : TimezoneParams = null) {
-        return this.getRequest("timezone", this.buildTimezoneUrlParams(params, this.apiKey));
+    public getTimezone(params : TimezoneParams = null, callback) {
+        return this.getRequest("timezone", this.buildTimezoneUrlParams(params, this.apiKey), callback);
     }
-    
-    private buildTimezoneUrlParams(params=null, apiKey="") {
-        var urlParams = "apiKey=" + apiKey;
 
-        if(params != null) {
-            var param = params.getIp();
+    private buildTimezoneUrlParams(params=null, apiKey="") {
+    var urlParams = "apiKey=" + apiKey;
 
-            if(param && param != "") {
-                urlParams = urlParams + "&ip=" + param;
-            }
+    if(params != null) {
+        var param = params.getIP();
+        if(param && param != "") {
+            urlParams = urlParams + "&ip=" + param;
+        }
 
-            param = params.getTimezone();
-            if(param && param != "") {
-                urlParams = urlParams + "&tz=" + param;
-            }
+        param = params.getTimezone();
+        if(param && param != "") {
+            urlParams = urlParams + "&tz=" + param;
+        }
 
-            var latitude = params.getLatitude();
-            var longitude = params.getLongitude();
-            if(latitude && latitude != 1000.0 && longitude && longitude != 1000.0) {
-                urlParams = urlParams + "&lat=" + latitude + "&long=" + longitude;
-            }
+        var latitude = params.getLatitude();
+        var longitude = params.getLongitude();
+        if(latitude && latitude != 1000.0 && longitude && longitude != 1000.0) {
+            urlParams = urlParams + "&lat=" + latitude + "&long=" + longitude;
         }
-        return urlParams;
+    }
+    return urlParams;
     }
 
     private buildGeolocationUrlParams(params=null, apiKey="") {
-        var urlParams = "apiKey=" + apiKey;
         
+        var urlParams = "apiKey=" + apiKey;
         if(params != null) {
-            var param = params.getIp();
+            var param = params.getIP();
            
             if(param && param != "") {
                 urlParams = urlParams + "&ip=" + param;
             }
 
             param = params.getFields();
+        
             if(param && param != "") {
                 urlParams = urlParams + "&fields=" + param;
             }
         }
+
         return urlParams;
     }
     
 
-    private getRequest(subUrl = "", params = ""){
-        var jsonData = null;
-        var data = null;
-        var xhr = new XMLHttpRequest();
-        
-        xhr.withCredentials = true;
-        xhr.addEventListener("readystatechange", function () {
-            if(this.readyState === 4) {
-                if(this.status == 0) {
-                    jsonData = {
-                        "message": "Internet is not connected!"
-                    };
-                } else {
-                    jsonData = JSON.parse(this.responseText);
-                }
-            }
-        });
-        
-        // console.log("https://api.ipgeolocation.io/" + subUrl + "?" + params + "");
-        xhr.open("GET", "https://api.ipgeolocation.io/" + subUrl + "?" + params + "", false);
-        xhr.send(data);
-        
-        return jsonData;
+    private getRequest(subUrl = "", params = "", callback){
+
+    var jsonData = null;
+    var data = null;
+    var xhr = new XMLHttpRequest();
+    xhr.withCredentials = true;
+    xhr.addEventListener("readystatechange", function () {
+    if (this.readyState === 4) {
+
+        if(this.status == 0){
+            jsonData = {
+            "message": "Internet is not connected!"
+            };
+        }else{
+              jsonData = JSON.parse(this.responseText);
+        }
+
+        if (callback && typeof(callback) === typeof(Function)) {
+	        callback(jsonData);
+	    }
+
+    }
+    });
+    xhr.open("GET", "https://api.ipgeolocation.io/"+subUrl+"?"+params+"", true);
+    xhr.send(data);
+    return jsonData;
+    
     }
 
-    private postRequest(subUrl="", params: GeolocationParams=null, apiKey="") {
+    private postRequest(subUrl = "", params : GeolocationParams = null, apiKey="", callback){
+
         var jsonData = null; 
         var data = JSON.stringify({
-          "ips": params.getIps()
+          "ips": params.getIPList()
         });
         var xhr = new XMLHttpRequest();
-        
         xhr.withCredentials = true;
         xhr.addEventListener("readystatechange", function () {
             if (this.readyState === 4) {
-                if(this.status == 0) {
+
+                if(this.status == 0){
                     jsonData = {
-                        "message": "Internet is not connected!"
+                    "message": "Internet is not connected!"
                     };
-                } else {
-                    jsonData = JSON.parse(this.responseText);
+                }else{
+                      jsonData = JSON.parse(this.responseText);
                 }
+
+	           if (callback && typeof(callback) === typeof(Function)) {
+		        callback(jsonData);
+		        }
+
             }
         });
-        
-        xhr.open("POST", "https://api.ipgeolocation.io/" + subUrl + "?apiKey=" + apiKey + "", false);
+        xhr.open("POST", "https://api.ipgeolocation.io/"+subUrl+"?apiKey="+apiKey+"", true);
         xhr.setRequestHeader("Content-Type", "application/json");
         xhr.send(data);
 
         return jsonData;
+        
     }
+
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TimezoneParams.ts b/TimezoneParams.ts
@@ -1,8 +1,9 @@
 export class TimezoneParams {
-    timezone: string;
-    ip: string;
-    latitude: number;
-    longitude: number;
+
+    timezone :string;
+    ip :string;
+    latitude :number;
+    longitude :number;
 
     constructor() {
         this.timezone = "";
@@ -19,11 +20,11 @@ export class TimezoneParams {
         return this.timezone;
     }
 
-    setIp(ip = "") {
+    setIP(ip = "") {
         this.ip = ip;
     }
 
-    getIp() {
+    getIP() {
         return this.ip;
     }
 
@@ -39,4 +40,6 @@ export class TimezoneParams {
     getLongitude() {
         return this.longitude;
     }
+
 }
+
diff --git a/package.json b/package.json
@@ -1,20 +1,38 @@
 {
-  "name": "ip-geolocation-api-sdk-typescript",
-  "version": "1.0.2",
-  "description": "",
-  "main": "IPGeolocationAPI.ts",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@gitlab.com/ahsanNawaz111/ipGeoLocation-TypeScript.git"
+  "_from": "ip-geolocation-api-sdk-typescript",
+  "_id": "ip-geolocation-api-sdk-typescript@1.0.4",
+  "_inBundle": false,
+  "_integrity": "sha512-3H57yHooCwH3glQLZskv8fw1PYFB9+95PZzsFO89acrzIeGcUsbUzd91f4uM8OJIODPXYP+UQEBajjIJWIOWeg==",
+  "_location": "/ip-geolocation-api-sdk-typescript",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "ip-geolocation-api-sdk-typescript",
+    "name": "ip-geolocation-api-sdk-typescript",
+    "escapedName": "ip-geolocation-api-sdk-typescript",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
   },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/ip-geolocation-api-sdk-typescript/-/ip-geolocation-api-sdk-typescript-1.0.4.tgz",
+  "_shasum": "247858c28360a16ba09569b2e8501385c9d05356",
+  "_spec": "ip-geolocation-api-sdk-typescript",
+  "_where": "/home/developer/test-ts2",
   "author": "",
-  "license": "ISC",
   "bugs": {
     "url": "https://gitlab.com/ahsanNawaz111/ipGeoLocation-TypeScript/issues"
   },
+  "bundleDependencies": false,
+  "dependencies": {
+    "xmlhttprequest": "^1.8.0"
+  },
+  "deprecated": false,
+  "description": "## Installation ```cli npm i ip-geolocation-api-sdk-typescript ```",
   "homepage": "https://gitlab.com/ahsanNawaz111/ipGeoLocation-TypeScript#README",
   "keywords": [
     "ip",
@@ -28,7 +46,15 @@
     "geoip api",
     "ip location api"
   ],
-  "dependencies": {
-    "xmlhttprequest": "^1.8.0"
-  }
+  "license": "ISC",
+  "main": "IPGeolocationAPI.ts",
+  "name": "ip-geolocation-api-sdk-typescript",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@gitlab.com/ahsanNawaz111/ipGeoLocation-TypeScript.git"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "version": "1.0.4"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`export class TimezoneParams {`
`2`		`- timezone: string;`
`3`		`- ip: string;`
`4`		`- latitude: number;`
`5`		`- longitude: number;`
	`2`	`+`
	`3`	`+ timezone :string;`
	`4`	`+ ip :string;`
	`5`	`+ latitude :number;`
	`6`	`+ longitude :number;`
`6`	`7`
`7`	`8`	`constructor() {`
`8`	`9`	`this.timezone = "";`
`@@ -19,11 +20,11 @@ export class TimezoneParams {`
`19`	`20`	`return this.timezone;`
`20`	`21`	`}`
`21`	`22`
`22`		`- setIp(ip = "") {`
	`23`	`+ setIP(ip = "") {`
`23`	`24`	`this.ip = ip;`
`24`	`25`	`}`
`25`	`26`
`26`		`- getIp() {`
	`27`	`+ getIP() {`
`27`	`28`	`return this.ip;`
`28`	`29`	`}`
`29`	`30`
`@@ -39,4 +40,6 @@ export class TimezoneParams {`
`39`	`40`	`getLongitude() {`
`40`	`41`	`return this.longitude;`
`41`	`42`	`}`
	`43`	`+`
`42`	`44`	`}`
	`45`	`+`