angelia.io 2.4.77 → 2.4.79

package/client/index.js

@@ -50,7 +50,10 @@ 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
@@ -65,9 +68,17 @@ 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))
+				.map(
+					([k, v]) =>
+						encodeURIComponent(k) + '=' + encodeURIComponent(v),
+				)
 				.join('&')
 
 			url = url.toString()
@@ -232,11 +243,17 @@ class Client {
 		}
 
 		const io = new Worker(
-			URL.createObjectURL(new Blob(["'use strict';new (" + ClientWebWorker.toString() + ')']), {
-				type: 'application/javascript; charset=utf-8',
-			}),
+			URL.createObjectURL(
+				new Blob(
+					["'use strict';new (" + ClientWebWorker.toString() + ')'],
+					{
+						type: 'application/javascript; charset=utf-8',
+					},
+				),
+			),
 		)
-		let shouldConnect = options.dontConnect !== undefined ? !options.dontConnect : true
+		let shouldConnect =
+			options.dontConnect !== undefined ? !options.dontConnect : true
 
 		Object.assign(this, {
 			url: options.url,
@@ -264,7 +281,11 @@ class Client {
 		this.on('disconnect', this.disconnect)
 
 		// to try to close the connection nicely
-		window.addEventListener('unload', () => this.disconnect(true), true)
+		window.addEventListener(
+			'unload',
+			() => this.disconnect(true),
+			true,
+		)
 
 		// to send messages fast without waiting for the connection
 		shouldConnect && this.connect()
@@ -277,7 +298,10 @@ class Client {
 			'connect',
 			{
 				url: this.url,
-				params: typeof this.params === 'function' ? this.params() || {} : {},
+				params:
+					typeof this.params === 'function'
+						? this.params() || {}
+						: {},
 			},
 		])
 	}
@@ -307,16 +331,28 @@ class Client {
 			this.listeners[k].push(v)
 			return () => this.off(k, v)
 		} else {
-			console.error('ws - socket.on("' + k + '", callback) key and callback cannot be empty')
+			console.error(
+				'ws - socket.on("' +
+					k +
+					'", callback) key and callback cannot be empty',
+			)
 		}
 	}
 	off(k, v) {
 		if (!this.listeners[k]) {
-			console.error('ws - socket.off("' + k + '", callback)', k, 'key not found')
+			console.error(
+				'ws - socket.off("' + k + '", callback)',
+				k,
+				'key not found',
+			)
 		} else {
 			let i = this.listeners[k].indexOf(v)
 			if (i === -1) {
-				console.error('ws - socket.off("' + k + '", callback)', v, 'callback not found')
+				console.error(
+					'ws - socket.off("' + k + '", callback)',
+					v,
+					'callback not found',
+				)
 			} else {
 				this.listeners[k].splice(i, 1)
 			}

package/index.js

@@ -1,4 +1,4 @@
-module.exports = function() {
+module.exports = function () {
 	throw new Error(`
 Usage on Server:
 import Server from 'angelia.io/server'

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "angelia.io",
-	"version": "2.4.77",
+	"version": "2.4.79",
 	"description": "WebSockets Server and Client API for node.js and the browser, with rooms support.",
 	"homepage": "https://github.com/titoBouzout/angelia.io",
 	"repository": {
@@ -35,16 +35,18 @@
 		"ws": "^7.x.x"
 	},
 	"prettier": {
-		"printWidth": 100,
+		"printWidth": 70,
 		"useTabs": true,
 		"semi": false,
 		"singleQuote": true,
+		"quoteProps": "as-needed",
 		"jsxSingleQuote": false,
 		"trailingComma": "all",
 		"bracketSpacing": true,
-		"jsxBracketSameLine": false,
+		"bracketSameLine": false,
 		"arrowParens": "avoid",
-		"quoteProps": "preserve",
-		"proseWrap": "preserve"
+		"proseWrap": "never",
+		"endOfLine": "lf",
+		"singleAttributePerLine": true
 	}
 }

package/publish.bat

@@ -1,13 +1 @@
-
-git add --all
-git commit -m "update"
-
-call npm version patch
-
-git add --all
-git commit -m "update version"
-
-git push --all --prune
-
-call npm publish
-
+publish-package

package/server/Listeners.js

@@ -135,12 +135,14 @@ class Listeners {
 	// isobject <https://github.com/jonschlinkert/isobject>
 	// MIT license - Copyright (c) 2014-2017, Jon Schlinkert.
 	isObject(o) {
-		return o != null && typeof o === 'object' && Array.isArray(o) === false
+		return (
+			o != null && typeof o === 'object' && Array.isArray(o) === false
+		)
 	}
 	// is-class <https://github.com/miguelmota/is-class>
 	// MIT license - Copyright (C) 2014 Miguel Mota
 	isClass() {
-		;(function(root) {
+		;(function (root) {
 			const toString = Function.prototype.toString
 
 			function fnBody(fn) {
@@ -163,7 +165,9 @@ class Listeners {
 				const body = fnBody(fn)
 				return (
 					/classCallCheck\(/.test(body) ||
-					/TypeError\("Cannot call a class as a function"\)/.test(body)
+					/TypeError\("Cannot call a class as a function"\)/.test(
+						body,
+					)
 				)
 			}
 		})(Listeners.prototype)

package/server/Server.js

@@ -79,7 +79,10 @@ class ServerSingleton {
 			},
 		})
 
-		this.pingData = this.WebSocket.Sender.frame(Buffer.from(''), this.WebSocketFrame)
+		this.pingData = this.WebSocket.Sender.frame(
+			Buffer.from(''),
+			this.WebSocketFrame,
+		)
 		this.disconnectData = this.WebSocket.Sender.frame(
 			Buffer.from(JSON.stringify([['disconnect', true]])),
 			this.WebSocketFrame,
@@ -88,16 +91,23 @@ class ServerSingleton {
 
 	listen(options) {
 		Object.assign(this, {
-			port: +options.port > 0 && +options.port <= 65535 ? +options.port : this.port,
+			port:
+				+options.port > 0 && +options.port <= 65535
+					? +options.port
+					: this.port,
 			hostname: options.hostname || this.hostname,
-			maxMessageSize: +options.maxMessageSize > 0 ? +options.maxMessageSize : this.maxMessageSize,
+			maxMessageSize:
+				+options.maxMessageSize > 0
+					? +options.maxMessageSize
+					: this.maxMessageSize,
 			cert: options.cert || this.cert,
 			key: options.key || this.key,
 			http: options.http || this.http,
 
 			since: Date.now(),
 			now: Date.now(),
-			timeout: +options.timeout >= 10000 ? +options.timeout : this.timeout,
+			timeout:
+				+options.timeout >= 10000 ? +options.timeout : this.timeout,
 		})
 		this.timeoutCheck = this.timeout / 2
 
@@ -134,7 +144,9 @@ class ServerSingleton {
 			clientTracking: false,
 			backlog: 1024,
 			skipUTF8Validation:
-				options.skipUTF8Validation !== undefined ? options.skipUTF8Validation : false,
+				options.skipUTF8Validation !== undefined
+					? options.skipUTF8Validation
+					: false,
 		})
 
 		io.on('connection', this.onconnect)
@@ -142,23 +154,6 @@ class ServerSingleton {
 
 		this.http.listen(this.port, this.hostname || null)
 
-		for (let m of ['RESTART', 'SIGINT', 'SIGTERM', 'SIGBREAK']) {
-			process.on(m, () => {
-				if (!io.closing) {
-					io.closing = true
-					if (options.debug) {
-						console.log('Socket Server Shutting Down\n', this)
-					} else {
-						console.log('Socket Server Shutting Down\n')
-					}
-					io.close()
-					if (options.debug) {
-						process.exit()
-					}
-				}
-			})
-		}
-
 		console.log('Socket Server Started Listening On Port ', this.port)
 		this.events.listen && this.events.listen()
 	}
@@ -229,7 +224,11 @@ class ServerSingleton {
 		Object.assign(socket, {
 			ip: (
 				this.ip(request.connection.remoteAddress) ||
-				this.ip((request.headers['x-forwarded-for'] || '').split(/\s*,\s*/)[0]) ||
+				this.ip(
+					(request.headers['x-forwarded-for'] || '').split(
+						/\s*,\s*/,
+					)[0],
+				) ||
 				request.connection.remoteAddress ||
 				(request.headers['x-forwarded-for'] || '').split(/\s*,\s*/)[0]
 			).replace(/^::ffff:/, ''),
@@ -285,7 +284,10 @@ class ServerSingleton {
 			let json = JSON.stringify(messages)
 			this.bytesSent += json.length
 			socket.bytesSent += json.length
-			this.cache[id] = this.WebSocket.Sender.frame(Buffer.from(json), this.WebSocketFrame)
+			this.cache[id] = this.WebSocket.Sender.frame(
+				Buffer.from(json),
+				this.WebSocketFrame,
+			)
 		} else {
 			this.messagesSentCacheHit++
 		}
@@ -303,7 +305,8 @@ class ServerSingleton {
 			if (delay > this.timeout) {
 				// timedout
 				socket.timedout = true
-				this.events.timeout && this.events.timeout(socket.proxy, delay)
+				this.events.timeout &&
+					this.events.timeout(socket.proxy, delay)
 				socket.io.terminate()
 			} else if (delay > this.timeoutCheck - 5000) {
 				/*
@@ -352,11 +355,21 @@ class ServerSingleton {
 			}
 			default: {
 				if (
-					/^(::f{4}:)?10\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(i) ||
-					/^(::f{4}:)?192\.168\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(i) ||
-					/^(::f{4}:)?172\.(1[6-9]|2\d|30|31)\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(i) ||
-					/^(::f{4}:)?127\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(i) ||
-					/^(::f{4}:)?169\.254\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(i) ||
+					/^(::f{4}:)?10\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(
+						i,
+					) ||
+					/^(::f{4}:)?192\.168\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(
+						i,
+					) ||
+					/^(::f{4}:)?172\.(1[6-9]|2\d|30|31)\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(
+						i,
+					) ||
+					/^(::f{4}:)?127\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(
+						i,
+					) ||
+					/^(::f{4}:)?169\.254\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(
+						i,
+					) ||
 					/^f[cd][0-9a-f]{2}:/i.test(i) ||
 					/^fe80:/i.test(i)
 				)
@@ -458,7 +471,10 @@ class ServerSingleton {
 		// listeners
 		for (let l in this.events) {
 			// listener
-			console.log('this.events.' + l, this.HasFastProperties(this.events[l]))
+			console.log(
+				'this.events.' + l,
+				this.HasFastProperties(this.events[l]),
+			)
 			// methods
 			if (this.events[l].fns) {
 				for (let m in this.events[l].fns) {
@@ -471,9 +487,15 @@ class ServerSingleton {
 		}
 
 		// classes
-		console.log('this.events', this.HasFastProperties(this.events.classes))
+		console.log(
+			'this.events',
+			this.HasFastProperties(this.events.classes),
+		)
 		for (let m in this.events.classes) {
-			console.log('this.events.' + m, this.HasFastProperties(this.events.classes[m]))
+			console.log(
+				'this.events.' + m,
+				this.HasFastProperties(this.events.classes[m]),
+			)
 			// class
 			for (let f in this.events.classes[m]) {
 				// methods

package/server/Socket.js

@@ -84,7 +84,8 @@ class Socket {
 	}
 	disconnect(noReconnect) {
 		if (noReconnect) {
-			for (let m of this.server.disconnectData) this.io._socket.write(m)
+			for (let m of this.server.disconnectData)
+				this.io._socket.write(m)
 		}
 		this.io.close()
 	}