fix: ota

Author: bamboo0403

electron-builder.yml

@@ -11,6 +11,7 @@ extraMetadata:
 files:
   - dist/main.js
   - dist/js/**/*
+  - dist/ts/**/*
   - src/view/**/*
   - src/css/**/*
   - package.json

src/main.ts

@@ -1,6 +1,6 @@
 import { app, BrowserWindow, ipcMain } from "electron";
-import { autoUpdater } from "electron-updater";
 import * as path from "path";
+import { initAutoUpdater } from "./ts/utils/ota";
 
 let mainWindow: BrowserWindow | null = null;
 let dataService: any;
@@ -55,43 +55,10 @@ if (!gotTheLock) {
   app.whenReady().then(() => {
     createWindow();
 
-    // Auto-updater configuration
-    autoUpdater.autoDownload = true;
-    autoUpdater.autoInstallOnAppQuit = true;
-    autoUpdater.allowPrerelease = true; // Since version is beta
-    autoUpdater.allowDowngrade = false;
-
-    if (app.isPackaged) {
-      autoUpdater.setFeedURL({
-        provider: 'github',
-        owner: 'ExpTechTW',
-        repo: 'ES-Net-Wave',
-        vPrefixedTagName: false,
-      });
-    }
-
-    autoUpdater.on('update-available', (info) => {
-      console.log('Update available:', info.version);
-    });
-
-    autoUpdater.on('update-downloaded', (info) => {
-      console.log('Update downloaded:', info.version);
-      setTimeout(() => {
-        autoUpdater.quitAndInstall(true, true);
-      }, 3000);
+    ipcMain.once("init-ota", () => {
+      initAutoUpdater(() => mainWindow);
     });
 
-    autoUpdater.on('error', (err) => {
-      console.error('Update error:', err.message);
-    });
-
-    if (app.isPackaged) {
-      autoUpdater.checkForUpdates().catch(() => {});
-      setInterval(() => {
-        autoUpdater.checkForUpdates().catch(() => {});
-      }, 300000); // Check every 5 minutes
-    }
-
     mainWindow!.webContents.on("dom-ready", () => {
       mainWindow!.webContents.removeAllListeners("before-input-event");
 

src/ts/index.ts

@@ -9,9 +9,14 @@ const { ipcRenderer } = require("electron");
 
 let wsService: WSService | null = null;
 let stationSelector: StationSelector | null = null;
+ipcRenderer.on("ota-log", (event: IpcRendererEvent, message: string) => {
+  console.log(`[OTA] ${message}`);
+});
 
 function initializeApplication() {
   try {
+    ipcRenderer.send("init-ota");
+
     wsService = new WSService();
     wsService.connect();
     window.wsService = wsService;

src/ts/utils/ota.ts

@@ -0,0 +1,136 @@
+import { app, BrowserWindow } from 'electron';
+import { autoUpdater } from 'electron-updater';
+
+let updateCheckInterval: NodeJS.Timeout | null = null;
+let getMainWindowRef: (() => BrowserWindow | null) | null = null;
+
+/**
+ * Log helper that sends log to both main process console and renderer process
+ */
+function logOTA(message: string) {
+  console.log(`[OTA] ${message}`);
+  if (getMainWindowRef) {
+    const mainWindow = getMainWindowRef();
+    if (mainWindow && !mainWindow.isDestroyed()) {
+      mainWindow.webContents.send('ota-log', message);
+    }
+  }
+}
+
+/**
+ * Initialize auto updater with GitHub as the update source
+ */
+function initAutoUpdater(getMainWindow: () => BrowserWindow | null) {
+  getMainWindowRef = getMainWindow;
+  logOTA('initAutoUpdater called');
+  try {
+    autoUpdater.autoDownload = true;
+    autoUpdater.autoInstallOnAppQuit = true;
+    autoUpdater.allowPrerelease = true; // Allow beta/alpha versions
+    autoUpdater.allowDowngrade = false;
+
+    if (app.isPackaged) {
+      autoUpdater.setFeedURL({
+        provider: 'github',
+        owner: 'ExpTechTW',
+        repo: 'ES-Net-Wave',
+        vPrefixedTagName: false,
+      });
+    }
+
+    // Event handlers
+    autoUpdater.on('checking-for-update', () => {
+      logOTA('Checking for update...');
+      const mainWindow = getMainWindow();
+      if (mainWindow && !mainWindow.isDestroyed()) {
+        mainWindow.webContents.send('update-checking');
+      }
+    });
+
+    autoUpdater.on('update-available', (info) => {
+      logOTA(`Update available: ${info.version}`);
+      const mainWindow = getMainWindow();
+      if (mainWindow && !mainWindow.isDestroyed()) {
+        mainWindow.webContents.send('update-available', info);
+      }
+    });
+
+    autoUpdater.on('update-not-available', (info) => {
+      logOTA(`Update not available: ${info.version}`);
+      const mainWindow = getMainWindow();
+      if (mainWindow && !mainWindow.isDestroyed()) {
+        mainWindow.webContents.send('update-not-available', info);
+      }
+    });
+
+    autoUpdater.on('download-progress', (progressObj) => {
+      logOTA(`Download progress: ${progressObj.percent.toFixed(2)}%`);
+      const mainWindow = getMainWindow();
+      if (mainWindow && !mainWindow.isDestroyed()) {
+        mainWindow.webContents.send('download-progress', progressObj);
+      }
+    });
+
+    autoUpdater.on('update-downloaded', (info) => {
+      logOTA(`Update downloaded: ${info.version}`);
+      const mainWindow = getMainWindow();
+      if (mainWindow && !mainWindow.isDestroyed()) {
+        mainWindow.webContents.send('update-downloaded', info);
+      }
+      // Wait 3 seconds before installing
+      setTimeout(() => {
+        autoUpdater.quitAndInstall(true, true);
+      }, 3000);
+    });
+
+    autoUpdater.on('error', (err) => {
+      const message = err && err.message ? err.message : String(err);
+      logOTA(`Update error: ${message}`);
+      const mainWindow = getMainWindow();
+      if (mainWindow && !mainWindow.isDestroyed()) {
+        mainWindow.webContents.send('update-error', message);
+      }
+    });
+
+    startAutoUpdateScheduler();
+    logOTA('Auto updater initialized');
+  } catch (err) {
+    logOTA(`Initialization error: ${err}`);
+  }
+}
+
+/**
+ * Start the auto update scheduler
+ */
+function startAutoUpdateScheduler() {
+  if (!app.isPackaged) {
+    logOTA('Auto update skipped (not packaged)');
+    return;
+  }
+
+  if (updateCheckInterval) {
+    logOTA('Auto update scheduler already running');
+    return;
+  }
+
+  logOTA('Auto update scheduler started');
+  // Check immediately
+  autoUpdater.checkForUpdates().catch(() => undefined);
+  // Then check every 5 minutes
+  updateCheckInterval = setInterval(() => {
+    autoUpdater.checkForUpdates().catch(() => undefined);
+  }, 300000);
+}
+
+/**
+ * Stop the auto update scheduler
+ */
+function stopAutoUpdateScheduler() {
+  if (updateCheckInterval) {
+    clearInterval(updateCheckInterval);
+    updateCheckInterval = null;
+    logOTA('Auto update scheduler stopped');
+  }
+}
+
+export { initAutoUpdater, stopAutoUpdateScheduler };

tsconfig.main.json

@@ -14,6 +14,6 @@
     "declaration": false,
     "sourceMap": true
   },
-  "include": ["src/main.ts"],
+  "include": ["src/main.ts", "src/ts/utils/ota.ts"],
   "exclude": ["node_modules", "dist"]
 }