1 files changed, 34 insertions, 35 deletions
diff --git a/tools/node_modules/eslint/node_modules/rxjs/_esm5/internal/observable/dom/WebSocketSubject.js b/tools/node_modules/eslint/node_modules/rxjs/_esm5/internal/observable/dom/WebSocketSubject.js
index cd573272b7..136c8636cd 100644
--- a/tools/node_modules/eslint/node_modules/rxjs/_esm5/internal/observable/dom/WebSocketSubject.js
+++ b/tools/node_modules/eslint/node_modules/rxjs/_esm5/internal/observable/dom/WebSocketSubject.js
@@ -1,12 +1,10 @@
-/** PURE_IMPORTS_START tslib,_.._Subject,_.._Subscriber,_.._Observable,_.._Subscription,_.._ReplaySubject,_.._util_tryCatch,_.._util_errorObject PURE_IMPORTS_END */
+/** PURE_IMPORTS_START tslib,_.._Subject,_.._Subscriber,_.._Observable,_.._Subscription,_.._ReplaySubject PURE_IMPORTS_END */
 import * as tslib_1 from "tslib";
 import { Subject, AnonymousSubject } from '../../Subject';
 import { Subscriber } from '../../Subscriber';
 import { Observable } from '../../Observable';
 import { Subscription } from '../../Subscription';
 import { ReplaySubject } from '../../ReplaySubject';
-import { tryCatch } from '../../util/tryCatch';
-import { errorObject } from '../../util/errorObject';
 var DEFAULT_WEBSOCKET_CONFIG = {
     url: '',
     deserializer: function (e) { return JSON.parse(e.data); },
@@ -60,29 +58,28 @@ var WebSocketSubject = /*@__PURE__*/ (function (_super) {
     WebSocketSubject.prototype.multiplex = function (subMsg, unsubMsg, messageFilter) {
         var self = this;
         return new Observable(function (observer) {
-            var result = tryCatch(subMsg)();
-            if (result === errorObject) {
-                observer.error(errorObject.e);
+            try {
+                self.next(subMsg());
             }
-            else {
-                self.next(result);
+            catch (err) {
+                observer.error(err);
             }
             var subscription = self.subscribe(function (x) {
-                var result = tryCatch(messageFilter)(x);
-                if (result === errorObject) {
-                    observer.error(errorObject.e);
+                try {
+                    if (messageFilter(x)) {
+                        observer.next(x);
+                    }
                 }
-                else if (result) {
-                    observer.next(x);
+                catch (err) {
+                    observer.error(err);
                 }
             }, function (err) { return observer.error(err); }, function () { return observer.complete(); });
             return function () {
-                var result = tryCatch(unsubMsg)();
-                if (result === errorObject) {
-                    observer.error(errorObject.e);
+                try {
+                    self.next(unsubMsg());
                 }
-                else {
-                    self.next(result);
+                catch (err) {
+                    observer.error(err);
                 }
                 subscription.unsubscribe();
             };
@@ -113,6 +110,12 @@ var WebSocketSubject = /*@__PURE__*/ (function (_super) {
             }
         });
         socket.onopen = function (e) {
+            var _socket = _this._socket;
+            if (!_socket) {
+                socket.close();
+                _this._resetState();
+                return;
+            }
             var openObserver = _this._config.openObserver;
             if (openObserver) {
                 openObserver.next(e);
@@ -120,13 +123,13 @@ var WebSocketSubject = /*@__PURE__*/ (function (_super) {
             var queue = _this.destination;
             _this.destination = Subscriber.create(function (x) {
                 if (socket.readyState === 1) {
-                    var serializer = _this._config.serializer;
-                    var msg = tryCatch(serializer)(x);
-                    if (msg === errorObject) {
-                        _this.destination.error(errorObject.e);
-                        return;
+                    try {
+                        var serializer = _this._config.serializer;
+                        socket.send(serializer(x));
+                    }
+                    catch (e) {
+                        _this.destination.error(e);
                     }
-                    socket.send(msg);
                 }
             }, function (e) {
                 var closingObserver = _this._config.closingObserver;
@@ -170,13 +173,12 @@ var WebSocketSubject = /*@__PURE__*/ (function (_super) {
             }
         };
         socket.onmessage = function (e) {
-            var deserializer = _this._config.deserializer;
-            var result = tryCatch(deserializer)(e);
-            if (result === errorObject) {
-                observer.error(errorObject.e);
+            try {
+                var deserializer = _this._config.deserializer;
+                observer.next(deserializer(e));
             }
-            else {
-                observer.next(result);
+            catch (err) {
+                observer.error(err);
             }
         };
     };
@@ -202,15 +204,12 @@ var WebSocketSubject = /*@__PURE__*/ (function (_super) {
         return subscriber;
     };
     WebSocketSubject.prototype.unsubscribe = function () {
-        var _a = this, source = _a.source, _socket = _a._socket;
+        var _socket = this._socket;
         if (_socket && _socket.readyState === 1) {
             _socket.close();
-            this._resetState();
         }
+        this._resetState();
         _super.prototype.unsubscribe.call(this);
-        if (!source) {
-            this.destination = new ReplaySubject();
-        }
     };
     return WebSocketSubject;
 }(AnonymousSubject));