@k03mad/ip2geo 9.3.0 → 9.4.0

package/.vscode/settings.json

@@ -1,3 +1,7 @@
 {
-    "eslint.experimental.useFlatConfig": true
+    "cSpell.words": [
+      "consts",
+      "geoip",
+      "nvmrc"
+    ]
 }

package/app/cli.js

@@ -7,7 +7,7 @@ import {DEFAULT_CACHE_FILE_DIR, DEFAULT_CACHE_FILE_NEWLINE, DEFAULT_CACHE_FILE_S
 import {pruneCache} from './helpers/cache.js';
 import {codeText, nameText} from './helpers/colors.js';
 
-const {blue, red, green} = chalk;
+const {blue, red, green, dim, bold} = chalk;
 
 const args = process.argv.slice(2);
 const argsExtra = args.filter(arg => !arg.startsWith('-'));
@@ -43,6 +43,7 @@ if (isHelp) {
 
 if (isPrune) {
     const cacheFolder = argsExtra[0] || DEFAULT_CACHE_FILE_DIR;
+    log(blue(cacheFolder));
 
     try {
         const {duplicates, empty, longLinesFiles} = await pruneCache(
@@ -51,27 +52,22 @@ if (isPrune) {
             DEFAULT_CACHE_FILE_NEWLINE,
         );
 
-        const message = [
+        log([
             '',
-            `Removed duplicate cache entries: ${green(duplicates)}`,
-            `Removed empty cache entries: ${green(empty)}`,
-        ];
-
-        if (longLinesFiles.size > 0) {
-            message.push(
-                '',
-                red('Something went wrong with these cache files (lines too long):'),
-                ...[...longLinesFiles].map(elem => blue(`— ${elem}`)),
-            );
+            green(`Removed duplicate cache entries: ${bold(duplicates.length)}`),
+            ...duplicates.map(elem => dim(`— ${elem}`)),
+            green(`Removed empty cache entries: ${bold(empty.length)}`),
+            ...empty.map(elem => dim(`— ${elem}`)),
+        ]);
+
+        if (longLinesFiles.length > 0) {
+            log([
+                red(`Required manual check, some cache files has too long lines: ${bold(longLinesFiles.length)}`),
+                ...longLinesFiles.map(({file, elem}) => dim(`— ${file}\n|— ${elem}`)),
+            ]);
         }
-
-        log(message);
     } catch (err) {
-        if (err.code !== 'ENOENT') {
-            logErrorExit(err);
-        }
-
-        log(`Cache folder empty: ${cacheFolder}`);
+        logErrorExit(red(err));
     }
 } else {
     const output = argsExtra.length === 0

package/app/helpers/cache.js

@@ -5,6 +5,8 @@ import _debug from 'debug';
 
 const debug = _debug('mad:geoip');
 
+const ipRe = /((25[0-5]|((?:2[0-4]|1\d|[1-9])?)\d)\.?\b){4}/;
+
 const outputKeys = [
     'ip',
     'continent',
@@ -161,6 +163,19 @@ export const writeToMapCache = (body, cacheMap, cacheMapMaxEntries) => {
 export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline) => {
     const files = await fs.readdir(cacheDir);
 
+    await Promise.all(files.map(async file => {
+        const fullFilePath = path.join(cacheDir, file);
+
+        const [stat, data] = await Promise.all([
+            fs.lstat(fullFilePath),
+            fs.readFile(fullFilePath, {encoding: 'utf8'}),
+        ]);
+
+        if (stat.isDirectory() || !ipRe.test(data)) {
+            throw new Error(`Folder has subfolders or files without IPs, wrong cache folder arg?\n${fullFilePath}`);
+        }
+    }));
+
     const cacheLineToNum = line => Number(
         line.split(cacheFileSeparator)[0]
             .split('.')
@@ -168,9 +183,8 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
             .join(''),
     );
 
-    let duplicates = 0;
-    let empty = 0;
-
+    const duplicates = new Set();
+    const empty = [];
     const longLinesFiles = new Set();
 
     await Promise.all(files.map(async file => {
@@ -183,10 +197,14 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
             const splitted = elem.split(cacheFileSeparator);
 
             if (splitted.length > outputKeys.length) {
-                longLinesFiles.add(fullFilePath);
+                longLinesFiles.add({file: fullFilePath, elem});
+            }
+
+            if (splitted.filter(Boolean).length > 1) {
+                return true;
             }
 
-            return splitted.filter(Boolean).length > 1;
+            empty.push(elem);
         });
 
         const uniq = [...new Set(dataArrRemoveEmpty)]
@@ -195,9 +213,13 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
         const fileContent = uniq.join(cacheFileNewline).trim();
         await (fileContent ? fs.writeFile(fullFilePath, fileContent) : fs.rm(fullFilePath));
 
-        empty += dataArr.length - dataArrRemoveEmpty.length;
-        duplicates += dataArrRemoveEmpty.length - uniq.length;
+        dataArrRemoveEmpty
+            .forEach((elem, i, arr) => arr.indexOf(elem) !== i && duplicates.add(elem));
     }));
 
-    return {duplicates, empty, longLinesFiles};
+    return {
+        duplicates: [...duplicates],
+        empty,
+        longLinesFiles: [...longLinesFiles],
+    };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/ip2geo",
-  "version": "9.3.0",
+  "version": "9.4.0",
   "description": "GeoIP library",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@k03mad/request": "6.1.0",
-    "@k03mad/simple-log": "2.3.0",
+    "@k03mad/simple-log": "3.0.0",
     "chalk": "5.3.0",
     "debug": "4.3.6"
   },