larasopp 1.2.10 → 1.2.11

package/lib/Listener.d.ts

@@ -1,11 +1,12 @@
-import { type Event } from "easy-event-emitter";
+import { type Event as EventListener } from "easy-event-emitter";
 import type Larasopp from ".";
 declare class Listener {
     private readonly context;
     private channel;
     private listeners?;
     constructor(channel: string, constext: Larasopp);
-    listen(event: string, callback: (data: any) => void): Event;
+    listen(event: string, callback: (data: any) => void): EventListener;
+    unsubscribe(): void;
     remove(): void;
 }
 export default Listener;

package/lib/Listener.js

@@ -31,6 +31,10 @@ class Listener {
         this.listeners.push(listener);
         return listener;
     }
+    unsubscribe() {
+        this.context.unsubscribe(this.channel);
+        this.remove();
+    }
     remove() {
         if (!this.listeners)
             return;

package/lib/Subscribe.d.ts

@@ -1,29 +1,29 @@
-import { TMessage, TListenerEvents, TListenerCallback, TListen } from "./Core";
-import type { Event, Events } from "easy-event-emitter";
-interface ISubscribe {
-    events: Events;
-    hasChannel: (channel: string) => boolean;
-    pushChannel: (channel: string) => void;
-    removeChannel: (channel: string) => void;
-    send: <T>(message: TMessage<T>) => void;
-    channel: string;
-    status: boolean;
-}
-declare class Subscribe {
-    private events;
-    private currentEvents;
-    private hasChannel;
-    private pushChannel;
-    private removeChannel;
-    private status;
-    private _channel;
-    private send;
-    constructor({ events, hasChannel, pushChannel, removeChannel, status, channel, send }: ISubscribe);
-    get channel(): string;
-    private init;
-    listen<T>(event: string, callback: (data: T) => void): TListen;
-    private clearEvents;
-    remove(): void;
-    addListener(event: TListenerEvents, callback: TListenerCallback): Event | undefined;
-}
-export default Subscribe;
+import { TMessage, TListenerEvents, TListenerCallback, TListen } from "./Core";
+import type { Event, Events } from "easy-event-emitter";
+interface ISubscribe {
+    events: Events;
+    hasChannel: (channel: string) => boolean;
+    pushChannel: (channel: string) => void;
+    removeChannel: (channel: string) => void;
+    send: <T>(message: TMessage<T>) => void;
+    channel: string;
+    status: boolean;
+}
+declare class Subscribe {
+    private events;
+    private currentEvents;
+    private hasChannel;
+    private pushChannel;
+    private removeChannel;
+    private status;
+    private _channel;
+    private send;
+    constructor({ events, hasChannel, pushChannel, removeChannel, status, channel, send }: ISubscribe);
+    get channel(): string;
+    private init;
+    listen<T>(event: string, callback: (data: T) => void): TListen;
+    private clearEvents;
+    remove(): void;
+    addListener(event: TListenerEvents, callback: TListenerCallback): Event | undefined;
+}
+export default Subscribe;

package/lib/Subscribe.js

@@ -1,107 +1,107 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class Subscribe {
-    constructor({ events, hasChannel, pushChannel, removeChannel, status, channel, send }) {
-        Object.defineProperty(this, "events", {
-            enumerable: true,
-            configurable: true,
-            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,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "pushChannel", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "removeChannel", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "status", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "_channel", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "send", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.events = events;
-        this.currentEvents = [];
-        this.hasChannel = hasChannel;
-        this.pushChannel = pushChannel;
-        this.removeChannel = removeChannel;
-        this.status = status;
-        this._channel = channel;
-        this.send = send;
-        this.init();
-    }
-    get channel() {
-        return this._channel;
-    }
-    init() {
-        this.pushChannel(this.channel);
-        if (this.status) {
-            this.send({
-                subscribe: this.channel
-            });
-        }
-        else {
-            const event = this.events.addListener('open', () => {
-                this.send({
-                    subscribe: this.channel
-                });
-                event.remove();
-            });
-        }
-    }
-    listen(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;
-        this.send({
-            unsubscribe: this.channel
-        });
-    }
-    addListener(event, callback) {
-        return this.events.addListener(event + ':' + this.channel, callback);
-    }
-}
-exports.default = Subscribe;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Subscribe {
+    constructor({ events, hasChannel, pushChannel, removeChannel, status, channel, send }) {
+        Object.defineProperty(this, "events", {
+            enumerable: true,
+            configurable: true,
+            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,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "pushChannel", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "removeChannel", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "status", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_channel", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "send", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.events = events;
+        this.currentEvents = [];
+        this.hasChannel = hasChannel;
+        this.pushChannel = pushChannel;
+        this.removeChannel = removeChannel;
+        this.status = status;
+        this._channel = channel;
+        this.send = send;
+        this.init();
+    }
+    get channel() {
+        return this._channel;
+    }
+    init() {
+        this.pushChannel(this.channel);
+        if (this.status) {
+            this.send({
+                subscribe: this.channel
+            });
+        }
+        else {
+            const event = this.events.addListener('open', () => {
+                this.send({
+                    subscribe: this.channel
+                });
+                event.remove();
+            });
+        }
+    }
+    listen(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;
+        this.send({
+            unsubscribe: this.channel
+        });
+    }
+    addListener(event, callback) {
+        return this.events.addListener(event + ':' + this.channel, callback);
+    }
+}
+exports.default = Subscribe;

package/lib/index.d.ts

@@ -1,7 +1,7 @@
-import { Event } from "easy-event-emitter";
+import { type Event as EventListener } from "easy-event-emitter";
 import Core from "./Core";
 import Listener from "./Listener";
-import type { IConfig, TPermissions, TSocketEvents, TListenerCallback, TListen } from "./types";
+import type { IConfig, TPermissions, TSocketEvents, TListenerCallback } from "./types";
 declare class Larasopp extends Core {
     private readonly channels;
     constructor(config: IConfig);
@@ -10,7 +10,8 @@ declare class Larasopp extends Core {
     unsubscribe(channel: string): void;
     trigger<T>(channel: string, event: string, message: T, permission?: TPermissions, waitSubscribe?: boolean): void;
     private pushListener;
-    addListener(event: TSocketEvents, callback: TListenerCallback): Event | undefined;
+    countListeners(channel: string): number;
+    addListener(event: TSocketEvents, callback: TListenerCallback): EventListener | undefined;
 }
-export type { TListen };
+export type { Listener, EventListener };
 export default Larasopp;

package/lib/index.js

@@ -55,12 +55,17 @@ class Larasopp extends Core_1.default {
     pushListener(channel, listener) {
         if (!this.channels[channel]) {
             this.channels[channel] = [];
+            this.send({
+                subscribe: channel
+            });
         }
-        this.send({
-            subscribe: channel
-        });
         this.channels[channel].push(listener);
     }
+    countListeners(channel) {
+        if (!this.channels[channel])
+            return -1;
+        return this.channels[channel].length;
+    }
     addListener(event, callback) {
         if (!constants_1.SocketEvents.includes(event))
             return;

package/lib/types.d.ts

@@ -6,9 +6,6 @@ export type TListenerCallback = (data: {
     channel: string;
 }) => void;
 export type TPermissions = 'public' | 'protected' | 'private';
-export type TListen = {
-    remove: () => void;
-};
 export type TMessage<T> = {
     subscribe?: string;
     unsubscribe?: string;

package/package.json

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

package/src/Listener.ts

@@ -1,12 +1,12 @@
 import {
-	type Event
+	type Event as EventListener
 } from "easy-event-emitter";
 import type Larasopp from ".";
 
 class Listener {
 	private readonly context: Larasopp;
 	private channel: string;
-	private listeners?: Event[];
+	private listeners?: EventListener[];
 
 	constructor(channel: string, constext: Larasopp) {
 		this.channel = channel;
@@ -22,6 +22,11 @@ class Listener {
 		return listener;
 	}
 
+	public unsubscribe() {
+		this.context.unsubscribe(this.channel);
+		this.remove();
+	}
+
 	public remove() {
 		if (!this.listeners) return;
 		this.listeners.forEach((listener) => listener.remove());

package/src/index.ts

@@ -1,5 +1,5 @@
 import {
-	Event
+	type Event as EventListener
 } from "easy-event-emitter";
 import Core from "./Core";
 import { SocketEvents } from "./constants";
@@ -9,7 +9,6 @@ import type {
 	TPermissions,
 	TSocketEvents,
 	TListenerCallback,
-	TListen,
 	TChannels
 } from "./types";
 
@@ -64,21 +63,27 @@ class Larasopp extends Core {
 	private pushListener(channel: string, listener: Listener): void {
 		if (!this.channels[channel]) {
 			this.channels[channel] = [];
+			this.send({
+				subscribe: channel
+			});
 		}
-		this.send({
-			subscribe: channel
-		});
 		this.channels[channel].push(listener);
 	}
 
-	public addListener(event: TSocketEvents, callback: TListenerCallback): Event | undefined {
+	public countListeners(channel: string) {
+		if (!this.channels[channel]) return -1;
+		return this.channels[channel].length;
+	}
+
+	public addListener(event: TSocketEvents, callback: TListenerCallback): EventListener | undefined {
 		if (!SocketEvents.includes(event)) return;
 		return this.events.addListener(event, callback);
 	}
 }
 
 export type {
-	TListen
+	Listener,
+	EventListener
 };
 
 export default Larasopp;

package/src/types.ts

@@ -12,10 +12,6 @@ export type TListenerCallback = (data:{channel: string}) => void;
 
 export type TPermissions = 'public' | 'protected' | 'private';
 
-export type TListen = {
-	remove: () => void;
-};
-
 export type TMessage<T> = {
 	subscribe?: string;
 	unsubscribe?: string;