angelia.io 2.4.72 → 2.4.75

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "angelia.io",
-	"version": "2.4.72",
+	"version": "2.4.75",
 	"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/readme.md

@@ -90,6 +90,7 @@ Server.listen({
 | `cert`               | String      | ''      | path to the cert file for using https fullchain.pem                                                          |
 | `key`                | String      | ''      | path to the key file for using https privkey.pem                                                             |
 | `http`               | node server | null    | in case you want to use your own server. Else one will be created, as in `require('http(s)').createServer()` |
+| `timeout`            | Number      | 60000   | time in milliseconds after a socket is considered gone, minimun value is 10000                               |
 
 ### Server Object
 
@@ -155,7 +156,7 @@ import Server from 'angelia.io/server'
 
 class _ {
 	connect(socket, request) {
-		console.log(socket, data, callback)
+		console.log(socket, request)
 	}
 }
 Server.on(_)
@@ -365,7 +366,6 @@ As in `socket.on('connect', () => console.log('connect happened!'))`
 | `connect`    | **this happens only once** when we connect to the server, any future connection is a `reconnect`        |
 | `reconnect`  | if we were connected at least once, then any reconnection will dispatch this event instead of `connect` |
 | `disconnect` | when we disconnect from the server                                                                      |
-|              |
 
 </details>
 

package/server/Server.js

@@ -97,12 +97,14 @@ class ServerSingleton {
 
 			since: Date.now(),
 			now: Date.now(),
+			timeout: +options.timeout >= 10000 ? +options.timeout : this.timeout,
 		})
+		this.timeoutCheck = this.timeout / 2
 
 		this.ensureFastProperties()
 
 		// updates ping and checks for disconnections
-		setInterval(this.ping, 30 * 1000)
+		setInterval(this.ping, this.timeoutCheck)
 		setInterval(this.updateNow, 500)
 
 		// fires the server
@@ -145,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) {
@@ -217,8 +219,6 @@ class ServerSingleton {
 
 	// PRIVATE API
 	onconnect(socket, request) {
-		this.updateNow()
-
 		socket = new this.Socket(socket, this)
 
 		// set the ip, userAgent and params
@@ -305,8 +305,18 @@ class ServerSingleton {
 				socket.timedout = true
 				this.events.timeout && this.events.timeout(socket.proxy, delay)
 				socket.io.terminate()
-			} else {
-				// ping
+			} else if (delay > this.timeoutCheck - 5000) {
+				/*
+				in an example:
+				if timeout is set to 60 seeconds
+				then we check for timed out sockets every 30 seconds
+				if the socket was last seen 29 seconds ago
+				then the next check will be in another 30 seconds
+				that means that if the socket doesnt sends any message
+				then the last seen will be 59 seconds the next time
+				this gives very little amount of time to check
+				for this reason we remove 5 seconds on the condition
+				*/
 				this.pingSocket(socket)
 			}
 		}

package/server/rooms/Room.js

@@ -51,7 +51,7 @@ class Room {
 			this[parent][remove](this)
 
 			// dispatch leave
-			this.onLeave && this.onLeave(socket)
+			// this.onLeave && this.onLeave(socket)
 
 			// dispatch that the room has been deleted
 			this.onDelete && this.onDelete(socket)