FieldServer · JohanvdWest · Jun 5, 2019 · Jun 4, 2019 · Jun 4, 2019 · Jun 4, 2019
diff --git a/.idea/WebSocket-Node.iml b/.idea/WebSocket-Node.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.npmignore b/.npmignore
@@ -1,7 +1,12 @@
 .npmignore
 .gitignore
+.git/
+.DS_Store
+.lock-*
+node_modules/
 docs/
 example/
 build/
+builderror.log
+npm-debug.log
 test/
-node_modules/
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,17 @@
+env:
+  - INTRAVENOUS=yes
+
+os:
+  - linux
+
+branches:
+  only:
+    - master
+
+language: node_js
+node_js:
+  - "10"
+  - "12"
+
+script: "npm run test"
+after_failure: "cat /home/travis/build/happner/happner/npm-debug.log"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,14 @@
 Changelog
 =========
 
+Version 1.0.28 (SMC)
+--------------------
+*Released to SMC 2019-06-04*
+
+* [SMC] Revert workaround for accepting/rejecting a websocket twice
+
 Version 1.0.27 (SMC & Upstream)
---------------
+-------------------------------
 *Released to SMC 2019-02-11*
 *Released 2018-09-19*
 

diff --git a/lib/WebSocketRequest.js b/lib/WebSocketRequest.js
@@ -247,9 +247,7 @@ WebSocketRequest.prototype.parseCookies = function(str) {
 };
 
 WebSocketRequest.prototype.accept = function(acceptedProtocol, allowedOrigin, cookies) {
-    if (this._verifyResolution() == false){
-      return;
-    }
+    this._verifyResolution();
 
     // TODO: Handle extensions
 
@@ -465,9 +463,7 @@ WebSocketRequest.prototype.accept = function(acceptedProtocol, allowedOrigin, co
 };
 
 WebSocketRequest.prototype.reject = function(status, reason, extraHeaders) {
-    if (this._verifyResolution() == false){
-      return;
-    }
+    this._verifyResolution();
 
     // Mark the request resolved now so that the user can't call accept or
     // reject a second time.
@@ -493,12 +489,7 @@ WebSocketRequest.prototype.reject = function(status, reason, extraHeaders) {
     }
 
     response += '\r\n';
-    try{
-      this.socket.end(response, 'ascii');
-    }
-    catch(err){
-        console.log(err);
-    }
+    this.socket.end(response, 'ascii');
 
     this.emit('requestRejected', this);
 };
@@ -515,10 +506,8 @@ WebSocketRequest.prototype._removeSocketCloseListeners = function() {
 
 WebSocketRequest.prototype._verifyResolution = function() {
     if (this._resolved) {
-        console.log(new Error('WebSocketRequest may only be accepted or rejected one time.'));
-        return false;
+        throw new Error('WebSocketRequest may only be accepted or rejected one time.');
     }
-    return true;
 };
 
 function cleanupFailedConnection(connection) {