@acontplus/ng-infrastructure 3.0.0 → 3.1.1

package/fesm2022/acontplus-ng-infrastructure.mjs

@@ -1,14 +1,88 @@
 import { HttpContextToken, HttpResponse, HttpContext, HttpClient } from '@angular/common/http';
 import * as i0 from '@angular/core';
-import { inject, Injectable, signal, computed, InjectionToken } from '@angular/core';
+import { inject, PLATFORM_ID, signal, computed, Injectable, InjectionToken } from '@angular/core';
 import { switchMap, throwError, of, catchError, lastValueFrom } from 'rxjs';
+import { Language, detectBrowserLanguages, languageToBcp47, detectBrowserLanguage, bcp47ToLanguage, getLocalizedAppMessage, AppMessageKey, getLocalizedErrorMessage } from '@acontplus/core';
 import { NotificationService } from '@acontplus/ng-notifications';
 import { AUTH_TOKEN, ENVIRONMENT, CORE_CONFIG, DEFAULT_CONFIG as DEFAULT_CONFIG$1 } from '@acontplus/ng-config';
+import { isPlatformBrowser } from '@angular/common';
 import { Router } from '@angular/router';
 import { v4 } from 'uuid';
 import { finalize, catchError as catchError$1 } from 'rxjs/operators';
 import { OverlayService } from '@acontplus/ng-components';
 
