Use ip address from x forwarded for (#26)

* update ip address. * bump version.
Moesif · Oct 30, 2024 · b5e26bb · b5e26bb
1 parent 11ba990
commit b5e26bb
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/esm/package-lock.json b/esm/package-lock.json
diff --git a/esm/package.json b/esm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moesif-cloudflare",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Moesif API analytics and monetization integration for Cloudflare workers",
   "main": "src/index.mjs",
   "keywords": [

diff --git a/esm/src/batcher.mjs b/esm/src/batcher.mjs
@@ -114,7 +114,7 @@ class Batcher {
         const moesifHeaders = {
           Accept: 'application/json; charset=utf-8',
           'X-Moesif-Application-Id': appId,
-          'User-Agent': 'moesif-cloudflare/2.0.0',
+          'User-Agent': 'moesif-cloudflare/2.0.1',
           'X-Moesif-Cf-Install-Id': INSTALL_ID,
           'X-Moesif-Cf-Install-Product': INSTALL_PRODUCT && INSTALL_PRODUCT.id,
           'X-Moesif-Cf-Install-Type': 'esm',

diff --git a/esm/src/index.mjs b/esm/src/index.mjs
@@ -85,7 +85,7 @@ function moesifMiddleware(originalFetch, userOptions) {
 				uri: request.url,
 				verb: request.method,
 				headers: headersToObject(request.headers),
-				ip_address: request.headers.get('cf-connecting-ip'),
+				ip_address: request.headers.get('x-forwarded-for') || request.headers.get('cf-connecting-ip'),
 			},
 			response: response.isEmpty
 				? undefined

diff --git a/legacy/src/index.js b/legacy/src/index.js
@@ -341,7 +341,7 @@ async function makeMoesifEvent(request, response, before, after, txId, requestBo
       uri: request.url,
       verb: request.method,
       headers: headersToObject(request.headers),
-      ip_address: request.headers.get('cf-connecting-ip')
+      ip_address: request.headers.get('x-forwarded-for') || request.headers.get('cf-connecting-ip')
     },
     response: response.isEmpty ? undefined : {
       time: after,