Back out "JS apps support 1/n"

Summary:
Original commit changeset: 56d1ca1a60ed

This broke Android support in some instances. We haven't had a chance to investigate this yet, but this should cleanly reapply, so we can figure out what happened after the release.

Reviewed By: cekkaewnumchai

Differential Revision: D18688590

fbshipit-source-id: ff84080d43fa481cc8c8c669a76aed15d0f8aa56
This commit is contained in:
John Knox
2019-11-25 09:53:16 -08:00
committed by realpassy
parent e50f900758
commit 2fd6301876
10 changed files with 10 additions and 496 deletions

View File

@@ -13,8 +13,7 @@ import {App} from './App.js';
import {Logger} from './fb-interfaces/Logger';
import {Store} from './reducers/index';
import {setPluginState} from './reducers/pluginStates';
import {Payload, ConnectionStatus} from 'rsocket-types';
import {Flowable, Single} from 'rsocket-flowable';
import {ReactiveSocket} from 'rsocket-types';
import {performance} from 'perf_hooks';
import {reportPlatformFailures, reportPluginFailures} from './utils/metrics';
import {notNull} from './utils/typeUtils';
@@ -98,13 +97,6 @@ const handleError = (
}
};
export interface FlipperClientConnection<D, M> {
connectionStatus(): Flowable<ConnectionStatus>;
close(): void;
fireAndForget(payload: Payload<D, M>): void;
requestResponse(payload: Payload<D, M>): Single<Payload<D, M>>;
}
export default class Client extends EventEmitter {
app: App | undefined;
connected: boolean;
@@ -113,7 +105,7 @@ export default class Client extends EventEmitter {
sdkVersion: number;
messageIdCounter: number;
plugins: Plugins;
connection: FlipperClientConnection<any, any> | null | undefined;
connection: ReactiveSocket<any, any> | null | undefined;
store: Store;
activePlugins: Set<string>;
device: Promise<BaseDevice>;
@@ -137,7 +129,7 @@ export default class Client extends EventEmitter {
constructor(
id: string,
query: ClientQuery,
conn: FlipperClientConnection<any, any> | null | undefined,
conn: ReactiveSocket<any, any> | null | undefined,
logger: Logger,
store: Store,
plugins?: Plugins | null | undefined,