-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: Upgrade electron dependencies (#216)
* chore: Upgrade dependencies * chore: Upgrade packages * feat: Update transpilation process * refactor: Move methods to the helpers file and update getFreePort definition * fix: Circular dependencies * fix: Library import style * fix: App Path definition * fix: Tests * fix: output folder and building ci * chore: Remove unused dependencies * refactor: Update file extension * fix: file extension * chore: Update build step to generate the installer * fix: Windows upload artifacts flow * fix: path * fix: GetFreePort logic and Import order * fix: Update icons * chore: Update deployment notification message
- Loading branch information
Showing
16 changed files
with
5,750 additions
and
2,077 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,212 @@ | ||
| import fs from 'fs' | ||
| import { exit } from 'process' | ||
| import { shell, app, BrowserWindow, ipcMain, crashReporter, systemPreferences } from 'electron' | ||
| import updater from 'electron-updater' | ||
| import { main } from './main' | ||
| import { parseConfig } from './cmdParser' | ||
| import { createWindow, hideWindowInTray, loadDecentralandWeb, onOpenUrl, showWindowAndHideTray } from './window' | ||
| import { isTrustedCertificate } from './certificateChecker' | ||
| import { getAppTitle, getAppBasePath, getFreePort, getOSName } from './helpers' | ||
| import { LauncherPaths } from './types' | ||
|
|
||
| // all uncaught exceptions are being sent automatically | ||
| initializeCrashReport() | ||
|
|
||
| parseConfig([...process.argv]) | ||
|
|
||
| main.openingUrl = process.argv.find((arg) => arg.startsWith('dcl://')) | ||
| console.log('main.openingUrl: ', main.openingUrl) | ||
|
|
||
| app.setAsDefaultProtocolClient('dcl') | ||
|
|
||
| const isAppAllowed = app.requestSingleInstanceLock() | ||
|
|
||
| if (!isAppAllowed) { | ||
| app.quit() | ||
| } else { | ||
| app.on('open-url', (event, url) => { | ||
| if (main.win) { | ||
| onOpenUrl(url, main.win) | ||
| } else { | ||
| main.openingUrl = url | ||
| } | ||
| event.preventDefault() | ||
| }) | ||
| } | ||
|
|
||
| const osName = getOSName() | ||
|
|
||
| console.log('Config:', main.config) | ||
| console.log('OS:', osName) | ||
|
|
||
| if (getOSName() === null) { | ||
| console.error('OS not supported') | ||
| exit(1) | ||
| } | ||
|
|
||
| const launcherPaths: LauncherPaths = { | ||
| baseUrl: `https://renderer-artifacts.decentraland.org/desktop/`, | ||
| rendererPath: `${app.getPath('appData')}/explorer-desktop-launcher/renderer/`, | ||
| executablePath: `/unity-renderer-${osName}`, | ||
| versionPath: `/version.json`, | ||
| artifactUrl: `unity-renderer-${osName}.zip`, | ||
| remoteVersionUrl: `/version.json` | ||
| } | ||
|
|
||
| if (getOSName() === 'windows') { | ||
| launcherPaths.rendererPath = launcherPaths.rendererPath.replace(/\//gi, '\\') | ||
| launcherPaths.versionPath = launcherPaths.versionPath.replace(/\//gi, '\\') | ||
| launcherPaths.executablePath = launcherPaths.executablePath.replace(/\//gi, '\\') | ||
| } | ||
|
|
||
| const checkUpdates = async (win: BrowserWindow): Promise<void> => { | ||
| try { | ||
| const result = await updater.autoUpdater.checkForUpdatesAndNotify() | ||
| console.log('Result:', result) | ||
| if (result === null || !result.downloadPromise) { | ||
| await loadDecentralandWeb(win) | ||
| } else { | ||
| await result.downloadPromise | ||
|
|
||
| console.log('Download completed') | ||
| const silent = process.platform === 'darwin' // Silent=true only on Mac | ||
| updater.autoUpdater.quitAndInstall(silent, true) | ||
| } | ||
| } catch (err) { | ||
| console.error(`Check Updates error: ${err}`) | ||
| await loadDecentralandWeb(win) // Load current version anyway | ||
| } | ||
| return Promise.resolve() | ||
| } | ||
|
|
||
| const startApp = async (): Promise<void> => { | ||
| main.config.port = await getFreePort() | ||
|
|
||
| if (main.openingUrl) { | ||
| console.log('opening-url: ', main.openingUrl) | ||
| onOpenUrl(main.openingUrl) | ||
| } | ||
|
|
||
| const appTitle = getAppTitle() | ||
| const win = await createWindow(appTitle, launcherPaths) | ||
| main.win = win | ||
|
|
||
| ipcMain.on('process-terminated', async (event, reloadWebsite: boolean) => { | ||
| main.isRendererOpen = false | ||
|
|
||
| if (reloadWebsite) { | ||
| // (#1457) we should reload the url | ||
| await loadDecentralandWeb(win) | ||
| } | ||
|
|
||
| showWindowAndHideTray(win) | ||
| }) | ||
|
|
||
| ipcMain.on('on-open-renderer', (event) => { | ||
| main.isRendererOpen = true | ||
| hideWindowInTray(win) | ||
| }) | ||
|
|
||
| win.on('close', (event: { preventDefault: () => void }) => { | ||
| // this prevents the launcher from closing when using the X button on the window | ||
| if (!main.isExitAllowed && main.isRendererOpen) { | ||
| hideWindowInTray(win) | ||
| event.preventDefault() | ||
| } | ||
| }) | ||
|
|
||
| win.on('minimize', function (event: { preventDefault: () => void }) { | ||
| hideWindowInTray(win) | ||
| event.preventDefault() | ||
| }) | ||
|
|
||
| app.on('second-instance', (event, commandLine, workingDirectory) => { | ||
| if (process.platform !== 'darwin') { | ||
| // Find the arg that is our custom protocol url and store it | ||
| const url = commandLine.find((arg) => arg.startsWith('dcl://')) | ||
| if (url) onOpenUrl(url, win) | ||
|
|
||
| console.log('second-instance url: ', url) | ||
| } | ||
| showWindowAndHideTray(win) | ||
| }) | ||
|
|
||
| win.webContents.setWindowOpenHandler(({ url }) => { | ||
| shell.openExternal(url) | ||
| return { action: 'deny' } | ||
| }) | ||
|
|
||
| ipcMain.on('loadDecentralandWeb', (event: any, url: string, explorerDesktopBranch: string) => { | ||
| main.config.customUrl = url | ||
| main.config.desktopBranch = explorerDesktopBranch | ||
| loadDecentralandWeb(win) | ||
| }) | ||
|
|
||
| if (!main.config.developerMode && !main.config.previewMode) { | ||
| await checkUpdates(win) | ||
| } | ||
|
|
||
| const microphoneResult = await askForMediaAccess('microphone') | ||
| if (!microphoneResult) { | ||
| console.log('Microphone permission was not given') | ||
| } | ||
| return Promise.resolve() | ||
| } | ||
|
|
||
| // SSL/TSL: this is the self signed certificate support | ||
| app.on('certificate-error', (event, webContents, url, error, certificate, callback) => { | ||
| // On certificate error we disable default behaviour (stop loading the page) | ||
| // and we then say "it is all fine - true" to the callback | ||
| if (isTrustedCertificate(url, error)) { | ||
| event.preventDefault() | ||
| callback(true) | ||
| } | ||
| }) | ||
|
|
||
| app | ||
| .whenReady() | ||
| .then(async () => { | ||
| await startApp() | ||
|
|
||
| app.on('activate', () => { | ||
| if (BrowserWindow.getAllWindows().length === 0) { | ||
| startApp() | ||
| } | ||
| }) | ||
|
|
||
| app.on('window-all-closed', () => { | ||
| if (process.platform !== 'darwin') { | ||
| app.quit() | ||
| } | ||
| }) | ||
|
|
||
| app.on('before-quit', function () { | ||
| //this allows exiting the launcher through command+Q or alt+f4 | ||
| main.isExitAllowed = true | ||
| }) | ||
| }) | ||
| .catch(async (error) => { | ||
| console.error(`Error starting app: ${error}`) | ||
| }) | ||
|
|
||
| function initializeCrashReport() { | ||
| var path = getAppBasePath() | ||
| if (!fs.existsSync(path)) fs.mkdir(path, () => {}) | ||
|
|
||
| app.setPath('crashDumps', path) | ||
|
|
||
| crashReporter.start({ uploadToServer: false }) | ||
| } | ||
|
|
||
| const askForMediaAccess = async (mediaType: 'microphone' | 'camera') => { | ||
| if (systemPreferences.askForMediaAccess) { | ||
| // Electron currently only implements this on macOS | ||
| const previous = await systemPreferences.getMediaAccessStatus(mediaType) | ||
| const result = await systemPreferences.askForMediaAccess(mediaType) | ||
| const next = await systemPreferences.getMediaAccessStatus(mediaType) | ||
| console.log(`MediaAccess for ${mediaType} is went from ${previous} to ${next} (askForMediaAccess: ${result})`) | ||
| return result | ||
| } | ||
| // For other platforms we can't reasonably do anything other than assume we have access. | ||
| return true | ||
| } |
Oops, something went wrong.