angelia.io 2.4.74 → 2.4.77

package/client/index.js

@@ -1,15 +1,15 @@
 'use strict'
 
-const ClientWebWorker = `class ClientWebWorker {
+class ClientWebWorker {
 	constructor() {
-		Blob.prototype.toJSON = function(){
+		Blob.prototype.toJSON = function () {
 			return {
-				b: new FileReaderSync().readAsDataURL(this)
+				b: new FileReaderSync().readAsDataURL(this),
 			}
 		}
-		ArrayBuffer.prototype.toJSON = function(){
+		ArrayBuffer.prototype.toJSON = function () {
 			return {
-				a: new FileReaderSync().readAsDataURL(this)
+				a: new FileReaderSync().readAsDataURL(this),
 			}
 		}
 
@@ -50,10 +50,7 @@ const ClientWebWorker = `class ClientWebWorker {
 	}
 
 	connect(options) {
-		if (
-			this.reconnect &&
-			(!this.io || this.io.readyState === WebSocket.CLOSED)
-		) {
+		if (this.reconnect && (!this.io || this.io.readyState === WebSocket.CLOSED)) {
 			let url = new URL(options.url)
 
 			// parms creation
@@ -68,12 +65,7 @@ const ClientWebWorker = `class ClientWebWorker {
 			}
 			url.search = Object.entries(params)
 				.filter(([k, v]) => {
-					return !(
-						k === undefined ||
-						k === null ||
-						v === undefined ||
-						v === null
-					)
+					return !(k === undefined || k === null || v === undefined || v === null)
 				})
 				.map(([k, v]) => encodeURIComponent(k) + '=' + encodeURIComponent(v))
 				.join('&')
@@ -222,7 +214,7 @@ const ClientWebWorker = `class ClientWebWorker {
 		}
 		return id
 	}
-}`
+}
 
 class Client {
 	constructor(options) {
@@ -240,7 +232,7 @@ class Client {
 		}
 
 		const io = new Worker(
-			URL.createObjectURL(new Blob(["'use strict';new (" + ClientWebWorker + ')']), {
+			URL.createObjectURL(new Blob(["'use strict';new (" + ClientWebWorker.toString() + ')']), {
 				type: 'application/javascript; charset=utf-8',
 			}),
 		)
@@ -275,7 +267,7 @@ class Client {
 		window.addEventListener('unload', () => this.disconnect(true), true)
 
 		// to send messages fast without waiting for the connection
-		shouldConnect && Promise.resolve().then(() => this.connect())
+		shouldConnect && this.connect()
 	}
 
 	// public API

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "angelia.io",
-	"version": "2.4.74",
+	"version": "2.4.77",
 	"description": "WebSockets Server and Client API for node.js and the browser, with rooms support.",
 	"homepage": "https://github.com/titoBouzout/angelia.io",
 	"repository": {
@@ -46,54 +46,5 @@
 		"arrowParens": "avoid",
 		"quoteProps": "preserve",
 		"proseWrap": "preserve"
-	},
-	"eslintConfig": {
-		"env": {
-			"browser": true,
-			"node": true,
-			"es6": true
-		},
-		"parser": "babel-eslint",
-		"extends": "eslint:recommended",
-		"parserOptions": {
-			"ecmaFeatures": {
-				"experimentalObjectRestSpread": true,
-				"jsx": true,
-				"impliedStrict": true,
-				"es6": true
-			},
-			"es6": true,
-			"ecmaVersion": 6,
-			"sourceType": "module",
-			"allowImportExportEverywhere": false,
-			"codeFrame": false
-		},
-		"plugins": [
-			"react"
-		],
-		"rules": {
-			"comma-dangle": "off",
-			"indent": "off",
-			"linebreak-style": [
-				"error",
-				"unix"
-			],
-			"no-cond-assign": "off",
-			"no-console": "off",
-			"no-empty": "off",
-			"no-extra-boolean-cast": "off",
-			"no-extra-semi": "off",
-			"no-fallthrough": "off",
-			"no-func-assign": "off",
-			"no-inner-declarations": "off",
-			"no-mixed-spaces-and-tabs": "off",
-			"no-redeclare": "off",
-			"no-tabs": "off",
-			"no-undef": "off",
-			"no-global-assign": "off",
-			"no-unreachable": "off",
-			"no-unused-vars": "off",
-			"strict": "off"
-		}
 	}
 }

package/server/Server.js

@@ -147,9 +147,9 @@ class ServerSingleton {
 				if (!io.closing) {
 					io.closing = true
 					if (options.debug) {
-						console.log('Server Shutting Down\n', this)
+						console.log('Socket Server Shutting Down\n', this)
 					} else {
-						console.log('Server Shutting Down\n')
+						console.log('Socket Server Shutting Down\n')
 					}
 					io.close()
 					if (options.debug) {