@k03mad/ip2geo 2.0.0 → 2.2.0

package/README.md

@@ -4,35 +4,55 @@
 — Runtime cache \
 — Filesystem infinity cache
 
+## Global
+
+```bash
+npm i @k03mad/ip2geo -g
+
+ip2geo 1.1.1.1
+# {
+#   ip: '1.1.1.1',
+#   emoji: '🇺🇸',
+#   country: 'United States',
+#   countryA2: 'US',
+#   region: 'District of Columbia',
+#   city: 'Washington',
+#   org: 'APNIC and Cloudflare DNS Resolver project',
+#   isp: 'Cloudflare, Inc.',
+#   ispDomain: 'cloudflare.com'
+# }
+
+ip2geo 1.1.1.1 --json
+# {"ip":"1.1.1.1","emoji":"🇺🇸","country":"United States","countryA2":"US","region":"District of Columbia","city":"Washington","org":"APNIC and Cloudflare DNS Resolver project","isp":"Cloudflare, Inc.","ispDomain":"cloudflare.com"}
+```
+
 ## API
 
 ```bash
 npm i @k03mad/ip2geo --save-exact
-echo "/geoip" >> .gitignore
+echo .geoip >> .gitignore
 ```
 
 ```js
 import {ip2geo} from '@k03mad/ip2geo';
 
-const {
-    ip,
-    emoji,
-    country,
-    countryA2,
-    city,
-    isp,
-} = await ip2geo('1.1.1.1', {
+const info = await ip2geo('1.1.1.1', {
     // defaults
-    cacheDir: 'geoip',
+    cacheDir: '.geoip',
     cacheFileName: 'ips.log',
     cacheFileSeparator: ';;',
     cacheFileNewline: '\n',
 });
 
-// ip: "1.1.1.1"
-// emoji: "🇺🇸"
-// country: "United States"
-// countryA2: "US"
-// city: "Washington"
-// isp: "Cloudflare, Inc."
+// info {
+//   ip: '1.1.1.1',
+//   emoji: '🇺🇸',
+//   country: 'United States',
+//   countryA2: 'US',
+//   region: 'District of Columbia',
+//   city: 'Washington',
+//   org: 'APNIC and Cloudflare DNS Resolver project',
+//   isp: 'Cloudflare, Inc.',
+//   ispDomain: 'cloudflare.com'
+// }
 ```

package/app/cli.js

@@ -0,0 +1,39 @@
+#!/usr/bin/env node
+
+import {codeText, errorText, nameText} from './helpers/colors.js';
+import {log, throwError} from './helpers/logging.js';
+
+import {ip2geo} from './index.js';
+
+const jsonParam = '--json';
+
+let args = process.argv.slice(2);
+
+if (args.length === 0) {
+    const prefix = codeText('$');
+    const name = nameText('ip2geo');
+
+    throwError([
+        errorText('IP(s) should be passed as args'),
+        '',
+        `${prefix} ${name} 1.1.1.1`,
+        `${prefix} ${name} 1.1.1.1 8.8.8.8`,
+    ]);
+}
+
+let json;
+
+if (args.includes(jsonParam)) {
+    json = true;
+    args = args.filter(elem => elem !== jsonParam);
+}
+
+await Promise.all(args.map(async arg => {
+    const output = await ip2geo(arg);
+
+    if (json) {
+        return log(JSON.stringify(output));
+    }
+
+    log(output);
+}));

package/app/helpers/array.js

@@ -0,0 +1,5 @@
+/**
+ * @param {any|any[]} elem
+ * @returns {any[]}
+ */
+export const convertToArray = elem => Array.isArray(elem) ? elem : [elem];

package/app/helpers/colors.js

@@ -0,0 +1,6 @@
+import chalk from 'chalk';
+
+export const errorText = chalk.red.bold.bgGray;
+export const codeText = chalk.gray;
+export const numText = chalk.blue;
+export const nameText = chalk.magenta;

package/app/helpers/logging.js

@@ -0,0 +1,26 @@
+/* eslint-disable no-console */
+
+import {convertToArray} from './array.js';
+
+/**
+ * @param {any|any[]} msg
+ * @returns {void}
+ */
+export const log = msg => convertToArray(msg)
+    .forEach(elem => console.log(elem));
+
+/**
+ * @param {any|any[]} msg
+ * @returns {void}
+ */
+export const logError = msg => convertToArray(msg)
+    .forEach(elem => console.error(elem));
+
+/**
+ * @param {any|any[]} msg
+ * @returns {void}
+ */
+export const throwError = msg => {
+    logError(msg);
+    process.exit(1);
+};

package/app/lib/ip2geo.js

@@ -21,7 +21,7 @@ const debug = _debug('mad:geoip');
 
 const API = 'https://ipwho.is/';
 
-const DEFAULT_CACHE_FILE_DIR = 'geoip';
+const DEFAULT_CACHE_FILE_DIR = '.geoip';
 const DEFAULT_CACHE_FILE_NAME = 'ips.log';
 const DEFAULT_CACHE_FILE_SEPARATOR = ';;';
 const DEFAULT_CACHE_FILE_NEWLINE = '\n';
