@k03mad/ip2geo 7.5.0 → 8.1.0

package/app/cli.js

@@ -42,13 +42,18 @@ if (isPrune) {
     const cacheFolder = argsExtra[0] || DEFAULT_CACHE_FILE_DIR;
 
     try {
-        const {removedEntries} = await pruneCache(
+        const {duplicates, noData} = await pruneCache(
             cacheFolder,
             DEFAULT_CACHE_FILE_SEPARATOR,
             DEFAULT_CACHE_FILE_NEWLINE,
         );
 
-        log(`Removed duplicate cache entries: ${removedEntries}`);
+        log([
+            `Removed duplicate cache entries: ${duplicates}`,
+            `Removed empty cache entries: ${noData}`,
+            '',
+            `Total: ${duplicates + noData}`,
+        ]);
     } catch (err) {
         if (err.code !== 'ENOENT') {
             logErrorExit(err);

package/app/helpers/cache.js

@@ -99,7 +99,7 @@ export const writeToFsCache = async (ip, data, cacheDir, cacheFileName, cacheFil
     debug('set to fs cache: %o %o', cacheFileFull, data);
 
     await fs.mkdir(cacheDir, {recursive: true});
-    await fs.appendFile(cacheFileFull, Object.values(data).join(cacheFileSeparator) + cacheFileNewline);
+    await fs.appendFile(cacheFileFull, cacheFileNewline + Object.values(data).join(cacheFileSeparator));
 };
 
 /**
@@ -168,19 +168,26 @@ export const pruneCache = async (cacheDir, cacheFileSeparator, cacheFileNewline)
             .join(''),
     );
 
-    let removedEntries = 0;
+    let duplicates = 0;
+    let empty = 0;
 
     await Promise.all(files.map(async file => {
         const fullFilePath = path.join(cacheDir, file);
 
         const data = await fs.readFile(fullFilePath, {encoding: 'utf8'});
-        const dataArr = data.split(cacheFileNewline);
+        const dataArr = data.split(cacheFileNewline).filter(Boolean);
 
-        const uniq = [...new Set(dataArr)].sort((a, b) => cacheLineToNum(a) - cacheLineToNum(b));
-        await fs.writeFile(fullFilePath, uniq.join(cacheFileNewline));
+        const dataArrRemoveEmpty = dataArr.filter(elem => {
+            const splitted = elem.split(cacheFileSeparator);
+            return splitted.filter(Boolean).length > 1;
+        });
 
-        removedEntries += dataArr.length - uniq.length;
+        const uniq = [...new Set(dataArrRemoveEmpty)].sort((a, b) => cacheLineToNum(a) - cacheLineToNum(b));
+        await fs.writeFile(fullFilePath, uniq.join(cacheFileNewline).trim());
+
+        duplicates += dataArr.length - uniq.length;
+        empty += dataArr.length - dataArrRemoveEmpty.length;
     }));
 
-    return {removedEntries};
+    return {duplicates, empty};
 };

package/package.json

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

package/tests/shared/fs.js

@@ -40,5 +40,5 @@ export const checkCacheFile = async ({
     const cacheFile = `${response.ip.split(/\.|:/)[0]}_${cacheFileName}`;
     const data = await fs.readFile(path.join(cacheDir, cacheFile), {encoding: 'utf8'});
 
-    assert.equal(data, Object.values(response).join(cacheFileSeparator) + cacheFileNewline);
+    assert.equal(data, cacheFileNewline + Object.values(response).join(cacheFileSeparator));
 };