node-ipdox 1.0.6 → 1.1.0

package/README.md

@@ -4,6 +4,25 @@
 
 IPDox is a simple and efficient IP geolocation library for Node.js. It fetches data from multiple geolocation APIs and provides a unified response. It also includes a caching mechanism to prevent unnecessary requests.
 
+## Providers
+
+Current keyless providers used:
+
+- ip-api.com
+- ipwho.is
+- freeipapi.com
+- ipapi.co
+
+Note: ip-api.com free tier uses HTTP only. Provide `ipApiKey` to enable HTTPS (pro).
+
+Fallback providers (best-effort, used after primary providers fail):
+
+- geoip.vuiz.net
+- apip.cc
+- ip-sonar.com
+
+Fallback providers can return partial data; `city` may be an empty string when unknown.
+
 ## Installation
 
 ```bash
@@ -18,7 +37,9 @@ import { IPDox } from "node-ipdox";
 const ipdox = new IPDox({
 	cacheMaxItems: 5000,
 	cacheMaxAge: 43200000,
-	maxRetries: 10
+	maxRetries: 10,
+	requestTimeoutMs: 5000,
+	ipApiKey: "YOUR_IP_API_KEY"
 });
 
 ipdox
@@ -29,13 +50,15 @@ ipdox
 
 ## API
 
-### `new IPDox({ cacheMaxItems, cacheMaxAge, maxRetries })`
+### `new IPDox({ cacheMaxItems, cacheMaxAge, maxRetries, requestTimeoutMs, ipApiKey })`
 
 Creates a new instance of IPDox.
 
 - `cacheMaxItems` - The maximum number of items to store in the cache (default: 1000)
 - `cacheMaxAge` - The cache timeout in milliseconds (default: 43200000 (12 hours))
 - `maxRetries` - Maximum number of retries if an API request fails (default: 10)
+- `requestTimeoutMs` - Request timeout in milliseconds (default: 5000)
+- `ipApiKey` - Optional ip-api.com pro API key to enable HTTPS
 
 ### `ipdox.doxIP({ ip })`
 
@@ -45,7 +68,7 @@ Fetches geolocation data for the specified IP address.
 
 Returns a Promise that resolves to an `IPDOXResponse` object.
 
-If no response is found, undefined is returned.
+If no response is found or the IP is invalid, undefined is returned.
 
 ## IPDOXResponse
 
@@ -59,8 +82,8 @@ export interface IPDOXResponse {
 	continent: string; // Continent ISO code
 	latitude: number; // Latitude
 	longitude: number; // Longitude
-	zip: string; // Zip code
-	isp: string; // ISP name
+	zip?: string; // Zip code (might be undefined)
+	isp?: string; // ISP name (might be undefined)
 	proxy?: boolean; // Boolean indicating if the IP address is a proxy (might be undefined)
 	isHosting?: boolean; // Boolean indicating if the IP address is a hosting provider (might be undefined)
 	proxyInfo?: {

package/dist/ipdox.d.ts

@@ -4,6 +4,11 @@ import { IPDOXConstructor } from "./types/IPDOXConstructor.js";
 declare class IPDox {
     private cache;
     private maxRetries;
+    private requestTimeoutMs;
+    private inFlight;
+    private http;
+    private ipApiKey?;
+    private unavailableProviders;
     /**
      * @description Creates an instance of IPDox.
      * @param {IPDOXConstructor} params
@@ -11,7 +16,7 @@ declare class IPDox {
      * @param {number} params.cacheMaxAge - The cache timeout in milliseconds (default: 43200000 (12 hours))
      * @param {number} params.maxRetries - The maximum number of retries (default: 10)
      */
-    constructor({ cacheMaxItems, cacheMaxAge, maxRetries }?: IPDOXConstructor);
+    constructor({ cacheMaxItems, cacheMaxAge, maxRetries, requestTimeoutMs, ipApiKey }?: IPDOXConstructor);
     /**
      * @description Get information about an IP address
      * @param {IPDOXRequest} params - Params of the request
@@ -20,12 +25,25 @@ declare class IPDox {
      * @memberof IPDox
      */
     doxIP({ ip }: IPDOXRequest): Promise<IPDOXResponse | undefined>;
-    private selectRandomAPI;
+    private shuffleProviders;
+    private fetchWithRetries;
+    private fetchFromProvider;
+    private waitWithJitter;
+    private noteProviderFailure;
+    private isDnsError;
+    private parseNumber;
+    private parseString;
+    private pickString;
+    private pickStringOrEmpty;
+    private normalizeContinentCode;
     private cacheResponse;
     private fetchIPHyphenAPIDotCom;
     private fetchFreeIPAPIDotCom;
     private fetchIPWhoDotIs;
     private fetchIPAPIDotCo;
+    private fetchGeoIPVuizDotNet;
+    private fetchAPIPDotCC;
+    private fetchIPSonarDotCom;
 }
 export default IPDox;
 //# sourceMappingURL=ipdox.d.ts.map

package/dist/ipdox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ipdox.d.ts","sourceRoot":"","sources":["../src/ipdox.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAI/D,cAAM,KAAK;IACV,OAAO,CAAC,KAAK,CAAkC;IAC/C,OAAO,CAAC,UAAU,CAAS;IAE3B;;;;;;OAMG;gBAEF,EACC,aAAoB,EACpB,WAAsB,EACtB,UAAe,EACf,GAAE,gBAIF;IASF;;;;;;OAMG;IACG,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAqDrE,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,aAAa;YAIP,sBAAsB;YA4BtB,oBAAoB;YA4BpB,eAAe;YA4Bf,eAAe;CAyB7B;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"ipdox.d.ts","sourceRoot":"","sources":["../src/ipdox.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAoB/D,cAAM,KAAK;IACV,OAAO,CAAC,KAAK,CAAkC;IAC/C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAkD;IAClE,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,oBAAoB,CAAe;IAE3C;;;;;;OAMG;gBAEF,EACC,aAAoB,EACpB,WAAsB,EACtB,UAAe,EACf,gBAA6C,EAC7C,QAAQ,EACR,GAAE,gBAKF;IAqBF;;;;;;OAMG;IACG,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IA0BrE,OAAO,CAAC,gBAAgB;YAcV,gBAAgB;YAmEhB,iBAAiB;YAwBjB,cAAc;IAS5B,OAAO,CAAC,mBAAmB;IAM3B,OAAO,CAAC,UAAU;IAUlB,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,sBAAsB;IA0B9B,OAAO,CAAC,aAAa;YAIP,sBAAsB;YAuDtB,oBAAoB;YAkDpB,eAAe;YAoDf,eAAe;YAuCf,oBAAoB;YAwDpB,cAAc;YAyDd,kBAAkB;CA6ChC;AAED,eAAe,KAAK,CAAC"}

package/dist/ipdox.js

@@ -3,12 +3,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_net_1 = require("node:net");
 const axios_1 = __importDefault(require("axios"));
 const apis_js_1 = require("./utils/apis.js");
 const lru_cache_1 = require("lru-cache");
+const DEFAULT_REQUEST_TIMEOUT_MS = 5000;
+const DEFAULT_USER_AGENT = "node-ipdox";
+const RETRY_BACKOFF_BASE_MS = 150;
+const RETRY_BACKOFF_MAX_MS = 2000;
+const PRIMARY_PROVIDERS = [
+    apis_js_1.GeoAPIs.IP_HYPHEN_API_DOT_COM,
+    apis_js_1.GeoAPIs.FREE_IP_API_DOT_COM,
+    apis_js_1.GeoAPIs.IPWHO_DOT_IS,
+    apis_js_1.GeoAPIs.IPAPI_DOT_CO
+];
+const FALLBACK_PROVIDERS = [
+    apis_js_1.GeoAPIs.GEOIP_VUIZ_DOT_NET,
+    apis_js_1.GeoAPIs.APIP_DOT_CC,
+    apis_js_1.GeoAPIs.IP_SONAR_DOT_COM
+];
 class IPDox {
     cache;
     maxRetries;
+    requestTimeoutMs;
+    inFlight;
+    http;
+    ipApiKey;
+    unavailableProviders;
     /**
      * @description Creates an instance of IPDox.
      * @param {IPDOXConstructor} params
@@ -16,16 +37,29 @@ class IPDox {
      * @param {number} params.cacheMaxAge - The cache timeout in milliseconds (default: 43200000 (12 hours))
      * @param {number} params.maxRetries - The maximum number of retries (default: 10)
      */
-    constructor({ cacheMaxItems = 1000, cacheMaxAge = 43200000, maxRetries = 10 } = {
+    constructor({ cacheMaxItems = 1000, cacheMaxAge = 43200000, maxRetries = 10, requestTimeoutMs = DEFAULT_REQUEST_TIMEOUT_MS, ipApiKey } = {
         cacheMaxItems: 1000,
         cacheMaxAge: 43200000,
-        maxRetries: 10
+        maxRetries: 10,
+        requestTimeoutMs: DEFAULT_REQUEST_TIMEOUT_MS
     }) {
         this.cache = new lru_cache_1.LRUCache({
             max: cacheMaxItems,
-            ttl: cacheMaxAge
+            ttl: cacheMaxAge,
+            ttlAutopurge: true
         });
         this.maxRetries = maxRetries;
+        this.requestTimeoutMs = requestTimeoutMs;
+        this.inFlight = new Map();
+        this.ipApiKey = typeof ipApiKey === "string" ? ipApiKey.trim() : undefined;
+        this.unavailableProviders = new Set();
+        this.http = axios_1.default.create({
+            timeout: this.requestTimeoutMs,
+            headers: {
+                "User-Agent": DEFAULT_USER_AGENT
+            },
+            validateStatus: status => status >= 200 && status < 500
+        });
     }
     /**
      * @description Get information about an IP address
@@ -35,65 +69,212 @@ class IPDox {
      * @memberof IPDox
      */
     async doxIP({ ip }) {
+        const normalizedIP = typeof ip === "string" ? ip.trim() : "";
         // Check that the ip is valid
-        if (!ip || ip === "") {
+        if (!normalizedIP || (0, node_net_1.isIP)(normalizedIP) === 0) {
             return undefined;
         }
         // Check if the IP is already in the cache
-        if (this.cache.has(ip)) {
-            const cachedResponse = this.cache.get(ip);
-            if (cachedResponse) {
-                return cachedResponse;
-            }
+        const cachedResponse = this.cache.get(normalizedIP);
+        if (cachedResponse) {
+            return cachedResponse;
         }
-        // Select a random API
-        let randomAPI = this.selectRandomAPI();
-        let response = null;
-        let retries = 0;
-        // Fetch data from the API
-        while (!response && retries < this.maxRetries) {
-            try {
-                switch (randomAPI) {
-                    case apis_js_1.GeoAPIs.IP_HYPHEN_API_DOT_COM:
-                        response = await this.fetchIPHyphenAPIDotCom(ip);
-                        break;
-                    case apis_js_1.GeoAPIs.FREE_IP_API_DOT_COM:
-                        response = await this.fetchFreeIPAPIDotCom(ip);
-                        break;
-                    case apis_js_1.GeoAPIs.IPWHO_DOT_IS:
-                        response = await this.fetchIPWhoDotIs(ip);
-                        break;
-                    case apis_js_1.GeoAPIs.IPAPI_DOT_CO:
-                        response = await this.fetchIPAPIDotCo(ip);
-                        break;
+        // Check if there's an ongoing request for the same IP
+        const inFlight = this.inFlight.get(normalizedIP);
+        if (inFlight) {
+            return inFlight;
+        }
+        const task = this.fetchWithRetries(normalizedIP);
+        this.inFlight.set(normalizedIP, task);
+        task.finally(() => this.inFlight.delete(normalizedIP));
+        return task;
+    }
+    shuffleProviders(providers, avoidFirst) {
+        const shuffled = [...providers];
+        for (let i = shuffled.length - 1; i > 0; i--) {
+            const j = Math.floor(Math.random() * (i + 1));
+            [shuffled[i], shuffled[j]] = [shuffled[j], shuffled[i]];
+        }
+        if (avoidFirst && shuffled.length > 1 && shuffled[0] === avoidFirst) {
+            [shuffled[0], shuffled[1]] = [shuffled[1], shuffled[0]];
+        }
+        return shuffled;
+    }
+    async fetchWithRetries(ip) {
+        if (this.maxRetries <= 0) {
+            return undefined;
+        }
+        const primaryProviders = PRIMARY_PROVIDERS.filter(provider => !this.unavailableProviders.has(provider));
+        const fallbackProviders = FALLBACK_PROVIDERS.filter(provider => !this.unavailableProviders.has(provider));
+        const providers = primaryProviders.length > 0 || fallbackProviders.length > 0
+            ? { primary: primaryProviders, fallback: fallbackProviders }
+            : {
+                primary: Object.values(apis_js_1.GeoAPIs).filter(provider => !this.unavailableProviders.has(provider)),
+                fallback: []
+            };
+        let attempts = 0;
+        let order = [
+            ...this.shuffleProviders(providers.primary),
+            ...this.shuffleProviders(providers.fallback)
+        ];
+        let index = 0;
+        if (order.length === 0) {
+            return undefined;
+        }
+        while (attempts < this.maxRetries) {
+            if (index >= order.length) {
+                order = [
+                    ...this.shuffleProviders(providers.primary),
+                    ...this.shuffleProviders(providers.fallback)
+                ];
+                index = 0;
+                if (order.length === 0) {
+                    return undefined;
                 }
             }
+            const provider = order[index];
+            index++;
+            if (this.unavailableProviders.has(provider)) {
+                attempts++;
+                continue;
+            }
+            try {
+                return await this.fetchFromProvider(provider, ip);
+            }
             catch (error) {
-                // If the promise is rejected, select another random API and try again
-                randomAPI = this.selectRandomAPI();
-                retries++;
+                this.noteProviderFailure(provider, error);
+                attempts++;
+                if (attempts < this.maxRetries) {
+                    await this.waitWithJitter(attempts);
+                }
             }
         }
-        // If max retries reached and no response, return undefined
-        if (retries === this.maxRetries && !response) {
-            return undefined;
+        return undefined;
+    }
+    async fetchFromProvider(provider, ip) {
+        switch (provider) {
+            case apis_js_1.GeoAPIs.IP_HYPHEN_API_DOT_COM:
+                return this.fetchIPHyphenAPIDotCom(ip);
+            case apis_js_1.GeoAPIs.FREE_IP_API_DOT_COM:
+                return this.fetchFreeIPAPIDotCom(ip);
+            case apis_js_1.GeoAPIs.IPWHO_DOT_IS:
+                return this.fetchIPWhoDotIs(ip);
+            case apis_js_1.GeoAPIs.IPAPI_DOT_CO:
+                return this.fetchIPAPIDotCo(ip);
+            case apis_js_1.GeoAPIs.GEOIP_VUIZ_DOT_NET:
+                return this.fetchGeoIPVuizDotNet(ip);
+            case apis_js_1.GeoAPIs.APIP_DOT_CC:
+                return this.fetchAPIPDotCC(ip);
+            case apis_js_1.GeoAPIs.IP_SONAR_DOT_COM:
+                return this.fetchIPSonarDotCom(ip);
+            default:
+                throw new Error("Unsupported provider");
+        }
+    }
+    async waitWithJitter(attempt) {
+        const baseDelay = Math.min(RETRY_BACKOFF_MAX_MS, RETRY_BACKOFF_BASE_MS * 2 ** Math.max(0, attempt - 1));
+        const jitter = Math.random() * baseDelay;
+        await new Promise(resolve => setTimeout(resolve, jitter));
+    }
+    noteProviderFailure(provider, error) {
+        if (provider === apis_js_1.GeoAPIs.IPAPI_DOT_CO && this.isDnsError(error)) {
+            this.unavailableProviders.add(provider);
+        }
+    }
+    isDnsError(error) {
+        if (!error || typeof error !== "object") {
+            return false;
+        }
+        const maybeError = error;
+        const code = maybeError.code ?? maybeError.cause?.code;
+        return code === "ENOTFOUND" || code === "EAI_AGAIN" || code === "ENODATA";
+    }
+    parseNumber(value) {
+        if (typeof value === "number" && Number.isFinite(value)) {
+            return value;
+        }
+        if (typeof value === "string") {
+            const trimmed = value.trim();
+            if (trimmed !== "") {
+                const parsed = Number.parseFloat(trimmed);
+                if (Number.isFinite(parsed)) {
+                    return parsed;
+                }
+            }
         }
-        // Return the response
-        return response ? response : undefined;
+        return undefined;
     }
-    selectRandomAPI() {
-        // Get a random entry from the enum
-        const randomEntry = Object.entries(apis_js_1.GeoAPIs)[Math.floor(Math.random() * Object.entries(apis_js_1.GeoAPIs).length)];
-        // Return the random entry
-        return randomEntry[1];
+    parseString(value) {
+        if (typeof value === "string") {
+            const trimmed = value.trim();
+            return trimmed === "" ? undefined : trimmed;
+        }
+        return undefined;
+    }
+    pickString(...values) {
+        for (const value of values) {
+            const parsed = this.parseString(value);
+            if (parsed) {
+                return parsed;
+            }
+        }
+        return undefined;
+    }
+    pickStringOrEmpty(...values) {
+        return this.pickString(...values) ?? "";
+    }
+    normalizeContinentCode(continentName) {
+        const name = this.parseString(continentName)?.toLowerCase();
+        if (!name) {
+            return undefined;
+        }
+        switch (name) {
+            case "north america":
+                return "NA";
+            case "south america":
+                return "SA";
+            case "europe":
+                return "EU";
+            case "africa":
+                return "AF";
+            case "asia":
+                return "AS";
+            case "oceania":
+                return "OC";
+            case "antarctica":
+                return "AN";
+            default:
+                return undefined;
+        }
     }
     cacheResponse(ip, response) {
         this.cache.set(ip, response);
     }
     async fetchIPHyphenAPIDotCom(ip) {
-        const requestURL = apis_js_1.GeoAPIs.IP_HYPHEN_API_DOT_COM + ip + "?fields=24899583";
-        const response = await axios_1.default.get(requestURL);
+        const baseURL = this.ipApiKey
+            ? "https://pro.ip-api.com/json/"
+            : apis_js_1.GeoAPIs.IP_HYPHEN_API_DOT_COM;
+        const requestURL = baseURL +
+            ip +
+            "?fields=24899583" +
+            (this.ipApiKey ? `&key=${encodeURIComponent(this.ipApiKey)}` : "");
+        const response = await this.http.get(requestURL);
         if (response.data.status === "success") {
+            const zip = typeof response.data.zip === "string" && response.data.zip !== ""
+                ? response.data.zip
+                : undefined;
+            const isp = typeof response.data.isp === "string" && response.data.isp !== ""
+                ? response.data.isp
+                : undefined;
+            const proxy = typeof response.data.proxy === "boolean"
+                ? response.data.proxy
+                : undefined;
+            const isHosting = typeof response.data.hosting === "boolean"
+                ? response.data.hosting
+                : undefined;
+            const timeZone = typeof response.data.timezone === "string"
+                ? response.data.timezone
+                : undefined;
             const formattedResponse = {
                 ip: response.data.query,
                 country: response.data.countryCode,
@@ -101,11 +282,11 @@ class IPDox {
                 continent: response.data.continentCode,
                 latitude: response.data.lat,
                 longitude: response.data.lon,
-                zip: response.data.zip,
-                isp: response.data.isp,
-                proxy: response.data.proxy,
-                isHosting: response.data.hosting,
-                timeZone: response.data.timezone,
+                zip,
+                isp,
+                proxy,
+                isHosting,
+                timeZone,
                 source: "ip-api.com"
             };
             this.cacheResponse(ip, formattedResponse);
@@ -117,8 +298,25 @@ class IPDox {
     }
     async fetchFreeIPAPIDotCom(ip) {
         const requestURL = apis_js_1.GeoAPIs.FREE_IP_API_DOT_COM + ip;
-        const response = await axios_1.default.get(requestURL);
-        if (response.data.ipVersion === 4) {
+        const response = await this.http.get(requestURL);
+        if (response.data.ipVersion === 4 || response.data.ipVersion === 6) {
+            const zip = typeof response.data.zipCode === "string" &&
+                response.data.zipCode !== ""
+                ? response.data.zipCode
+                : undefined;
+            const isp = typeof response.data.isp === "string" && response.data.isp !== ""
+                ? response.data.isp
+                : undefined;
+            const proxy = typeof response.data.proxy === "boolean"
+                ? response.data.proxy
+                : undefined;
+            const isHosting = typeof response.data.hosting === "boolean"
+                ? response.data.hosting
+                : undefined;
+            const timeZone = Array.isArray(response.data.timeZones) &&
+                typeof response.data.timeZones[0] === "string"
+                ? response.data.timeZones[0]
+                : undefined;
             const formattedResponse = {
                 ip: response.data.ipAddress,
                 country: response.data.countryCode,
@@ -126,11 +324,11 @@ class IPDox {
                 continent: response.data.continentCode,
                 latitude: response.data.latitude,
                 longitude: response.data.longitude,
-                zip: response.data.zipCode,
-                isp: response.data.isp,
-                proxy: response.data.proxy,
-                isHosting: response.data.hosting,
-                timeZone: response.data.timeZones[0],
+                zip,
+                isp,
+                proxy,
+                isHosting,
+                timeZone,
                 source: "freeipapi.com"
             };
             this.cacheResponse(ip, formattedResponse);
@@ -142,8 +340,27 @@ class IPDox {
     }
     async fetchIPWhoDotIs(ip) {
         const requestURL = apis_js_1.GeoAPIs.IPWHO_DOT_IS + ip;
-        const response = await axios_1.default.get(requestURL);
+        const response = await this.http.get(requestURL);
         if (response.data.success) {
+            const zip = typeof response.data.postal === "string" &&
+                response.data.postal !== ""
+                ? response.data.postal
+                : undefined;
+            const isp = typeof response.data.connection?.isp === "string" &&
+                response.data.connection.isp !== ""
+                ? response.data.connection.isp
+                : undefined;
+            const proxy = typeof response.data.proxy === "boolean"
+                ? response.data.proxy
+                : undefined;
+            const isHosting = typeof response.data.hosting === "boolean"
+                ? response.data.hosting
+                : undefined;
+            const timeZone = typeof response.data.timezone?.id === "string"
+                ? response.data.timezone.id
+                : typeof response.data.timezone === "string"
+                    ? response.data.timezone
+                    : undefined;
             const formattedResponse = {
                 ip: response.data.ip,
                 country: response.data.country_code,
@@ -151,11 +368,11 @@ class IPDox {
                 continent: response.data.continent_code,
                 latitude: response.data.latitude,
                 longitude: response.data.longitude,
-                zip: response.data.postal,
-                isp: response.data.connection.isp,
-                proxy: false,
-                isHosting: false,
-                timeZone: response.data.timezone.id,
+                zip,
+                isp,
+                proxy,
+                isHosting,
+                timeZone,
                 source: "ipwho.is"
             };
             this.cacheResponse(ip, formattedResponse);
@@ -167,8 +384,18 @@ class IPDox {
     }
     async fetchIPAPIDotCo(ip) {
         const requestURL = apis_js_1.GeoAPIs.IPAPI_DOT_CO + ip + "/json";
-        const response = await axios_1.default.get(requestURL);
+        const response = await this.http.get(requestURL);
         if (response.data.ip) {
+            const zip = typeof response.data.postal === "string" &&
+                response.data.postal !== ""
+                ? response.data.postal
+                : undefined;
+            const isp = typeof response.data.org === "string" && response.data.org !== ""
+                ? response.data.org
+                : undefined;
+            const timeZone = typeof response.data.timezone === "string"
+                ? response.data.timezone
+                : undefined;
             const formattedResponse = {
                 ip: response.data.ip,
                 country: response.data.country_code,
@@ -176,9 +403,9 @@ class IPDox {
                 continent: response.data.continent_code,
                 latitude: response.data.latitude,
                 longitude: response.data.longitude,
-                zip: response.data.postal,
-                isp: response.data.org,
-                timeZone: response.data.timezone,
+                zip,
+                isp,
+                timeZone,
                 source: "ipapi.co"
             };
             this.cacheResponse(ip, formattedResponse);
@@ -188,6 +415,116 @@ class IPDox {
             return Promise.reject();
         }
     }
+    async fetchGeoIPVuizDotNet(ip) {
+        const requestURL = apis_js_1.GeoAPIs.GEOIP_VUIZ_DOT_NET + "?ip=" + encodeURIComponent(ip);
+        const response = await this.http.get(requestURL);
+        const data = response.data;
+        const responseIP = this.parseString(data?.ip) ?? ip;
+        const country = this.pickString(data?.country_code, data?.countryCode);
+        const city = this.pickStringOrEmpty(data?.city, data?.region, data?.country, data?.country_name);
+        const continent = this.pickString(data?.continent_code, data?.continentCode) ??
+            this.normalizeContinentCode(data?.continent);
+        const latitude = this.parseNumber(data?.latitude ?? data?.lat);
+        const longitude = this.parseNumber(data?.longitude ?? data?.lon);
+        if (responseIP &&
+            country &&
+            continent &&
+            latitude !== undefined &&
+            longitude !== undefined) {
+            const zip = this.pickString(data?.postal_code, data?.zip);
+            const isp = this.pickString(data?.isp, data?.organization, data?.asn_organization);
+            const timeZone = this.pickString(data?.timezone);
+            const formattedResponse = {
+                ip: responseIP,
+                country,
+                city,
+                continent,
+                latitude,
+                longitude,
+                zip,
+                isp,
+                timeZone,
+                source: "geoip.vuiz.net"
+            };
+            this.cacheResponse(ip, formattedResponse);
+            return Promise.resolve(formattedResponse);
+        }
+        return Promise.reject();
+    }
+    async fetchAPIPDotCC(ip) {
+        const requestURL = apis_js_1.GeoAPIs.APIP_DOT_CC + encodeURIComponent(ip);
+        const response = await this.http.get(requestURL);
+        const data = response.data;
+        if (data?.status && data.status !== "success") {
+            return Promise.reject();
+        }
+        const responseIP = this.parseString(data?.ip) ?? ip;
+        const country = this.parseString(data?.CountryCode);
+        const city = this.pickStringOrEmpty(data?.City, data?.RegionName, data?.CountryName);
+        const continent = this.parseString(data?.ContinentCode) ??
+            this.normalizeContinentCode(data?.ContinentName);
+        const latitude = this.parseNumber(data?.Latitude);
+        const longitude = this.parseNumber(data?.Longitude);
+        if (responseIP &&
+            country &&
+            continent &&
+            latitude !== undefined &&
+            longitude !== undefined) {
+            const zip = this.parseString(data?.Postal);
+            const isp = this.parseString(data?.org) ||
+                this.parseString(data?.Org) ||
+                this.parseString(data?.ISP);
+            const timeZone = this.parseString(data?.TimeZone);
+            const formattedResponse = {
+                ip: responseIP,
+                country,
+                city,
+                continent,
+                latitude,
+                longitude,
+                zip,
+                isp,
+                timeZone,
+                source: "apip.cc"
+            };
+            this.cacheResponse(ip, formattedResponse);
+            return Promise.resolve(formattedResponse);
+        }
+        return Promise.reject();
+    }
+    async fetchIPSonarDotCom(ip) {
+        const requestURL = apis_js_1.GeoAPIs.IP_SONAR_DOT_COM + encodeURIComponent(ip);
+        const response = await this.http.get(requestURL);
+        const data = response.data;
+        const responseIP = this.parseString(data?.ip) ?? ip;
+        const country = this.parseString(data?.country_code);
+        const city = this.pickStringOrEmpty(data?.city_name, data?.region_name, data?.country_name);
+        const continent = this.parseString(data?.continent_code);
+        const latitude = this.parseNumber(data?.latitude);
+        const longitude = this.parseNumber(data?.longitude);
+        if (responseIP &&
+            country &&
+            continent &&
+            latitude !== undefined &&
+            longitude !== undefined) {
+            const zip = this.parseString(data?.postal_code);
+            const timeZone = this.parseString(data?.timezone);
+            const formattedResponse = {
+                ip: responseIP,
+                country,
+                city,
+                continent,
+                latitude,
+                longitude,
+                zip,
+                timeZone,
+                source: "ip-sonar.com"
+            };
+            this.cacheResponse(ip, formattedResponse);
+            return Promise.resolve(formattedResponse);
+        }
+        return Promise.reject();
+    }
 }
 exports.default = IPDox;
 //# sourceMappingURL=ipdox.js.map

package/dist/ipdox.js.map

@@ -1 +1 @@
-{"version":3,"file":"ipdox.js","sourceRoot":"","sources":["../src/ipdox.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ipdox.js","sourceRoot":"","sources":["../src/ipdox.ts"],"names":[],"mappings":"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"}

package/dist/types/IPDOXConstructor.d.ts

@@ -5,10 +5,14 @@
  * @property {number} cacheMaxItems The maximum number of items in the cache (default: 1000)
  * @property {number} cacheMaxAge The cache timeout in milliseconds (default: 43200000 (12 hours))
  * @property {number} maxRetries The maximum number of retries (default: 10)
+ * @property {number} requestTimeoutMs Request timeout in milliseconds (default: 5000)
+ * @property {string} ipApiKey Optional ip-api.com pro API key for HTTPS
  */
 export interface IPDOXConstructor {
     cacheMaxItems?: number;
     cacheMaxAge?: number;
     maxRetries?: number;
+    requestTimeoutMs?: number;
+    ipApiKey?: string;
 }
 //# sourceMappingURL=IPDOXConstructor.d.ts.map

package/dist/types/IPDOXConstructor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IPDOXConstructor.d.ts","sourceRoot":"","sources":["../../src/types/IPDOXConstructor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAChC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB"}
+{"version":3,"file":"IPDOXConstructor.d.ts","sourceRoot":"","sources":["../../src/types/IPDOXConstructor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,MAAM,WAAW,gBAAgB;IAChC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB"}

package/dist/types/IPDOXResponse.d.ts

@@ -8,8 +8,8 @@
  * @property {string} continent The continent (ISO 3166)
  * @property {number} latitude The latitude
  * @property {number} longitude The longitude
- * @property {string} zip The ZIP code
- * @property {string} isp The ISP (Internet Service Provider)
+ * @property {string} zip The ZIP code (might be undefined)
+ * @property {string} isp The ISP (Internet Service Provider) (might be undefined)
  * @property {boolean} proxy Is the IP address a proxy?
  * @property {boolean} isHosting Is the IP address a hosting provider?
  * @property {object} proxyInfo Information about the proxy
@@ -26,8 +26,8 @@ export interface IPDOXResponse {
     continent: string;
     latitude: number;
     longitude: number;
-    zip: string;
-    isp: string;
+    zip?: string;
+    isp?: string;
     proxy?: boolean;
     isHosting?: boolean;
     proxyInfo?: {

package/dist/types/IPDOXResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IPDOXResponse.d.ts","sourceRoot":"","sources":["../../src/types/IPDOXResponse.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,WAAW,aAAa;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE;QACX,KAAK,EAAE,OAAO,CAAC;QACf,KAAK,EAAE,OAAO,CAAC;QACf,OAAO,EAAE,OAAO,CAAC;KACjB,CAAC;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CACf"}
+{"version":3,"file":"IPDOXResponse.d.ts","sourceRoot":"","sources":["../../src/types/IPDOXResponse.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,WAAW,aAAa;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE;QACX,KAAK,EAAE,OAAO,CAAC;QACf,KAAK,EAAE,OAAO,CAAC;QACf,OAAO,EAAE,OAAO,CAAC;KACjB,CAAC;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CACf"}

package/dist/utils/apis.d.ts

@@ -2,6 +2,9 @@ export declare enum GeoAPIs {
     IP_HYPHEN_API_DOT_COM = "http://ip-api.com/json/",
     FREE_IP_API_DOT_COM = "https://freeipapi.com/api/json/",
     IPWHO_DOT_IS = "https://ipwho.is/",
-    IPAPI_DOT_CO = "https://ipapi.co/"
+    IPAPI_DOT_CO = "https://ipapi.co/",
+    GEOIP_VUIZ_DOT_NET = "https://geoip.vuiz.net/geoip",
+    APIP_DOT_CC = "https://apip.cc/api-json/",
+    IP_SONAR_DOT_COM = "https://api.ip-sonar.com/v1/"
 }
 //# sourceMappingURL=apis.d.ts.map

package/dist/utils/apis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apis.d.ts","sourceRoot":"","sources":["../../src/utils/apis.ts"],"names":[],"mappings":"AAAA,oBAAY,OAAO;IAClB,qBAAqB,4BAA4B;IACjD,mBAAmB,oCAAoC;IACvD,YAAY,sBAAsB;IAClC,YAAY,sBAAsB;CAClC"}
+{"version":3,"file":"apis.d.ts","sourceRoot":"","sources":["../../src/utils/apis.ts"],"names":[],"mappings":"AAAA,oBAAY,OAAO;IAClB,qBAAqB,4BAA4B;IACjD,mBAAmB,oCAAoC;IACvD,YAAY,sBAAsB;IAClC,YAAY,sBAAsB;IAClC,kBAAkB,iCAAiC;IACnD,WAAW,8BAA8B;IACzC,gBAAgB,iCAAiC;CACjD"}

package/dist/utils/apis.js

@@ -7,5 +7,8 @@ var GeoAPIs;
     GeoAPIs["FREE_IP_API_DOT_COM"] = "https://freeipapi.com/api/json/";
     GeoAPIs["IPWHO_DOT_IS"] = "https://ipwho.is/";
     GeoAPIs["IPAPI_DOT_CO"] = "https://ipapi.co/";
+    GeoAPIs["GEOIP_VUIZ_DOT_NET"] = "https://geoip.vuiz.net/geoip";
+    GeoAPIs["APIP_DOT_CC"] = "https://apip.cc/api-json/";
+    GeoAPIs["IP_SONAR_DOT_COM"] = "https://api.ip-sonar.com/v1/";
 })(GeoAPIs || (exports.GeoAPIs = GeoAPIs = {}));
 //# sourceMappingURL=apis.js.map

package/dist/utils/apis.js.map

@@ -1 +1 @@
-{"version":3,"file":"apis.js","sourceRoot":"","sources":["../../src/utils/apis.ts"],"names":[],"mappings":";;;AAAA,IAAY,OAKX;AALD,WAAY,OAAO;IAClB,4DAAiD,CAAA;IACjD,kEAAuD,CAAA;IACvD,6CAAkC,CAAA;IAClC,6CAAkC,CAAA;AACnC,CAAC,EALW,OAAO,uBAAP,OAAO,QAKlB"}
+{"version":3,"file":"apis.js","sourceRoot":"","sources":["../../src/utils/apis.ts"],"names":[],"mappings":";;;AAAA,IAAY,OAQX;AARD,WAAY,OAAO;IAClB,4DAAiD,CAAA;IACjD,kEAAuD,CAAA;IACvD,6CAAkC,CAAA;IAClC,6CAAkC,CAAA;IAClC,8DAAmD,CAAA;IACnD,oDAAyC,CAAA;IACzC,4DAAiD,CAAA;AAClD,CAAC,EARW,OAAO,uBAAP,OAAO,QAQlB"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-ipdox",
-	"version": "1.0.6",
+	"version": "1.1.0",
 	"description": "node-ipdox is a Node.js library for GeoIP lookup, leveraging various free GeoIP APIs. It provides a unified response format and incorporates local caching to minimize duplicate requests.",
 	"author": "Mikel Calvo <contact@mikecalvo.net> (www.mikelcalvo.net)",
 	"keywords": [
@@ -15,10 +15,21 @@
 	"license": "ISC",
 	"readmeFilename": "README.md",
 	"homepage": "https://github.com/MikelCalvo/ipdox#readme",
-	"bugs": { "url": "https://github.com/MikelCalvo/ipdox/issues" },
+	"bugs": {
+		"url": "https://github.com/MikelCalvo/ipdox/issues"
+	},
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
-	"files": ["dist"],
+	"exports": {
+		".": {
+			"types": "./dist/index.d.ts",
+			"require": "./dist/index.js",
+			"import": "./dist/index.js"
+		}
+	},
+	"files": [
+		"dist"
+	],
 	"scripts": {
 		"test": "vitest run",
 		"test:watch": "vitest",
@@ -34,11 +45,14 @@
 		"access": "public",
 		"provenance": true
 	},
-	"dependencies": { "axios": "1.13.2", "lru-cache": "^11.2.4" },
+	"dependencies": {
+		"axios": "1.13.4",
+		"lru-cache": "^11.2.5"
+	},
 	"devDependencies": {
-		"@types/node": "25.0.2",
-		"prettier": "3.7.4",
+		"@types/node": "25.2.1",
+		"prettier": "3.8.1",
 		"typescript": "^5.9.3",
-		"vitest": "4.0.15"
+		"vitest": "4.0.18"
 	}
 }