Skip to content

[No QA] Clear desktop updates debug logs #59010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mountiny merged 4 commits into from
Apr 2, 2025
Merged

[No QA] Clear desktop updates debug logs #59010

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b585ad
clear logs
rezkiy37 Mar 24, 2025
ba81f55
Merge branch 'main' of https://github.com/rezkiy37/Expensify into cho…
rezkiy37 Mar 31, 2025
7a12b4e
Merge branch 'main' of https://github.com/rezkiy37/Expensify into cho…
rezkiy37 Apr 2, 2025
c090118
clear logs
rezkiy37 Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 4 additions & 40 deletions desktop/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ import type {CreateDownloadQueueModule, DownloadItem} from './createDownloadQueu
import serve from './electron-serve';
import ELECTRON_EVENTS from './ELECTRON_EVENTS';

console.log('[dev] main');

const createDownloadQueue = require<CreateDownloadQueueModule>('./createDownloadQueue').default;

const port = process.env.PORT ?? 8082;
Expand Down Expand Up @@ -139,38 +137,26 @@ const preferredLocale: Locale = CONST.LOCALES.DEFAULT;
const appProtocol = CONST.DEEPLINK_BASE_URL.replace('://', '');

const quitAndInstallWithUpdate = () => {
console.log('[dev] quitAndInstallWithUpdate');
if (!downloadedVersion) {
console.log('[dev] !downloadedVersion');
return;
}
hasUpdate = true;
autoUpdater.quitAndInstall();
};

const verifyAndInstallLatestVersion = (): void => {
console.log('[dev] verifyAndInstallLatestVersion');

autoUpdater
.checkForUpdates()
.then((result) => {
console.log('[dev] verifyAndInstallLatestVersion: result', result);
console.log('[dev] verifyAndInstallLatestVersion: downloadedVersion', downloadedVersion);

if (result?.updateInfo.version === downloadedVersion) {
console.log('[dev] verifyAndInstallLatestVersion: if - versions match, installing');
return quitAndInstallWithUpdate();
}

console.log('[dev] verifyAndInstallLatestVersion: else - downloading new update');

return autoUpdater.downloadUpdate().then(() => {
console.log('[dev] verifyAndInstallLatestVersion: download complete, installing');
return quitAndInstallWithUpdate();
});
})
.catch((error) => {
console.log('[dev] verifyAndInstallLatestVersion: error', error);
log.error('Error during update check or download:', error);
});
};
Expand All @@ -182,16 +168,13 @@ const manuallyCheckForUpdates = (menuItem?: MenuItem, browserWindow?: BaseWindow
// eslint-disable-next-line no-param-reassign -- menu item flags like enabled or visible can be dynamically toggled by mutating the object
menuItem.enabled = false;
}
console.log('[dev] manuallyCheckForUpdates');
autoUpdater
.checkForUpdates()
.catch((error: unknown) => {
console.log('[dev] manuallyCheckForUpdates: catch');
isSilentUpdating = false;
return {error};
})
.then((result) => {
console.log('[dev] manuallyCheckForUpdates: then');
const downloadPromise = result && 'downloadPromise' in result ? result.downloadPromise : undefined;

if (!browserWindow) {
Expand Down Expand Up @@ -246,48 +229,33 @@ const showKeyboardShortcutsPage = (browserWindow: BrowserWindow) => {
/** Actual auto-update listeners */
const electronUpdater = (browserWindow: BrowserWindow): PlatformSpecificUpdater => ({
init: () => {
console.log('[dev] electronUpdater.init');
autoUpdater.on(ELECTRON_EVENTS.UPDATE_DOWNLOADED, (info) => {
console.log('[dev] ELECTRON_EVENTS.UPDATE_DOWNLOADED');
console.log('[dev] info:', info);
console.log('[dev] isSilentUpdating:', isSilentUpdating);

const systemMenu = Menu.getApplicationMenu();
const updateMenuItem = systemMenu?.getMenuItemById(`update`);
const checkForUpdatesMenuItem = systemMenu?.getMenuItemById(`checkForUpdates`);

downloadedVersion = info.version;

if (updateMenuItem) {
console.log('[dev] updateMenuItem', updateMenuItem);
updateMenuItem.visible = true;
}
if (checkForUpdatesMenuItem) {
console.log('[dev] checkForUpdatesMenuItem', checkForUpdatesMenuItem);
checkForUpdatesMenuItem.visible = false;
}
if (browserWindow.isVisible() && !isSilentUpdating) {
console.log('[dev] browserWindow.isVisible() && !isSilentUpdating');
browserWindow.webContents.send(ELECTRON_EVENTS.UPDATE_DOWNLOADED, info.version);
} else {
console.log('[dev] else');
verifyAndInstallLatestVersion();
}
});

console.log('[dev] ipcMain.on(ELECTRON_EVENTS.START_UPDATE, quitAndInstallWithUpdate)');
ipcMain.on(ELECTRON_EVENTS.START_UPDATE, () => {
console.log('[dev] ELECTRON_EVENTS.START_UPDATE');
verifyAndInstallLatestVersion();
});
autoUpdater.checkForUpdates().then((result) => {
console.log('[dev] update result 1: ', result);
});
autoUpdater.checkForUpdates();
},
update: () => {
autoUpdater.checkForUpdates().then((result) => {
console.log('[dev] update result 2:', result);
});
autoUpdater.checkForUpdates();
},
});

Expand All @@ -314,7 +282,7 @@ const mainWindow = (): Promise<void> => {

// Prod and staging set the icon in the electron-builder config, so only update it here for dev
if (__DEV__) {
console.log('CONFIG: ', CONFIG);
console.debug('CONFIG: ', CONFIG);
app.dock.setIcon(`${__dirname}/../icon-dev.png`);
app.setName('New Expensify Dev');
}
Expand Down Expand Up @@ -414,6 +382,7 @@ const mainWindow = (): Promise<void> => {
}
callback({responseHeaders: details.responseHeaders});
});
/* eslint-enable */

// Prod and staging overwrite the app name in the electron-builder config, so only update it here for dev
if (__DEV__) {
Expand Down Expand Up @@ -674,11 +643,8 @@ const mainWindow = (): Promise<void> => {
browserWindow.show();
});

console.log('[dev] expectedUpdateVersion:', expectedUpdateVersion);
console.log('[dev] app.getVersion():', app.getVersion());
// Hide the app if we expected to upgrade to a new version but never did.
if (expectedUpdateVersion && app.getVersion() !== expectedUpdateVersion) {
console.log('[dev] expectedUpdateVersion && app.getVersion() !== expectedUpdateVersion');
browserWindow.hide();
app.hide();
}
Expand Down Expand Up @@ -726,7 +692,6 @@ const mainWindow = (): Promise<void> => {

// Automatically check for and install the latest version in the background
ipcMain.on(ELECTRON_EVENTS.SILENT_UPDATE, () => {
console.log('[dev] ELECTRON_EVENTS.SILENT_UPDATE');
if (isSilentUpdating) {
return;
}
Expand Down Expand Up @@ -757,7 +722,6 @@ const mainWindow = (): Promise<void> => {
return;
}

console.log('[dev] checkForUpdates(electronUpdater(browserWindowRef));');
checkForUpdates(electronUpdater(browserWindowRef));
})
);
Expand Down
Loading