@smess/networking 1.0.4 → 1.0.6

package/dist/src/services/logger.service.test.js

@@ -1,33 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const logger_service_1 = require("./logger.service");
+import { $logger, LogLevel } from './logger.service.js';
 describe('LoggerService', () => {
     beforeEach(() => {
-        logger_service_1.$logger.clearLogs();
-        logger_service_1.$logger.setLogLevel(logger_service_1.LogLevel.DEBUG);
+        $logger.clearLogs();
+        $logger.setLogLevel(LogLevel.DEBUG);
     });
     it('should log info', () => {
-        logger_service_1.$logger.info('info message', { foo: 1 }, 'test');
-        const logs = logger_service_1.$logger.getLogs();
-        expect(logs[0].level).toBe(logger_service_1.LogLevel.INFO);
+        $logger.info('info message', { foo: 1 }, 'test');
+        const logs = $logger.getLogs();
+        expect(logs[0].level).toBe(LogLevel.INFO);
         expect(logs[0].message).toBe('info message');
         expect(logs[0].data).toEqual({ foo: 1 });
         expect(logs[0].context).toBe('test');
     });
     it('should log warn and error', () => {
-        logger_service_1.$logger.warn('warn message');
-        logger_service_1.$logger.error('error message', { bar: 2 });
-        const logs = logger_service_1.$logger.getLogs();
-        expect(logs[0].level).toBe(logger_service_1.LogLevel.WARN);
-        expect(logs[1].level).toBe(logger_service_1.LogLevel.ERROR);
+        $logger.warn('warn message');
+        $logger.error('error message', { bar: 2 });
+        const logs = $logger.getLogs();
+        expect(logs[0].level).toBe(LogLevel.WARN);
+        expect(logs[1].level).toBe(LogLevel.ERROR);
         expect(logs[1].data).toEqual({ bar: 2 });
     });
     it('should respect log level', () => {
-        logger_service_1.$logger.setLogLevel(logger_service_1.LogLevel.ERROR);
-        logger_service_1.$logger.info('should not log');
-        logger_service_1.$logger.error('should log');
-        const logs = logger_service_1.$logger.getLogs();
+        $logger.setLogLevel(LogLevel.ERROR);
+        $logger.info('should not log');
+        $logger.error('should log');
+        const logs = $logger.getLogs();
         expect(logs.length).toBe(1);
-        expect(logs[0].level).toBe(logger_service_1.LogLevel.ERROR);
+        expect(logs[0].level).toBe(LogLevel.ERROR);
     });
 });

package/dist/src/services/order.service.d.ts

