refactor(errorCodes, reportingLogger): Replace ErrorCodes type definition with valueof utility and update ReportingLogger to use baseUrl; adjust tests accordingly

Author: gtamanaha

src/logging/errorCodes.ts

@@ -1,4 +1,6 @@
-export type ErrorCodes = (typeof ErrorCodes)[keyof typeof ErrorCodes];
+import { valueof } from '../utils';
+
+export type ErrorCodes = valueof<typeof ErrorCodes>;
 
 export const ErrorCodes = {
     UNHANDLED_EXCEPTION: 'UNHANDLED_EXCEPTION',

src/logging/logMessage.ts

@@ -1,5 +1,4 @@
-import { IAPIClient } from "../apiClient";
-import { IMParticleWebSDKInstance } from "../mp-instance";
+
 import { ErrorCodes } from "./errorCodes";
 import { LogRequest, LogRequestSeverity } from "./logRequest";
 import { FetchUploader, XHRUploader } from "../uploaders";
@@ -14,15 +13,14 @@ export class ReportingLogger implements IReportingLogger {
     private readonly reporter: string = 'mp-wsdk';
     private readonly integration: string = 'mp-wsdk';
     private readonly rateLimiter: IRateLimiter;
-    private readonly mpInstance: IMParticleWebSDKInstance;
-
+    private readonly DEFAULT_ACCOUNT_ID: string = 'no-account-id-set';
+    
     constructor(
-        mpInstance: IMParticleWebSDKInstance,
+        private baseUrl: string,
         private readonly sdkVersion: string,
         private readonly accountId: string,
         rateLimiter?: IRateLimiter,
     ) {
-        this.mpInstance = mpInstance;
         this.isEnabled = this.isReportingEnabled();
         this.rateLimiter = rateLimiter ?? new RateLimiter();
     }
@@ -107,12 +105,7 @@ export class ReportingLogger implements IReportingLogger {
     }
 
     private sendLogToServer(logRequest: LogRequest) {
-        const baseUrl = this.mpInstance._Helpers.createServiceUrl(
-            this.mpInstance._Store.SDKConfig.v2SecureServiceUrl,
-            this.mpInstance._Store.devToken
-        );
-        
-        const uploadUrl = `${baseUrl}/v1/log`;
+        const uploadUrl = `${this.baseUrl}/v1/log`;
         const uploader = window.fetch
             ? new FetchUploader(uploadUrl)
             : new XHRUploader(uploadUrl);
@@ -122,7 +115,7 @@ export class ReportingLogger implements IReportingLogger {
             headers: {
                 Accept: 'text/plain;charset=UTF-8',
                 'Content-Type': 'text/plain;charset=UTF-8',
-                'rokt-account-id': this.accountId
+                'rokt-account-id': this.accountId || this.DEFAULT_ACCOUNT_ID
             },
             body: JSON.stringify(logRequest),
         });

src/logging/reportingLogger.ts

@@ -3,27 +3,15 @@ import { LogRequestSeverity } from '../../src/logging/logRequest';
 import { ErrorCodes } from '../../src/logging/errorCodes';
 
 describe('ReportingLogger', () => {
-    let mpInstance: any;
     let logger: ReportingLogger;
+    const baseUrl = 'https://test-url.com';
     const sdkVersion = '1.2.3';
     let mockFetch: jest.Mock;
     const accountId = '1234567890';
     beforeEach(() => {
         mockFetch = jest.fn().mockResolvedValue({ ok: true });
         global.fetch = mockFetch;
 
-        mpInstance = {
-            _Helpers: {
-                createServiceUrl: jest.fn().mockReturnValue('https://test-url.com')
-            },
-            _Store: {
-                SDKConfig: {
-                    v2SecureServiceUrl: 'https://secure-service.com'
-                },
-                devToken: 'test-token'
-            }
-        };
-        
         delete (globalThis as any).location;
         (globalThis as any).location = {
             href: 'https://e.com',
@@ -36,7 +24,7 @@ describe('ReportingLogger', () => {
             ROKT_DOMAIN: 'set',
             fetch: mockFetch
         });
-        logger = new ReportingLogger(mpInstance, sdkVersion, accountId);
+        logger = new ReportingLogger(baseUrl, sdkVersion, accountId);
     });
 
     afterEach(() => {
@@ -72,23 +60,23 @@ describe('ReportingLogger', () => {
 
     it('does not log if ROKT_DOMAIN missing', () => {
         delete (globalThis as any).ROKT_DOMAIN;
-        logger = new ReportingLogger(mpInstance, sdkVersion, accountId);
+        logger = new ReportingLogger(baseUrl, sdkVersion, accountId);
         logger.error('x');
         expect(mockFetch).not.toHaveBeenCalled();
     });
 
     it('does not log if feature flag and debug mode off', () => {
         window.mParticle.config.isWebSdkLoggingEnabled = false;
         window.location.search = '';
-        logger = new ReportingLogger(mpInstance, sdkVersion, accountId);
+        logger = new ReportingLogger(baseUrl, sdkVersion, accountId);
         logger.error('x');
         expect(mockFetch).not.toHaveBeenCalled();
     });
 
     it('logs if debug mode on even if feature flag off', () => {
         window.mParticle.config.isWebSdkLoggingEnabled = false;
         window.location.search = '?mp_enable_logging=true';
-        logger = new ReportingLogger(mpInstance, sdkVersion, accountId);
+        logger = new ReportingLogger(baseUrl, sdkVersion, accountId);
         logger.error('x');
         expect(mockFetch).toHaveBeenCalled();
     });
@@ -100,11 +88,19 @@ describe('ReportingLogger', () => {
                 return ++count > 3;
             }),
         };
-        logger = new ReportingLogger(mpInstance, sdkVersion, accountId, mockRateLimiter);
+        logger = new ReportingLogger(baseUrl, sdkVersion, accountId, mockRateLimiter);
 
         for (let i = 0; i < 5; i++) logger.error('err');
         expect(mockFetch).toHaveBeenCalledTimes(3);
     });
+
+    it('uses default account id when accountId is empty', () => {
+        logger = new ReportingLogger(baseUrl, sdkVersion, undefined);
+        logger.error('msg');
+        expect(mockFetch).toHaveBeenCalled();
+        const fetchCall = mockFetch.mock.calls[0];
+        expect(fetchCall[1].headers['rokt-account-id']).toBe('no-account-id-set');
+    });
 });
 
 describe('RateLimiter', () => {