larasopp 1.2.6 → 1.2.8

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

@@ -26,7 +26,6 @@ export type TConfigDataReviver = {
 export interface IConfig {
     host: string;
     token?: string;
-    tls?: boolean;
     reviver?: (this: any, key: string, value: any) => any;
     dataReviver?: TConfigDataReviver;
 }
@@ -45,7 +44,7 @@ declare abstract class Core {
      * Connect to websocket
      * @returns {this}
      */
-    connect(): this;
+    connect(token?: string): this;
     /**
      * Disconnect
      * @returns {void}

package/lib/Core.js

@@ -34,14 +34,14 @@ class Core {
             value: void 0
         });
         this.events = new easy_event_emitter_1.default;
-        this.config = Object.assign({ tls: false }, config);
+        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 });
@@ -53,13 +53,10 @@ class Core {
      * Connect to websocket
      * @returns {this}
      */
-    connect() {
+    connect(token) {
         try {
-            const host = [(this.config.tls ? 'wss' : 'ws') + '://'];
-            host.push(this.config.host);
-            if (this.config.token)
-                host.push('/token=' + this.config.token);
-            this.ws = new WebSocket(host.join(''));
+            const host = this.config.host + '/token=' + (token !== null && token !== void 0 ? token : this.config.token);
+            this.ws = new WebSocket(encodeURI(host));
             this.ws.onopen = this.handleOpen;
             this.ws.onclose = this.handleClose;
             this.ws.onerror = this.handleError;

package/package.json

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

package/src/Core.ts

@@ -34,7 +34,6 @@ export type TConfigDataReviver = {
 export interface IConfig {
 	host: string;
 	token?: string;
-	tls?: boolean;
 	reviver?: (this: any, key: string, value: any) => any;
 	dataReviver?: TConfigDataReviver;
 }
@@ -52,10 +51,7 @@ abstract class Core {
 	constructor(config: IConfig) {
 		this.events = new EventEmitter;
 
-		this.config = {
-			tls: false,
-			...config,
-		};
+		this.config = config;
 		
 		this.handleOpen = this.handleOpen.bind(this);
 		this.handleClose = this.handleClose.bind(this);
@@ -64,10 +60,7 @@ abstract class Core {
 	}
 
 	public setConfig(config: IConfig): void {
-		this.config = {
-			tls: false,
-			...config,
-		};
+		this.config = config;
 	}
 
 	public setToken(token: string): void {
@@ -84,13 +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);
-
-			this.ws = new WebSocket(host.join(''));
+			const host = this.config.host + '/token=' + (token ?? this.config.token);
+			this.ws = new WebSocket(encodeURI(host));
 			this.ws.onopen = this.handleOpen;
 			this.ws.onclose = this.handleClose;
 			this.ws.onerror = this.handleError;