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

@@ -16,7 +16,6 @@ import {RSocketServer} from 'rsocket-core';
import RSocketTCPServer from 'rsocket-tcp-server';
import {Single} from 'rsocket-flowable';
import Client from './Client';
import {FlipperClientConnection} from './Client';
import {UninitializedClient} from './UninitializedClient';
import {reportPlatformFailures} from './utils/metrics';
import EventEmitter from 'events';
@@ -24,11 +23,9 @@ import invariant from 'invariant';
import tls from 'tls';
import net, {Socket} from 'net';
import {Responder, Payload, ReactiveSocket} from 'rsocket-types';
import GK from './fb-stubs/GK';
import {initJsEmulatorIPC} from './utils/js-client/serverUtils';
type ClientInfo = {
connection: FlipperClientConnection<any, any> | null | undefined;
connection: ReactiveSocket<any, any> | null | undefined;
client: Client;
};
@@ -86,11 +83,6 @@ class Server extends EventEmitter {
return;
});
reportPlatformFailures(this.initialisePromise, 'initializeServer');
if (GK.get('flipper_js_client_emulator')) {
initJsEmulatorIPC(this.store, this.logger, this, this.connections);
}
return this.initialisePromise;
}
@@ -311,7 +303,7 @@ class Server extends EventEmitter {
}
async addConnection(
conn: FlipperClientConnection<any, any>,
conn: ReactiveSocket<any, any>,
query: ClientQuery,
csrQuery: ClientCsrQuery,
): Promise<Client> {