ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-12-06 17:27:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Promise.resolve

Browse Source
This commit is contained in:
Chris Clark
2015-10-27 10:49:59 -07:00
parent 6db2a72eb8
commit b224d4d1c4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/common/connection.js
View File

@@ -59,7 +59,7 @@ class Connection extends EventEmitter {
this.emit.apply(this, parameters);
}
get state() {
get _state() {
return this._ws ? this._ws.readyState : WebSocket.CLOSED;
}
@@ -68,7 +68,7 @@ class Connection extends EventEmitter {
}
isConnected() {
return this.state === WebSocket.OPEN && this._isReady;
return this._state === WebSocket.OPEN && this._isReady;
}
_onUnexpectedClose() {
@@ -92,9 +92,9 @@ class Connection extends EventEmitter {
connect() {
return new Promise((resolve, reject) => {
if (this.state === WebSocket.OPEN) {
if (this._state === WebSocket.OPEN) {
resolve();
} else if (this.state === WebSocket.CONNECTING) {
} else if (this._state === WebSocket.CONNECTING) {
this._ws.once('open', resolve);
} else {
this._ws = new WebSocket(this._url);
@@ -107,9 +107,9 @@ class Connection extends EventEmitter {
disconnect() {
return new Promise(resolve => {
if (this.state === WebSocket.CLOSED) {
if (this._state === WebSocket.CLOSED) {
resolve();
} else if (this.state === WebSocket.CLOSING) {
} else if (this._state === WebSocket.CLOSING) {
this._ws.once('close', resolve);
} else {
this._ws.removeListener('close', this._onUnexpectedClose);
@@ -131,7 +131,7 @@ class Connection extends EventEmitter {
return new Promise((resolve, reject) => {
if (!this._shouldBeConnected) {
reject(new NotConnectedError());
} else if (this.state === WebSocket.OPEN && this._isReady) {
} else if (this._state === WebSocket.OPEN && this._isReady) {
promise.then(resolve, reject);
} else {
this.once('connected', () => promise.then(resolve, reject));