From 92271d1454f0a80d23192850e9a933a48e08cb9f Mon Sep 17 00:00:00 2001
From: John Knox <jknox@fb.com>
Date: Mon, 11 Feb 2019 14:01:33 -0800
Subject: [PATCH] Use rsocket requestResponse in desktop app

Summary:
Changes the desktop app to use requestResponse for communicating with the sdk, when the sdk is on a version that can handle it.
If it's an old sdk version, just use fire and forget. We can delete this code after a while, but keeping it for now to smooth things over during migration.

This should be fully backwards compatible both ways.

Reviewed By: passy

Differential Revision: D13971354

fbshipit-source-id: 60e18dda5c253c81ab7e62ca1aae4f4bc423f7e2
---
 src/Client.js | 61 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 10 deletions(-)

diff --git a/src/Client.js b/src/Client.js
index a918fb0a6..ffe3c6243 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -29,6 +29,7 @@ export type ClientQuery = {|
   os: OS,
   device: string,
   device_id: string,
+  sdk_version?: number,
 |};
 
 export type ClientExport = {|
@@ -91,6 +92,7 @@ export default class Client extends EventEmitter {
     this.connection = conn;
     this.id = id;
     this.query = query;
+    this.sdkVersion = query.sdk_version || 0;
     this.messageIdCounter = 0;
     this.logger = logger;
     this.store = store;
@@ -132,6 +134,7 @@ export default class Client extends EventEmitter {
   connected: boolean;
   id: string;
   query: ClientQuery;
+  sdkVersion: number;
   messageIdCounter: number;
   plugins: Plugins;
   connection: ?ReactiveSocket;
@@ -265,17 +268,29 @@ export default class Client extends EventEmitter {
       return;
     }
 
-    const callbacks = this.requestCallbacks.get(id);
-    if (!callbacks) {
-      return;
+    if (this.sdkVersion < 1) {
+      const callbacks = this.requestCallbacks.get(id);
+      if (!callbacks) {
+        return;
+      }
+      this.requestCallbacks.delete(id);
+      this.finishTimingRequestResponse(callbacks.metadata);
+      this.onResponse(data, callbacks.resolve, callbacks.reject);
     }
-    this.requestCallbacks.delete(id);
-    this.finishTimingRequestResponse(callbacks.metadata);
+  }
 
+  onResponse(
+    data: {
+      success?: Object,
+      error?: Object,
+    },
+    resolve: any => any,
+    reject: any => any,
+  ) {
     if (data.success) {
-      callbacks.resolve(data.success);
+      resolve(data.success);
     } else if (data.error) {
-      callbacks.reject(data.error);
+      reject(data.error);
       const {error} = data;
       if (error) {
         handleError(this.store, this.getDevice()?.serial, error);
@@ -329,7 +344,10 @@ export default class Client extends EventEmitter {
         id,
         params,
       };
-      this.requestCallbacks.set(id, {reject, resolve, metadata});
+
+      if (this.sdkVersion < 1) {
+        this.requestCallbacks.set(id, {reject, resolve, metadata});
+      }
 
       const data = {
         id,
@@ -338,9 +356,32 @@ export default class Client extends EventEmitter {
       };
 
       console.debug(data, 'message:call');
-      this.startTimingRequestResponse({method, id, params});
+
+      if (this.sdkVersion < 1) {
+        this.startTimingRequestResponse({method, id, params});
+        if (this.connection) {
+          this.connection.fireAndForget({data: JSON.stringify(data)});
+        }
+        return;
+      }
+
+      const mark = this.getPerformanceMark(metadata);
+      performance.mark(mark);
       if (this.connection) {
-        this.connection.fireAndForget({data: JSON.stringify(data)});
+        this.connection
+          .requestResponse({data: JSON.stringify(data)})
+          .subscribe({
+            onComplete: payload => {
+              const logEventName = this.getLogEventName(data);
+              this.logger.trackTimeSince(mark, logEventName);
+              const response: {|
+                success?: Object,
+                error?: Object,
+              |} = JSON.parse(payload.data);
+              this.onResponse(response, resolve, reject);
+            },
+            onError: reject,
+          });
       }
     });
   }