locate-user - npm Package Compare versions

Comparing version 1.0.1 to 1.0.2

index.js

 'use strict';
 const getLocation = require('./lib/get-location');
 
-
 module.exports = getLocation;

lib/get-location.js

 'use strict';
 
-const https = require('https');
+const http = require('http');
 const getUserIP = require('user-ip');
@@ -15,3 +15,3 @@
         if (!req) {
-            const error = new Error('Request Object Should Not Be Null Or Undefined');
+            const error = new TypeError('Request Object Should Not Be Null Or Undefined');
             reject(error);
@@ -21,25 +21,38 @@ }
         const userIP = getUserIP(req);
-        const url = `https://freegeoip.net/json/${userIP}`;
+        const url = `http://ip-api.com/json/${userIP}`;
 
-        if (userIP) {
-            https.get(url, resStream => {
-                let data = '';
-                resStream.setEncoding('utf8');
-                resStream.on('data', chunk => data += chunk);
-                resStream.on('error', reject);
-                resStream.on('end', () => {
-                    try {
-                        const body = JSON.parse(data);
-                        resolve(body);
-                    } catch (error) {
-                        reject(error);
+        if (!userIP) {
+            const error = new TypeError('IP Address Should Not Be Empty');
+            reject(error);
+        }
+
+        http.get(url, resStream => {
+            let data = '';
+            resStream.setEncoding('utf8');
+            resStream.on('error', reject);
+            resStream.on('data', chunk => data += chunk);
+            resStream.on('end', () => {
+                try {
+                    const body = JSON.parse(data);
+
+                    /*
+                     * If status is fail should respond Bad Request (400)
+                     */
+                    if (body && (body.status === 'fail')) {
+                        const error = new Error(body.status);
+                        error.status = 400;
+                        return reject(error);
                     }
-                });
 
-            })
-        }
+                    resolve(body);
+                } catch (error) {
+                    reject(error);
+                }
+            });
 
-    })
+        });
+
+    });
 }
 
-module.exports = getLocation;
+module.exports = getLocation;

package.json

 {
   "name": "locate-user",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Know Your Client/User's Location",
@@ -36,4 +36,4 @@ "main": "index.js",
     "chai": "^4.1.0",
-    "mocha": "^3.4.2"
+    "mocha": "^5.2.0"
   }
 }

README.md

@@ -56,3 +56,4 @@ # locate-user
         .catch(next);
-})
+});
+
 app.listen(3000)
@@ -59,0 +60,0 @@

test/index.js

@@ -12,18 +12,17 @@ 'use strict';
 
-const keys = ['ip', 'country_code', 'country_name', 'region_code', 'region_name', 'city', 'zip_code', 'time_zone', 'latitude', 'longitude', 'metro_code'];
-
 const expected = {
-    ip: '1.1.1.1',
-    country_code: 'AU',
-    country_name: 'Australia',
-    region_code: 'VIC',
-    region_name: 'Victoria',
+    query: '1.1.1.1',
+    countryCode: 'AU',
+    country: 'Australia',
+    region: 'VIC',
+    regionName: 'Victoria',
     city: 'Research',
-    zip_code: '3095',
-    time_zone: 'Australia/Melbourne',
-    latitude: -37.7,
-    longitude: 145.1833,
-    metro_code: 0
+    zip: '3095',
+    timezone: 'Australia/Melbourne',
+    lat: -37.7,
+    lon: 145.1833,
+    status: 'success'
 };
 
+const keys = Object.keys(expected);
 
@@ -37,3 +36,2 @@
             .then(data => {
-                data.should.have.all.keys(keys);
                 keys.forEach(key => data.should.have.property(key, expected[key]));
@@ -43,4 +41,28 @@ done();
             .catch(done);
-    })
+    });
 
+
+    it('should throw error with status 400 when status from IP API is fail', done => {
+
+        /*
+         * 127.0.0.1 .. querying this ip from IP API service will
+         * result in fail status...
+         */
+        const mockReq = {
+            headers: {},
+            client: { remoteAddress: '127.0.0.1' }
+        };
+
+        locateUser(mockReq)
+            .catch(error => {
+                error.should.be.an.instanceof(Error);
+                if (error.status === 400) {
+                    done()
+                } else {
+                    done(error);
+                }
+            });
+    });
+
+
 })

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Improved metrics

Lines of code

94

increased by40.3%

Number of lines in readme file

66

increased by1.54%

Worsened metrics

Total package byte prevSize

6161

decreased by-0.65%

Number of package files

7

decreased by-12.5%

No dependency changes