angelia.io 1.64.0 → 1.67.0

package/client/index.js

@@ -240,20 +240,18 @@ class Client {
 		}
 
 		const io = new Worker(
-			URL.createObjectURL(
-				new Blob(["'use strict';new (" + ClientWebWorker + ')']),
-				{
-					type: 'application/javascript; charset=utf-8',
-				},
-			),
+			URL.createObjectURL(new Blob(["'use strict';new (" + ClientWebWorker + ')']), {
+				type: 'application/javascript; charset=utf-8',
+			}),
 		)
+		let shouldConnect = options.dontConnect !== undefined ? !options.dontConnect : true
 
 		Object.assign(this, {
 			url: options.url,
 			params: options.params,
 			longLiveFlash: options.longLiveFlash,
-
-			connected: true,
+			shouldConnect: shouldConnect,
+			connected: shouldConnect,
 			messages: [],
 			listeners: {
 				'': [this.oncallback.bind(this)],
@@ -277,7 +275,7 @@ class Client {
 		window.addEventListener('unload', () => this.disconnect(true), true)
 
 		// to send messages fast without waiting for the connection
-		Promise.resolve().then(() => this.connect())
+		shouldConnect && Promise.resolve().then(() => this.connect())
 	}
 
 	// public API
@@ -317,28 +315,16 @@ 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)
 			}
@@ -410,7 +396,7 @@ class Client {
 				break
 			}
 			case 'connect': {
-				this.connect()
+				if (this.shouldConnect) this.connect()
 				break
 			}
 			case 'connected': {
@@ -419,10 +405,10 @@ class Client {
 			}
 		}
 	}
-	decode(s){
+	decode(s) {
 		if (s.b) {
 			return fetch(s.b).then(r => r.blob())
-		} else if(s.a) {
+		} else if (s.a) {
 			return fetch(s.a).then(r => r.arrayBuffer())
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "angelia.io",
-	"version": "1.64.0",
+	"version": "1.67.0",
 	"description": "WebSockets Server and Client API for node.js and the browser, with rooms support.",
 	"homepage": "https://github.com/titoBouzout/angelia.io",
 	"repository": {
@@ -32,7 +32,7 @@
 		"isobject": "^4.0.0",
 		"to-fast-properties": "^3.0.1",
 		"utf-8-validate": "^5.0.4",
-		"ws": "^7.4.3"
+		"ws": "^7.x.x"
 	},
 	"prettier": {
 		"printWidth": 100,

package/readme.md

@@ -85,13 +85,15 @@ const server = new Server.listen({
 })
 ```
 
-| name             | kind   | default | description                                         |
-| ---------------- | ------ | ------- | --------------------------------------------------- |
-| `hostname`       | String | ''      | the hostname if any                                 |
-| `port`           | Number | 3001    | the port to use for this server                     |
-| `maxMessageSize` | Number | 5       | max size in mb of a message received                |
-| `cert`           | String | ''      | path to the cert file for using https fullchain.pem |
-| `key`            | String | ''      | path to the key file for using https privkey.pem    |
+| name                 | kind    | default | description                                         |
+| -------------------- | ------- | ------- | --------------------------------------------------- |
+| `hostname`           | String  | ''      | the hostname if any                                 |
+| `port`               | Number  | 3001    | the port to use for this server                     |
+| `maxMessageSize`     | Number  | 5       | max size in mb of a message received                |
+| `skipUTF8Validation` | Boolean | false   | allows to skip utf8 validation                      |
+| `dontConnect`        | Boolean | false   | allows to instance the socket without connecting    |
+| `cert`               | String  | ''      | path to the cert file for using https fullchain.pem |
+| `key`                | String  | ''      | path to the key file for using https privkey.pem    |
 
 ### Server Object
 

package/server/Server.js

@@ -78,10 +78,7 @@ 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,
@@ -90,13 +87,9 @@ 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,
 
@@ -135,6 +128,8 @@ class ServerSingleton {
 			maxPayload: this.maxMessageSize * 1024 * 1024,
 			clientTracking: false,
 			backlog: 1024,
+			skipUTF8Validation:
+				options.skipUTF8Validation !== undefined ? options.skipUTF8Validation : false,
 		})
 
 		io.on('connection', this.onconnect)
@@ -229,9 +224,7 @@ 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:/, ''),
@@ -287,10 +280,7 @@ 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++
 		}
@@ -349,12 +339,8 @@ class ServerSingleton {
 				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}:)?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)
@@ -472,10 +458,7 @@ class ServerSingleton {
 		// 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