Skip to content

Release/5.2.0 alpha #6

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Release/5.2.0 alpha #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
264285d
use autoUpdater from electron with github feedUrl for dialog control
jgresham Apr 18, 2024
f673783
bump 5.2.0
jgresham Apr 18, 2024
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
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nice-node",
"version": "5.1.2-alpha",
"version": "5.2.0-alpha",
"description": "Run a node at home, the easy way.",
"homepage": "https://nicenode.xyz",
"productName": "NiceNode",
Expand Down
134 changes: 134 additions & 0 deletions src/main/basicUpdater.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
// import sleep from 'await-sleep';
// import { type BrowserWindow, autoUpdater, dialog, FeedURLOptions } from 'electron';
import type { BrowserWindow } from 'electron';
// // const { updateElectronApp } = require('update-electron-app')
import { type IUpdateElectronAppOptions, updateElectronApp, UpdateSourceType } from 'update-electron-app';
import logger, { autoUpdateLogger } from './logger';
import log from 'electron-log/main';
const updateLogger = log.scope('updater');

// import { reportEvent } from './events';
// import i18nMain from './i18nMain';
// // import logger, { autoUpdateLogger } from './logger';
// import logger from './logger';
// import { getSetIsPreReleaseUpdatesEnabled } from './state/settings';

// let notifyUserIfNoUpdateAvailable: boolean;

// const t = i18nMain.getFixedT(null, 'updater');

// const intiUpdateHandlers = (browserWindow: BrowserWindow) => {
// autoUpdater.on('error', (error) => {
// logger.error('autoUpdater:::::::::error', error);
// });

// autoUpdater.on('checking-for-update', () => {
// logger.info('autoUpdater:::::::::checking-for-update');
// });
// autoUpdater.on('update-available', async (info: any) => {
// logger.info('autoUpdater:::::::::update-available: ', info);
// // Quick fix to wait for window load before showing update prompt
// await sleep(5000);
// dialog
// .showMessageBox(browserWindow, {
// type: 'info',
// title: t('UpdateAvailable'),
// message: `${t('UpdateNiceNode')} ${info.version}.`,
// buttons: [t('Yes'), t('No')],
// })
// .then(async (buttonIndex) => {
// if (buttonIndex.response === 0) {
// console.log('update accepted by user');
// console.log('starting download');
// autoUpdater.quitAndInstall();
// dialog.showMessageBox(browserWindow, {
// type: 'info',
// title: t('UpdateAvailable'),
// message: t('DownloadingUpdate'),
// });
// } else {
// console.log('update checkbox not checked');
// }
// })
// .catch((err) => {
// console.error('error in update available dialog: ', err);
// });
// });

// autoUpdater.on('update-not-available', () => {
// logger.info('autoUpdater:::::::::update-not-available');
// if (notifyUserIfNoUpdateAvailable) {
// dialog.showMessageBox(browserWindow, {
// type: 'info',
// title: t('NoUpdateAvailable'),
// message: t('NoUpdateAvailable'),
// });
// notifyUserIfNoUpdateAvailable = false;
// }
// });

// autoUpdater.on('update-downloaded', () => {
// logger.info('autoUpdater:::::::::update-downloaded');
// logger.info('Calling autoUpdater.quitAndInstall()');
// reportEvent('UpdatedNiceNode');
// try {
// autoUpdater.quitAndInstall();
// } catch (err) {
// logger.error('Error in: autoUpdater.quitAndInstall()');
// logger.error(err);
// dialog.showErrorBox(
// t('ErrorUpdating'),
// t('UnableToInstallUpdate', {
// downloadLink: 'https://www.nicenode.xyz/#download',
// }),
// );
// // todo: send error details
// reportEvent('ErrorUpdatingNiceNode');
// }
// });
// };

// export const initialize = (mainWindow: BrowserWindow) => {
// // autoUpdater.logger = autoUpdateLogger;
// // autoUpdater.autoDownload = false;
// // autoUpdater.autoInstallOnAppQuit = false;
// const isPreReleaseUpdatesEnabled = getSetIsPreReleaseUpdatesEnabled();
// logger.info(`isPreReleaseUpdatesEnabled: ${isPreReleaseUpdatesEnabled}`);
// // const server = 'https://github.com/NiceNode/nice-node/releases/latest'
// // const url = `${server}/update/${process.platform}/${app.getVersion()}`
// // autoUpdater.setFeedURL({ url });
// // autoUpdater.allowPrerelease = isPreReleaseUpdatesEnabled;
// notifyUserIfNoUpdateAvailable = false;
// intiUpdateHandlers(mainWindow);
// };

export const checkForUpdates = (notifyIfNoUpdateAvailable: boolean) => {
logger.info(`updater.checkForUpdates set to: ${notifyIfNoUpdateAvailable}`);
// notifyUserIfNoUpdateAvailable = notifyIfNoUpdateAvailable;
// autoUpdater.checkForUpdates();
};