+const LANGUAGE_STORAGE_KEY = 'acontplus-language';
+class LanguageInfo {
+    platformId = inject(PLATFORM_ID);
+    authToken = inject(AUTH_TOKEN, { optional: true });
+    _language = signal(Language.English, /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "_language" }] : /* istanbul ignore next */ []));
+    _bcp47 = signal('en', /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "_bcp47" }] : /* istanbul ignore next */ []));
+    initialized = false;
+    language = computed(() => this._language(), /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "language" }] : /* istanbul ignore next */ []));
+    bcp47Tag = computed(() => this._bcp47(), /* @ts-ignore */
+    ...(ngDevMode ? [{ debugName: "bcp47Tag" }] : /* istanbul ignore next */ []));
+    getCurrentLanguage() {
+        this.ensureInitialized();
+        return this._language();
+    }
+    getBcp47Tag() {
+        this.ensureInitialized();
+        return this._bcp47();
+    }
+    getBrowserLanguages() {
+        return detectBrowserLanguages();
+    }
+    setLanguage(language) {
+        this._language.set(language);
+        this._bcp47.set(languageToBcp47(language));
+        if (isPlatformBrowser(this.platformId)) {
+            sessionStorage.setItem(LANGUAGE_STORAGE_KEY, language.toString());
+        }
+    }
+    ensureInitialized() {
+        if (this.initialized)
+            return;
+        this.initialized = true;
+        if (!isPlatformBrowser(this.platformId)) {
+            this._language.set(Language.English);
+            this._bcp47.set('en');
+            return;
+        }
+        const userLocale = this.authToken?.getUserData?.()?.locale;
+        if (userLocale) {
+            this._language.set(this.resolveLanguage(userLocale));
+            this._bcp47.set(languageToBcp47(this._language()));
+            return;
+        }
+        const stored = sessionStorage.getItem(LANGUAGE_STORAGE_KEY);
+        if (stored) {
+            const parsed = Number(stored);
+            if (parsed > 0) {
+                this._language.set(parsed);
+                this._bcp47.set(languageToBcp47(parsed));
+                return;
+            }
+        }
+        const browserLang = detectBrowserLanguage();
+        this._language.set(browserLang);
+        this._bcp47.set(languageToBcp47(browserLang));
+    }
+    resolveLanguage(locale) {
+        return bcp47ToLanguage(locale);
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.0", ngImport: i0, type: LanguageInfo, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.1.0", ngImport: i0, type: LanguageInfo, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.0", ngImport: i0, type: LanguageInfo, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
 //const RETRY_COUNT = 2;
 // ---------------------------------------------------------------------------
 // HTTP Context Tokens
@@ -29,6 +103,7 @@ const SHOW_NOTIFICATIONS = new HttpContextToken(() => undefined);
 const apiInterceptor = (req, next) => {
     const toastr = inject(NotificationService);
     const tokenProvider = inject(AUTH_TOKEN, { optional: true });
+    const languageInfo = inject(LanguageInfo);
     // Attach Bearer token when available
     const token = tokenProvider?.getToken();
     const modifiedReq = token ? req.clone({ setHeaders: { Authorization: `Bearer ${token}` } }) : req;
@@ -53,10 +128,10 @@ const apiInterceptor = (req, next) => {
     // (needed to properly throw ApiResponse errors into the RxJS stream).
     switchMap((event) => {
         if (event instanceof HttpResponse) {
-            const standardized = standardizeApiResponse(event.body);
-            handleToastNotifications(standardized, toastr, req);
+            const standardized = standardizeApiResponse(event.body, languageInfo);
+            handleToastNotifications(standardized, toastr, req, languageInfo);
             if (standardized.status === 'error') {
-                handleApiResponseError(standardized, toastr, req);
+                handleApiResponseError(standardized, toastr, req, languageInfo);
                 return throwError(() => standardized);
             }
             return of(transformResponseForConsumers(standardized, event));
@@ -65,26 +140,25 @@ const apiInterceptor = (req, next) => {
     }), 
     // Handle HTTP-level errors — show notification for critical errors, always re-throw.
     catchError((error) => {
-        return handleHttpError(error, toastr);
+        return handleHttpError(error, toastr, languageInfo);
     }));
 };
 // ---------------------------------------------------------------------------
 // Standardisation
 // ---------------------------------------------------------------------------
-function standardizeApiResponse(body) {
+function standardizeApiResponse(body, languageInfo) {
     if (isValidApiResponse(body))
         return body;
-    // Wrap any non-null/undefined body (including objects with non-standard status fields)
     if (body !== null && body !== undefined) {
-        return wrapSuccess(body);
+        return wrapSuccess(body, languageInfo);
     }
-    return wrapSuccess(undefined);
+    return wrapSuccess(undefined, languageInfo);
 }
-function wrapSuccess(data) {
+function wrapSuccess(data, languageInfo) {
     return {
         status: 'success',
         code: '200',
-        message: 'Operation completed successfully',
+        message: getLocalizedAppMessage(AppMessageKey.OPERATION_COMPLETED, languageInfo.getCurrentLanguage()),
         data,
         timestamp: new Date().toISOString(),
     };
@@ -101,7 +175,7 @@ function isValidApiResponse(response) {
 // ---------------------------------------------------------------------------
 // Notifications
 // ---------------------------------------------------------------------------
-function handleToastNotifications(response, notificationService, req) {
+function handleToastNotifications(response, notificationService, req, languageInfo) {
     // SKIP_NOTIFICATION always wins — even over SHOW_NOTIFICATIONS
     if (req.context.get(SKIP_NOTIFICATION))
         return;
@@ -121,17 +195,28 @@ function handleToastNotifications(response, notificationService, req) {
     });
     // Secondary: show individual warnings only when no primary message covered them
     if (response.status === 'warning' && response.warnings?.length && response.message) {
-        response.warnings.forEach((w) => notificationService.show({ type: 'warning', message: w.message }));
+        response.warnings.forEach((w) => notificationService.show({
+            type: 'warning',
+            message: getLocalizedErrorMessage(w.code, languageInfo.getCurrentLanguage(), w.message),
+        }));
     }
     // Secondary: show individual errors only when no primary message covered them
     if (response.status === 'error' && response.errors?.length && response.message) {
-        response.errors.forEach((e) => notificationService.show({ type: 'error', message: e.message }));
+        response.errors.forEach((e) => notificationService.show({
+            type: 'error',
+            message: getLocalizedErrorMessage(e.code, languageInfo.getCurrentLanguage(), e.message),
+        }));
     }
 }
-function handleApiResponseError(response, notificationService, req) {
+function handleApiResponseError(response, notificationService, req, languageInfo) {
     if (req.context.get(SKIP_NOTIFICATION))
         return;
-    const message = response.message || response.errors?.[0]?.message || 'An unexpected error occurred';
+    const language = languageInfo.getCurrentLanguage();
+    const serverMessage = response.message || response.errors?.[0]?.message;
+    const errorCode = response.errors?.[0]?.code ?? '';
+    const message = serverMessage ||
+        getLocalizedErrorMessage(errorCode, language) ||
+        getLocalizedAppMessage(AppMessageKey.UNEXPECTED_ERROR, language);
     notificationService.error({ message, config: { duration: 5000 } });
 }
 // ---------------------------------------------------------------------------
@@ -153,11 +238,11 @@ function transformResponseForConsumers(response, originalEvent) {
 // ---------------------------------------------------------------------------
 // Error handling
 // ---------------------------------------------------------------------------
-function handleHttpError(error, notificationService) {
+function handleHttpError(error, notificationService, languageInfo) {
     if (shouldShowCriticalErrorNotification(error.status)) {
         notificationService.error({
-            message: getCriticalErrorMessage(error),
-            title: getErrorTitle(error.status),
+            message: getCriticalErrorMessage(error, languageInfo),
+            title: getErrorTitle(error.status, languageInfo),
             config: { duration: 5000 },
         });
     }
@@ -166,21 +251,30 @@ function handleHttpError(error, notificationService) {
 function shouldShowCriticalErrorNotification(status) {
     return status === 0 || (status >= 500 && status < 600);
 }
-function getErrorTitle(status) {
+function getErrorTitle(status, languageInfo) {
+    const lang = languageInfo.getCurrentLanguage();
     if (status === 0)
-        return 'Connection Error';
+        return getLocalizedAppMessage(AppMessageKey.CONNECTION_ERROR, lang);
     if (status >= 500)
-        return 'Server Error';
-    return 'Error';
+        return getLocalizedAppMessage(AppMessageKey.SERVER_ERROR, lang);
+    return getLocalizedAppMessage(AppMessageKey.ERROR, lang);
 }
-function getCriticalErrorMessage(error) {
+function getCriticalErrorMessage(error, languageInfo) {
+    const lang = languageInfo.getCurrentLanguage();
     if (error.status === 0) {
-        return 'Unable to connect to the server. Please check your network connection.';
+        return (getLocalizedErrorMessage('NETWORK_ERROR', lang) ||
+            getLocalizedAppMessage(AppMessageKey.NETWORK_UNAVAILABLE, lang));
     }
     if (error.status >= 500) {
-        return (error.error?.message ?? error.message ?? 'A server error occurred. Please try again later.');
-    }
-    return error.error?.message ?? error.message ?? 'An unexpected error occurred';
+        return (error.error?.message ??
+            getLocalizedErrorMessage('INTERNAL_ERROR', lang) ??
+            error.message ??
+            getLocalizedAppMessage(AppMessageKey.UNEXPECTED_ERROR, lang));
+    }
+    return (error.error?.message ??
+        getLocalizedErrorMessage('UNHANDLED_ERROR', lang) ??
+        error.message ??
+        getLocalizedAppMessage(AppMessageKey.UNEXPECTED_ERROR, lang));
 }
 // ---------------------------------------------------------------------------
 // Utility: decide whether to auto-show toast
@@ -364,6 +458,36 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.0", ngImpor
                 }]
         }] });
 
+/**
+ * Returns whether a URL already identifies an external origin.
+ *
+ * Protocol-relative URLs are included because browsers resolve `//host/path`
+ * against the current page protocol.
+ */
+function isAbsoluteUrl(url) {
+    return /^(https?:)?\/\//i.test(url);
+}
+/**
+ * Joins an API base URL and an endpoint path without changing URL protocols.
+ *
+ * This deliberately does not use `new URL(path, baseUrl)`: this function joins
+ * an API prefix and endpoint, while the URL standard resolves relative
+ * references and can discard a base path that does not end in `/`.
+ */
+function joinApiUrl(baseUrl, path) {
+    if (!path) {
+        return baseUrl.replace(/\/+$/, '');
+    }
+    if (isAbsoluteUrl(path)) {
+        return path;
+    }
+    const normalizedBaseUrl = baseUrl.replace(/\/+$/, '');
+    if (!normalizedBaseUrl) {
+        return path;
+    }
+    return `${normalizedBaseUrl}/${path.replace(/^\/+/, '')}`;
+}
+
 // ---------------------------------------------------------------------------
 // HTTP Context Tokens & helpers
 // ---------------------------------------------------------------------------
@@ -396,6 +520,8 @@ const DEFAULT_CONFIG = {
     skipAuthUrls: ['/login', '/register', '/refresh'],
     includeAuthToken: true,
     baseUrlInjection: true,
+    enableLanguageHeader: true,
+    languageHeader: 'Accept-Language',
     refreshTokenCallback: undefined,
     logoutCallback: undefined,
 };
@@ -410,6 +536,7 @@ const httpContextInterceptor = (req, next) => {
     const router = inject(Router);
     const tenantService = inject(TenantInfo);
     const correlationService = inject(CorrelationInfo);
+    const languageInfo = inject(LanguageInfo);
     const loggingService = inject(LoggingService);
     const environment = inject(ENVIRONMENT);
     const config = {
@@ -431,7 +558,7 @@ const httpContextInterceptor = (req, next) => {
     // ── URL resolution ───────────────────────────────────────────────────────
     const finalUrl = resolveFinalUrl(req.url, isCustomUrl, config.baseUrlInjection, environment.apiBaseUrl);
     // ── Header construction ──────────────────────────────────────────────────
-    const headers = buildHeaders(config, tokenProvider, correlationService, tenantService, environment, skipAuth, contextHeaders, req);
+    const headers = buildHeaders(config, tokenProvider, correlationService, tenantService, languageInfo, environment, skipAuth, contextHeaders, req);
     // ── Clone request ────────────────────────────────────────────────────────
     const enhancedReq = req.clone({ url: finalUrl, setHeaders: headers });
     // ── Request logging ──────────────────────────────────────────────────────
@@ -503,9 +630,12 @@ function shouldSkipAuth(url, skipAuthUrls) {
     return skipAuthUrls.some((u) => url.includes(u));
 }
 function resolveFinalUrl(url, isCustomUrl, baseUrlInjection, apiBaseUrl) {
-    return isCustomUrl || !baseUrlInjection ? url : `${apiBaseUrl}${url}`;
+    if (isCustomUrl || !baseUrlInjection || isAbsoluteUrl(url)) {
+        return url;
+    }
+    return joinApiUrl(apiBaseUrl, url);
 }
-function buildHeaders(config, tokenProvider, correlationService, tenantService, environment, skipAuth, contextHeaders, req) {
+function buildHeaders(config, tokenProvider, correlationService, tenantService, languageInfo, environment, skipAuth, contextHeaders, req) {
     const correlationId = config.enableCorrelationTracking
         ? correlationService.getOrCreateCorrelationId()
         : v4();
@@ -521,6 +651,9 @@ function buildHeaders(config, tokenProvider, correlationService, tenantService,
     if (tenantId) {
         headers[config.tenantIdHeader] = tenantId;
     }
+    if (config.enableLanguageHeader) {
+        headers[config.languageHeader] = languageInfo.getBcp47Tag();
+    }
     if (config.clientVersion) {
         headers['Client-Version'] = config.clientVersion;
     }
@@ -700,12 +833,11 @@ const spinnerInterceptor = (req, next) => {
 class BaseHttpRepository {
     http = inject(HttpClient);
     buildUrl(path = '') {
-        const baseUrl = (this.config.baseUrl || '/api').replaceAll(/\/+/g, '');
-        const version = this.config.version ? `/v${this.config.version}` : '';
-        const endpoint = path
-            ? `${this.config.endpoint}/${path}`.replaceAll(/\/+/g, '/')
-            : this.config.endpoint;
-        return `${baseUrl}${version}/${endpoint.replace(/^\/+/, '')}`;
+        const baseUrl = this.config.baseUrl || '/api';
+        const version = this.config.version ? `v${this.config.version}` : '';
+        const versionedBaseUrl = version ? joinApiUrl(baseUrl, version) : baseUrl;
+        const endpoint = path ? joinApiUrl(this.config.endpoint, path) : this.config.endpoint;
+        return joinApiUrl(versionedBaseUrl, endpoint);
     }
     get(params, path = '') {
         return this.http.get(this.buildUrl(path), { params });
@@ -793,9 +925,10 @@ class RepositoryFactory {
     create(config) {
         const buildUrl = (path = '') => {
             const baseUrl = config.baseUrl || '/api';
-            const version = config.version ? `/v${config.version}` : '';
-            const endpoint = path ? `${config.endpoint}/${path}` : config.endpoint;
-            return `${baseUrl}${version}/${endpoint}`.replaceAll(/\/+/g, '/');
+            const version = config.version ? `v${config.version}` : '';
+            const versionedBaseUrl = version ? joinApiUrl(baseUrl, version) : baseUrl;
+            const endpoint = path ? joinApiUrl(config.endpoint, path) : config.endpoint;
+            return joinApiUrl(versionedBaseUrl, endpoint);
         };
         const buildParams = (pagination) => {
             const params = {};
@@ -835,11 +968,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.0", ngImpor
             args: [{ providedIn: 'root' }]
         }] });
 
-function mergeUrl(baseURL, endpoint) {
-    if (!baseURL)
-        return endpoint;
-    return `${baseURL.replace(/\/+$/, '')}/${endpoint.replace(/^\/+/, '')}`;
-}
 class AngularHttpAdapter {
     http;
     baseURL;
@@ -854,7 +982,7 @@ class AngularHttpAdapter {
         };
     }
     async request(params) {
-        const fullUrl = mergeUrl(this.baseURL, params.url);
+        const fullUrl = this.baseURL ? joinApiUrl(this.baseURL, params.url) : params.url;
         const httpOptions = this.buildOptions(params.options);
         const observable = this.http.request(params.method, fullUrl, {
             body: params.data,
@@ -932,7 +1060,7 @@ class CoreConfigService {
         const baseUrl = this.config.apiBaseUrl;
         if (!entityName)
             return baseUrl;
-        return `${baseUrl}/${entityName}`.replaceAll(/\/+/g, '/');
+        return joinApiUrl(baseUrl, entityName);
     }
     /**
      * Check if a URL should be excluded from processing
@@ -993,6 +1121,7 @@ class BaseUseCase {
 
 // Only create commands if you have complex validation logic
 class Command extends BaseUseCase {
+    logger = inject(LoggingService);
     // Simple validation - override only when needed
     validate(_request) {
         return []; // Return array of error messages
@@ -1010,8 +1139,7 @@ class Command extends BaseUseCase {
         }
         return this.executeInternal(request).pipe(catchError$1((error) => {
             // Log the error for debugging
-            const logger = inject(LoggingService);
-            logger.error('An error occurred during command execution:', error);
+            this.logger.error('An error occurred during command execution:', error);
             // Re-throw the error so the caller can handle it
             return throwError(() => error);
         }));
@@ -1019,10 +1147,10 @@ class Command extends BaseUseCase {
 }
 
 class Query extends BaseUseCase {
+    logger = inject(LoggingService);
     execute(request) {
         return this.executeInternal(request).pipe(catchError$1((error) => {
-            const logger = inject(LoggingService);
-            logger.error('An error occurred during query execution:', error);
+            this.logger.error('An error occurred during query execution:', error);
             return throwError(() => error);
         }));
     }
@@ -1032,5 +1160,5 @@ class Query extends BaseUseCase {
  * Generated bundle index. Do not edit.
  */
 
-export { ActiveRequestsTracker, AngularHttpAdapter, BaseHttpRepository, BaseUseCase, Command, CoreConfigService, CorrelationInfo, GenericRepository, HTTP_CONTEXT_CONFIG, LoggingService, Query, REPOSITORY_CONFIG, RepositoryFactory, SHOW_NOTIFICATIONS, SHOW_SPINNER, SKIP_NOTIFICATION, SearchableGenericRepository, apiInterceptor, createCoreConfig, createHttpContextConfig, customUrl, httpContextInterceptor, provideCoreConfig, provideHttpContext, skipContextHeaders, spinnerInterceptor, withCustomHeaders, withoutSpinner };
+export { ActiveRequestsTracker, AngularHttpAdapter, BaseHttpRepository, BaseUseCase, Command, CoreConfigService, CorrelationInfo, GenericRepository, HTTP_CONTEXT_CONFIG, LanguageInfo, LoggingService, Query, REPOSITORY_CONFIG, RepositoryFactory, SHOW_NOTIFICATIONS, SHOW_SPINNER, SKIP_NOTIFICATION, SearchableGenericRepository, TenantInfo, apiInterceptor, createCoreConfig, createHttpContextConfig, customUrl, httpContextInterceptor, provideCoreConfig, provideHttpContext, skipContextHeaders, spinnerInterceptor, withCustomHeaders, withoutSpinner };
 //# sourceMappingURL=acontplus-ng-infrastructure.mjs.map