From 65d2ce7ed5b76a277c6d95bbdae47171dd25d839 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Tue, 14 Nov 2023 10:53:09 -0800 Subject: [PATCH] Move dev socket Summary: Not entirely sure what the use of this socket is, but it can definitely be defined inside flipper-ui-browser instead. Reviewed By: aigoncharov Differential Revision: D51307090 fbshipit-source-id: 36eb336536e8672fb0b2bcf12dad31c7fbc00a39 --- desktop/flipper-ui-browser/src/index.tsx | 29 ++++++++++++++++++++++++ desktop/static/index.web.dev.html | 29 ------------------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/desktop/flipper-ui-browser/src/index.tsx b/desktop/flipper-ui-browser/src/index.tsx index aabaa9203..6f9525b31 100644 --- a/desktop/flipper-ui-browser/src/index.tsx +++ b/desktop/flipper-ui-browser/src/index.tsx @@ -10,6 +10,7 @@ import { getLogger, getStringFromErrorLike, + isProduction, setLoggerInstance, } from 'flipper-common'; import {init as initLogger} from './fb-stubs/Logger'; @@ -51,6 +52,34 @@ async function start() { const params = new URL(location.href).searchParams; + if (!isProduction()) { + let token = params.get('token'); + if (!token) { + token = window.flipperConfig.authToken; + } + + const socket = new WebSocket(`ws://${location.host}?token=${token}`); + socket.addEventListener('message', ({data: dataRaw}) => { + const message = JSON.parse(dataRaw.toString()); + + if (typeof message.event === 'string') { + switch (message.event) { + case 'hasErrors': { + console.warn('Error message received', message.payload); + break; + } + case 'plugins-source-updated': { + window.postMessage({ + type: 'plugins-source-updated', + data: message.payload, + }); + break; + } + } + } + }); + } + const tokenProvider = () => { const providerParams = new URL(location.href).searchParams; let token = providerParams.get('token'); diff --git a/desktop/static/index.web.dev.html b/desktop/static/index.web.dev.html index 18aab2fb3..af9bda6ed 100644 --- a/desktop/static/index.web.dev.html +++ b/desktop/static/index.web.dev.html @@ -101,35 +101,6 @@ window.flipperShowMessage = showMessage; window.flipperHideMessage = hideMessage; - const params = new URL(location.href).searchParams; - let token = params.get('token'); - if (!token) { - token = window.flipperConfig.authToken - } - - const socket = new WebSocket(`ws://${location.host}?token=${token}`); - window.devSocket = socket; - - socket.addEventListener('message', ({ data: dataRaw }) => { - const message = JSON.parse(dataRaw.toString()) - - if (typeof message.event === 'string') { - switch (message.event) { - case 'hasErrors': { - console.warn('Error message received'. message.payload); - break; - } - case 'plugins-source-updated': { - window.postMessage({ - type: 'plugins-source-updated', - data: message.payload - }) - break; - } - } - } - }); - // load correct theme (n.b. this doesn't handle system value specifically, will assume light in such cases) try { if (window.flipperConfig.theme === 'dark') {