Centralize clientId creation

Summary: One step towards getting away from constructing and destructing clientIds manually everywhere by splitting and joining #'s. Which has been VERY error prone in the past.

Reviewed By: passy

Differential Revision: D18809442

fbshipit-source-id: bd4d89d3eb3d59694aa735b19dbd73d122e59ba0
This commit is contained in:
John Knox
2019-12-04 07:16:13 -08:00
committed by Facebook Github Bot
parent ab5892c60e
commit 15e1b25098
3 changed files with 18 additions and 2 deletions

View File

@@ -26,6 +26,7 @@ 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';
import {buildClientId} from './utils/clientUtils';
type ClientInfo = {
connection: FlipperClientConnection<any, any> | null | undefined;
@@ -334,7 +335,12 @@ class Server extends EventEmitter {
query.device_id = csrId;
query.app = appNameWithUpdateHint(query);
const id = `${query.app}#${query.os}#${query.device}#${csrId}`;
const id = buildClientId({
app: query.app,
os: query.os,
device: query.device,
device_id: csrId,
});
console.debug(`Device connected: ${id}`, 'server');
const client = new Client(id, query, conn, this.logger, this.store);