[client-app] (deltas P3) Change onResults interface in NylasLongConnection

Summary:
For legacy reasons, NylasLongConnection did not take the `onResults`
callback as an option, but rather it was a method you had to call on the
connection, which took the callback, and which you had to call after
instantiating the connection. This was an annoying and clunky interface.

This commit makes it so NylasLongConnection takes an `onResults` option
as one would expect it to, and updates any references to the old
interface

Depends on D4118

Test Plan: manual

Reviewers: halla, mark, spang, evan

Reviewed By: evan

Differential Revision: https://phab.nylas.com/D4119

Author: jstejada

packages/client-app/internal_packages/deltas/lib/delta-streaming-connection.es6

@@ -3,24 +3,27 @@ import {NylasLongConnection, DatabaseStore} from 'nylas-exports'
 
 class DeltaStreamingConnection extends NylasLongConnection {
   constructor(api, accountId, opts = {}) {
+    // TODO FYI this whole class is changing in an upcoming diff
+    opts.api = api
+    opts.accountId = accountId
     opts.throttleResultsInterval = 1000
     opts.closeIfDataStopsInterval = 15 * 1000
-    super(api, accountId, opts)
-
-    this._onError = opts.onError || (() => {})
-
-    const {getCursor, setCursor} = opts
-    this._getCursor = getCursor
-    this._setCursor = setCursor
 
     // Update cursor when deltas received
-    this.onResults((deltas = []) => {
+    opts.onResuls = (deltas = []) => {
       if (opts.onDeltas) opts.onDeltas(deltas, {source: "n1Cloud"});
       const last = _.last(deltas);
       if (last && last.cursor) {
         this._setCursor(last.cursor)
       }
-    })
+    }
+    super(opts)
+
+    this._onError = opts.onError || (() => {})
+
+    const {getCursor, setCursor} = opts
+    this._getCursor = getCursor
+    this._setCursor = setCursor
   }
 
   _deltaStreamingPath(cursor) {

packages/client-app/internal_packages/thread-search/lib/search-query-subscription.es6

@@ -4,10 +4,11 @@ import {
   NylasAPI,
   Thread,
   DatabaseStore,
+  SearchQueryParser,
   ComponentRegistry,
+  NylasLongConnection,
   FocusedContentStore,
   MutableQuerySubscription,
-  SearchQueryParser,
 } from 'nylas-exports'
 import SearchActions from './search-actions'
 
@@ -113,8 +114,9 @@ class SearchQuerySubscription extends MutableQuerySubscription {
     }
 
     this._connections = this._accountIds.map((accountId) => {
-      return NylasAPI.startLongConnection({
+      const conn = new NylasLongConnection({
         accountId,
+        api: NylasAPI,
         path: `/threads/search/streaming?q=${encodeURIComponent(this._searchQuery)}`,
         onResults: (results) => {
           if (!this._remoteResultsReceivedAt) {
@@ -139,6 +141,8 @@ class SearchQuerySubscription extends MutableQuerySubscription {
           }
         },
       })
+
+      return conn.start()
     })
   }
 

packages/client-app/src/flux/nylas-api.es6

@@ -59,16 +59,6 @@ class NylasAPI {
     return AccountStore.tokensForAccountId(aid).localSync
   }
 
-  longConnection = (opts) => {
-    const connection = new NylasLongConnection(this, opts.accountId, opts)
-    connection.onResults(opts.onResults)
-    return connection
-  }
-
-  startLongConnection = (opts) => {
-    return this.longConnection(opts).start()
-  }
-
   incrementRemoteChangeLock = (klass, id) => {
     this.lockTracker.increment(klass, id)
   }

packages/client-app/src/flux/nylas-long-connection.es6

@@ -18,11 +18,12 @@ const Status = {
 class NylasLongConnection {
   static Status = Status
 
-  constructor(api, accountId, opts = {}) {
+  constructor({api, accountId, ...opts} = {}) {
     const {
       path,
       timeout,
       onError,
+      onResults,
       onStatusChanged,
       throttleResultsInterval,
       closeIfDataStopsInterval,
@@ -42,9 +43,11 @@ class NylasLongConnection {
     this._path = path
     this._timeout = timeout || CONNECTION_TIMEOUT
     this._onError = onError || (() => {})
+    this._onResults = onResults || (() => {})
     this._onStatusChanged = onStatusChanged || (() => {})
     this._closeIfDataStopsInterval = closeIfDataStopsInterval
 
+    this._emitter.on('results-stopped-arriving', this._onResults)
     this._processBufferThrottled = _.throttle(this._processBuffer, PROCESS_BUFFER_THROTTLE, {leading: false})
     this._flushResultsSoon = () => {
       if (this._results.length === 0) { return }
@@ -93,10 +96,6 @@ class NylasLongConnection {
     this._onStatusChanged(this._status, this._httpStatusCode)
   }
 
-  onResults(callback) {
-    this._emitter.on('results-stopped-arriving', callback)
-  }
-
   onError(error) {
     this._onError(error)
   }