fiftyone.pipeline.core 4.4.85 → 4.4.87

package/evidence.js

@@ -148,15 +148,22 @@ class Evidence {
 
     evidence.add('server.host-ip', request.connection.localAddress.toString());
 
-    // Get querystring data
+    // Parsing URL using new URL constructor
+
+    const protocol = request.protocol || 'http';
+    const hostname = request.hostname || 'localhost'; // Use a default hostname if not available
+    const port = request.socket?.localPort || ''; // Port may not be available in some cases
 
-    const params = new url.URL(request.url, true);
+    // If request.url already contains the protocol, hostname, and port, use it as is
+    const fullURL = request.url.includes('://') ? request.url : `${protocol}://${hostname}${port ? `:${port}` : ''}${request.url}`;
+
+    // Get querystring data
 
-    const query = params.query;
+    const URL = new url.URL(fullURL);
+    const query = URL.searchParams;
 
-    Object.keys(query).forEach(function (key) {
-      const value = query[key];
-      evidence.add('query.' + key, value);
+    query.forEach(function (value, param) {
+      evidence.add('query.' + param, value);
     });
 
     return this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fiftyone.pipeline.core",
-  "version": "4.4.85",
+  "version": "4.4.87",
   "description": "Core library for the 51Degrees Pipeline API",
   "keywords": [
     "51degrees",

package/tests/evidence.test.js

@@ -66,3 +66,65 @@ test('evidenceKeyFilter', () => {
   )
     .toBe('header.user_agent');
 });
+
+/**
+ * Check that evidence addFromRequest
+ * can correctly handle Incoming Request object */
+
+test('evidence addFromRequest partial url', () => {
+  const { EventEmitter } = require('events');
+
+  // Mock request object
+  const mockRequest = new EventEmitter();
+  mockRequest.method = 'POST'; // Example HTTP method
+  mockRequest.url = '/?some-value=some'; // Example request URL
+  mockRequest.httpVersion = '1.1'; // Example HTTP version
+  mockRequest.hostname = 'test.url';
+  mockRequest.headers = {
+    'Content-Type': 'application/json',
+    'Content-Length': 18
+  }; // Example request headers
+
+  // Simulating request body data
+  const mockBodyData = JSON.stringify({ evidence: 'sample' });
+  mockRequest.emit('data', mockBodyData);
+  mockRequest.emit('end');
+
+  // Simulating connection object
+  mockRequest.connection = {
+    remoteAddress: '127.0.0.1',
+    localAddress: '127.0.0.1'
+  };
+
+  expect(() => syncFlowData.evidence.addFromRequest(mockRequest)).not.toThrow();
+  expect(syncFlowData.evidence.get('query.some-value')).toBe('some');
+});
+
+test('evidence addFromRequest full url', () => {
+  const { EventEmitter } = require('events');
+
+  // Mock request object
+  const mockRequest = new EventEmitter();
+  mockRequest.method = 'POST'; // Example HTTP method
+  mockRequest.url = 'http://test.com/path?some-value=some'; // Example request URL
+  mockRequest.httpVersion = '1.1'; // Example HTTP version
+  mockRequest.hostname = 'test.url';
+  mockRequest.headers = {
+    'Content-Type': 'application/json',
+    'Content-Length': 18
+  }; // Example request headers
+
+  // Simulating request body data
+  const mockBodyData = JSON.stringify({ evidence: 'sample' });
+  mockRequest.emit('data', mockBodyData);
+  mockRequest.emit('end');
+
+  // Simulating connection object
+  mockRequest.connection = {
+    remoteAddress: '127.0.0.1',
+    localAddress: '127.0.0.1'
+  };
+
+  expect(() => syncFlowData.evidence.addFromRequest(mockRequest)).not.toThrow();
+  expect(syncFlowData.evidence.get('query.some-value')).toBe('some');
+});