Исправление багов

- Исправил аргумент класса в функциях on и once
- Исправил ошибку с уничтоженными отправителями

Author: VerZsuT

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "emr-bridge",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Allows you to easily give access to main methods from the renderer process",
   "main": "esm/entries/index.js",
   "type": "module",
@@ -47,6 +47,6 @@
     "electron": ">=20.0.0"
   },
   "devDependencies": {
-    "typescript": "^5.5.3"
+    "typescript": "^5.7.2"
   }
 }

package.json

@@ -7,7 +7,7 @@ export default class WebContentsEventContainer {
     /**
      * Контейнер событий.
      */
-    private container = {} as {
+    private containers = {} as {
         /**
          * Название события.
          */
@@ -30,8 +30,7 @@ export default class WebContentsEventContainer {
      * @param sender - Отправитель.
      */
     public addOn(event: string, sender: WebContents): void {
-        this.addEvent(event)
-        this.container[event].on.push(sender)
+        this.addEvent(event).on.push(sender)
     }
 
     /**
@@ -40,8 +39,7 @@ export default class WebContentsEventContainer {
      * @param sender - Отправитель.
      */
     public addOnce(event: string, sender: WebContents): void {
-        this.addEvent(event)
-        this.container[event].once.push(sender)
+        this.addEvent(event).once.push(sender)
     }
 
     /**
@@ -50,7 +48,7 @@ export default class WebContentsEventContainer {
      * @returns многоразовые отправители для события.
      */
     public getOn(event: string): WebContents[] {
-        return this.getEvent(event).on.filter(sender => !sender.isDestroyed())
+        return this.addEvent(event).on
     }
 
     /**
@@ -59,7 +57,7 @@ export default class WebContentsEventContainer {
      * @returns Одноразовые отправители для события.
      */
     public getOnce(event: string): WebContents[] {
-        return this.getEvent(event).once.filter(sender => !sender.isDestroyed())
+        return this.addEvent(event).once
     }
 
     /**
@@ -68,35 +66,30 @@ export default class WebContentsEventContainer {
      * @returns Отправители для события.
      */
     public getAll(event: string): WebContents[] {
-        const senders = this.getEvent(event)
+        const container = this.addEvent(event)
 
-        return [...senders.on, ...senders.once]
+        return [...container.on, ...container.once]
     }
 
     /**
      * Удалить одноразовых отправителей для события.
      * @param event - Имя события.
      */
     public clearOnce(event: string): void {
-        this.getEvent(event).once = []
+        this.addEvent(event).once = []
     }
 
     /**
      * Добавить контейнер события.
      * @param name - Имя события.
+     * @returns Добавленный контейнер.
      */
-    private addEvent(name: string): void {
-        this.container[name] ??= { on: [], once: [] }
-    }
-
-    /**
-     * Получить контейнер события.
-     * @param name - Имя события.
-     * @returns Контейнер события.
-     */
-    private getEvent(name: string): (typeof this.container)[string] {
-        this.addEvent(name)
+    private addEvent(name: string): (typeof this.containers)[string] {
+        const container = this.containers[name] ??= { on: [], once: [] }
 
-        return this.container[name]
+        return this.containers[name] = {
+            on: container.on.filter(item => !item.isDestroyed()),
+            once: container.once.filter(item => !item.isDestroyed()),
+        }
     }
 }

src/scripts/helpers/web-contents-events-container.ts

@@ -1,6 +1,4 @@
-/*
-    Методы публикации в main процессе.
-*/
+// Методы публикации в main процессе.
 
 import { ipcMain } from 'electron'
 
@@ -83,13 +81,13 @@ export function emitEvent<T = unknown>(name: string, value?: T): void {
 export function on<TValue = any>(
     name: string,
     listener: EventListener<TValue>,
-    receives: HasSnapshotClass<TValue>
+    receives?: HasSnapshotClass<TValue>
 ): EventUnsubscribe {
     canThrowError()
 
     const emitChannel = IpcChannel.event.emit(name)
     const handler = (_: any, { value }: IResult<TValue>) => {
-        if (Transfer.isSnapshotValue(value)) {
+        if (Transfer.isSnapshotValue(value) && receives) {
             listener(Transfer.getFromSnapshot(value, receives) as TValue)
         } else {
             listener(value!)
@@ -111,13 +109,13 @@ export function on<TValue = any>(
 export function once<TValue = any>(
     name: string,
     listener: EventListener<TValue>,
-    receives: HasSnapshotClass<TValue>
+    receives?: HasSnapshotClass<TValue>
 ): EventUnsubscribe {
     canThrowError()
 
     const emitChannel = IpcChannel.event.emit(name)
     const handler = (_: any, { value }: IResult<TValue>) => {
-        if (Transfer.isSnapshotValue(value)) {
+        if (Transfer.isSnapshotValue(value) && receives) {
             listener(Transfer.getFromSnapshot(value, receives) as TValue)
         } else {
             listener(value!)