@k03mad/ip2geo 8.1.0 → 9.1.0

package/app/cli.js

@@ -1,11 +1,14 @@
 #!/usr/bin/env node
 
 import {log, logErrorExit} from '@k03mad/simple-log';
+import chalk from 'chalk';
 
 import {DEFAULT_CACHE_FILE_DIR, DEFAULT_CACHE_FILE_NEWLINE, DEFAULT_CACHE_FILE_SEPARATOR, ip2geo} from './api.js';
 import {pruneCache} from './helpers/cache.js';
 import {codeText, nameText} from './helpers/colors.js';
 
+const {blue, red, green} = chalk;
+
 const args = process.argv.slice(2);
 const argsExtra = args.filter(arg => !arg.startsWith('-'));
 
@@ -42,18 +45,26 @@ if (isPrune) {
     const cacheFolder = argsExtra[0] || DEFAULT_CACHE_FILE_DIR;
 
     try {
-        const {duplicates, noData} = await pruneCache(
+        const {duplicates, empty, longLinesFiles} = await pruneCache(
             cacheFolder,
             DEFAULT_CACHE_FILE_SEPARATOR,
             DEFAULT_CACHE_FILE_NEWLINE,
         );
 
-        log([
-            `Removed duplicate cache entries: ${duplicates}`,
-            `Removed empty cache entries: ${noData}`,
-            '',
-            `Total: ${duplicates + noData}`,
-        ]);
+        const message = [
+            `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}`)),
+            );
+        }
+
+        log(message);
     } catch (err) {
         if (err.code !== 'ENOENT') {
             logErrorExit(err);

package/app/helpers/cache.js

@@ -2,6 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 
 import _debug from 'debug';
+import ora from 'ora';
 
 const debug = _debug('mad:geoip');
 
@@ -170,6 +171,10 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
 
     let duplicates = 0;
     let empty = 0;
+    let counter = 0;
+    const longLinesFiles = new Set();
+
+    const spinner = ora().start();
 
     await Promise.all(files.map(async file => {
         const fullFilePath = path.join(cacheDir, file);
@@ -179,15 +184,27 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
 
         const dataArrRemoveEmpty = dataArr.filter(elem => {
             const splitted = elem.split(cacheFileSeparator);
+
+            if (splitted.length > outputKeys.length) {
+                longLinesFiles.add(fullFilePath);
+            }
+
             return splitted.filter(Boolean).length > 1;
         });
 
-        const uniq = [...new Set(dataArrRemoveEmpty)].sort((a, b) => cacheLineToNum(a) - cacheLineToNum(b));
-        await fs.writeFile(fullFilePath, uniq.join(cacheFileNewline).trim());
+        const uniq = [...new Set(dataArrRemoveEmpty)]
+            .sort((a, b) => cacheLineToNum(a) - cacheLineToNum(b));
+
+        const fileContent = uniq.join(cacheFileNewline).trim();
+        await (fileContent ? fs.writeFile(fullFilePath, fileContent) : fs.rm(fullFilePath));
 
-        duplicates += dataArr.length - uniq.length;
         empty += dataArr.length - dataArrRemoveEmpty.length;
+        duplicates += dataArrRemoveEmpty.length - uniq.length;
+
+        counter++;
+        spinner.text = `[${counter}/${files.length}]: ${fullFilePath}`;
     }));
 
-    return {duplicates, empty};
+    spinner.stop();
+    return {duplicates, empty, longLinesFiles};
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/ip2geo",
-  "version": "8.1.0",
+  "version": "9.1.0",
   "description": "GeoIP library",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
@@ -22,7 +22,8 @@
     "@k03mad/request": "6.1.0",
     "@k03mad/simple-log": "2.3.0",
     "chalk": "5.3.0",
-    "debug": "4.3.6"
+    "debug": "4.3.6",
+    "ora": "8.0.1"
   },
   "devDependencies": {
     "@k03mad/eslint-config": "23.0.0",