@k03mad/ip2geo 7.0.4 → 7.2.0

package/.husky/pre-commit

@@ -1,2 +1 @@
-npm run lint
-npm run test
+./node_modules/.bin/run-p -c lint test

package/app/lib/ip2geo.js

@@ -2,7 +2,6 @@ import os from 'node:os';
 import path from 'node:path';
 
 import {request} from '@k03mad/request';
-import {logErrorExit} from '@k03mad/simple-log';
 
 import {
     collectOutputData,
@@ -68,7 +67,11 @@ export const ip2geo = async ({
     rps = DEFAULT_RPS,
 } = {}) => {
     if (ip) {
-        const mapCache = readFromMapCache(ip, cacheMap, cacheMapMaxEntries);
+        const mapCache = readFromMapCache(
+            ip,
+            cacheMap,
+            cacheMapMaxEntries,
+        );
 
         if (mapCache) {
             return mapCache;
@@ -76,12 +79,19 @@ export const ip2geo = async ({
 
         const fsCache = await readFromFsCache(
             ip,
-            cacheDir, cacheFileName,
-            cacheFileSeparator, cacheFileNewline,
+            cacheDir,
+            cacheFileName,
+            cacheFileSeparator,
+            cacheFileNewline,
         );
 
         if (fsCache) {
-            writeToMapCache(fsCache, cacheMap, cacheMapMaxEntries);
+            writeToMapCache(
+                fsCache,
+                cacheMap,
+                cacheMapMaxEntries,
+            );
+
             return fsCache;
         }
     }
@@ -90,11 +100,11 @@ export const ip2geo = async ({
     const {body} = await request(reqUrl, {}, {rps});
 
     if (!body?.ip) {
-        logErrorExit([
+        throw new Error([
             'API error',
             `request: ${reqUrl}`,
-            `response body: ${body}`,
-        ]);
+            `response body: ${JSON.stringify(body)}`,
+        ].join('\n'));
     }
 
     const outputData = collectOutputData([
@@ -113,12 +123,19 @@ export const ip2geo = async ({
         body?.connection?.domain,
     ]);
 
-    writeToMapCache(outputData, cacheMap, cacheMapMaxEntries);
+    writeToMapCache(
+        outputData,
+        cacheMap,
+        cacheMapMaxEntries,
+    );
 
     await writeToFsCache(
-        body.ip, outputData,
-        cacheDir, cacheFileName,
-        cacheFileSeparator, cacheFileNewline,
+        body.ip,
+        outputData,
+        cacheDir,
+        cacheFileName,
+        cacheFileSeparator,
+        cacheFileNewline,
     );
 
     return outputData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/ip2geo",
-  "version": "7.0.4",
+  "version": "7.2.0",
   "description": "GeoIP library",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
@@ -19,24 +19,23 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@k03mad/request": "5.6.3",
-    "@k03mad/simple-log": "2.1.2",
+    "@k03mad/request": "5.7.0",
+    "@k03mad/simple-log": "2.1.4",
     "chalk": "5.3.0",
-    "debug": "4.3.4"
+    "debug": "4.3.5"
   },
   "devDependencies": {
-    "@k03mad/eslint-config": "20.6.0",
+    "@k03mad/eslint-config": "22.1.0",
     "eslint": "8.57.0",
     "husky": "9.0.11",
-    "mocha": "10.4.0"
+    "mocha": "10.4.0",
+    "npm-run-all": "4.1.5"
   },
   "scripts": {
     "lint": "npm run lint:eslint",
     "lint:eslint": "eslint ./ --cache",
     "test": "rm -rfv ./.geoip && mocha tests",
-    "clean": "npm run clean:modules && npm run clean:eslint:cache",
-    "clean:modules": "rm -rf ./node_modules || true",
-    "clean:eslint:cache": "rm -rf .eslintcache || true",
+    "clean": "rm -rf ./node_modules .eslintcache || true",
     "setup": "npm run clean && npm run setup:pnpm",
     "setup:pnpm": "npm i pnpm -g && pnpm i",
     "prepare": "husky || true"

package/tests/default.js

@@ -38,7 +38,7 @@ describe(testName, () => {
 
         Object.keys(REQUEST_IPV4).forEach(key => {
             it(`should have "${key}" in request response`, () => {
-                assert.ok(data[key]);
+                assert.ok(Object.hasOwn(data, key));
             });
         });
 

package/tests/shared/consts.js

@@ -25,8 +25,8 @@ export const REQUEST_IPV4_MAP_OFF_ONLY = {
     regionCode: 'ZH',
     city: 'Zürich',
     connectionAsn: 19_281,
-    connectionOrg: 'Quad9',
-    connectionIsp: 'Quad9',
+    connectionOrg: 'Quad',
+    connectionIsp: 'Quad',
     connectionDomain: 'quad9.net',
 };
 
@@ -40,8 +40,8 @@ export const REQUEST_IPV6 = {
     region: 'North Holland',
     regionCode: 'NH',
     city: 'Amsterdam',
-    connectionAsn: 0,
-    connectionOrg: '',
-    connectionIsp: 'NetActuate Inc',
+    connectionAsn: 36_236,
+    connectionOrg: 'Netactuate INC',
+    connectionIsp: 'Netactuate, INC',
     connectionDomain: '',
 };