export const setAllowPrerelease = (isAllowPrerelease: boolean) => {
logger.info(`updater.allowPrerelease set to: ${isAllowPrerelease}`);
// pre-release: not available https://www.electronjs.org/docs/latest/api/auto-updater#event-update-available
// autoUpdater.allowPrerelease = isAllowPrerelease;
};

// const feedUrl = `https://update.electronjs.org/NiceNode/test-nice-node-updater/darwin-arm64/5.1.2-alpha`
export const initialize = (mainWindow: BrowserWindow) => {
updateLogger.info('initialize updater');

const options: IUpdateElectronAppOptions = {
updateSource: {
type: UpdateSourceType.ElectronPublicUpdateService,
// repo: 'NiceNode/nice-node',
repo: 'NiceNode/test-nice-node-updater',
host: 'https://update.electronjs.org',
},
updateInterval: '5 minutes', // testing
logger: updateLogger
}

updateLogger.info('updater options: ', options);
updateElectronApp(options);
}
9 changes: 7 additions & 2 deletions src/main/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const RESOURCES_PATH = app.isPackaged
: path.join(__dirname, '..', '..', 'assets'); // starting point: .vite/build/main.js

const getAssetPath = (...paths: string[]): string => {
logger.log('RESOURCES_PATH: ', RESOURCES_PATH);
logger.info('RESOURCES_PATH: ', RESOURCES_PATH);
return path.join(RESOURCES_PATH, ...paths);
};

