@k03mad/ip2geo 9.6.0 → 10.0.0

package/app/cli.js

@@ -46,7 +46,13 @@ if (isPrune) {
     log(blue(cacheFolder));
 
     try {
-        const {duplicates, empty, 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}`)),
         ]);
@@ -66,6 +74,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

@@ -191,8 +191,10 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
     );
 
     const duplicates = new Set();
+    const different = new Set();
     const empty = [];
     const longLinesFiles = new Set();
+    let entries = 0;
 
     await Promise.all(files.map(async file => {
         const fullFilePath = path.join(cacheDir, file);
@@ -215,17 +217,38 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
         });
 
         const uniq = [...new Set(dataArrRemoveEmpty)]
-            .sort((a, b) => cacheLineToNum(a) - cacheLineToNum(b));
+            .sort((a, b) => cacheLineToNum(a) - cacheLineToNum(b))
+            .filter((elem, i, arr) => {
+                for (const [j, line] of arr.entries()) {
+                    if (
+                        i !== j
+                        && line.split(cacheFileSeparator)[0] === elem.split(cacheFileSeparator)[0]
+                    ) {
+                        different.add(elem);
+                        return false;
+                    }
+                }
+
+                return true;
+            });
 
         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],
+        different: [...different],
         empty,
         longLinesFiles: [...longLinesFiles],
     };

package/package.json

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