@@ -61,7 +61,7 @@ const collectOutputData = dataArr => {
  * @returns {string}
  */
 const getCacheFileFullPath = (ip, cacheDir, cacheFileName) => {
-    const [firstOctet] = ip.split('.');
+    const [firstOctet] = ip.split(/\.|:/);
     return path.join(cacheDir, `${firstOctet}_${cacheFileName}`);
 };
 

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@k03mad/ip2geo",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "GeoIP library",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
   ],
+  "bin": {
+    "ip2geo": "app/cli.js"
+  },
   "main": "app/index.js",
   "repository": {
     "type": "git",
@@ -17,6 +20,7 @@
   },
   "dependencies": {
     "@k03mad/request": "5.4.1",
+    "chalk": "5.3.0",
     "debug": "4.3.4"
   },
   "devDependencies": {

package/tests/helpers/path.js

@@ -0,0 +1,7 @@
+import path from 'node:path';
+
+/**
+ * @param {string} file import.meta.url
+ * @returns {string}
+ */
+export const getCurrentFilename = file => path.basename(file, '.js');

package/tests/opts-assigned-ipv6.js

@@ -0,0 +1,50 @@
+import assert from 'node:assert/strict';
+import {describe, it} from 'node:test';
+
+import {ip2geo} from '../app/index.js';
+
+import {getCurrentFilename} 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_NAME = 'ips.log';
+    const CACHE_FILE_SEPARATOR = ';;';
+    const CACHE_FILE_NEWLINE = '\n';
+
+    const REQUEST_IP = '2a00:dd80:40:100::';
+
+    const cacheFile = `${REQUEST_IP.split(/\.|:/)[0]}_${CACHE_FILE_NAME}`;
+
+    const response = {
+        ip: REQUEST_IP,
+        emoji: '🇳🇱',
+        country: 'Netherlands',
+        countryA2: 'NL',
+        region: 'North Holland',
+        city: 'Amsterdam',
+        org: '',
+        isp: 'NetActuate Inc',
+        ispDomain: '',
+    };
+
+    removeCacheFolder(CACHE_FILE_DIR);
+
+    it(`should return correct response for IP: "${REQUEST_IP}"`, async () => {
+        const data = await ip2geo(REQUEST_IP, {
+            cacheDir: CACHE_FILE_DIR,
+        });
+
+        assert.deepEqual(data, response);
+    });
+
+    checkCacheFile(
+        CACHE_FILE_DIR,
+        cacheFile,
+        CACHE_FILE_SEPARATOR,
+        CACHE_FILE_NEWLINE,
+        response,
+    );
+});

package/tests/opts-assigned-subfolder.js

@@ -1,19 +1,27 @@
 import assert from 'node:assert/strict';
+import path from 'node:path';
 import {describe, it} from 'node:test';
 
 import {ip2geo} from '../app/index.js';
 
+import {getCurrentFilename} from './helpers/path.js';
 import {checkCacheFile, removeCacheFolder} from './shared/fs.js';
 
-describe('opts-assigned', () => {
-    const CACHE_FILE_DIR = 'geoip-subfolder/hello_there';
+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_NAME = 'ips.log';
     const CACHE_FILE_SEPARATOR = ';;';
     const CACHE_FILE_NEWLINE = '\n';
 
     const REQUEST_IP = '9.9.9.9';
 
-    const cacheFile = `${REQUEST_IP.split('.')[0]}_${CACHE_FILE_NAME}`;
+    const cacheFile = `${REQUEST_IP.split(/\.|:/)[0]}_${CACHE_FILE_NAME}`;
 
     const response = {
         ip: REQUEST_IP,

package/tests/opts-assigned.js

@@ -3,17 +3,20 @@ import {describe, it} from 'node:test';
 
 import {ip2geo} from '../app/index.js';
 
+import {getCurrentFilename} from './helpers/path.js';
 import {checkCacheFile, removeCacheFolder} from './shared/fs.js';
 
-describe('opts-assigned', () => {
-    const CACHE_FILE_DIR = 'geoip-cache-opts';
+const testName = getCurrentFilename(import.meta.url);
+
+describe(testName, () => {
+    const CACHE_FILE_DIR = testName;
     const CACHE_FILE_NAME = 'ips.md';
     const CACHE_FILE_SEPARATOR = '-_-';
     const CACHE_FILE_NEWLINE = '%%%';
 
     const REQUEST_IP = '8.8.8.8';
 
-    const cacheFile = `${REQUEST_IP.split('.')[0]}_${CACHE_FILE_NAME}`;
+    const cacheFile = `${REQUEST_IP.split(/\.|:/)[0]}_${CACHE_FILE_NAME}`;
 
     const response = {
         ip: REQUEST_IP,

package/tests/opts-default.js

@@ -6,14 +6,14 @@ import {ip2geo} from '../app/index.js';
 import {checkCacheFile, removeCacheFolder} from './shared/fs.js';
 
 describe('opts-default', () => {
-    const CACHE_FILE_DIR = 'geoip';
+    const CACHE_FILE_DIR = '.geoip';
     const CACHE_FILE_NAME = 'ips.log';
     const CACHE_FILE_SEPARATOR = ';;';
     const CACHE_FILE_NEWLINE = '\n';
 
     const REQUEST_IP = '1.1.1.1';
 
-    const cacheFile = `${REQUEST_IP.split('.')[0]}_${CACHE_FILE_NAME}`;
+    const cacheFile = `${REQUEST_IP.split(/\.|:/)[0]}_${CACHE_FILE_NAME}`;
 
     const response = {
         ip: REQUEST_IP,