Skip to content

Fix definition and nullable types issue #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix definition and nullable types issue #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e926dde
fix issue with nullable types and initialization of the types
delciocapolo Mar 31, 2024
93fd767
types for the xmlhttprequest were requested in the package[json] and …
delciocapolo Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 29 additions & 15 deletions IPGeolocationAPI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,50 @@ import { TimezoneParams } from './TimezoneParams';
import { XMLHttpRequest } from 'xmlhttprequest';

export class IPGeolocationAPI {
apiKey: string;
apiKey: string | null;
async: boolean;

constructor(apiKey: string = null, async: boolean = true) {
constructor(apiKey: string | null = null, async: boolean = true) {
this.apiKey = apiKey;
this.async = async;
}

public getGeolocation(callback: (json: any) => any, geolocationParams: GeolocationParams = null): void {
public getGeolocation(callback: (json: any) => any, geolocationParams: GeolocationParams | null = null): void {
if (geolocationParams && geolocationParams.getIPAddresses().length === 0) {
this.getRequest("ipgeo", this.buildGeolocationUrlParams(this.apiKey, geolocationParams), callback);
if (this.apiKey) {
this.getRequest("ipgeo", this.buildGeolocationUrlParams(this.apiKey, geolocationParams), callback);
} else {
throw new Error('API Key invalid');
}
} else {
const jsonData = JSON.stringify({
"ips": geolocationParams.getIPAddresses()
"ips": geolocationParams!.getIPAddresses()
});

this.postRequest("ipgeo-bulk", this.buildGeolocationUrlParams(this.apiKey, geolocationParams), jsonData, callback);
if (this.apiKey && geolocationParams) {
this.postRequest("ipgeo-bulk", this.buildGeolocationUrlParams(this.apiKey, geolocationParams), jsonData, callback);
}
}
}

public getTimezone(callback: (json: any) => any, timezoneParams: TimezoneParams = null): void {
this.getRequest("timezone", this.buildTimezoneUrlParams(this.apiKey, timezoneParams), callback);
public getTimezone(callback: (json: any) => any, timezoneParams: TimezoneParams | null = null): void {
if (this.apiKey && timezoneParams) {
this.getRequest("timezone", this.buildTimezoneUrlParams(this.apiKey, timezoneParams), callback);
} else {
throw new Error('You need to provide a API Key valid or your Timezone is invalid');
}
}

public getUserAgent(callback: (json: any) => any, uaString: string = null): void {
public getUserAgent(callback: (json: any) => any, uaString: string | null = null): void {
var jsonData: string = JSON.stringify({
"uaString": uaString
});

this.postRequest('user-agent', "apiKey=" + this.apiKey, jsonData, callback);
if (this.apiKey) {
this.postRequest('user-agent', "apiKey=" + this.apiKey, jsonData, callback);
} else {
throw new Error('You need to provide a API Key');
}
}

public getBulkUserAgent(callback: (json: any) => any, uaStrings = []): void {
Expand All @@ -51,7 +65,7 @@ export class IPGeolocationAPI {
return this.async;
}

private buildGeolocationUrlParams(apiKey: string = null, geolocationParams: GeolocationParams = null): string {
private buildGeolocationUrlParams(apiKey: string | null = null, geolocationParams: GeolocationParams | null = null): string {
let urlParams = "";

if (apiKey) {
Expand Down Expand Up @@ -133,7 +147,7 @@ export class IPGeolocationAPI {
return urlParams;
}

private buildTimezoneUrlParams(apiKey: string = null, timezoneParams: TimezoneParams = null) {
private buildTimezoneUrlParams(apiKey: string | null = null, timezoneParams: TimezoneParams | null = null) {
let urlParams = "";

if (apiKey) {
Expand Down Expand Up @@ -161,10 +175,10 @@ export class IPGeolocationAPI {
if (urlParams) {
urlParams = urlParams.concat('&');
}

urlParams = urlParams.concat('location=', timezoneParams.getLocation());
}

if (timezoneParams.getLatitude() >= -90 && timezoneParams.getLatitude() <= 90 && timezoneParams.getLongitude() >= -180 && timezoneParams.getLongitude() <= 180) {
if (urlParams) {
urlParams = urlParams.concat("&");
Expand Down Expand Up @@ -239,7 +253,7 @@ export class IPGeolocationAPI {
xhr.open("POST", "https://api.ipgeolocation.io/".concat(subUrl, "?", urlParams, ""), this.async, null, null);
xhr.setRequestHeader("Accept", "application/json");
xhr.setRequestHeader("Content-Type", "application/json");
xhr.send(requestData);
xhr.send(requestData as XMLHttpRequestBodyInit);
}
}

Expand Down
4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,7 @@
"dependencies": {
"xmlhttprequest": "^1.8.0"
},
"devDependencies": {}
"devDependencies": {
"@types/xmlhttprequest": "^1.8.2"
}
}