Do not delegate to Launcher
Summary: For the last stable Electron version, do not delegate to Launcher. Reviewed By: antonk52 Differential Revision: D49821835 fbshipit-source-id: 0a80627cd1da312447b7d98d0351aa8faf2bae89
This commit is contained in:
committed by
Facebook GitHub Bot
parent
dbe07b80ad
commit
df8a68b7f1
@@ -1,100 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*
|
||||
* @format
|
||||
*/
|
||||
|
||||
import os from 'os';
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import {spawn} from 'child_process';
|
||||
import xdg from 'xdg-basedir';
|
||||
import mkdirp from 'mkdirp';
|
||||
|
||||
const isProduction = () =>
|
||||
!/node_modules[\\/]electron[\\/]/.test(process.execPath);
|
||||
|
||||
const isLauncherInstalled = async () => {
|
||||
if (os.type() == 'Darwin') {
|
||||
const receipt = 'com.facebook.flipper.launcher';
|
||||
const plistLocation = '/Applications/Flipper.app/Contents/Info.plist';
|
||||
try {
|
||||
return (
|
||||
(await fs.promises.stat(plistLocation)) &&
|
||||
(await fs.promises.readFile(plistLocation)).indexOf(receipt) > 0
|
||||
);
|
||||
} catch (e) {
|
||||
console.error('Error while reading Info.plist', e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
const startLauncher = (argv: {file?: string; url?: string}) => {
|
||||
const args = [];
|
||||
if (argv.file) {
|
||||
args.push('--file', argv.file);
|
||||
}
|
||||
if (argv.url) {
|
||||
args.push('--url', argv.url);
|
||||
}
|
||||
if (os.type() == 'Darwin') {
|
||||
spawn('open', ['/Applications/Flipper.app', '--args'].concat(args));
|
||||
}
|
||||
};
|
||||
|
||||
const checkIsCycle = async () => {
|
||||
const dir = path.join(xdg.cache!, 'flipper');
|
||||
const filePath = path.join(dir, 'last-launcher-run');
|
||||
// This isn't monotonically increasing, so there's a change we get time drift
|
||||
// between the checks, but the worst case here is that we do two roundtrips
|
||||
// before this check works.
|
||||
const rightNow = Date.now();
|
||||
|
||||
let backThen;
|
||||
try {
|
||||
backThen = parseInt((await fs.promises.readFile(filePath)).toString(), 10);
|
||||
} catch (e) {
|
||||
backThen = 0;
|
||||
}
|
||||
|
||||
const delta = rightNow - backThen;
|
||||
await mkdirp(dir);
|
||||
await fs.promises.writeFile(filePath, '' + rightNow);
|
||||
|
||||
// If the last startup was less than 5s ago, something's not okay.
|
||||
return Math.abs(delta) < 5000;
|
||||
};
|
||||
|
||||
/**
|
||||
* Runs the launcher if required and returns a boolean based on whether
|
||||
* it has. You should shut down this instance of the app in that case.
|
||||
*/
|
||||
export default async function delegateToLauncher(argv: {
|
||||
launcher: boolean;
|
||||
file?: string;
|
||||
url?: string;
|
||||
}) {
|
||||
if (argv.launcher && isProduction() && (await isLauncherInstalled())) {
|
||||
if (await checkIsCycle()) {
|
||||
console.error(
|
||||
'Launcher cycle detected. Not delegating even though I usually would.',
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
console.warn('Delegating to Flipper Launcher ...');
|
||||
console.warn(
|
||||
`You can disable this behavior by passing '--no-launcher' at startup.`,
|
||||
);
|
||||
startLauncher(argv);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -28,7 +28,6 @@ import fixPath from 'fix-path';
|
||||
import {exec} from 'child_process';
|
||||
import setup, {Config, configPath} from './setup';
|
||||
import isFB from './fb-stubs/isFB';
|
||||
import delegateToLauncher from './launcher';
|
||||
import yargs from 'yargs';
|
||||
import {promisify} from 'util';
|
||||
import process from 'process';
|
||||
@@ -174,14 +173,8 @@ app.on('ready', async () => {
|
||||
const config = await setup(argv);
|
||||
processConfig(config);
|
||||
|
||||
// If we delegate to the launcher, shut down this instance of the app.
|
||||
delegateToLauncher(argv)
|
||||
.then(async (hasLauncherInvoked: boolean) => {
|
||||
if (hasLauncherInvoked) {
|
||||
app.quit();
|
||||
return;
|
||||
}
|
||||
appReady = true;
|
||||
|
||||
app.commandLine.appendSwitch('scroll-bounce');
|
||||
configureSession();
|
||||
createWindow(config);
|
||||
@@ -224,8 +217,6 @@ app.on('ready', async () => {
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
.catch((e: any) => console.error('Error while delegating app launch', e));
|
||||
});
|
||||
|
||||
app.on('web-contents-created', (_event, contents) => {
|
||||
|
||||
Reference in New Issue
Block a user