barsa-novin-ray-core 2.3.97 → 2.3.98

package/fesm2022/barsa-novin-ray-core.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { Injectable, inject, ElementRef, Input, ChangeDetectionStrategy, Component, Pipe, ComponentFactoryResolver, Injector, ApplicationRef, Compiler, DOCUMENT, NgModuleFactory, InjectionToken, NgZone, EventEmitter, ChangeDetectorRef, Renderer2, HostBinding, Output, HostListener, ViewContainerRef, ViewChild, signal, Directive, TemplateRef, input, NgModule, NO_ERRORS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA, provideAppInitializer, ErrorHandler } from '@angular/core';
-import { Subject, from, BehaviorSubject, of, exhaustMap, map as map$1, combineLatest, withLatestFrom as withLatestFrom$1, fromEvent, forkJoin, takeUntil as takeUntil$1, filter as filter$1, throwError, merge, interval, tap as tap$1, concatMap as concatMap$1, catchError as catchError$1, finalize as finalize$1, take, debounceTime as debounceTime$1, skip, Observable, timer, mergeWith, Subscription } from 'rxjs';
+import { Subject, from, BehaviorSubject, of, exhaustMap, map as map$1, combineLatest, withLatestFrom as withLatestFrom$1, fromEvent, forkJoin, takeUntil as takeUntil$1, filter as filter$1, throwError, merge, interval, concatMap as concatMap$1, catchError as catchError$1, finalize as finalize$1, take, debounceTime as debounceTime$1, skip, Observable, tap as tap$1, timer, mergeWith, Subscription } from 'rxjs';
 import * as i1 from '@angular/router';
 import { Router, NavigationEnd, ActivatedRoute, RouterEvent, NavigationStart, RouterModule } from '@angular/router';
 import { DomSanitizer, Title } from '@angular/platform-browser';
@@ -7803,32 +7803,12 @@ const NOTIFICATION_WEBWORKER_FACTORY = new InjectionToken('notificaion-worker');
 class ServiceWorkerNotificationService {
     constructor() {
         this.hasRegistration = false;
-        this._logService = inject(LogService);
         this._swPush = inject(SwPush);
         this._portalService = inject(PortalService);
-        this._notificationPermissionAllowed = true;
-        const _logService = this._logService;
-        const _swPush = this._swPush;
-        _logService.info(`swPush enable ${_swPush.isEnabled}`);
-        _swPush.notificationClicks.pipe(tap$1((c) => console.log(c))).subscribe((e) => {
-            if (!e.notification.tag) {
-                return;
-            }
-            this.closeNotifications([e.notification.tag]);
-            let actionTitle = e.action;
-            if (actionTitle === '') {
-                actionTitle = 'show';
-            }
-            if (!BarsaApi?.LoginFormData?.IsUserLoggedIn) {
-                return;
-            }
-            this._portalService.ExecuteNotificationAction(e.notification.tag, actionTitle);
-            // TODO:exeucte action
-            // not handled!!
-        });
-        this.getSw().then((c) => (this.hasRegistration = !!c));
-        this.handlePermission();
+        this._notificationPermissionAllowed = false;
+        this.init();
     }
+    // بررسی وضعیت فعلی
     get isEnabled() {
         return this._swPush.isEnabled && this.hasRegistration && this._notificationPermissionAllowed;
     }
@@ -7844,6 +7824,7 @@ class ServiceWorkerNotificationService {
             }
         });
     }
+    // نمایش دستی نوتیفیکیشن (برای تست)
     async showNotification(payload) {
         const sw = await this.getSw();
         if (!sw) {
@@ -7883,6 +7864,23 @@ class ServiceWorkerNotificationService {
             data
         });
     }
+    async init() {
+        console.log(`SwPush enabled: ${this._swPush.isEnabled}`);
+        this.handlePermission();
+        // مدیریت کلیک روی نوتیفیکیشن‌ها
+        this._swPush.notificationClicks.subscribe((e) => {
+            if (!e.notification.tag) {
+                return;
+            }
+            const actionTitle = e.action || 'show';
+            if (!BarsaApi?.LoginFormData?.IsUserLoggedIn) {
+                return;
+            }
+            this._portalService.ExecuteNotificationAction(e.notification.tag, actionTitle);
+        });
+        // بررسی مجوز و ثبت سرویس‌ورکر
+        await this.registerServiceWorker();
+    }
     handlePermission() {
         if (!navigator?.permissions?.query) {
             return;
@@ -7895,14 +7893,17 @@ class ServiceWorkerNotificationService {
     permissionQuery(result) {
         let newPrompt;
         if (result.state === 'granted') {
+            console.log('notificaiton granted');
             // notifications allowed, go wild
         }
         else if (result.state === 'prompt') {
             // we can ask the user
+            console.log('notificaiton prompt');
             newPrompt = Notification.requestPermission();
         }
         else if (result.state === 'denied') {
             // notifications were disabled
+            console.log('notificaiton denied');
             this._notificationPermissionAllowed = false;
         }
         result.onchange = () => console.log({ updatedPermission: result });
@@ -7912,14 +7913,23 @@ class ServiceWorkerNotificationService {
         this._notificationPermissionAllowed = false;
         console.error(error);
     }
-    async getSw() {
-        if (!navigator.serviceWorker) {
-            this.hasRegistration = false;
-            return undefined;
+    async requestPermission() {
+        if (Notification.permission === 'default') {
+            await Notification.requestPermission();
         }
-        const x = await navigator.serviceWorker.getRegistration('custom-ngsw-worker.js');
-        this.hasRegistration = !!x;
-        return x;
+        this._notificationPermissionAllowed = Notification.permission === 'granted';
+    }
+    async registerServiceWorker() {
+        if (!('serviceWorker' in navigator)) {
+            return;
+        }
+        const reg = await navigator.serviceWorker.getRegistration();
+        this.hasRegistration = !!reg;
+    }
+    async getSw() {
+        const reg = await navigator.serviceWorker.getRegistration();
+        this.hasRegistration = !!reg;
+        return reg;
     }
     _isSupported() {
         if (!('serviceWorker' in navigator)) {