feat: integrated check-for-updates ipc, seperated configs for OTA and…

… publish

build.mjs

@@ -1,12 +1,22 @@
 /**
- * This script is used to build the electron app **with notarization**. It is used for the final build and release process.
+ * This script is used to build, release, code sign and notarize the app.
+ * It is used for the final build and release process.
  */
 import { config } from "dotenv"
 import { build } from "electron-builder"
-import { publishOptions } from "./electron/constants/options.mjs"
 
 config();
 
+const publishOptions = {
+  provider: 'github',
+  owner: 'valory-xyz',
+  repo: 'olas-operate-app',
+  releaseType: 'draft',
+  token: process.env.GH_TOKEN,
+  private: false,
+  publishAutoUpdate: true,
+};
+
 const main = async () => {
   console.log("Building...");
 

electron/dev-app-update.yml

@@ -0,0 +1,5 @@
+provider: github
+owner: valory-xyz
+repo: olas-operate-app
+channel: latest
+releaseType: draft

electron/main.mjs

@@ -401,6 +401,7 @@ async function launchNextAppDev() {
   });
 }
 
+// Fires after splash screen is loaded
 ipcMain.on('check', async function (event, _argument) {
   // Setup
   try {
@@ -498,14 +499,10 @@ app.on('before-quit', async () => {
 });
 
 // UPDATER EVENTS
-macUpdater.on('update-downloaded', () => {
+macUpdater.once('update-downloaded', () => {
   mainWindow.webContents.send('update-downloaded');
 });
 
-macUpdater.on('update-available', (info) => {
-  mainWindow.webContents.send('update-available', info);
-});
-
 macUpdater.on('download-progress', (progress) => {
   mainWindow.webContents.send('download-progress', progress);
 });
@@ -518,6 +515,32 @@ ipcMain.on('install-update', () => {
   macUpdater.quitAndInstall();
 });
 
+// const checkForUpdates = async () => {
+//   macUpdater.once('update-available', (info) => {
+//     logger.electron('Update available.');
+//     logger.electron(`Version: ${info.version}`);
+//     resolve({
+//       available: true,
+//       version: info.version,
+//       message: info.releaseNotes,
+//     });
+//   });
+
+//   macUpdater.once('update-not-available', () => {
+//     logger.electron('No updates available.');
+//     resolve({ available: false, message: 'No updates available.' });
+//   });
+
+//   macUpdater.once('error', (error) => {
+//     logger.electron('Error in auto-updater:', error);
+//     reject(error);
+//   });
+
+//   macUpdater.checkForUpdates();
+// };
+
+ipcMain.handle('check-for-updates', async () => macUpdater.checkForUpdates());
+
 // PROCESS SPECIFIC EVENTS (HANDLES NON-GRACEFUL TERMINATION)
 process.on('uncaughtException', (error) => {
   logger.electron('Uncaught Exception:', error);

electron/preload.mjs

@@ -30,7 +30,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
   openPath: (filePath) => ipcRenderer.send('open-path', filePath),
   saveLogs: (data) => ipcRenderer.invoke('save-logs', data),
 
-  // update downloads
+  // OTA updates
+  checkUpdates: () => ipcRenderer.invoke('check-for-updates'),
   startDownload: () => ipcRenderer.send('start-download'),
   quitAndInstall: () => ipcRenderer.send('install-update'),
 });

electron/store.mjs

@@ -1,4 +1,5 @@
 const defaultSchema = {
+  version: { type: 'string', default: '' },
   environmentName: { type: 'string', default: '' },
   isInitialFunded: { type: 'boolean', default: false },
   firstStakingRewardAchieved: { type: 'boolean', default: false },

electron/update.mjs

@@ -1,14 +1,23 @@
 import { MacUpdater } from 'electron-updater';
 
-import { publishOptions } from './constants/options.mjs';
+import { isDev } from './constants/env.mjs';
 import { logger } from './utils/logger.mjs';
 
-const macUpdater = new MacUpdater(publishOptions);
+export const updateOptions = {
+  provider: 'github',
+  owner: 'valory-xyz',
+  repo: 'olas-operate-app',
+  releaseType: 'draft',
+  private: false,
+};
 
-macUpdater.setFeedURL({ ...publishOptions });
+const macUpdater = new MacUpdater(updateOptions);
+
+macUpdater.setFeedURL({ ...updateOptions });
 
 macUpdater.autoDownload = false;
 macUpdater.autoInstallOnAppQuit = false;
 macUpdater.logger = logger;
+macUpdater.forceDevUpdateConfig = isDev;
 
 export { macUpdater };

electron/utils/icons.mjs

@@ -1,6 +1,7 @@
 import { nativeImage } from 'electron';
 
-import { isMac } from '../constants/os.mjs';
+import { isLinux, isMac } from '../constants/os.mjs';
+import { logger } from './logger.mjs';
 
 const TRAY_ICONS_PATHS = {
   LOGGED_OUT: `${import.meta.dirname}/assets/icons/tray-logged-out.png`,
@@ -17,7 +18,7 @@ const TRAY_ICONS = {
 };
 
 try {
-  if (isMac) {
+  if (isMac || isLinux) {
     // resize icons for macOS
     const size = { width: 16, height: 16 };
     TRAY_ICONS.LOGGED_OUT = TRAY_ICONS.LOGGED_OUT.resize(size);
@@ -26,7 +27,7 @@ try {
     TRAY_ICONS.RUNNING = TRAY_ICONS.RUNNING.resize({ width: 16, height: 16 });
   }
 } catch (e) {
-  console.log('Error resizing tray icons', e);
+  logger.electron('Error resizing tray icons', e);
 }
 
 export { TRAY_ICONS, TRAY_ICONS_PATHS };

electron/utils/logger.mjs

@@ -52,7 +52,7 @@ const logger = winston.createLogger({
     new winston.transports.File({
       filename: 'electron.log',
       dirname: paths.dotOperateDirectory,
-      level: 'electron',
+      levels: ['electron'],
       format: combine(levelFilter('electron'), timestamp(), logFormat),
       maxFiles: 1,
       maxsize: 1024 * 1024 * 10,

frontend/components/Settings/index.tsx

@@ -6,6 +6,7 @@ import { useMemo } from 'react';
 import { UNICODE_SYMBOLS } from '@/constants/symbols';
 import { PageState } from '@/enums/PageState';
 import { SettingsScreen } from '@/enums/SettingsScreen';
+import { useElectronApi } from '@/hooks/useElectronApi';
 import { useMasterSafe } from '@/hooks/useMasterSafe';
 import { usePageState } from '@/hooks/usePageState';
 import { useSettings } from '@/hooks/useSettings';
@@ -49,6 +50,7 @@ export const Settings = () => {
 const SettingsMain = () => {
   const { backupSafeAddress } = useMasterSafe();
   const { goto } = usePageState();
+  const { checkUpdates } = useElectronApi();
 
   const truncatedBackupSafeAddress: string | undefined = useMemo(() => {
     if (backupSafeAddress) {
@@ -89,6 +91,11 @@ const SettingsMain = () => {
           <NoBackupWallet />
         )}
       </CardSection>
+      <CardSection borderbottom="true" vertical gap={8}>
+        <Button onClick={checkUpdates} color="primary" size="large">
+          Check for updates
+        </Button>
+      </CardSection>
 
       <DebugInfoCard />
     </Card>
@@ -120,7 +127,7 @@ const NoBackupWallet = () => {
       <Button
         type="primary"
         size="large"
-        disabled={true} // not in this iteration?
+        disabled={true} // TODO: enable when feature is ready
         onClick={() => gotoSettings(SettingsScreen.AddBackupWallet)}
       >
         Add backup wallet

frontend/context/ElectronApiProvider.tsx

@@ -33,6 +33,7 @@ type ElectronApiContextProps = {
   openPath?: (filePath: string) => void;
 
   // download new updates
+  checkUpdates?: () => Promise<void>;
   startDownload?: () => Promise<void>;
   quitAndInstall?: () => void;
 };
@@ -58,6 +59,7 @@ export const ElectronApiContext = createContext<ElectronApiContextProps>({
   openPath: () => {},
 
   // download updates
+  checkUpdates: async () => {},
   startDownload: async () => {},
   quitAndInstall: async () => {},
 });