ac-geoip 4.0.2 → 4.0.3

package/.github/workflows/node.js.yml

@@ -19,14 +19,14 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x, 22.x]
+        node-version: [22.x, 24.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
         redis-version: [6]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v5
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v5
       with:
         node-version: ${{ matrix.node-version }}
 

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [4.0.3](https://github.com/admiralcloud/ac-geoip/compare/v4.0.2..v4.0.3) (2026-04-04 11:04:37)
+
+
+### Bug Fix
+
+
+* **App:** Package updates | MP | [5ed01a4cad0aa0de2bee164385f31aab1710be6d](https://github.com/admiralcloud/ac-geoip/commit/5ed01a4cad0aa0de2bee164385f31aab1710be6d)    
+Package updates  
+Related issues:
+### Style
+
+
+* **App:** Lint-fix | MP | [55ae6cac606a00a5e6cc2090195c4ba1e6bc49ea](https://github.com/admiralcloud/ac-geoip/commit/55ae6cac606a00a5e6cc2090195c4ba1e6bc49ea)    
+Lint-fix  
+Related issues:
 
 ## [4.0.2](https://github.com/admiralcloud/ac-geoip/compare/v4.0.1..v4.0.2) (2026-03-21 11:29:30)
 

package/README.md

@@ -5,7 +5,7 @@ GEOIP web service requires an account at Maxmind.
 
 You can also use the Geolite2 database from Maxmind: https://dev.maxmind.com/geoip/geoip2/geolite2/
 
-[![Node.js CI](https://github.com/AdmiralCloud/ac-geoip/actions/workflows/node.js.yml/badge.svg)](https://github.com/AdmiralCloud/ac-geoip/actions/workflows/node.js.yml)
+[![Node.js CI](https://github.com/AdmiralCloud/ac-geoip/actions/workflows/node.js.yml/badge.svg)](https://github.com/AdmiralCloud/ac-geoip/actions/workflows/node.js.yml) [![CodeQL](https://github.com/AdmiralCloud/ac-geoip/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/AdmiralCloud/ac-geoip/actions/workflows/github-code-scanning/codeql)
 
 ## Breaking Change Version 4.x
 Version 4.x requires Node 20 or higher.

package/eslint.config.js

@@ -1,32 +1,34 @@
 const globals = require('globals')
 
-module.exports = {
-  ignores: [
-    'config/env/**'
-  ],
-  languageOptions: {
-    ecmaVersion: 2022,
-    sourceType: 'module',
-    globals: {
-      ...globals.commonjs,
-      ...globals.es2015,
-      ...globals.node,
-      expect: 'readonly',
-      describe: 'readonly',
-      it: 'readonly'
+module.exports = [
+  {
+    files: ['index.js', 'test/**.js'],
+    languageOptions: {
+      ecmaVersion: 2022,
+      sourceType: 'module',
+      globals: {
+        ...globals.commonjs,
+        ...globals.es2015,
+        ...globals.node,
+        expect: 'readonly',
+        describe: 'readonly',
+        it: 'readonly'
+      }
+    },
+    rules: {
+      'no-const-assign': 'error',
+      'space-before-function-paren': 'off',
+      'no-extra-semi': 'off',
+      'object-curly-spacing': ['error', 'always'],
+      'brace-style': ['error', 'stroustrup', { allowSingleLine: true }],
+      'block-spacing': 'error',
+      'no-useless-escape': 'off',
+      'no-console': ['warn', { allow: ['warn', 'error'] }],
+      'no-unused-vars': 'error',
+      'eqeqeq': 'error',
+      'no-var': 'error',
+      'curly': 'error',
+      'prefer-const': ['error', { ignoreReadBeforeAssign: true }]
     }
-  },
-  rules: {
-    'no-const-assign': 'error', // Ensure this rule is enabled
-    'space-before-function-paren': 'off',
-    'no-extra-semi': 'off',
-    'object-curly-spacing': ['error', 'always'],
-    'brace-style': ['error', 'stroustrup', { allowSingleLine: true }],
-    'no-useless-escape': 'off',
-    'standard/no-callback-literal': 'off',
-    'new-cap': 'off',
-    'no-console': ['error', { allow: ['log', 'warn', 'error'] }],
-    "no-unused-vars": "error", // we shouldn't clutter code with unused variables
-    "prefer-const": ["warn", { "ignoreReadBeforeAssign": true }],
   }
-}
+]

package/index.js

@@ -34,11 +34,11 @@ const acgeoip = () => {
   }
 
   const init = (params) => {
-    if (_.has(params, 'userId')) _.set(geoip, 'userId', _.get(params, 'userId'))
-    if (_.has(params, 'licenseKey')) _.set(geoip, 'licenseKey', _.get(params, 'licenseKey'))
-    if (_.has(params, 'env')) _.set(geoip, 'environment', _.get(params, 'env'))
-    if (_.has(params, 'redis')) _.set(geoip, 'redis', _.get(params, 'redis'))
-    if (_.has(params, 'geolite')) _.set(geoip, 'geolite', _.get(params, 'geolite'))
+    if (_.has(params, 'userId')) { _.set(geoip, 'userId', _.get(params, 'userId')) }
+    if (_.has(params, 'licenseKey')) { _.set(geoip, 'licenseKey', _.get(params, 'licenseKey')) }
+    if (_.has(params, 'env')) { _.set(geoip, 'environment', _.get(params, 'env')) }
+    if (_.has(params, 'redis')) { _.set(geoip, 'redis', _.get(params, 'redis')) }
+    if (_.has(params, 'geolite')) { _.set(geoip, 'geolite', _.get(params, 'geolite')) }
 
     if (_.get(params, 'geolite.enabled') && _.get(params, 'geolite.useBuffer')) {
       const dbBuffer = fs.readFileSync(_.get(geoip, 'geolite.path'))
@@ -64,7 +64,7 @@ const acgeoip = () => {
     }
 
     const ip = _.get(params, 'ip')
-    if (ipPackage.isSpecialIP(ip)) return
+    if (ipPackage.isSpecialIP(ip)) { return }
 
     const mapping = _.get(params, 'mapping', geoip.mapping)
     const debug = _.get(params, 'debug')
@@ -88,12 +88,12 @@ const acgeoip = () => {
       geoipResponse = getFromMemory({ ip })
     }
 
-    if (debugPerformance) console.log('%s | getFromCache %d', functionName, performanceHelper(start, process.hrtime()))
+    if (debugPerformance) { console.warn('%s | getFromCache %d', functionName, performanceHelper(start, process.hrtime())) }
 
     if (!geoipResponse) {
       if (_.get(geoip, 'geolite.useBuffer') && geoip.reader) {
         geoipResponse = geoip.reader.city(ip)
-        if (debugPerformance) console.log('%s | readFromBuffer %d', functionName, performanceHelper(start, process.hrtime()))
+        if (debugPerformance) { console.warn('%s | readFromBuffer %d', functionName, performanceHelper(start, process.hrtime())) }
       }
       else {
         try {
@@ -103,13 +103,13 @@ const acgeoip = () => {
               geoipReader = await Reader.open(_.get(geoip, 'geolite.path'))
               _.set(geoip, 'geolite.reader', geoipReader)
             }
-            if (geoipReader) geoipResponse = geoipReader.city(ip)
+            if (geoipReader) { geoipResponse = geoipReader.city(ip) }
           }
 
-          if (debugPerformance) console.log('%s | readFromDB %d', functionName, performanceHelper(start, process.hrtime()))
+          if (debugPerformance) { console.warn('%s | readFromDB %d', functionName, performanceHelper(start, process.hrtime())) }
 
           if (debug) {
-            console.log('AC-GEOIP | From Geolite | %j', geoipResponse)
+            console.warn('AC-GEOIP | From Geolite | %j', geoipResponse)
           }
         }
         catch (e) {
@@ -126,14 +126,14 @@ const acgeoip = () => {
           storeInMemory({ ip, geoipResponse })
         }
 
-        if (debugPerformance) console.log('%s | storeInCache %d', functionName, performanceHelper(start, process.hrtime()))
+        if (debugPerformance) { console.warn('%s | storeInCache %d', functionName, performanceHelper(start, process.hrtime())) }
       }
     }
 
     // prepare response
     if (!_.isEmpty(mapping)) {
       _.forEach(mapping, item => {
-        if (_.get(geoipResponse, item.geoIP)) _.set(response, item.response, _.get(geoipResponse, item.geoIP))
+        if (_.get(geoipResponse, item.geoIP)) { _.set(response, item.response, _.get(geoipResponse, item.geoIP)) }
       })
     }
     else {
@@ -141,9 +141,9 @@ const acgeoip = () => {
     }
 
     _.set(response, 'origin', _.get(geoipResponse, 'origin'))
-    if (_.get(geoipResponse, 'fromCache')) _.set(response, 'fromCache', true)
+    if (_.get(geoipResponse, 'fromCache')) { _.set(response, 'fromCache', true) }
 
-    if (debugPerformance) console.log('%s | Finished %d', functionName, performanceHelper(start, process.hrtime()))
+    if (debugPerformance) { console.warn('%s | Finished %d', functionName, performanceHelper(start, process.hrtime())) }
 
     return response
   }
@@ -175,20 +175,20 @@ const acgeoip = () => {
     else {
       geoipResponse = getFromMemory({ ip })
     }
-    if (debugPerformance) console.log('%s | getFromCache %d', functionName, performanceHelper(start, process.hrtime()))
+    if (debugPerformance) { console.warn('%s | getFromCache %d', functionName, performanceHelper(start, process.hrtime())) }
 
     // fetch fresh
     if (!_.get(geoipResponse, 'country')) {
       try {
         const client = new WebServiceClient(geoip.userId, geoip.licenseKey)
         geoipResponse = await client.city(ip)
-        if (debugPerformance) console.log('%s | readFromWebservice %d', functionName, performanceHelper(start, process.hrtime()))
+        if (debugPerformance) { console.warn('%s | readFromWebservice %d', functionName, performanceHelper(start, process.hrtime())) }
         if (geoipResponse) {
           _.set(geoipResponse, 'origin', 'webservice')
         }
 
         if (debug) {
-          console.log('AC-GEOIP | From Maxmind | %j', geoipResponse)
+          console.warn('AC-GEOIP | From Maxmind | %j', geoipResponse)
         }
       }
       catch (e) {
@@ -203,13 +203,13 @@ const acgeoip = () => {
       else {
         storeInMemory({ ip, geoipResponse })
       }
-      if (debugPerformance) console.log('%s | storeInCache %d', functionName, performanceHelper(start, process.hrtime()))
+      if (debugPerformance) { console.warn('%s | storeInCache %d', functionName, performanceHelper(start, process.hrtime())) }
     }
 
     // prepare response
     if (!_.isEmpty(mapping)) {
       _.forEach(mapping, item => {
-        if (_.get(geoipResponse, item.geoIP)) _.set(response, item.response, _.get(geoipResponse, item.geoIP))
+        if (_.get(geoipResponse, item.geoIP)) { _.set(response, item.response, _.get(geoipResponse, item.geoIP)) }
       })
     }
     else {
@@ -217,7 +217,7 @@ const acgeoip = () => {
     }
 
     _.set(response, 'origin', _.get(geoipResponse, 'origin'))
-    if (_.get(geoipResponse, 'fromCache')) _.set(response, 'fromCache', true)
+    if (_.get(geoipResponse, 'fromCache')) { _.set(response, 'fromCache', true) }
 
     return response
   }
@@ -237,7 +237,7 @@ const acgeoip = () => {
 
   const checkRedis = async (params) => {
     const refresh = _.get(params, 'refresh')
-    if (!geoip.redis || refresh) return
+    if (!geoip.redis || refresh) { return }
 
     const ip = _.get(params, 'ip')
     const redisKey = _.get(geoip, 'environment') + ':geoip:' + ip
@@ -251,11 +251,11 @@ const acgeoip = () => {
         geoipResponse.fromCache = true
       }
       if (debug) {
-        console.log('AC-GEOIP | From Cache | %j', geoipResponse)
+        console.warn('AC-GEOIP | From Cache | %j', geoipResponse)
       }
     }
     catch (e) {
-      console.log(e)
+      console.warn(e)
       console.error('AC-GEOIP | From Cache | Failed | %j', e)
     }
     return geoipResponse

package/package.json

@@ -3,17 +3,18 @@
   "author": "Mark Poepping (https://www.admiralcloud.com)",
   "license": "MIT",
   "repository": "admiralcloud/ac-geoip",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "dependencies": {
     "@maxmind/geoip2-node": "^6.3.4",
-    "ac-ip": "^4.1.12",
-    "lodash": "^4.17.23",
+    "ac-ip": "^5.0.0",
+    "lodash": "^4.18.1",
     "node-cache": "^5.1.2"
   },
   "devDependencies": {
-    "ac-semantic-release": "^0.4.10",
+    "ac-semantic-release": "^1.0.1",
     "chai": "^4.5.0",
-    "eslint": "^9.39.4",
+    "eslint": "^10.2.0",
+    "globals": "^17.4.0",
     "ioredis": "^5.10.1",
     "mocha": "^11.7.5"
   },