From 62cb33b763f118a8534ebaf87be08eed59c006a4 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Mon, 3 Jul 2023 09:40:26 -0700 Subject: [PATCH] comms: app-connectivity Summary: It doesn't get more generic than 'comms'. So, narrow it down: app-connectivity. Reviewed By: passy Differential Revision: D47185255 fbshipit-source-id: 87e9c2487c9b07603d14e856de670757078c0da1 --- desktop/flipper-server-core/src/FlipperServerImpl.tsx | 4 ++-- .../{comms => app-connectivity}/BrowserClientConnection.tsx | 0 .../{comms => app-connectivity}/BrowserServerWebSocket.tsx | 0 .../src/{comms => app-connectivity}/ClientConnection.tsx | 0 .../src/{comms => app-connectivity}/SecureServerWebSocket.tsx | 0 .../src/{comms => app-connectivity}/ServerController.tsx | 0 .../src/{comms => app-connectivity}/ServerFactory.tsx | 0 .../src/{comms => app-connectivity}/ServerRSocket.tsx | 0 .../src/{comms => app-connectivity}/ServerWebSocket.tsx | 0 .../src/{comms => app-connectivity}/ServerWebSocketBase.tsx | 0 .../src/{comms => app-connectivity}/Utilities.tsx | 0 .../{comms => app-connectivity}/WebSocketClientConnection.tsx | 0 .../__tests__/BrowserServerWebSocket.node.tsx | 0 .../__tests__/SecureServerWebSocket.node.tsx | 0 .../__tests__/ServerWebSocket.node.tsx | 0 .../src/{comms => app-connectivity}/__tests__/utils.tsx | 0 desktop/flipper-server-core/src/index.tsx | 2 +- desktop/flipper-server-core/src/plugins/ServerAddManager.tsx | 2 +- desktop/flipper-server-core/src/plugins/ServerAddOn.tsx | 2 +- desktop/flipper-server-core/src/plugins/loadServerAddOn.tsx | 2 +- desktop/flipper-server-core/src/server/startServer.tsx | 2 +- desktop/flipper-server-core/src/utils/DeviceListener.tsx | 2 +- 22 files changed, 8 insertions(+), 8 deletions(-) rename desktop/flipper-server-core/src/{comms => app-connectivity}/BrowserClientConnection.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/BrowserServerWebSocket.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/ClientConnection.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/SecureServerWebSocket.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/ServerController.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/ServerFactory.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/ServerRSocket.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/ServerWebSocket.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/ServerWebSocketBase.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/Utilities.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/WebSocketClientConnection.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/__tests__/BrowserServerWebSocket.node.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/__tests__/SecureServerWebSocket.node.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/__tests__/ServerWebSocket.node.tsx (100%) rename desktop/flipper-server-core/src/{comms => app-connectivity}/__tests__/utils.tsx (100%) diff --git a/desktop/flipper-server-core/src/FlipperServerImpl.tsx b/desktop/flipper-server-core/src/FlipperServerImpl.tsx index 8cfe798c1..bf657b6e0 100644 --- a/desktop/flipper-server-core/src/FlipperServerImpl.tsx +++ b/desktop/flipper-server-core/src/FlipperServerImpl.tsx @@ -10,7 +10,7 @@ import './utils/macCa'; import './utils/fetch-polyfill'; import EventEmitter from 'events'; -import {ServerController} from './comms/ServerController'; +import {ServerController} from './app-connectivity/ServerController'; import {AndroidDeviceManager} from './devices/android/androidDeviceManager'; import {IOSDeviceManager} from './devices/ios/iOSDeviceManager'; import metroDevice from './devices/metro/metroDeviceManager'; @@ -52,7 +52,7 @@ import {promises} from 'fs'; import rm from 'rimraf'; import assert from 'assert'; import {initializeAdbClient} from './devices/android/adbClient'; -import {assertNotNull} from './comms/Utilities'; +import {assertNotNull} from './app-connectivity/Utilities'; import {mkdirp} from 'fs-extra'; import {flipperDataFolder, flipperSettingsFolder} from './utils/paths'; import {DebuggableDevice} from './devices/DebuggableDevice'; diff --git a/desktop/flipper-server-core/src/comms/BrowserClientConnection.tsx b/desktop/flipper-server-core/src/app-connectivity/BrowserClientConnection.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/BrowserClientConnection.tsx rename to desktop/flipper-server-core/src/app-connectivity/BrowserClientConnection.tsx diff --git a/desktop/flipper-server-core/src/comms/BrowserServerWebSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/BrowserServerWebSocket.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/BrowserServerWebSocket.tsx rename to desktop/flipper-server-core/src/app-connectivity/BrowserServerWebSocket.tsx diff --git a/desktop/flipper-server-core/src/comms/ClientConnection.tsx b/desktop/flipper-server-core/src/app-connectivity/ClientConnection.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/ClientConnection.tsx rename to desktop/flipper-server-core/src/app-connectivity/ClientConnection.tsx diff --git a/desktop/flipper-server-core/src/comms/SecureServerWebSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/SecureServerWebSocket.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/SecureServerWebSocket.tsx rename to desktop/flipper-server-core/src/app-connectivity/SecureServerWebSocket.tsx diff --git a/desktop/flipper-server-core/src/comms/ServerController.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/ServerController.tsx rename to desktop/flipper-server-core/src/app-connectivity/ServerController.tsx diff --git a/desktop/flipper-server-core/src/comms/ServerFactory.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerFactory.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/ServerFactory.tsx rename to desktop/flipper-server-core/src/app-connectivity/ServerFactory.tsx diff --git a/desktop/flipper-server-core/src/comms/ServerRSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/ServerRSocket.tsx rename to desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx diff --git a/desktop/flipper-server-core/src/comms/ServerWebSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/ServerWebSocket.tsx rename to desktop/flipper-server-core/src/app-connectivity/ServerWebSocket.tsx diff --git a/desktop/flipper-server-core/src/comms/ServerWebSocketBase.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/ServerWebSocketBase.tsx rename to desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx diff --git a/desktop/flipper-server-core/src/comms/Utilities.tsx b/desktop/flipper-server-core/src/app-connectivity/Utilities.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/Utilities.tsx rename to desktop/flipper-server-core/src/app-connectivity/Utilities.tsx diff --git a/desktop/flipper-server-core/src/comms/WebSocketClientConnection.tsx b/desktop/flipper-server-core/src/app-connectivity/WebSocketClientConnection.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/WebSocketClientConnection.tsx rename to desktop/flipper-server-core/src/app-connectivity/WebSocketClientConnection.tsx diff --git a/desktop/flipper-server-core/src/comms/__tests__/BrowserServerWebSocket.node.tsx b/desktop/flipper-server-core/src/app-connectivity/__tests__/BrowserServerWebSocket.node.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/__tests__/BrowserServerWebSocket.node.tsx rename to desktop/flipper-server-core/src/app-connectivity/__tests__/BrowserServerWebSocket.node.tsx diff --git a/desktop/flipper-server-core/src/comms/__tests__/SecureServerWebSocket.node.tsx b/desktop/flipper-server-core/src/app-connectivity/__tests__/SecureServerWebSocket.node.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/__tests__/SecureServerWebSocket.node.tsx rename to desktop/flipper-server-core/src/app-connectivity/__tests__/SecureServerWebSocket.node.tsx diff --git a/desktop/flipper-server-core/src/comms/__tests__/ServerWebSocket.node.tsx b/desktop/flipper-server-core/src/app-connectivity/__tests__/ServerWebSocket.node.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/__tests__/ServerWebSocket.node.tsx rename to desktop/flipper-server-core/src/app-connectivity/__tests__/ServerWebSocket.node.tsx diff --git a/desktop/flipper-server-core/src/comms/__tests__/utils.tsx b/desktop/flipper-server-core/src/app-connectivity/__tests__/utils.tsx similarity index 100% rename from desktop/flipper-server-core/src/comms/__tests__/utils.tsx rename to desktop/flipper-server-core/src/app-connectivity/__tests__/utils.tsx diff --git a/desktop/flipper-server-core/src/index.tsx b/desktop/flipper-server-core/src/index.tsx index a9dc5ce78..c97511791 100644 --- a/desktop/flipper-server-core/src/index.tsx +++ b/desktop/flipper-server-core/src/index.tsx @@ -21,6 +21,6 @@ export * from './server/startServer'; export * from './server/utilities'; export {isFBBuild} from './fb-stubs/constants'; -export {WEBSOCKET_MAX_MESSAGE_SIZE} from './comms/ServerWebSocket'; +export {WEBSOCKET_MAX_MESSAGE_SIZE} from './app-connectivity/ServerWebSocket'; export {getAuthToken, hasAuthToken} from './utils/certificateUtils'; diff --git a/desktop/flipper-server-core/src/plugins/ServerAddManager.tsx b/desktop/flipper-server-core/src/plugins/ServerAddManager.tsx index 507ff855c..55f1f9101 100644 --- a/desktop/flipper-server-core/src/plugins/ServerAddManager.tsx +++ b/desktop/flipper-server-core/src/plugins/ServerAddManager.tsx @@ -13,7 +13,7 @@ import { FlipperServerForServerAddOn, ServerAddOnStartDetails, } from 'flipper-common'; -import {assertNotNull} from '../comms/Utilities'; +import {assertNotNull} from '../app-connectivity/Utilities'; import {StateMachine} from '../utils/StateMachine'; import {ServerAddOn} from './ServerAddOn'; diff --git a/desktop/flipper-server-core/src/plugins/ServerAddOn.tsx b/desktop/flipper-server-core/src/plugins/ServerAddOn.tsx index bb03c8f30..285eb0bf7 100644 --- a/desktop/flipper-server-core/src/plugins/ServerAddOn.tsx +++ b/desktop/flipper-server-core/src/plugins/ServerAddOn.tsx @@ -8,7 +8,7 @@ */ import assert from 'assert'; -import {assertNotNull} from '../comms/Utilities'; +import {assertNotNull} from '../app-connectivity/Utilities'; import { FlipperServerForServerAddOn, ServerAddOnCleanup, diff --git a/desktop/flipper-server-core/src/plugins/loadServerAddOn.tsx b/desktop/flipper-server-core/src/plugins/loadServerAddOn.tsx index 8d031eff2..c3ea11c6e 100644 --- a/desktop/flipper-server-core/src/plugins/loadServerAddOn.tsx +++ b/desktop/flipper-server-core/src/plugins/loadServerAddOn.tsx @@ -11,7 +11,7 @@ import { ServerAddOn as ServerAddOnFn, ServerAddOnStartDetails, } from 'flipper-common'; -import {assertNotNull} from '../comms/Utilities'; +import {assertNotNull} from '../app-connectivity/Utilities'; import * as FlipperPluginSDK from 'flipper-plugin-core'; declare global { diff --git a/desktop/flipper-server-core/src/server/startServer.tsx b/desktop/flipper-server-core/src/server/startServer.tsx index 18aa6be2e..9372d8a11 100644 --- a/desktop/flipper-server-core/src/server/startServer.tsx +++ b/desktop/flipper-server-core/src/server/startServer.tsx @@ -14,7 +14,7 @@ import http, {ServerResponse} from 'http'; import path from 'path'; import fs from 'fs-extra'; import {ServerOptions, VerifyClientCallbackSync, WebSocketServer} from 'ws'; -import {WEBSOCKET_MAX_MESSAGE_SIZE} from '../comms/ServerWebSocket'; +import {WEBSOCKET_MAX_MESSAGE_SIZE} from '../app-connectivity/ServerWebSocket'; import {parse} from 'url'; import {makeSocketPath, checkSocketInUse} from './utilities'; diff --git a/desktop/flipper-server-core/src/utils/DeviceListener.tsx b/desktop/flipper-server-core/src/utils/DeviceListener.tsx index 8a31628fc..cf2807eb5 100644 --- a/desktop/flipper-server-core/src/utils/DeviceListener.tsx +++ b/desktop/flipper-server-core/src/utils/DeviceListener.tsx @@ -8,7 +8,7 @@ */ import {sleep} from 'flipper-common'; -import {assertNotNull} from '../comms/Utilities'; +import {assertNotNull} from '../app-connectivity/Utilities'; import {StateMachine} from './StateMachine'; export const RESTART_CNT = 3;