@mojaloop/sdk-scheme-adapter 24.14.0 → 24.15.1

package/modules/api-svc/test/unit/{index.configPolling.test.js → SdkServer.configPolling.test.js}

@@ -35,8 +35,8 @@ jest.mock('~/lib/cache');
 jest.mock('~/ControlAgent');
 
 const promClient = require('prom-client');
+const SdkServer = require('../../src/SdkServer');
 const ControlAgent = require('~/ControlAgent');
-const { Server } = require('~/index');
 const { logger } = require('~/lib/logger');
 const testConfig = require('./data/defaultConfig.json');
 
@@ -92,7 +92,7 @@ describe('Config Polling Tests -->', () => {
             }
         };
 
-        server = new Server(config, logger);
+        server = new SdkServer(config, logger);
         await server.start();
 
         await jest.advanceTimersByTimeAsync(POLL_INTERVAL_MS * 2);
@@ -105,7 +105,7 @@ describe('Config Polling Tests -->', () => {
             pm4mlEnabled: false,
         };
 
-        server = new Server(config, logger);
+        server = new SdkServer(config, logger);
         await server.start();
 
         await jest.advanceTimersByTimeAsync(POLL_INTERVAL_MS * 2);
@@ -113,7 +113,7 @@ describe('Config Polling Tests -->', () => {
     });
 
     it('should poll at configured interval', async () => {
-        server = new Server(mockConfig, logger);
+        server = new SdkServer(mockConfig, logger);
         await server.start();
         expect(mockControlAgent.getUpdatedConfig).toHaveBeenCalledTimes(0);
 
@@ -130,7 +130,7 @@ describe('Config Polling Tests -->', () => {
             jwsSigningKey: newJwsKey
         });
 
-        server = new Server(mockConfig, logger);
+        server = new SdkServer(mockConfig, logger);
         const restartSpy = jest.spyOn(server, 'restart');
 
         await server.start();
@@ -150,7 +150,7 @@ describe('Config Polling Tests -->', () => {
     it('should handle unchanged config efficiently (no-op)', async () => {
         mockControlAgent.getUpdatedConfig.mockResolvedValue({});
 
-        server = new Server(mockConfig, logger);
+        server = new SdkServer(mockConfig, logger);
         const restartSpy = jest.spyOn(server, 'restart');
         await server.start();
 
@@ -165,7 +165,7 @@ describe('Config Polling Tests -->', () => {
     it('should prevent race condition when update already in progress', async () => {
         mockControlAgent.getUpdatedConfig.mockResolvedValue({ jwsSigningKey: 'new-key' });
 
-        server = new Server(mockConfig, logger);
+        server = new SdkServer(mockConfig, logger);
         await server.start();
         // Simulate restart in progress
         server._configUpdateInProgress = true;
@@ -176,7 +176,7 @@ describe('Config Polling Tests -->', () => {
     });
 
     it('should skip polling when WebSocket not OPEN', async () => {
-        server = new Server(mockConfig, logger);
+        server = new SdkServer(mockConfig, logger);
         await server.start();
 
         mockControlAgent.getUpdatedConfig.mockClear();
@@ -190,7 +190,7 @@ describe('Config Polling Tests -->', () => {
         it('should handle network errors gracefully during polling', async () => {
             mockControlAgent.getUpdatedConfig.mockRejectedValue(new Error('Connection refused'));
 
-            server = new Server(mockConfig, logger);
+            server = new SdkServer(mockConfig, logger);
             await server.start();
             await jest.advanceTimersByTimeAsync(POLL_INTERVAL_MS);
 
@@ -204,7 +204,7 @@ describe('Config Polling Tests -->', () => {
         it('should handle missing config response', async () => {
             mockControlAgent.getUpdatedConfig.mockResolvedValue(null);
 
-            server = new Server(mockConfig, logger);
+            server = new SdkServer(mockConfig, logger);
             await server.start();
             await jest.advanceTimersByTimeAsync(POLL_INTERVAL_MS);
 
@@ -214,7 +214,7 @@ describe('Config Polling Tests -->', () => {
     });
 
     it('should stop polling when server stops', async () => {
-        server = new Server(mockConfig, logger);
+        server = new SdkServer(mockConfig, logger);
         await server.start();
 
         expect(server._configPollInterval).toBeDefined();

package/modules/api-svc/test/unit/lib/utils.test.js

@@ -24,7 +24,7 @@
 
  --------------
  ******/
-const { transformHeadersIsoToFspiop } = require('~/lib/utils');
+const { transformHeadersIsoToFspiop, generateTraceparent, isValidTraceFlags } = require('~/lib/utils');
 
 describe('utils', () => {
     describe('transformHeadersIsoToFspiop', () => {
@@ -42,4 +42,74 @@ describe('utils', () => {
             expect(transformHeadersIsoToFspiop(isoHeaders)).toEqual(fspiopHeaders);
         });
     });
+
+    describe('isValidTraceFlags', () => {
+        it('should validate correct hex strings', () => {
+            expect(isValidTraceFlags('00')).toBe(true);
+            expect(isValidTraceFlags('01')).toBe(true);
+        });
+
+        it('should reject invalid strings', () => {
+            expect(isValidTraceFlags('0')).toBe(false);      // Too short
+            expect(isValidTraceFlags('000')).toBe(false);    // Too long
+            expect(isValidTraceFlags('zz')).toBe(false);     // Invalid hex
+            expect(isValidTraceFlags('')).toBe(false);       // Empty string
+        });
+
+        it('should reject non-string inputs', () => {
+            expect(isValidTraceFlags(null)).toBe(false);
+            expect(isValidTraceFlags(undefined)).toBe(false);
+            expect(isValidTraceFlags(1)).toBe(false);
+            expect(isValidTraceFlags({})).toBe(false);
+        });
+    });
+
+    describe('generateTraceparent', () => {
+        describe('default behavior', () => {
+            it('should generate valid traceparent with default flags (01)', () => {
+                const traceparent = generateTraceparent();
+                const parts = traceparent.split('-');
+
+                expect(parts).toHaveLength(4);
+                expect(parts[0]).toBe('00');           // version
+                expect(parts[1]).toHaveLength(32);     // traceId (16 bytes = 32 hex chars)
+                expect(parts[2]).toHaveLength(16);     // spanId (8 bytes = 16 hex chars)
+                expect(parts[3]).toBe('01');           // default flags
+
+                // Validate hex format
+                expect(/^[0-9a-f]{32}$/.test(parts[1])).toBe(true);
+                expect(/^[0-9a-f]{16}$/.test(parts[2])).toBe(true);
+            });
+
+            it('should use provided traceId', () => {
+                const traceId = '1234567890abcdef1234567890abcdef';
+                const traceparent = generateTraceparent(traceId);
+                const parts = traceparent.split('-');
+
+                expect(parts[1]).toBe(traceId);
+            });
+        });
+
+        describe('custom trace flags', () => {
+            it('should use custom trace flags when provided', () => {
+                const traceparent = generateTraceparent(undefined, '00');
+                expect(traceparent.split('-')[3]).toBe('00');
+            });
+
+            it('should accept uppercase hex and convert to lowercase', () => {
+                const traceparent = generateTraceparent(undefined, 'FF');
+                expect(traceparent.split('-')[3]).toBe('ff');
+            });
+        });
+
+        describe('validation', () => {
+            it('should throw error for invalid trace flags', () => {
+                expect(() => generateTraceparent(undefined, '0')).toThrow();
+                expect(() => generateTraceparent(undefined, '000')).toThrow();
+                expect(() => generateTraceparent(undefined, 'zz')).toThrow();
+            });
+
+        });
+
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "24.14.0",
+  "version": "24.15.1",
   "description": "mojaloop sdk-scheme-adapter",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter",