angelia.io 2.4.78 → 3.4.80

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()
@@ -216,7 +227,7 @@ class ClientWebWorker {
 	}
 }
 
-class Client {
+export class Client {
 	constructor(options) {
 		if (!options || typeof options === 'string') {
 			options = {
@@ -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)
 			}
@@ -405,18 +441,3 @@ class Client {
 		}
 	}
 }
-
-;(function (root) {
-	if (typeof exports !== 'undefined') {
-		if (typeof module !== 'undefined' && module.exports) {
-			exports = module.exports = Client
-		}
-		exports.Client = Client
-	} else if (typeof define === 'function' && define.amd) {
-		define([], function () {
-			return Client
-		})
-	} else {
-		root.Client = Client
-	}
-})(this)

package/index.js

@@ -1,5 +1,4 @@
-module.exports = function() {
-	throw new Error(`
+throw new Error(`
 Usage on Server:
 import Server from 'angelia.io/server'
 
@@ -8,4 +7,3 @@ import Client from 'angelia.io/client'
 
 See readme: https://github.com/titoBouzout/angelia.io
 `)
-}

package/package.json

@@ -1,12 +1,13 @@
 {
 	"name": "angelia.io",
-	"version": "2.4.78",
+	"version": "3.4.80",
 	"description": "WebSockets Server and Client API for node.js and the browser, with rooms support.",
 	"homepage": "https://github.com/titoBouzout/angelia.io",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/titoBouzout/angelia.io"
 	},
+	"type": "module",
 	"main": "index.js",
 	"keywords": [
 		"Client",
@@ -32,19 +33,21 @@
 		"isobject": "^4.0.0",
 		"to-fast-properties": "^3.0.1",
 		"utf-8-validate": "^5.0.4",
-		"ws": "^7.x.x"
+		"ws": "^8.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

@@ -1,5 +1,3 @@
-'use strict'
-
 const inspect = Symbol.for('nodejs.util.inspect.custom')
 
 class Listeners {
@@ -135,12 +133,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 +163,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)
@@ -192,4 +194,6 @@ class Listeners {
 
 Listeners.prototype.isClass()
 
-module.exports = Listeners
+const listeners = new Listeners()
+
+export { listeners as Listeners }

package/server/Server.js

@@ -1,11 +1,19 @@
-'use strict'
-
 const inspect = Symbol.for('nodejs.util.inspect.custom')
 
-const Listeners = new (require('./Listeners.js'))()
-const Manager = require('./rooms/Manager.js')
+import { Listeners } from './Listeners.js'
+
+import { Manager } from './rooms/Manager.js'
+import { Room } from './rooms/Room.js'
+// const toFastProperties = require('to-fast-properties')
+import url from 'node:url'
+import { Socket } from './Socket.js'
+
+import fs from 'node:fs'
+
+import * as http from 'http'
+import * as https from 'https'
 
-const toFastProperties = require('to-fast-properties')
+import WebSocket, { WebSocketServer } from 'ws'
 
 class ServerSingleton {
 	constructor() {
@@ -49,16 +57,17 @@ class ServerSingleton {
 
 			_track: Manager.track,
 			rooms: Manager.rooms,
-			Room: require('./rooms/Room.js'),
+			Room,
 			observe: Manager.observe,
 
 			cacheIds: Symbol('cache'),
 			cacheId: 1,
 			cache: Object.create(null),
 
-			URL: require('url'),
-			Socket: require('./Socket.js'),
-			WebSocket: require('ws'),
+			URL: url,
+			Socket,
+			WebSocket,
+			WebSocketServer,
 			WebSocketFrame: {
 				readOnly: false,
 				mask: false,
@@ -79,7 +88,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,20 +100,27 @@ 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
 
-		this.ensureFastProperties()
+		// this.ensureFastProperties()
 
 		// updates ping and checks for disconnections
 		setInterval(this.ping, this.timeoutCheck)
@@ -114,8 +133,7 @@ class ServerSingleton {
 				res.end()
 			}
 			if (this.cert && this.key) {
-				let fs = require('fs')
-				this.http = require('https').createServer(
+				this.http = https.createServer(
 					{
 						cert: fs.readFileSync(this.cert), // fullchain.pem
 						key: fs.readFileSync(this.key), // privkey.pem
@@ -123,18 +141,20 @@ class ServerSingleton {
 					handle,
 				)
 			} else {
-				this.http = require('http').createServer(handle)
+				this.http = http.createServer(handle)
 			}
 		}
 
-		let io = new this.WebSocket.Server({
+		let io = new this.WebSocketServer({
 			server: this.http,
 			perMessageDeflate: false,
 			maxPayload: this.maxMessageSize * 1024 * 1024,
 			clientTracking: false,
 			backlog: 1024,
 			skipUTF8Validation:
-				options.skipUTF8Validation !== undefined ? options.skipUTF8Validation : false,
+				options.skipUTF8Validation !== undefined
+					? options.skipUTF8Validation
+					: false,
 		})
 
 		io.on('connection', this.onconnect)
@@ -163,7 +183,7 @@ class ServerSingleton {
 			},
 		})
 
-		this.ensureFastProperties()
+		// this.ensureFastProperties()
 	}
 
 	// emits to everyone connected to the server
@@ -212,7 +232,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:/, ''),
@@ -268,7 +292,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++
 		}
@@ -286,7 +313,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) {
 				/*
@@ -335,11 +363,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)
 				)
@@ -441,7 +479,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) {
@@ -454,9 +495,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
@@ -475,4 +522,4 @@ class ServerSingleton {
 
 const Server = new ServerSingleton()
 
-module.exports = Server
+export { Server, Server as default }

package/server/Socket.js

@@ -1,10 +1,8 @@
-'use strict'
-
 const inspect = Symbol.for('nodejs.util.inspect.custom')
 
-const { leave } = require('./rooms/constants.js')
+import { leave } from './rooms/constants.js'
 
-class Socket {
+export class Socket {
 	constructor(socket, server) {
 		Object.assign(this, {
 			server: server,
@@ -84,7 +82,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()
 	}
@@ -224,5 +223,3 @@ class Socket {
 		}
 	}
 }
-
-module.exports = Socket

package/server/index.js

@@ -1,3 +1,3 @@
-'use strict'
+export { Server as default } from './Server.js'
 
-module.exports = require('./Server.js')
+export * from './Server.js'

package/server/rooms/Manager.js

@@ -1,8 +1,6 @@
-'use strict'
+import { join, leave } from './constants.js'
 
-const { join, leave } = require('./constants.js')
-
-const Rooms = require('./Rooms.js')
+import { Rooms } from './Rooms.js'
 
 class ManagerSingleton {
 	constructor() {
@@ -107,6 +105,4 @@ class ManagerSingleton {
 	}
 }
 
-const Manager = new ManagerSingleton()
-
-module.exports = Manager
+export const Manager = new ManagerSingleton()

package/server/rooms/Room.js

@@ -1,8 +1,6 @@
-'use strict'
+import { join, leave, parent, add, remove } from './constants.js'
 
-const { join, leave, parent, add, remove } = require('./constants.js')
-
-class Room {
+export class Room {
 	constructor() {
 		this.sockets = new Set()
 	}
@@ -97,5 +95,3 @@ class Room {
 		return this.sockets[Symbol.iterator]()
 	}
 }
-
-module.exports = Room

package/server/rooms/Rooms.js

@@ -1,8 +1,6 @@
-'use strict'
+import { add, remove } from './constants.js'
 
-const { add, remove } = require('./constants.js')
-
-class Rooms {
+export class Rooms {
 	constructor(path) {
 		Object.assign(this, {
 			path: path,
@@ -36,5 +34,3 @@ class Rooms {
 		return this.rooms[Symbol.iterator]()
 	}
 }
-
-module.exports = Rooms

package/server/rooms/constants.js

@@ -1,17 +1,6 @@
-const join = Symbol.for('Room.join')
-const leave = Symbol.for('Room.leave')
-const parent = Symbol.for('Room.parent')
+export const join = Symbol.for('Room.join')
+export const leave = Symbol.for('Room.leave')
+export const parent = Symbol.for('Room.parent')
 
-const add = Symbol.for('Rooms.add')
-const remove = Symbol.for('Rooms.remove')
-
-module.exports = {
-	// Room
-	join,
-	leave,
-	parent,
-
-	// Rooms
-	add,
-	remove,
-}
+export const add = Symbol.for('Rooms.add')
+export const remove = Symbol.for('Rooms.remove')