Expand Down Expand Up @@ -158,7 +158,12 @@ export const createWindow = async () => {

// App auto updates
updater.initialize(mainWindow);
// updater.checkForUpdates(false);
// disabled in dev env
if (!isDevelopment) {
updater.checkForUpdates(false);
} else {
logger.info('updater.checkForUpdates() skipped. Disabled in development env');
}

menuBuilder = new MenuBuilder(mainWindow);
menuBuilder.buildMenu();
Expand Down
176 changes: 84 additions & 92 deletions src/main/updater.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,92 +1,90 @@
// import sleep from 'await-sleep';
import sleep from 'await-sleep';
// import { type BrowserWindow, autoUpdater, dialog, FeedURLOptions } from 'electron';
import type { BrowserWindow } from 'electron';
// // const { updateElectronApp } = require('update-electron-app')
import { type IUpdateElectronAppOptions, updateElectronApp, UpdateSourceType } from 'update-electron-app';
import { app, autoUpdater, dialog, type BrowserWindow } from 'electron';
import logger, { autoUpdateLogger } from './logger';
import log from 'electron-log/main';
const updateLogger = log.scope('updater');

// import { reportEvent } from './events';
// import i18nMain from './i18nMain';
// // import logger, { autoUpdateLogger } from './logger';
import { reportEvent } from './events';
import i18nMain from './i18nMain';
// import logger, { autoUpdateLogger } from './logger';
// import logger from './logger';
// import { getSetIsPreReleaseUpdatesEnabled } from './state/settings';
import { getSetIsPreReleaseUpdatesEnabled } from './state/settings';

// let notifyUserIfNoUpdateAvailable: boolean;
let notifyUserIfNoUpdateAvailable: boolean;

// const t = i18nMain.getFixedT(null, 'updater');
const t = i18nMain.getFixedT(null, 'updater');

// const intiUpdateHandlers = (browserWindow: BrowserWindow) => {
// autoUpdater.on('error', (error) => {
// logger.error('autoUpdater:::::::::error', error);
// });
const intiUpdateHandlers = (browserWindow: BrowserWindow) => {
autoUpdater.on('error', (error) => {
logger.error('autoUpdater:::::::::error', error);
});

// autoUpdater.on('checking-for-update', () => {
// logger.info('autoUpdater:::::::::checking-for-update');
// });
// autoUpdater.on('update-available', async (info: any) => {
// logger.info('autoUpdater:::::::::update-available: ', info);
// // Quick fix to wait for window load before showing update prompt
// await sleep(5000);
// dialog
// .showMessageBox(browserWindow, {
// type: 'info',
// title: t('UpdateAvailable'),
// message: `${t('UpdateNiceNode')} ${info.version}.`,
// buttons: [t('Yes'), t('No')],
// })
// .then(async (buttonIndex) => {
// if (buttonIndex.response === 0) {
// console.log('update accepted by user');
// console.log('starting download');
// autoUpdater.quitAndInstall();
// dialog.showMessageBox(browserWindow, {
// type: 'info',
// title: t('UpdateAvailable'),
// message: t('DownloadingUpdate'),
// });
// } else {
// console.log('update checkbox not checked');
// }
// })
// .catch((err) => {
// console.error('error in update available dialog: ', err);
// });
// });
autoUpdater.on('checking-for-update', () => {
logger.info('autoUpdater:::::::::checking-for-update');
});
autoUpdater.on('update-available', async (info: any) => {
logger.info('autoUpdater:::::::::update-available: ', info);
// Quick fix to wait for window load before showing update prompt
await sleep(5000);
dialog
.showMessageBox(browserWindow, {
type: 'info',
title: t('UpdateAvailable'),
message: `${t('UpdateNiceNode')} ${info.version}.`,
buttons: [t('Yes'), t('No')],
})
.then(async (buttonIndex) => {
if (buttonIndex.response === 0) {
console.log('update accepted by user');
console.log('starting download');
autoUpdater.quitAndInstall();
dialog.showMessageBox(browserWindow, {
type: 'info',
title: t('UpdateAvailable'),
message: t('DownloadingUpdate'),
});
} else {
console.log('update checkbox not checked');
}
})
.catch((err) => {
console.error('error in update available dialog: ', err);
});
});

// autoUpdater.on('update-not-available', () => {
// logger.info('autoUpdater:::::::::update-not-available');
// if (notifyUserIfNoUpdateAvailable) {
// dialog.showMessageBox(browserWindow, {
// type: 'info',
// title: t('NoUpdateAvailable'),
// message: t('NoUpdateAvailable'),
// });
// notifyUserIfNoUpdateAvailable = false;
// }
// });
autoUpdater.on('update-not-available', () => {
logger.info('autoUpdater:::::::::update-not-available');
if (notifyUserIfNoUpdateAvailable) {
dialog.showMessageBox(browserWindow, {
type: 'info',
title: t('NoUpdateAvailable'),
message: t('NoUpdateAvailable'),
});
notifyUserIfNoUpdateAvailable = false;
}
});

// autoUpdater.on('update-downloaded', () => {
// logger.info('autoUpdater:::::::::update-downloaded');
// logger.info('Calling autoUpdater.quitAndInstall()');
// reportEvent('UpdatedNiceNode');
// try {
// autoUpdater.quitAndInstall();
// } catch (err) {
// logger.error('Error in: autoUpdater.quitAndInstall()');
// logger.error(err);
// dialog.showErrorBox(
// t('ErrorUpdating'),
// t('UnableToInstallUpdate', {
// downloadLink: 'https://www.nicenode.xyz/#download',
// }),
// );
// // todo: send error details
// reportEvent('ErrorUpdatingNiceNode');
// }
// });
// };
autoUpdater.on('update-downloaded', (...args) => {
logger.info('autoUpdater:::::::::update-downloaded args: ', args);
logger.info('Calling autoUpdater.quitAndInstall()');
reportEvent('UpdatedNiceNode');
try {
autoUpdater.quitAndInstall();
} catch (err) {
logger.error('Error in: autoUpdater.quitAndInstall()');
logger.error(err);
dialog.showErrorBox(
t('ErrorUpdating'),
t('UnableToInstallUpdate', {
downloadLink: 'https://www.nicenode.xyz/#download',
}),
);
// todo: send error details
reportEvent('ErrorUpdatingNiceNode');
}
});
};

// export const initialize = (mainWindow: BrowserWindow) => {
// // autoUpdater.logger = autoUpdateLogger;
Expand All @@ -104,8 +102,8 @@ const updateLogger = log.scope('updater');

export const checkForUpdates = (notifyIfNoUpdateAvailable: boolean) => {
logger.info(`updater.checkForUpdates set to: ${notifyIfNoUpdateAvailable}`);
// notifyUserIfNoUpdateAvailable = notifyIfNoUpdateAvailable;
// autoUpdater.checkForUpdates();
notifyUserIfNoUpdateAvailable = notifyIfNoUpdateAvailable;
autoUpdater.checkForUpdates();
};

export const setAllowPrerelease = (isAllowPrerelease: boolean) => {
Expand All @@ -116,17 +114,11 @@ export const setAllowPrerelease = (isAllowPrerelease: boolean) => {

export const initialize = (mainWindow: BrowserWindow) => {
updateLogger.info('initialize updater');

const options: IUpdateElectronAppOptions = {
updateSource: {
type: UpdateSourceType.ElectronPublicUpdateService,
repo: 'NiceNode/nice-node',
host: 'https://update.electronjs.org',
},
updateInterval: '5 minutes', // testing
logger: updateLogger
}

updateLogger.info('updater options: ', options);
updateElectronApp(options);
const host = 'https://update.electronjs.org';
const publicRepo = 'NiceNode/test-nice-node-updater';
const currentAppVersion = app.getVersion(); // ex. 5.1.2-alpha
const feedUrl = `${host}/${publicRepo}/${process.platform}-${process.arch}/${currentAppVersion}`
autoUpdater.setFeedURL({ url: feedUrl });
notifyUserIfNoUpdateAvailable = false;
intiUpdateHandlers(mainWindow);
}