larasopp 1.2.0 → 1.2.3

package/lib/Core.js

@@ -61,10 +61,6 @@ class Core {
      * @returns {this}
      */
     connect() {
-        if (!navigator.onLine) {
-            setTimeout(this.connect.bind(this), 5000);
-            return this;
-        }
         try {
             const host = [(this.config.tls ? 'wss' : 'ws') + '://'];
             host.push(this.config.host);
@@ -93,7 +89,7 @@ class Core {
             (_a = this.ws) === null || _a === void 0 ? void 0 : _a.close();
             this._status = false;
         }
-        this.ws = null;
+        this.ws = undefined;
     }
     isJson(str) {
         try {
@@ -137,6 +133,8 @@ class Core {
         return this._socketId;
     }
     get status() {
+        if (!this._status)
+            this.connect();
         return this._status;
     }
     _send(message) {

package/lib/index.d.ts

@@ -4,6 +4,7 @@ import Listener from "./Listener";
 declare class Larasopp extends Core {
     private readonly channels;
     constructor(config: IConfig);
+    private listenResumeSubscribes;
     subscribe(channel: string): Listener;
     unsubscribe(channel: string): void;
     trigger<T>(channel: string, event: string, message: T, permission?: TPermissions, waitSubscribe?: boolean): void;

package/lib/index.js

@@ -38,6 +38,14 @@ class Larasopp extends Core_1.default {
             value: void 0
         });
         this.channels = {};
+        this.listenResumeSubscribes();
+    }
+    listenResumeSubscribes() {
+        this.addListener('open', () => {
+            Object.keys(this.channels).forEach((channel) => this.send({
+                subscribe: channel
+            }));
+        });
     }
     subscribe(channel) {
         const listener = new Listener_1.default(channel, this);

package/package.json

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

package/src/Core.ts

@@ -39,7 +39,7 @@ export type TChannels = {
 
 abstract class Core {
 	public readonly events: Events;
-	private ws?: WebSocket | null;
+	private ws?: WebSocket;
 	protected _status: boolean;
 	private _socketId?: string;
 	private config: IConfig;
@@ -52,7 +52,7 @@ abstract class Core {
 			...config,
 		};
 		this._status = false;
-
+		
 		this.handleOpen = this.handleOpen.bind(this);
 		this.handleClose = this.handleClose.bind(this);
 		this.handleError = this.handleError.bind(this);
@@ -81,12 +81,6 @@ abstract class Core {
 	 * @returns {this}
 	 */
 	public connect(): this {
-
-		if (!navigator.onLine) {
-			setTimeout(this.connect.bind(this), 5000);
-			return this;
-		}
-
 		try {
 			const host = [(this.config.tls ? 'wss' : 'ws') + '://'];
 			host.push(this.config.host);
@@ -115,7 +109,7 @@ abstract class Core {
 			this.ws?.close();
 			this._status = false;
 		}
-		this.ws = null;
+		this.ws = undefined;
 	}
 
 	protected isJson(str: string) {
@@ -166,6 +160,7 @@ abstract class Core {
 	}
 
 	public get status(): boolean {
+		if (!this._status) this.connect();
 		return this._status;
 	}
 

package/src/index.ts

@@ -19,6 +19,16 @@ class Larasopp extends Core {
 		super(config);
 		
 		this.channels = {};
+
+		this.listenResumeSubscribes();
+	}
+
+	private listenResumeSubscribes() {
+		this.addListener('open', () => {
+			Object.keys(this.channels).forEach((channel) => this.send({
+				subscribe: channel
+			}));
+		});
 	}
 
 	public subscribe(channel: string) {