@k03mad/ip2geo 6.1.0 → 7.0.0

package/app/helpers/cache.js

@@ -29,7 +29,9 @@ export const collectOutputData = dataArr => {
     const outputData = {};
 
     outputKeys.forEach((key, i) => {
-        outputData[key] = dataArr[i];
+        outputData[key] = key === 'connectionAsn' && dataArr[i]
+            ? Number(dataArr[i])
+            : dataArr[i];
     });
 
     return outputData;

package/app/lib/ip2geo.js

@@ -75,7 +75,10 @@ export const ip2geo = async ({
             return mapCache;
         }
 
-        const fsCache = await readFromFsCache(ip, cacheDir, cacheFileName);
+        const fsCache = await readFromFsCache(
+            ip, cacheDir,
+            cacheFileName, cacheFileSeparator, cacheFileNewline,
+        );
 
         if (fsCache) {
             writeToMapCache(fsCache, cacheMap, cacheMapMaxEntries);

package/package.json

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

package/tests/cache-file-entries.js

@@ -0,0 +1,35 @@
+import assert from 'node:assert/strict';
+
+import {describe, it} from 'mocha';
+
+import {ip2geo} from '../app/index.js';
+
+import {REQUEST_IPV4} from './helpers/consts.js';
+import {getCurrentFilename, getTestFolder} from './helpers/path.js';
+import {checkCacheFile, removeCacheFolder} from './shared/fs.js';
+
+const testName = getCurrentFilename(import.meta.url);
+
+describe(testName, () => {
+    const opts = {
+        cacheDir: getTestFolder(testName),
+        cacheMap: new Map(),
+        cacheMapMaxEntries: 0,
+    };
+
+    it('should remove fs cache dir if exist', () => removeCacheFolder(opts.cacheDir));
+
+    ['first try', 'second try'].forEach(name => {
+        describe(name, () => {
+            it(`should return correct response for IP: "${REQUEST_IPV4.ip}"`, async () => {
+                const data = await ip2geo({ip: REQUEST_IPV4.ip, ...opts});
+                assert.deepEqual(data, REQUEST_IPV4);
+            });
+
+            it('should have cache file', () => checkCacheFile({
+                ...opts,
+                response: REQUEST_IPV4,
+            }));
+        });
+    });
+});