Add support to load settings from options (flag) and default to specific options

Summary: This change gives priority to a user option settingsString to set up the flipper-server configuration and load them from a json string. Also giving the user the chance to avoid flipper-server looking at the launcher config files in the computer

Reviewed By: mweststrate

Differential Revision: D34210110

fbshipit-source-id: 9e852b79da106b5140c59116fd7d0c0f3155e620

desktop/flipper-dump/src/index.tsx

@@ -48,6 +48,17 @@ const argv = yargs
       type: 'string',
       demandOption: true,
     },
+    settingsString: {
+      describe: `override the existing defaults settings of flipper (settings.json file) e.g "{"androidHome":"/usr/local/bin","enableAndroid":true}"`,
+      type: 'string',
+      default: '',
+    },
+    launcherSettings: {
+      describe:
+        'Open Flipper with the configuration stored in .config folder for the launcher',
+      type: 'boolean',
+      default: true,
+    },
     // TODO: support filtering events
     // TODO: support verbose mode
     // TODO: support post processing messages
@@ -90,9 +101,9 @@ async function start(deviceQuery: string, appName: string, pluginId: string) {
           execPath: process.execPath,
           desktopPath: `/dev/null`,
         },
-        launcherSettings: await loadLauncherSettings(),
+        launcherSettings: await loadLauncherSettings(argv.launcherSettings),
         processConfig: loadProcessConfig(process.env),
-        settings: await loadSettings(),
+        settings: await loadSettings(argv.settingsString),
         validWebSocketOrigins: [],
       },
       logger,

desktop/flipper-server-core/src/utils/launcherSettings.tsx

@@ -65,7 +65,13 @@ function deserialize(content: string): LauncherSettings {
   };
 }
 
-export async function loadLauncherSettings(): Promise<LauncherSettings> {
+export async function loadLauncherSettings(
+  enableLauncherSettings: boolean = true,
+): Promise<LauncherSettings> {
+  if (!enableLauncherSettings) {
+    return defaultLauncherSettings;
+  }
+
   const fileName = getLauncherSettingsFile();
   try {
     const content = (await fs.readFile(fileName)).toString();

desktop/flipper-server-core/src/utils/settings.tsx

@@ -13,7 +13,16 @@ import xdg from 'xdg-basedir';
 import {Settings, Tristate} from 'flipper-common';
 import {readFile, writeFile, pathExists, mkdirp} from 'fs-extra';
 
-export async function loadSettings(): Promise<Settings> {
+export async function loadSettings(
+  settingsString: string = '',
+): Promise<Settings> {
+  if (settingsString !== '') {
+    try {
+      return replaceDefaultSettings(JSON.parse(settingsString));
+    } catch (e) {
+      throw new Error("couldn't read the user settingsString");
+    }
+  }
   if (!pathExists(getSettingsFile())) {
     return getDefaultSettings();
   }
@@ -74,3 +83,7 @@ function getDefaultAndroidSdkPath() {
 function getWindowsSdkPath() {
   return `${os.homedir()}\\AppData\\Local\\android\\sdk`;
 }
+
+function replaceDefaultSettings(userSettings: Partial<Settings>): Settings {
+  return {...getDefaultSettings(), ...userSettings};
+}

desktop/flipper-server/src/index.tsx

@@ -44,6 +44,17 @@ const argv = yargs
       type: 'boolean',
       default: false,
     },
+    settingsString: {
+      describe: `override the existing defaults settings of flipper (settings.json file) e.g "{"androidHome":"/usr/local/bin","enableAndroid":true}"`,
+      type: 'string',
+      default: '',
+    },
+    launcherSettings: {
+      describe:
+        'Open Flipper with the configuration stored in .config folder for the launcher',
+      type: 'boolean',
+      default: true,
+    },
   })
   .version('DEV')
   .help()
@@ -71,7 +82,12 @@ async function start() {
     staticDir,
     entry: 'index.web.dev.html',
   });
-  const flipperServer = await startFlipperServer(rootDir, staticDir);
+  const flipperServer = await startFlipperServer(
+    rootDir,
+    staticDir,
+    argv.settingsString,
+    argv.launcherSettings,
+  );
   if (argv.failFast) {
     flipperServer.on('server-state', ({state}) => {
       if (state === 'error') {

desktop/flipper-server/src/startFlipperServer.tsx

@@ -28,6 +28,8 @@ import fs from 'fs';
 export async function startFlipperServer(
   rootDir: string,
   staticPath: string,
+  settingsString: string,
+  enableLauncherSettings: boolean,
 ): Promise<FlipperServerImpl> {
   if (os.platform() === 'darwin') {
     // By default Node.JS has its internal certificate storage and doesn't use
@@ -85,9 +87,9 @@ export async function startFlipperServer(
         tempPath: os.tmpdir(),
         desktopPath: desktopPath,
       },
-      launcherSettings: await loadLauncherSettings(),
+      launcherSettings: await loadLauncherSettings(enableLauncherSettings),
       processConfig: loadProcessConfig(env),
-      settings: await loadSettings(),
+      settings: await loadSettings(settingsString),
       validWebSocketOrigins: ['localhost:', 'http://localhost:'],
     },
     logger,