@k03mad/ip2geo 9.4.0 → 9.7.0

package/app/cli.js

@@ -46,7 +46,7 @@ if (isPrune) {
     log(blue(cacheFolder));
 
     try {
-        const {duplicates, empty, longLinesFiles} = await pruneCache(
+        const {duplicates, empty, entries, longLinesFiles} = await pruneCache(
             cacheFolder,
             DEFAULT_CACHE_FILE_SEPARATOR,
             DEFAULT_CACHE_FILE_NEWLINE,
@@ -66,6 +66,11 @@ if (isPrune) {
                 ...longLinesFiles.map(({file, elem}) => dim(`— ${file}\n|— ${elem}`)),
             ]);
         }
+
+        log([
+            '',
+            green(`Current cache entries: ${bold(entries)}`),
+        ]);
     } catch (err) {
         logErrorExit(red(err));
     }

package/app/helpers/cache.js

@@ -2,11 +2,10 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 
 import _debug from 'debug';
+import {isIP} from 'is-ip';
 
 const debug = _debug('mad:geoip');
 
-const ipRe = /((25[0-5]|((?:2[0-4]|1\d|[1-9])?)\d)\.?\b){4}/;
-
 const outputKeys = [
     'ip',
     'continent',
@@ -171,7 +170,15 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
             fs.readFile(fullFilePath, {encoding: 'utf8'}),
         ]);
 
-        if (stat.isDirectory() || !ipRe.test(data)) {
+        const firstIp = data
+            .split(cacheFileNewline)
+            .find(Boolean)
+            .split(cacheFileSeparator)[0];
+
+        if (
+            stat.isDirectory()
+            || !isIP(firstIp)
+        ) {
             throw new Error(`Folder has subfolders or files without IPs, wrong cache folder arg?\n${fullFilePath}`);
         }
     }));
@@ -186,6 +193,7 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
     const duplicates = new Set();
     const empty = [];
     const longLinesFiles = new Set();
+    let entries = 0;
 
     await Promise.all(files.map(async file => {
         const fullFilePath = path.join(cacheDir, file);
@@ -211,13 +219,20 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
             .sort((a, b) => cacheLineToNum(a) - cacheLineToNum(b));
 
         const fileContent = uniq.join(cacheFileNewline).trim();
-        await (fileContent ? fs.writeFile(fullFilePath, fileContent) : fs.rm(fullFilePath));
+
+        if (fileContent) {
+            await fs.writeFile(fullFilePath, fileContent);
+            entries += uniq.length;
+        } else {
+            await fs.rm(fullFilePath);
+        }
 
         dataArrRemoveEmpty
             .forEach((elem, i, arr) => arr.indexOf(elem) !== i && duplicates.add(elem));
     }));
 
     return {
+        entries,
         duplicates: [...duplicates],
         empty,
         longLinesFiles: [...longLinesFiles],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/ip2geo",
-  "version": "9.4.0",
+  "version": "9.7.0",
   "description": "GeoIP library",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
@@ -20,14 +20,15 @@
   },
   "dependencies": {
     "@k03mad/request": "6.1.0",
-    "@k03mad/simple-log": "3.0.0",
+    "@k03mad/simple-log": "4.0.0",
     "chalk": "5.3.0",
-    "debug": "4.3.6"
+    "debug": "4.3.6",
+    "is-ip": "5.0.1"
   },
   "devDependencies": {
-    "@k03mad/eslint-config": "23.0.0",
+    "@k03mad/eslint-config": "23.1.0",
     "eslint": "8.57.0",
-    "husky": "9.1.4",
+    "husky": "9.1.5",
     "mocha": "10.7.3",
     "npm-run-all": "4.1.5"
   },