@streamlayer/sdk-web-notifications 0.15.0 → 0.15.1

package/lib/index.js

@@ -8,5 +8,10 @@ export const notifications = (instance, opts, done) => {
     instance.addNotification = instance.notifications.add;
     instance.sdk.getNotificationsStore = () => instance.notifications.getQueueStore();
     instance.sdk.getActiveNotification = () => instance.notifications.getActiveNotification();
+    instance.sdk.onMount(() => {
+        return () => {
+            instance.notifications.queue.drain();
+        };
+    });
     done();
 };

package/lib/queue/index.d.ts

@@ -7,7 +7,6 @@ export type NotificationsQueueOptions = {
 export type NotificationsList = ReturnType<typeof createComputedStore<Notification[]>>;
 export declare class NotificationsQueue {
     notificationsList: ReturnType<SingleStore<Map<Notification['id'], Notification>>['getStore']>;
-    private notifications;
     private store;
     private timeouts;
     private waitingQueue;
@@ -19,4 +18,5 @@ export declare class NotificationsQueue {
     tickWaitingQueue: () => void;
     tickActiveQueue: (notificationId: string) => void;
     closeNotification: (notificationId: string) => Notification | undefined;
+    drain: () => void;
 }

package/lib/queue/index.js

@@ -1,8 +1,7 @@
-import { SingleStore, createSingleStore } from '@streamlayer/sdk-web-interfaces';
+import { createSingleStore } from '@streamlayer/sdk-web-interfaces';
 import { createLogger } from '@streamlayer/sdk-web-logger';
 export class NotificationsQueue {
     notificationsList;
-    notifications;
     store;
     timeouts;
     waitingQueue;
@@ -16,8 +15,7 @@ export class NotificationsQueue {
         this.timeouts = new Map();
         this.waitingQueue = new Set();
         this.activeQueue = new Set();
-        this.notifications = new SingleStore(createSingleStore(new Map()), 'notifications-queue');
-        this.notificationsList = this.notifications.getStore();
+        this.notificationsList = createSingleStore(new Map());
     }
     addToQueue = (notification) => {
         if (this.store.has(notification.id)) {
@@ -90,9 +88,9 @@ export class NotificationsQueue {
         }
         const timeout = setTimeout(() => {
             const closureId = notificationId;
-            const prevQueue = new Map(this.notifications.getValue());
+            const prevQueue = new Map(this.notificationsList.get());
             prevQueue.set(notification.id, notification);
-            this.notifications.setValue(prevQueue);
+            this.notificationsList.set(prevQueue);
             const timeout = setTimeout(() => {
                 this.logger.debug({ notificationId: closureId, delay: notification.autoHideDuration || 5000 }, 'notification hiding by autoHideDuration');
                 this.closeNotification(closureId);
@@ -105,17 +103,17 @@ export class NotificationsQueue {
         this.tickWaitingQueue();
     };
     closeNotification = (notificationId) => {
-        const prevQueue = new Map(this.notifications.getValue());
+        const prevQueue = new Map(this.notificationsList.get());
         const notification = prevQueue.get(notificationId);
         if (notification) {
             // do not hide notification if we have more than one notification in waiting queue,
             // because we need to show next notification immediately
             notification.hiding = !(this.waitingQueue.size >= this.options.concurrency);
-            this.notifications.setValue(prevQueue);
+            this.notificationsList.set(prevQueue);
             const timeout = setTimeout(() => {
-                const prevQueue = new Map(this.notifications.getValue());
+                const prevQueue = new Map(this.notificationsList.get());
                 prevQueue.delete(notificationId);
-                this.notifications.setValue(prevQueue);
+                this.notificationsList.set(prevQueue);
                 const timeout = this.timeouts.get(notificationId);
                 if (timeout !== undefined) {
                     clearTimeout(timeout);
@@ -132,4 +130,12 @@ export class NotificationsQueue {
         this.logger.debug({ notificationId }, 'notification hiding');
         return notification;
     };
+    drain = () => {
+        this.store.clear();
+        this.timeouts.clear();
+        this.waitingQueue.clear();
+        this.activeQueue.clear();
+        this.notificationsList.off();
+        this.notificationsList.set(new Map());
+    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamlayer/sdk-web-notifications",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "type": "module",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",