From 8a9875cf970bdb0e5e99a65bc57ca1047a55d4e0 Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@meteor.com>
Date: Thu, 9 Nov 2017 14:04:52 -0800
Subject: [PATCH] Remove underscore from stream_client_nodejs

---
 packages/ddp-client/server/stream_client_nodejs.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/ddp-client/server/stream_client_nodejs.js b/packages/ddp-client/server/stream_client_nodejs.js
index 7abae4d970..61d92dcc81 100644
--- a/packages/ddp-client/server/stream_client_nodejs.js
+++ b/packages/ddp-client/server/stream_client_nodejs.js
@@ -91,7 +91,7 @@ export default class ClientStream extends StreamClientCommon {
 
     // fire resets. This must come after status change so that clients
     // can call send from within a reset callback.
-    _.each(this.eventCallbacks.reset, callback => {
+    this.forEachCallback('reset', callback => {
       callback();
     });
   }
@@ -103,7 +103,7 @@ export default class ClientStream extends StreamClientCommon {
       this.client = null;
       client.close();
 
-      _.each(this.eventCallbacks.disconnect, callback => {
+      this.forEachCallback('disconnect', callback => {
         callback(maybeError);
       });
     }
@@ -140,7 +140,7 @@ export default class ClientStream extends StreamClientCommon {
       headers: this.headers,
       extensions: [deflate]
     };
-    fayeOptions = _.extend(fayeOptions, this.npmFayeOptions);
+    fayeOptions = { ...fayeOptions, ...this.npmFayeOptions };
     var proxyUrl = this._getProxyUrl(targetUrl);
     if (proxyUrl) {
       fayeOptions.proxy = { origin: proxyUrl };