Remove usage of server enabled

Summary: Used last year to GK server usage. This is obsolete so is safe to remove.

Reviewed By: ivanmisuno

Differential Revision: D49414625

fbshipit-source-id: 9eeff932c59c90dff829e4c6c83bad43a0fd74e3
This commit is contained in:
Lorenzo Blasa
2023-09-20 04:10:39 -07:00
committed by Facebook GitHub Bot
parent f897203a32
commit 0540d240c0
3 changed files with 20 additions and 113 deletions

View File

@@ -123,7 +123,6 @@ async function getFlipperServer(
const keytar: KeytarModule | undefined = await getKeytarModule(staticPath);
const gatekeepers = getGatekeepers(environmentInfo.os.unixname);
const serverUsageEnabled = gatekeepers['flipper_desktop_use_server'];
const settings = await loadSettings();
const port = 52342;
/**
@@ -166,41 +165,6 @@ async function getFlipperServer(
await shutdown(TCPconnectionURL);
}
const [homePath, tempPath, desktopPath] = await Promise.all([
electronIpcClient.send('getPath', 'home'),
electronIpcClient.send('getPath', 'temp'),
electronIpcClient.send('getPath', 'desktop'),
]);
const getEmbeddedServer = async () => {
const server = new FlipperServerImpl(
{
sessionId,
environmentInfo,
env: parseEnvironmentVariables(env),
gatekeepers: gatekeepers,
paths: {
appPath,
homePath,
execPath,
staticPath,
tempPath,
desktopPath,
},
launcherSettings: await loadLauncherSettings(),
processConfig: loadProcessConfig(env),
settings,
validWebSocketOrigins:
constants.VALID_WEB_SOCKET_REQUEST_ORIGIN_PREFIXES,
},
logger,
keytar,
);
return server;
};
if (serverUsageEnabled && (!settings.server || settings.server.enabled)) {
console.info('flipper-server: not running/listening, start');
const {readyForIncomingConnections} = await startServer({
@@ -225,8 +189,6 @@ async function getFlipperServer(
return getExternalServer(TCPconnectionURL);
}
return getEmbeddedServer();
}
async function start() {
const logger = createDelegatedLogger();

View File

@@ -15,7 +15,7 @@ export type GKMap = {[key: string]: boolean};
// Allow OSS users start flipper-server
const whitelistedGKs: Array<GKID> = ['flipper_desktop_use_server'];
const whitelistedGKs: Array<GKID> = [''];
export function loadGKs(_username: string, _gks: Array<GKID>): Promise<GKMap> {
return Promise.reject(

View File

@@ -131,14 +131,7 @@ class SettingsSheet extends Component<Props, State> {
enablePluginMarketplace,
enablePluginMarketplaceAutoUpdate,
marketplaceURL,
server,
} = this.state.updatedSettings;
const serverUsageEnabled = getRenderHostInstance().GK(
'flipper_desktop_use_server',
);
const serverType = getRenderHostInstance().serverConfig.type;
const settingsPristine =
isEqual(this.props.settings, this.state.updatedSettings) &&
isEqual(this.props.launcherSettings, this.state.updatedLauncherSettings);
@@ -400,54 +393,6 @@ class SettingsSheet extends Component<Props, State> {
/>
</ToggledSection>
</NUX>
<ToggledSection
label="Server (Experimental)"
toggled={(serverUsageEnabled && (!server || server.enabled)) ?? false}
frozen={!serverUsageEnabled}
onChange={(v) => {
this.setState((prevState) => ({
updatedSettings: {
...prevState.updatedSettings,
server: {enabled: v},
},
}));
}}>
{serverUsageEnabled ? (
<>
<ConfigText
content={
"For changes to take effect, click on 'Apply and Restart'"
}
/>
{serverType ? (
<>
<ConfigText
content={`Flipper is currently using an '${serverType}' server.`}
/>
{serverType === 'external' ? (
<>
<br />
<span>
To stop the server, it may be necessary to kill the
process listening at port <b>52342</b>. See below:
</span>
<br />
<code>sudo kill $(lsof -t -i :52342)</code>
</>
) : (
<></>
)}
</>
) : (
<></>
)}
</>
) : (
<ConfigText
content={'The usage of flipperd (server) is currently disabled.'}
/>
)}
</ToggledSection>
<Layout.Right center>
<span>Reset all new user tooltips</span>
<ResetTooltips />