angelia.io 2.4.79 → 3.4.81

package/client/index.js

@@ -227,7 +227,7 @@ class ClientWebWorker {
 	}
 }
 
-class Client {
+export class Client {
 	constructor(options) {
 		if (!options || typeof options === 'string') {
 			options = {
@@ -441,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,13 +1,32 @@
 {
 	"name": "angelia.io",
-	"version": "2.4.79",
+	"version": "3.4.81",
 	"description": "WebSockets Server and Client API for node.js and the browser, with rooms support.",
+	"author": "@titoBouzout @boredofnames",
+	"license": "GPL",
 	"homepage": "https://github.com/titoBouzout/angelia.io",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/titoBouzout/angelia.io"
 	},
+	"type": "module",
 	"main": "index.js",
+	"dependencies": {
+		"bufferutil": "^4.0.3",
+		"is-class": "^0.0.9",
+		"isobject": "^4.0.0",
+		"to-fast-properties": "^3.0.1",
+		"utf-8-validate": "^6.x.x",
+		"ws": "^8.x.x"
+	},
+	"exports": {
+		"./server": {
+			"default": "./server/Server.js"
+		},
+		"./client": {
+			"default": "./client/index.js"
+		}
+	},
 	"keywords": [
 		"Client",
 		"Server",
@@ -24,16 +43,6 @@
 		"io",
 		"ws"
 	],
-	"author": "@titoBouzout @boredofnames",
-	"license": "GPL",
-	"dependencies": {
-		"bufferutil": "^4.0.3",
-		"is-class": "^0.0.9",
-		"isobject": "^4.0.0",
-		"to-fast-properties": "^3.0.1",
-		"utf-8-validate": "^5.0.4",
-		"ws": "^7.x.x"
-	},
 	"prettier": {
 		"printWidth": 70,
 		"useTabs": true,

package/server/Listeners.js

@@ -1,5 +1,3 @@
-'use strict'
-
 const inspect = Symbol.for('nodejs.util.inspect.custom')
 
 class Listeners {
@@ -196,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'
 
-const toFastProperties = require('to-fast-properties')
+import * as http from 'http'
+import * as https from 'https'
+
+import WebSocket, { WebSocketServer, Sender } from 'ws'
 
 class ServerSingleton {
 	constructor() {
@@ -49,16 +57,18 @@ 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,
+			Sender,
+			Socket,
+			WebSocket,
+			WebSocketServer,
 			WebSocketFrame: {
 				readOnly: false,
 				mask: false,
@@ -79,11 +89,8 @@ class ServerSingleton {
 			},
 		})
 
-		this.pingData = this.WebSocket.Sender.frame(
-			Buffer.from(''),
-			this.WebSocketFrame,
-		)
-		this.disconnectData = this.WebSocket.Sender.frame(
+		this.pingData = this.Sender.frame(Buffer.from(''), this.WebSocketFrame)
+		this.disconnectData = this.Sender.frame(
 			Buffer.from(JSON.stringify([['disconnect', true]])),
 			this.WebSocketFrame,
 		)
@@ -111,7 +118,7 @@ class ServerSingleton {
 		})
 		this.timeoutCheck = this.timeout / 2
 
-		this.ensureFastProperties()
+		// this.ensureFastProperties()
 
 		// updates ping and checks for disconnections
 		setInterval(this.ping, this.timeoutCheck)
@@ -124,8 +131,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
@@ -133,11 +139,11 @@ 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,
@@ -175,7 +181,7 @@ class ServerSingleton {
 			},
 		})
 
-		this.ensureFastProperties()
+		// this.ensureFastProperties()
 	}
 
 	// emits to everyone connected to the server
@@ -284,7 +290,7 @@ class ServerSingleton {
 			let json = JSON.stringify(messages)
 			this.bytesSent += json.length
 			socket.bytesSent += json.length
-			this.cache[id] = this.WebSocket.Sender.frame(
+			this.cache[id] = this.Sender.frame(
 				Buffer.from(json),
 				this.WebSocketFrame,
 			)
@@ -512,6 +518,6 @@ class ServerSingleton {
 	}
 }
 
-const Server = new ServerSingleton()
+export const Server = new ServerSingleton()
 
-module.exports = Server
+export { Room, 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,
@@ -96,7 +94,9 @@ class Socket {
 		this.io.on('error', this.onerror)
 		this.io.on('message', this.onmessage)
 	}
-	onclose(code, message) {
+	onclose(code, message, isBinary) {
+		message = message.toString()
+
 		this.server.sockets.delete(this)
 
 		for (let room of this.rooms) {
@@ -138,7 +138,9 @@ class Socket {
 			return false
 		}
 	}
-	onmessage(e) {
+	onmessage(e, isBinary) {
+		e = isBinary ? e.toString() : e
+
 		if (e === '') {
 			this.server.pong(this)
 		} else {
@@ -225,5 +227,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')