From 3e334e1a0ee4944aaf4c3a88bca80cb0f27b8175 Mon Sep 17 00:00:00 2001
From: Lorenzo Blasa <lblasa@fb.com>
Date: Tue, 27 Jul 2021 02:23:03 -0700
Subject: [PATCH] Create a new comms directory and move the server type inside

Summary:
A new comms/ directory is introduced which will contain all the communication code between client and server.

This change just moves server.tsx to its new location, it will make the next changes easier to follow.

Reviewed By: fabiomassimo

Differential Revision: D29911904

fbshipit-source-id: ae319dc8f9fd7af9d8b5b5c0ee87b56102cc0a18
---
 desktop/app/src/{ => comms}/server.tsx        | 38 +++++++++----------
 desktop/app/src/dispatcher/server.tsx         |  2 +-
 desktop/app/src/utils/CertificateProvider.tsx |  2 +-
 .../js-client-server-utils/serverUtils.tsx    |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)
 rename desktop/app/src/{ => comms}/server.tsx (95%)

diff --git a/desktop/app/src/server.tsx b/desktop/app/src/comms/server.tsx
similarity index 95%
rename from desktop/app/src/server.tsx
rename to desktop/app/src/comms/server.tsx
index 19f15da8f..bd7e04f6a 100644
--- a/desktop/app/src/server.tsx
+++ b/desktop/app/src/comms/server.tsx
@@ -10,37 +10,37 @@
 import {
   SecureServerConfig,
   CertificateExchangeMedium,
-} from './utils/CertificateProvider';
-import {Logger} from './fb-interfaces/Logger';
-import {ClientQuery} from './Client';
-import {Store, State} from './reducers/index';
-import CertificateProvider from './utils/CertificateProvider';
+} from '../utils/CertificateProvider';
+import {Logger} from '../fb-interfaces/Logger';
+import {ClientQuery} from '../Client';
+import {Store, State} from '../reducers/index';
+import CertificateProvider from '../utils/CertificateProvider';
 import {RSocketServer} from 'rsocket-core';
 import RSocketTCPServer from 'rsocket-tcp-server';
-import Client from './Client';
-import {FlipperClientConnection} from './Client';
-import {UninitializedClient} from './UninitializedClient';
-import {reportPlatformFailures} from './utils/metrics';
+import Client from '../Client';
+import {FlipperClientConnection} from '../Client';
+import {UninitializedClient} from '../UninitializedClient';
+import {reportPlatformFailures} from '../utils/metrics';
 import {EventEmitter} from 'events';
 import invariant from 'invariant';
 import tls from 'tls';
 import net, {Socket} from 'net';
 import {Responder, Payload, ReactiveSocket} from 'rsocket-types';
-import constants from './fb-stubs/constants';
-import GK from './fb-stubs/GK';
-import {initJsEmulatorIPC} from './utils/js-client-server-utils/serverUtils';
-import {buildClientId} from './utils/clientUtils';
+import constants from '../fb-stubs/constants';
+import GK from '../fb-stubs/GK';
+import {initJsEmulatorIPC} from '../utils/js-client-server-utils/serverUtils';
+import {buildClientId} from '../utils/clientUtils';
 import {Single} from 'rsocket-flowable';
 import WebSocket from 'ws';
-import JSDevice from './devices/JSDevice';
-import {WebsocketClientFlipperConnection} from './utils/js-client-server-utils/websocketClientFlipperConnection';
+import JSDevice from '../devices/JSDevice';
+import {WebsocketClientFlipperConnection} from '../utils/js-client-server-utils/websocketClientFlipperConnection';
 import querystring from 'querystring';
 import {IncomingMessage} from 'http';
 import ws from 'ws';
-import DummyDevice from './devices/DummyDevice';
-import BaseDevice from './devices/BaseDevice';
-import {sideEffect} from './utils/sideEffect';
-import {destroyDevice} from './reducers/connections';
+import DummyDevice from '../devices/DummyDevice';
+import BaseDevice from '../devices/BaseDevice';
+import {sideEffect} from '../utils/sideEffect';
+import {destroyDevice} from '../reducers/connections';
 
 type ClientInfo = {
   connection: FlipperClientConnection<any, any> | null | undefined;
diff --git a/desktop/app/src/dispatcher/server.tsx b/desktop/app/src/dispatcher/server.tsx
index a17384500..41a8419fe 100644
--- a/desktop/app/src/dispatcher/server.tsx
+++ b/desktop/app/src/dispatcher/server.tsx
@@ -7,7 +7,7 @@
  * @format
  */
 
-import Server from '../server';
+import Server from '../comms/server';
 
 import {Store} from '../reducers/index';
 import {Logger} from '../fb-interfaces/Logger';
diff --git a/desktop/app/src/utils/CertificateProvider.tsx b/desktop/app/src/utils/CertificateProvider.tsx
index 3b1783fe9..36110cf0b 100644
--- a/desktop/app/src/utils/CertificateProvider.tsx
+++ b/desktop/app/src/utils/CertificateProvider.tsx
@@ -9,7 +9,7 @@
 
 import {Logger} from '../fb-interfaces/Logger';
 import {internGraphPOSTAPIRequest} from '../fb-stubs/user';
-import Server from '../server';
+import Server from '../comms/server';
 import {promisify} from 'util';
 import fs from 'fs';
 import fsExtra from 'fs-extra';
diff --git a/desktop/app/src/utils/js-client-server-utils/serverUtils.tsx b/desktop/app/src/utils/js-client-server-utils/serverUtils.tsx
index 92462f7e3..07f0f3a06 100644
--- a/desktop/app/src/utils/js-client-server-utils/serverUtils.tsx
+++ b/desktop/app/src/utils/js-client-server-utils/serverUtils.tsx
@@ -16,7 +16,7 @@ import {Logger} from '../../fb-interfaces/Logger';
 
 import {Payload, ConnectionStatus, ISubscriber} from 'rsocket-types';
 import {Flowable, Single} from 'rsocket-flowable';
-import Server from '../../server';
+import Server from '../../comms/server';
 import {buildClientId} from '../clientUtils';
 import {destroyDevice} from '../../reducers/connections';