@k03mad/ip2geo 2.2.0 → 2.3.0

package/app/cli.js

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
 
+import os from 'node:os';
+import path from 'node:path';
+
 import {codeText, errorText, nameText} from './helpers/colors.js';
 import {log, throwError} from './helpers/logging.js';
 
@@ -29,7 +32,9 @@ if (args.includes(jsonParam)) {
 }
 
 await Promise.all(args.map(async arg => {
-    const output = await ip2geo(arg);
+    const output = await ip2geo(arg, {
+        cacheDir: path.join(os.tmpdir(), '.ip2geo'),
+    });
 
     if (json) {
         return log(JSON.stringify(output));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/ip2geo",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "GeoIP library",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
@@ -26,12 +26,13 @@
   "devDependencies": {
     "@k03mad/eslint-config": "19.2.0",
     "eslint": "8.56.0",
-    "husky": "8.0.3"
+    "husky": "8.0.3",
+    "mocha": "10.2.0"
   },
   "scripts": {
     "lint": "npm run lint:eslint",
     "lint:eslint": "eslint ./ --cache",
-    "test": "node --test tests/*",
+    "test": "mocha tests",
     "clean": "npm run clean:modules && npm run clean:eslint:cache",
     "clean:modules": "rm -rf ./node_modules || true",
     "clean:eslint:cache": "rm -rf .eslintcache || true",

package/tests/helpers/path.js

@@ -5,3 +5,9 @@ import path from 'node:path';
  * @returns {string}
  */
 export const getCurrentFilename = file => path.basename(file, '.js');
+
+/**
+ * @param {string} file
+ * @returns {string}
+ */
+export const getTestFolder = file => path.join('.geoipCustom', file);

package/tests/opts-assigned-ipv6.js

@@ -1,15 +1,16 @@
 import assert from 'node:assert/strict';
-import {describe, it} from 'node:test';
+
+import {describe, it} from 'mocha';
 
 import {ip2geo} from '../app/index.js';
 
-import {getCurrentFilename} from './helpers/path.js';
+import {getCurrentFilename, getTestFolder} from './helpers/path.js';
 import {checkCacheFile, removeCacheFolder} from './shared/fs.js';
 
 const testName = getCurrentFilename(import.meta.url);
 
 describe(testName, () => {
-    const CACHE_FILE_DIR = testName;
+    const CACHE_FILE_DIR = getTestFolder(testName);
     const CACHE_FILE_NAME = 'ips.log';
     const CACHE_FILE_SEPARATOR = ';;';
     const CACHE_FILE_NEWLINE = '\n';
@@ -30,7 +31,7 @@ describe(testName, () => {
         ispDomain: '',
     };
 
-    removeCacheFolder(CACHE_FILE_DIR);
+    it('should remove fs cache dir if exist', () => removeCacheFolder(CACHE_FILE_DIR));
 
     it(`should return correct response for IP: "${REQUEST_IP}"`, async () => {
         const data = await ip2geo(REQUEST_IP, {
@@ -40,11 +41,11 @@ describe(testName, () => {
         assert.deepEqual(data, response);
     });
 
-    checkCacheFile(
+    it('should have cache file', () => checkCacheFile(
         CACHE_FILE_DIR,
         cacheFile,
         CACHE_FILE_SEPARATOR,
         CACHE_FILE_NEWLINE,
         response,
-    );
+    ));
 });

package/tests/opts-assigned-subfolder.js

@@ -1,18 +1,21 @@
 import assert from 'node:assert/strict';
 import path from 'node:path';
-import {describe, it} from 'node:test';
+
+import {describe, it} from 'mocha';
 
 import {ip2geo} from '../app/index.js';
 
-import {getCurrentFilename} from './helpers/path.js';
+import {getCurrentFilename, getTestFolder} from './helpers/path.js';
 import {checkCacheFile, removeCacheFolder} from './shared/fs.js';
 
 const testName = getCurrentFilename(import.meta.url);
 const SUBFOLDERS = 5;
 
 describe(testName, () => {
-    const CACHE_FILE_DIR = path.join(
-        ...Array.from({length: SUBFOLDERS}, () => testName),
+    const CACHE_FILE_DIR = getTestFolder(
+        path.join(
+            ...Array.from({length: SUBFOLDERS}, () => testName),
+        ),
     );
 
     const CACHE_FILE_NAME = 'ips.log';
@@ -35,7 +38,7 @@ describe(testName, () => {
         ispDomain: 'quad9.net',
     };
 
-    removeCacheFolder(CACHE_FILE_DIR);
+    it('should remove fs cache dir if exist', () => removeCacheFolder(CACHE_FILE_DIR));
 
     it(`should return correct response for IP: "${REQUEST_IP}"`, async () => {
         const data = await ip2geo(REQUEST_IP, {
@@ -45,11 +48,11 @@ describe(testName, () => {
         assert.deepEqual(data, response);
     });
 
-    checkCacheFile(
+    it('should have cache file', () => checkCacheFile(
         CACHE_FILE_DIR,
         cacheFile,
         CACHE_FILE_SEPARATOR,
         CACHE_FILE_NEWLINE,
         response,
-    );
+    ));
 });

package/tests/opts-assigned.js

@@ -1,15 +1,16 @@
 import assert from 'node:assert/strict';
-import {describe, it} from 'node:test';
+
+import {describe, it} from 'mocha';
 
 import {ip2geo} from '../app/index.js';
 
-import {getCurrentFilename} from './helpers/path.js';
+import {getCurrentFilename, getTestFolder} from './helpers/path.js';
 import {checkCacheFile, removeCacheFolder} from './shared/fs.js';
 
 const testName = getCurrentFilename(import.meta.url);
 
 describe(testName, () => {
-    const CACHE_FILE_DIR = testName;
+    const CACHE_FILE_DIR = getTestFolder(testName);
     const CACHE_FILE_NAME = 'ips.md';
     const CACHE_FILE_SEPARATOR = '-_-';
     const CACHE_FILE_NEWLINE = '%%%';
@@ -30,7 +31,7 @@ describe(testName, () => {
         ispDomain: 'google.com',
     };
 
-    removeCacheFolder(CACHE_FILE_DIR);
+    it('should remove fs cache dir if exist', () => removeCacheFolder(CACHE_FILE_DIR));
 
     it(`should return correct response for IP: "${REQUEST_IP}"`, async () => {
         const data = await ip2geo(REQUEST_IP, {
@@ -43,11 +44,11 @@ describe(testName, () => {
         assert.deepEqual(data, response);
     });
 
-    checkCacheFile(
+    it('should have cache file', () => checkCacheFile(
         CACHE_FILE_DIR,
         cacheFile,
         CACHE_FILE_SEPARATOR,
         CACHE_FILE_NEWLINE,
         response,
-    );
+    ));
 });

package/tests/opts-default.js

@@ -1,5 +1,6 @@
 import assert from 'node:assert/strict';
-import {describe, it} from 'node:test';
+
+import {describe, it} from 'mocha';
 
 import {ip2geo} from '../app/index.js';
 
@@ -48,13 +49,13 @@ describe('opts-default', () => {
             assert.deepEqual(data, response);
         });
 
-        checkCacheFile(
+        it('should have cache file', () => checkCacheFile(
             CACHE_FILE_DIR,
             cacheFile,
             CACHE_FILE_SEPARATOR,
             CACHE_FILE_NEWLINE,
             response,
-        );
+        ));
     });
 
     describe('without ip arg', () => {

package/tests/shared/fs.js

@@ -1,21 +1,18 @@
 import assert from 'node:assert/strict';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import {it} from 'node:test';
 
 /**
  * @param {string} cacheDir
  */
-export const removeCacheFolder = cacheDir => {
-    it('should remove fs cache dir if exist', async () => {
-        try {
-            await fs.rm(cacheDir, {recursive: true, force: true});
-        } catch (err) {
-            if (err.code !== 'ENOENT') {
-                throw err;
-            }
+export const removeCacheFolder = async cacheDir => {
+    try {
+        await fs.rm(cacheDir, {recursive: true, force: true});
+    } catch (err) {
+        if (err.code !== 'ENOENT') {
+            throw err;
         }
-    });
+    }
 };
 
 /**
@@ -25,10 +22,8 @@ export const removeCacheFolder = cacheDir => {
  * @param {string} cacheFileNewline
  * @param {object} response
  */
-export const checkCacheFile = (cacheDir, cacheFileName, cacheFileSeparator, cacheFileNewline, response) => {
-    it('should have cache file', async () => {
-        const data = await fs.readFile(path.join(cacheDir, cacheFileName), {encoding: 'utf8'});
+export const checkCacheFile = async (cacheDir, cacheFileName, cacheFileSeparator, cacheFileNewline, response) => {
+    const data = await fs.readFile(path.join(cacheDir, cacheFileName), {encoding: 'utf8'});
 
-        assert.equal(data, Object.values(response).join(cacheFileSeparator) + cacheFileNewline);
-    });
+    assert.equal(data, Object.values(response).join(cacheFileSeparator) + cacheFileNewline);
 };