@@ -1,5 +1,5 @@
-import { ProviderType, NetworkingConfig, NetworkingUIEventWrapped, HttpResponse } from '../types/types';
-import { SmessService } from './smess.service';
+import { ProviderType, NetworkingConfig, NetworkingUIEventWrapped, HttpResponse } from '../types/types.js';
+import { SmessService } from './smess.service.js';
 import { BehaviorSubject, Observable } from 'rxjs';
 export type OrderTarget = 'order-list' | 'order-create' | 'order-delete' | 'order-get-draft' | 'order-update' | 'order-get';
 export interface CreateOrderRequest extends UpdateOrderRequest {

package/dist/src/services/order.service.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OrderService = exports.OrderProvider = void 0;
-const smess_service_1 = require("./smess.service");
-class OrderProvider {
+import { Accept, SMESSHeader, SmessService } from './smess.service.js';
+export class OrderProvider {
     constructor(config, target, $authToken) {
         this.config = config;
         this.target = target;
@@ -44,33 +41,32 @@ class OrderProvider {
         }
     }
     get headers() {
-        let headers = smess_service_1.SmessService.getHeaders(smess_service_1.Accept.V1, this.$authToken.value);
+        let headers = SmessService.getHeaders(Accept.V1, this.$authToken.value);
         if (this.config.clientId) {
-            headers[smess_service_1.SMESSHeader.ClientId] = this.config.clientId;
+            headers[SMESSHeader.ClientId] = this.config.clientId;
         }
         if (this.config.apiKey) {
-            headers[smess_service_1.SMESSHeader.ApiKey] = this.config.apiKey;
+            headers[SMESSHeader.ApiKey] = this.config.apiKey;
         }
-        return smess_service_1.SmessService.filterHeaders(headers);
+        return SmessService.filterHeaders(headers);
     }
     getPath(...queryParams) {
         let definedPath = this.path;
         const params = definedPath.match(/\$\{(.+?)\}/g);
-        params === null || params === void 0 ? void 0 : params.forEach((value, index) => {
+        params?.forEach((value, index) => {
             definedPath = definedPath.replace(value, String(queryParams[index]));
         });
         return definedPath;
     }
 }
-exports.OrderProvider = OrderProvider;
-class OrderService {
+export class OrderService {
     constructor(config, $authToken) {
         this.config = config;
         this.$authToken = $authToken;
     }
     provider(target) {
         const targetWrapper = new OrderProvider(this.config, target, this.$authToken);
-        return new smess_service_1.SmessService(targetWrapper);
+        return new SmessService(targetWrapper);
     }
     list() {
         return this.provider('order-list').request();
@@ -91,4 +87,3 @@ class OrderService {
         return this.provider('order-get').request(null, undefined, id);
     }
 }
-exports.OrderService = OrderService;

package/dist/src/services/order.service.test.js

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const order_service_1 = require("./order.service");
-const types_1 = require("../types/types");
-const rxjs_1 = require("rxjs");
+import { OrderService } from './order.service.js';
+import { NetworkingUIEventWrapped, AlertModel } from '../types/types.js';
+import { of, BehaviorSubject } from 'rxjs';
 describe('OrderService', () => {
     const config = {
         baseUrl: 'https://api.example.com',
@@ -13,25 +11,25 @@ describe('OrderService', () => {
     let service;
     let $authToken;
     beforeEach(() => {
-        $authToken = new rxjs_1.BehaviorSubject(null);
-        service = new order_service_1.OrderService(config, $authToken);
+        $authToken = new BehaviorSubject(null);
+        service = new OrderService(config, $authToken);
     });
     it('list success', async () => {
         const response = { data: [{ id: '1', status: 'draft' }] };
         jest.spyOn(service, 'provider').mockReturnValue({
-            request: () => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.succeeded(response)),
+            request: () => of(NetworkingUIEventWrapped.succeeded(response)),
         });
         const result = await service.list().toPromise();
-        expect(result === null || result === void 0 ? void 0 : result.hasSuccess).toBe(true);
-        expect(result === null || result === void 0 ? void 0 : result.response).toEqual(response);
+        expect(result?.hasSuccess).toBe(true);
+        expect(result?.response).toEqual(response);
     });
     it('list error', async () => {
         jest.spyOn(service, 'provider').mockReturnValue({
-            request: () => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.failed(types_1.AlertModel.default())),
+            request: () => of(NetworkingUIEventWrapped.failed(AlertModel.default())),
         });
         const result = await service.list().toPromise();
-        expect(result === null || result === void 0 ? void 0 : result.hasFailed).toBe(true);
-        expect(result === null || result === void 0 ? void 0 : result.alertModel).toBeInstanceOf(types_1.AlertModel);
+        expect(result?.hasFailed).toBe(true);
+        expect(result?.alertModel).toBeInstanceOf(AlertModel);
     });
     it('create success', async () => {
         const payload = {
@@ -40,11 +38,11 @@ describe('OrderService', () => {
         };
         const response = { data: { id: '1', status: 'created' } };
         jest.spyOn(service, 'provider').mockReturnValue({
-            request: () => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.succeeded(response)),
+            request: () => of(NetworkingUIEventWrapped.succeeded(response)),
         });
         const result = await service.create(payload).toPromise();
-        expect(result === null || result === void 0 ? void 0 : result.hasSuccess).toBe(true);
-        expect(result === null || result === void 0 ? void 0 : result.response).toEqual(response);
+        expect(result?.hasSuccess).toBe(true);
+        expect(result?.response).toEqual(response);
     });
     it('create error', async () => {
         const payload = {
@@ -52,45 +50,45 @@ describe('OrderService', () => {
             order_items: [],
         };
         jest.spyOn(service, 'provider').mockReturnValue({
-            request: () => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.failed(types_1.AlertModel.default())),
+            request: () => of(NetworkingUIEventWrapped.failed(AlertModel.default())),
         });
         const result = await service.create(payload).toPromise();
-        expect(result === null || result === void 0 ? void 0 : result.hasFailed).toBe(true);
-        expect(result === null || result === void 0 ? void 0 : result.alertModel).toBeInstanceOf(types_1.AlertModel);
+        expect(result?.hasFailed).toBe(true);
+        expect(result?.alertModel).toBeInstanceOf(AlertModel);
     });
     it('delete success', async () => {
         const response = { data: { id: '1', status: 'deleted' } };
         jest.spyOn(service, 'provider').mockReturnValue({
-            request: (_payload, _mockResponse, id) => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.succeeded(response)),
+            request: (_payload, _mockResponse, id) => of(NetworkingUIEventWrapped.succeeded(response)),
         });
         const result = await service.delete('1').toPromise();
-        expect(result === null || result === void 0 ? void 0 : result.hasSuccess).toBe(true);
-        expect(result === null || result === void 0 ? void 0 : result.response).toEqual(response);
+        expect(result?.hasSuccess).toBe(true);
+        expect(result?.response).toEqual(response);
     });
     it('delete error', async () => {
         jest.spyOn(service, 'provider').mockReturnValue({
-            request: (_payload, _mockResponse, id) => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.failed(types_1.AlertModel.default())),
+            request: (_payload, _mockResponse, id) => of(NetworkingUIEventWrapped.failed(AlertModel.default())),
         });
         const result = await service.delete('1').toPromise();
-        expect(result === null || result === void 0 ? void 0 : result.hasFailed).toBe(true);
-        expect(result === null || result === void 0 ? void 0 : result.alertModel).toBeInstanceOf(types_1.AlertModel);
+        expect(result?.hasFailed).toBe(true);
+        expect(result?.alertModel).toBeInstanceOf(AlertModel);
     });
     it('getDraft success', async () => {
         const response = { data: { id: 'draft', status: 'draft' } };
         jest.spyOn(service, 'provider').mockReturnValue({
-            request: () => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.succeeded(response)),
+            request: () => of(NetworkingUIEventWrapped.succeeded(response)),
         });
         const result = await service.getDraft().toPromise();
-        expect(result === null || result === void 0 ? void 0 : result.hasSuccess).toBe(true);
-        expect(result === null || result === void 0 ? void 0 : result.response).toEqual(response);
+        expect(result?.hasSuccess).toBe(true);
+        expect(result?.response).toEqual(response);
     });
     it('getDraft error', async () => {
         jest.spyOn(service, 'provider').mockReturnValue({
-            request: () => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.failed(types_1.AlertModel.default())),
+            request: () => of(NetworkingUIEventWrapped.failed(AlertModel.default())),
         });
         const result = await service.getDraft().toPromise();
-        expect(result === null || result === void 0 ? void 0 : result.hasFailed).toBe(true);
-        expect(result === null || result === void 0 ? void 0 : result.alertModel).toBeInstanceOf(types_1.AlertModel);
+        expect(result?.hasFailed).toBe(true);
+        expect(result?.alertModel).toBeInstanceOf(AlertModel);
     });
     it('update success', async () => {
         const payload = {
@@ -99,11 +97,11 @@ describe('OrderService', () => {
         };
         const response = { data: { id: '1', status: 'updated' } };
         jest.spyOn(service, 'provider').mockReturnValue({
-            request: (_payload, _mockResponse, id) => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.succeeded(response)),
+            request: (_payload, _mockResponse, id) => of(NetworkingUIEventWrapped.succeeded(response)),
         });
         const result = await service.update('1', payload).toPromise();
-        expect(result === null || result === void 0 ? void 0 : result.hasSuccess).toBe(true);
-        expect(result === null || result === void 0 ? void 0 : result.response).toEqual(response);
+        expect(result?.hasSuccess).toBe(true);
+        expect(result?.response).toEqual(response);
     });
     it('update error', async () => {
         const payload = {
@@ -111,27 +109,27 @@ describe('OrderService', () => {
             order_items: [],
         };
         jest.spyOn(service, 'provider').mockReturnValue({
-            request: (_payload, _mockResponse, id) => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.failed(types_1.AlertModel.default())),
+            request: (_payload, _mockResponse, id) => of(NetworkingUIEventWrapped.failed(AlertModel.default())),
         });
         const result = await service.update('1', payload).toPromise();
-        expect(result === null || result === void 0 ? void 0 : result.hasFailed).toBe(true);
-        expect(result === null || result === void 0 ? void 0 : result.alertModel).toBeInstanceOf(types_1.AlertModel);
+        expect(result?.hasFailed).toBe(true);
+        expect(result?.alertModel).toBeInstanceOf(AlertModel);
     });
     it('get success', async () => {
         const response = { data: { id: '1', status: 'fetched' } };
         jest.spyOn(service, 'provider').mockReturnValue({
-            request: (_payload, _mockResponse, id) => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.succeeded(response)),
+            request: (_payload, _mockResponse, id) => of(NetworkingUIEventWrapped.succeeded(response)),
         });
         const result = await service.get('1').toPromise();
-        expect(result === null || result === void 0 ? void 0 : result.hasSuccess).toBe(true);
-        expect(result === null || result === void 0 ? void 0 : result.response).toEqual(response);
+        expect(result?.hasSuccess).toBe(true);
+        expect(result?.response).toEqual(response);
     });
     it('get error', async () => {
         jest.spyOn(service, 'provider').mockReturnValue({
-            request: (_payload, _mockResponse, id) => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.failed(types_1.AlertModel.default())),
+            request: (_payload, _mockResponse, id) => of(NetworkingUIEventWrapped.failed(AlertModel.default())),
         });
         const result = await service.get('1').toPromise();
-        expect(result === null || result === void 0 ? void 0 : result.hasFailed).toBe(true);
-        expect(result === null || result === void 0 ? void 0 : result.alertModel).toBeInstanceOf(types_1.AlertModel);
+        expect(result?.hasFailed).toBe(true);
+        expect(result?.alertModel).toBeInstanceOf(AlertModel);
     });
 });

package/dist/src/services/product.service.d.ts

@@ -1,6 +1,6 @@
-import { BaseProvider } from '../core/base.provider';
-import { BaseServiceWrapper } from '../core/base.service.wrapper';
-import { NetworkingConfig } from '../types/types';
+import { BaseProvider } from '../core/base.provider.js';
+import { BaseServiceWrapper } from '../core/base.service.wrapper.js';
+import { NetworkingConfig } from '../types/types.js';
 export interface Product {
     id: number;
     name: string;
@@ -15,7 +15,7 @@ export declare class ProductProvider extends BaseProvider {
 export declare class ProductService extends BaseServiceWrapper<ProductProvider> {
     private config;
     constructor(config: NetworkingConfig, productId?: number, method?: string);
-    fetchProductById(id: number): import("rxjs").Observable<import("../types/types").NetworkingUIEventWrapped<Product>>;
-    fetchAllProducts(): import("rxjs").Observable<import("../types/types").NetworkingUIEventWrapped<Product[]>>;
-    createProduct(product: Omit<Product, 'id'>): import("rxjs").Observable<import("../types/types").NetworkingUIEventWrapped<Product>>;
+    fetchProductById(id: number): import("rxjs").Observable<import("../types/types.js").NetworkingUIEventWrapped<Product>>;
+    fetchAllProducts(): import("rxjs").Observable<import("../types/types.js").NetworkingUIEventWrapped<Product[]>>;
+    createProduct(product: Omit<Product, 'id'>): import("rxjs").Observable<import("../types/types.js").NetworkingUIEventWrapped<Product>>;
 }

package/dist/src/services/product.service.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProductService = exports.ProductProvider = void 0;
-const base_provider_1 = require("../core/base.provider");
-const base_service_wrapper_1 = require("../core/base.service.wrapper");
+import { BaseProvider } from '../core/base.provider.js';
+import { BaseServiceWrapper } from '../core/base.service.wrapper.js';
 // ProductProvider implements ProviderType for product endpoints
-class ProductProvider extends base_provider_1.BaseProvider {
+export class ProductProvider extends BaseProvider {
     constructor(config, { productId, method } = {}) {
         super({
             config,
@@ -15,9 +12,8 @@ class ProductProvider extends base_provider_1.BaseProvider {
         });
     }
 }
-exports.ProductProvider = ProductProvider;
 // ProductService provides high-level methods for product API
-class ProductService extends base_service_wrapper_1.BaseServiceWrapper {
+export class ProductService extends BaseServiceWrapper {
     constructor(config, productId, method) {
         super(new ProductProvider(config, { productId, method }));
         this.config = config;
@@ -38,7 +34,6 @@ class ProductService extends base_service_wrapper_1.BaseServiceWrapper {
         return this.request(product);
     }
 }
-exports.ProductService = ProductService;
 // Example usage:
 // setNetworkingConfig({ baseUrl: 'https://fakestoreapi.com', isProd: false });
 // const productService = new ProductService();

package/dist/src/services/product.service.test.js

@@ -1,9 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const product_service_1 = require("./product.service");
-const types_1 = require("../types/types");
-const rxjs_1 = require("rxjs");
-const base_service_wrapper_1 = require("../core/base.service.wrapper");
+import { ProductService } from './product.service.js';
+import { NetworkingUIEventWrapped } from '../types/types.js';
+import { of, throwError } from 'rxjs';
+import { BaseServiceWrapper } from '../core/base.service.wrapper.js';
 describe('ProductService', () => {
     const config = {
         baseUrl: 'https://jsonplaceholder.typicode.com',
@@ -14,37 +12,38 @@ describe('ProductService', () => {
     const product = { id: 1, name: 'Product', price: 10 };
     let requestSpy;
     beforeEach(() => {
-        requestSpy = jest.spyOn(base_service_wrapper_1.BaseServiceWrapper.prototype, 'request').mockImplementation(() => (0, rxjs_1.of)(types_1.NetworkingUIEventWrapped.succeeded(product)));
+        requestSpy = jest.spyOn(BaseServiceWrapper.prototype, 'request').mockImplementation(() => of(NetworkingUIEventWrapped.succeeded(product)));
     });
     afterEach(() => {
         requestSpy.mockRestore();
     });
-    it('should fetch product by id', done => {
-        const service = new product_service_1.ProductService(config, 1);
-        service.fetchProductById(1).subscribe(result => {
+    it('should fetch product by id', (done) => {
+        const service = new ProductService(config, 1);
+        service.fetchProductById(1).subscribe((result) => {
             expect(result.response).toEqual(product);
             done();
         });
     });
-    it('should fetch all products', done => {
-        const service = new product_service_1.ProductService(config);
-        service.fetchAllProducts().subscribe(result => {
+    it('should fetch all products', (done) => {
+        const service = new ProductService(config);
+        service.fetchAllProducts().subscribe((result) => {
             expect(result.response).toEqual(product);
             done();
         });
     });
-    it('should create a product', done => {
-        const service = new product_service_1.ProductService(config);
-        service.createProduct({ name: 'New Product', price: 99.99 }).subscribe(result => {
+    it('should create a product', (done) => {
+        const service = new ProductService(config);
+        service.createProduct({ name: 'New Product', price: 99.99 }).subscribe((result) => {
             expect(result.response).toEqual(product);
             done();
         });
     });
-    it('request should handle error', done => {
-        requestSpy.mockImplementationOnce(() => (0, rxjs_1.throwError)(() => new Error('Test error')));
-        const service = new product_service_1.ProductService(config);
-        service.request('error').subscribe({
-            error: err => {
+    it('request should handle error', (done) => {
+        requestSpy.mockImplementationOnce(() => throwError(() => new Error('Test error')));
+        const service = new ProductService(config);
+        // Simulate error by calling a method that uses request
+        service.fetchProductById(1).subscribe({
+            error: (err) => {
                 expect(err).toBeInstanceOf(Error);
                 expect(err.message).toBe('Test error');
                 done();

package/dist/src/services/smess.service.d.ts

@@ -1,5 +1,5 @@
-import { HeaderType, NetworkingUIEventWrapped, ProviderType } from '../types/types';
-import { Observable } from '../utils/rxjs-import';
+import { ProviderType, NetworkingUIEventWrapped, HeaderType } from '../types/types.js';
+import { Observable } from '../utils/rxjs-import.js';
 export declare enum SMESSHeader {
     ContentType = "Content-Type",
     Authorization = "Authorization",

package/dist/src/services/smess.service.js

@@ -1,27 +1,21 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SmessService = exports.Accept = exports.ContentType = exports.SMESSHeader = void 0;
-const types_1 = require("../types/types");
-const rxjs_import_1 = require("../utils/rxjs-import");
-const rx_http_service_1 = __importDefault(require("../core/rx.http.service"));
-const logger_service_1 = require("../services/logger.service");
-var SMESSHeader;
+import { NetworkingUIEventWrapped, AlertModel, AlertButtonModel } from '../types/types.js';
+import { of, catchError, mergeMap, startWith } from '../utils/rxjs-import.js';
+import HttpService from '../core/rx.http.service.js';
+import { $logger } from '../services/logger.service.js';
+export var SMESSHeader;
 (function (SMESSHeader) {
     SMESSHeader["ContentType"] = "Content-Type";
     SMESSHeader["Authorization"] = "Authorization";
     SMESSHeader["Accept"] = "Accept";
     SMESSHeader["ApiKey"] = "X-Api-Key";
     SMESSHeader["ClientId"] = "X-Client-Id";
-})(SMESSHeader || (exports.SMESSHeader = SMESSHeader = {}));
-var ContentType;
+})(SMESSHeader || (SMESSHeader = {}));
+export var ContentType;
 (function (ContentType) {
     ContentType["Json"] = "application/json";
     ContentType["FormURLEncoded"] = "application/x-www-form-urlencoded";
-})(ContentType || (exports.ContentType = ContentType = {}));
-var Accept;
+})(ContentType || (ContentType = {}));
+export var Accept;
 (function (Accept) {
     Accept["V1"] = "application/json";
     Accept["V2"] = "application/vnd.smess.v2+json";
@@ -33,28 +27,27 @@ var Accept;
     Accept["V8"] = "application/vnd.smess.v8+json";
     Accept["V9"] = "application/vnd.smess.v9+json";
     Accept["V10"] = "application/vnd.smess.v10+json";
-})(Accept || (exports.Accept = Accept = {}));
-class SmessService {
+})(Accept || (Accept = {}));
+export class SmessService {
     constructor(target) {
         this.target = target;
         // Set default headers
-        logger_service_1.$logger.info('SmessService initialized', {
+        $logger.info('SmessService initialized', {
             target: this.target,
             baseURL: this.target.baseURL,
             method: this.target.method,
             headers: this.target.headers,
         }, 'SmessService');
-        this.httpService = rx_http_service_1.default.create({
+        this.httpService = HttpService.create({
             baseURL: this.target.baseURL,
             headers: this.target.headers,
             method: this.target.method,
         });
         this.httpService.interceptors.response.use((response) => response, async (error) => {
-            var _a;
             const originalRequest = error.config;
-            if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry) {
+            if (error.response?.status === 401 && !originalRequest._retry) {
                 originalRequest._retry = true;
-                logger_service_1.$logger.info('SmessService constructor - 401 retry', originalRequest, 'SmessService');
+                $logger.info('SmessService constructor - 401 retry', originalRequest, 'SmessService');
                 // Implement token refresh logic here
                 // Then retry the original request
                 // return httpService.request(originalRequest);
@@ -74,7 +67,7 @@ class SmessService {
         return filteredHeaders;
     }
     static commonHeaders(version, options) {
-        const { shouldAddClientIdHeader = true, } = options !== null && options !== void 0 ? options : {};
+        const { shouldAddClientIdHeader = true, } = options ?? {};
         const headers = {
             Accept: version,
             Authorization: '',
@@ -109,28 +102,27 @@ class SmessService {
         else {
             observable = this.httpService.request(config);
         }
-        return observable.pipe((0, rxjs_import_1.catchError)((error) => this.transformAxiosError(error, mockResponse)), (0, rxjs_import_1.mergeMap)((data) => this.transformAxiosResponse(data)), (0, rxjs_import_1.startWith)(types_1.NetworkingUIEventWrapped.waiting()));
+        return observable.pipe(catchError((error) => this.transformAxiosError(error, mockResponse)), mergeMap((data) => this.transformAxiosResponse(data)), startWith(NetworkingUIEventWrapped.waiting()));
     }
     // MARK: - Private
     transformAxiosError(error, mockResponse) {
-        logger_service_1.$logger.error('transformAxiosError', error, 'SmessService');
+        $logger.error('transformAxiosError', error, 'SmessService');
         const message = error instanceof Error ? error.message : String(error);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Required for axios compatibility
         const response = error.response;
         const httpErrorCode = response ? response.status : 0;
-        const title = response === null || response === void 0 ? void 0 : response.statusText;
-        const alertModel = new types_1.AlertModel(message, httpErrorCode, true, title, response === null || response === void 0 ? void 0 : response.data, [types_1.AlertButtonModel.buttonYes()]);
+        const title = response?.statusText;
+        const alertModel = new AlertModel(message, httpErrorCode, true, title, response?.data, [AlertButtonModel.buttonYes()]);
         if (mockResponse) {
-            return (0, rxjs_import_1.of)(types_1.NetworkingUIEventWrapped.succeeded(mockResponse));
+            return of(NetworkingUIEventWrapped.succeeded(mockResponse));
         }
-        return (0, rxjs_import_1.of)(types_1.NetworkingUIEventWrapped.failed(alertModel));
+        return of(NetworkingUIEventWrapped.failed(alertModel));
     }
     transformAxiosResponse(response) {
-        logger_service_1.$logger.info('transformAxiosResponse', response, 'SmessService');
-        if (response instanceof types_1.NetworkingUIEventWrapped) {
-            return (0, rxjs_import_1.of)(response);
+        $logger.info('transformAxiosResponse', response, 'SmessService');
+        if (response instanceof NetworkingUIEventWrapped) {
+            return of(response);
         }
-        return (0, rxjs_import_1.of)(types_1.NetworkingUIEventWrapped.succeeded(response.data));
+        return of(NetworkingUIEventWrapped.succeeded(response.data));
     }
 }
-exports.SmessService = SmessService;