@k03mad/ip2geo 9.7.0 → 10.1.0

package/.vscode/settings.json

@@ -1,6 +1,7 @@
 {
     "cSpell.words": [
       "consts",
+      "dups",
       "geoip",
       "nvmrc"
     ]

package/app/cli.js

@@ -46,7 +46,13 @@ if (isPrune) {
     log(blue(cacheFolder));
 
     try {
-        const {duplicates, empty, entries, longLinesFiles} = await pruneCache(
+        const {
+            different,
+            duplicates,
+            empty,
+            entries,
+            longLinesFiles,
+        } = await pruneCache(
             cacheFolder,
             DEFAULT_CACHE_FILE_SEPARATOR,
             DEFAULT_CACHE_FILE_NEWLINE,
@@ -56,6 +62,8 @@ if (isPrune) {
             '',
             green(`Removed duplicate cache entries: ${bold(duplicates.length)}`),
             ...duplicates.map(elem => dim(`— ${elem}`)),
+            green(`Removed different cache entries: ${bold(different.length)}`),
+            ...different.map(elem => dim(`— ${elem}`)),
             green(`Removed empty cache entries: ${bold(empty.length)}`),
             ...empty.map(elem => dim(`— ${elem}`)),
         ]);

package/app/helpers/cache.js

@@ -4,6 +4,8 @@ import path from 'node:path';
 import _debug from 'debug';
 import {isIP} from 'is-ip';
 
+import {getArrayDups} from './utils.js';
+
 const debug = _debug('mad:geoip');
 
 const outputKeys = [
@@ -191,6 +193,7 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
     );
 
     const duplicates = new Set();
+    const different = new Set();
     const empty = [];
     const longLinesFiles = new Set();
     let entries = 0;
@@ -215,25 +218,37 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
             empty.push(elem);
         });
 
-        const uniq = [...new Set(dataArrRemoveEmpty)]
+        const uniqSorted = [...new Set(dataArrRemoveEmpty)]
             .sort((a, b) => cacheLineToNum(a) - cacheLineToNum(b));
 
-        const fileContent = uniq.join(cacheFileNewline).trim();
+        const dupsIp = getArrayDups(uniqSorted.map(elem => elem.split(cacheFileSeparator)[0]));
+
+        const removeDiffs = uniqSorted.filter(elem => {
+            if (dupsIp.includes(elem.split(cacheFileSeparator)[0])) {
+                different.add(elem);
+                return false;
+            }
+
+            return true;
+        });
+
+        const fileContent = removeDiffs.join(cacheFileNewline).trim();
 
         if (fileContent) {
             await fs.writeFile(fullFilePath, fileContent);
-            entries += uniq.length;
+            entries += removeDiffs.length;
         } else {
             await fs.rm(fullFilePath);
         }
 
-        dataArrRemoveEmpty
-            .forEach((elem, i, arr) => arr.indexOf(elem) !== i && duplicates.add(elem));
+        const dups = getArrayDups(dataArrRemoveEmpty);
+        dups.forEach(dup => duplicates.add(dup));
     }));
 
     return {
         entries,
         duplicates: [...duplicates],
+        different: [...different],
         empty,
         longLinesFiles: [...longLinesFiles],
     };

package/app/helpers/utils.js

@@ -0,0 +1,4 @@
+/**
+ * @param {Array} arr
+ */
+export const getArrayDups = arr => arr.filter((e, i, a) => a.indexOf(e) !== i);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/ip2geo",
-  "version": "9.7.0",
+  "version": "10.1.0",
   "description": "GeoIP library",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"