larasopp 1.2.5 → 1.2.7

package/README.md

@@ -16,11 +16,13 @@ composer require larasopp/larasopp
 import Larasopp from "Larasopp";
 
 const larasopp = new Larasopp({
-	host: '127.0.0.1:9002',
+	host: 'ws://127.0.0.1:3001',
 	token: 'token'
 });
 
 larasopp.connect();
+//or
+larasopp.connect('token');
 
 ```
 

package/lib/Core.d.ts

@@ -20,10 +20,14 @@ export type TMessage<T> = {
     message?: T;
     type?: TPermissions;
 };
+export type TConfigDataReviver = {
+    [index: string]: (value: any) => any;
+};
 export interface IConfig {
     host: string;
     token?: string;
-    tls?: boolean;
+    reviver?: (this: any, key: string, value: any) => any;
+    dataReviver?: TConfigDataReviver;
 }
 export type TChannels = {
     [channel: string]: Listener[];
@@ -31,7 +35,6 @@ export type TChannels = {
 declare abstract class Core {
     readonly events: Events;
     private ws?;
-    protected _status: boolean;
     private _socketId?;
     private config;
     constructor(config: IConfig);
@@ -41,7 +44,7 @@ declare abstract class Core {
      * Connect to websocket
      * @returns {this}
      */
-    connect(): this;
+    connect(token?: string): this;
     /**
      * Disconnect
      * @returns {void}
@@ -51,6 +54,7 @@ declare abstract class Core {
     private handleOpen;
     private handleClose;
     private handleError;
+    private jsonParse;
     private handleMessage;
     private emitListener;
     get socketId(): string | undefined;

package/lib/Core.js

@@ -21,12 +21,6 @@ class Core {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "_status", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         Object.defineProperty(this, "_socketId", {
             enumerable: true,
             configurable: true,
@@ -40,15 +34,14 @@ class Core {
             value: void 0
         });
         this.events = new easy_event_emitter_1.default;
-        this.config = Object.assign({ tls: false }, config);
-        this._status = false;
+        this.config = config;
         this.handleOpen = this.handleOpen.bind(this);
         this.handleClose = this.handleClose.bind(this);
         this.handleError = this.handleError.bind(this);
         this.handleMessage = this.handleMessage.bind(this);
     }
     setConfig(config) {
-        this.config = Object.assign({ tls: false }, config);
+        this.config = config;
     }
     setToken(token) {
         this.config = Object.assign(Object.assign({}, this.config), { token });
@@ -60,12 +53,11 @@ class Core {
      * Connect to websocket
      * @returns {this}
      */
-    connect() {
+    connect(token) {
         try {
-            const host = [(this.config.tls ? 'wss' : 'ws') + '://'];
-            host.push(this.config.host);
+            const host = [this.config.host];
             if (this.config.token)
-                host.push('/token=' + this.config.token);
+                host.push('/token=' + (token !== null && token !== void 0 ? token : this.config.token));
             this.ws = new WebSocket(host.join(''));
             this.ws.onopen = this.handleOpen;
             this.ws.onclose = this.handleClose;
@@ -87,7 +79,6 @@ class Core {
         var _a;
         if (this.status) {
             (_a = this.ws) === null || _a === void 0 ? void 0 : _a.close();
-            this._status = false;
         }
         this.ws = undefined;
     }
@@ -101,19 +92,37 @@ class Core {
         return true;
     }
     handleOpen(e) {
-        this._status = true;
         this.events.emit("open", e);
     }
     handleClose(e) {
-        this._status = false;
         this.events.emit("close", e);
     }
     handleError(e) {
         this.events.emit("error", e);
     }
+    jsonParse(str) {
+        if (this.config) {
+            if (typeof this.config.reviver === 'function') {
+                return JSON.parse(str, this.config.reviver);
+            }
+            if (this.config.dataReviver) {
+                const replace = this.config.dataReviver;
+                return JSON.parse(str, (key, value) => {
+                    if (key === "createdAt" || key === "updatedAt") {
+                        return new Date(value);
+                    }
+                    if (key in replace && typeof replace[key] === 'function') {
+                        return replace[key](value);
+                    }
+                    return value;
+                });
+            }
+        }
+        return JSON.parse(str);
+    }
     handleMessage(e) {
         if (this.isJson(e.data)) {
-            const json = JSON.parse(e.data);
+            const json = this.jsonParse(e.data);
             if (json.socket_id) {
                 this._socketId = json.socket_id;
                 return;
@@ -133,10 +142,13 @@ class Core {
         return this._socketId;
     }
     get status() {
-        return this._status;
+        var _a, _b;
+        if (!this.ws)
+            return false;
+        return ((_a = this.ws) === null || _a === void 0 ? void 0 : _a.readyState) === ((_b = this.ws) === null || _b === void 0 ? void 0 : _b.OPEN);
     }
     _send(message) {
-        if (!this.ws)
+        if (!this.ws || !this.status)
             return;
         this.ws.send(JSON.stringify(message));
     }

package/package.json

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

package/src/Core.ts

@@ -27,10 +27,15 @@ export type TMessage<T> = {
 	type?: TPermissions;
 }
 
+export type TConfigDataReviver = {
+	[index: string]: (value: any) => any;
+};
+
 export interface IConfig {
 	host: string;
 	token?: string;
-	tls?: boolean;
+	reviver?: (this: any, key: string, value: any) => any;
+	dataReviver?: TConfigDataReviver;
 }
 
 export type TChannels = {
@@ -40,18 +45,13 @@ export type TChannels = {
 abstract class Core {
 	public readonly events: Events;
 	private ws?: WebSocket;
-	protected _status: boolean;
 	private _socketId?: string;
 	private config: IConfig;
 
 	constructor(config: IConfig) {
 		this.events = new EventEmitter;
 
-		this.config = {
-			tls: false,
-			...config,
-		};
-		this._status = false;
+		this.config = config;
 		
 		this.handleOpen = this.handleOpen.bind(this);
 		this.handleClose = this.handleClose.bind(this);
@@ -60,10 +60,7 @@ abstract class Core {
 	}
 
 	public setConfig(config: IConfig): void {
-		this.config = {
-			tls: false,
-			...config,
-		};
+		this.config = config;
 	}
 
 	public setToken(token: string): void {
@@ -80,11 +77,10 @@ abstract class Core {
 	 * Connect to websocket
 	 * @returns {this}
 	 */
-	public connect(): this {
+	public connect(token?: string): this {
 		try {
-			const host = [(this.config.tls ? 'wss' : 'ws') + '://'];
-			host.push(this.config.host);
-			if (this.config.token) host.push('/token=' + this.config.token);
+			const host = [this.config.host];
+			if (this.config.token) host.push('/token=' + (token ?? this.config.token));
 
 			this.ws = new WebSocket(host.join(''));
 			this.ws.onopen = this.handleOpen;
@@ -107,7 +103,6 @@ abstract class Core {
 	public disconnect(): void {
 		if (this.status) {
 			this.ws?.close();
-			this._status = false;
 		}
 		this.ws = undefined;
 	}
@@ -122,12 +117,10 @@ abstract class Core {
 	}
 
 	private handleOpen(e: Event): void {
-		this._status = true;
 		this.events.emit("open", e);
 	}
 
 	private handleClose(e: CloseEvent): void {
-		this._status = false;
 		this.events.emit("close", e);
 	}
 
@@ -135,9 +128,32 @@ abstract class Core {
 		this.events.emit("error", e);
 	}
 
+	private jsonParse(str: string) {
+		if (this.config) {
+			if (typeof this.config.reviver === 'function') {
+				return JSON.parse(str, this.config.reviver);
+			}
+	
+			if (this.config.dataReviver) {
+				const replace = this.config.dataReviver;
+				return JSON.parse(str, (key, value) => {
+					if (key === "createdAt" || key === "updatedAt") {
+						return new Date(value);
+					}
+					if (key in replace && typeof replace[key] === 'function') {
+						return replace[key](value);
+					}
+					return value;
+				});
+			}
+		}
+		
+		return JSON.parse(str);
+	}
+
 	private handleMessage(e: MessageEvent): void {
 		if (this.isJson(e.data)) {
-			const json = JSON.parse(e.data);
+			const json = this.jsonParse(e.data);
 			if (json.socket_id) {
 				this._socketId = json.socket_id;
 				return;
@@ -160,11 +176,12 @@ abstract class Core {
 	}
 
 	public get status(): boolean {
-		return this._status;
+		if (!this.ws) return false;
+		return this.ws?.readyState === this.ws?.OPEN;
 	}
 
 	private _send<T>(message: TMessage<T>) {
-		if (!this.ws) return;
+		if (!this.ws || !this.status) return;
 		this.ws.send(JSON.stringify(message));
 	}