larasopp 1.1.0 → 1.1.2

package/lib/Core.js

@@ -82,6 +82,7 @@ class Core {
         var _a;
         if (this.status) {
             (_a = this.ws) === null || _a === void 0 ? void 0 : _a.close();
+            this._status = false;
         }
     }
     isJsonString(str) {

package/lib/Subscribe.d.ts

@@ -11,6 +11,7 @@ interface ISubscribe {
 }
 declare class Subscribe {
     private events;
+    private currentEvents;
     private hasChannel;
     private pushChannel;
     private removeChannel;
@@ -21,6 +22,7 @@ declare class Subscribe {
     get channel(): string;
     private init;
     bind<T>(event: string, callback: (data: T) => void): TBind;
+    private clearEvents;
     remove(): void;
     addListener(event: TListenerEvents, callback: TListenerCallback): Event | undefined;
 }

package/lib/Subscribe.js

@@ -8,6 +8,12 @@ class Subscribe {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "currentEvents", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "hasChannel", {
             enumerable: true,
             configurable: true,
@@ -45,6 +51,7 @@ class Subscribe {
             value: void 0
         });
         this.events = events;
+        this.currentEvents = [];
         this.hasChannel = hasChannel;
         this.pushChannel = pushChannel;
         this.removeChannel = removeChannel;
@@ -74,13 +81,18 @@ class Subscribe {
     }
     bind(event, callback) {
         const Event = this.events.addListener(this.channel + ':' + event, callback);
+        this.currentEvents.push(Event);
         return {
             remove: () => {
                 Event.remove();
             }
         };
     }
+    clearEvents() {
+        this.currentEvents.forEach((event) => event.remove());
+    }
     remove() {
+        this.clearEvents();
         this.removeChannel(this.channel);
         if (this.hasChannel(this.channel))
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "larasopp",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Websocket client for laravel",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/Core.ts

@@ -104,6 +104,7 @@ abstract class Core {
 	public disconnect(): void {
 		if (this.status) {
 			this.ws?.close();
+			this._status = false;
 		}
 	}
 

package/src/Subscribe.ts

@@ -23,6 +23,7 @@ interface ISubscribe {
 
 class Subscribe {
 	private events: Events;
+	private currentEvents: Event[];
 	private hasChannel: (channel: string) => boolean;
 	private pushChannel: (channel: string) => void;
 	private removeChannel: (channel: string) => void;
@@ -32,6 +33,7 @@ class Subscribe {
 
 	constructor({events, hasChannel, pushChannel, removeChannel, status, channel, send}: ISubscribe) {
 		this.events = events;
+		this.currentEvents = [];
 		this.hasChannel = hasChannel;
 		this.pushChannel = pushChannel;
 		this.removeChannel = removeChannel;
@@ -65,6 +67,7 @@ class Subscribe {
 
 	public bind<T>(event: string, callback: (data: T) => void): TBind {
 		const Event = this.events.addListener(this.channel + ':' + event, callback);
+		this.currentEvents.push(Event);
 		return {
 			remove: () => {
 				Event.remove();
@@ -72,7 +75,12 @@ class Subscribe {
 		}
 	}
 
+	private clearEvents(): void {
+		this.currentEvents.forEach((event) => event.remove());
+	}
+
 	public remove(): void {
+		this.clearEvents();
 		this.removeChannel(this.channel);
 		if (this.hasChannel(this.channel)) return;
 		this.send({