Merge pull request #8 from Hermesiss/develop

Develop

Author: Hermesiss

.github/workflows/build-and-release.yml

@@ -1,6 +1,6 @@
 {
   "name": "devnullifier",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "DevNullifier: Clean application data, dev caches (node_modules, .cache, Library, Binary, Intermediate, etc) with Electron, Vue 3, and Vuetify 3.",
   "main": "dist-main/main/main.js",
   "scripts": {

package.json

@@ -6,7 +6,10 @@ import log from "electron-log";
 
 // Mock modules
 vi.mock("electron", () => ({
-  BrowserWindow: vi.fn()
+  BrowserWindow: vi.fn(),
+  ipcMain: {
+    handle: vi.fn()
+  }
 }));
 
 type UpdaterEvents = {
@@ -24,6 +27,8 @@ vi.mock("electron-updater", () => ({
     setFeedURL: vi.fn(),
     checkForUpdates: vi.fn(),
     quitAndInstall: vi.fn(),
+    allowPrerelease: false,
+    allowDowngrade: false,
     on: vi.fn(<K extends keyof UpdaterEvents>(event: K, callback: UpdaterEvents[K]) => {
       // Store the callback for later use in tests
       return callback;
@@ -65,11 +70,9 @@ describe("UpdateService", () => {
     it("should configure logging and update source correctly", () => {
       expect(log.transports.file.level).toBe("info");
       expect(autoUpdater.logger).toBe(log);
-      expect(autoUpdater.setFeedURL).toHaveBeenCalledWith({
-        provider: "github",
-        owner: "Hermesiss",
-        repo: "DevNullifier"
-      });
+      expect(autoUpdater.setFeedURL).toHaveBeenCalledWith(
+        "https://github.com/Hermesiss/DevNullifier/releases/latest/download/"
+      );
     });
 
     it("should set up all required event listeners", () => {

src/main/__tests__/updateService.test.ts

@@ -117,6 +117,9 @@ const api: ElectronAPI = {
   },
   checkForUpdates: () => ipcRenderer.invoke("check-for-updates"),
   quitAndInstall: () => ipcRenderer.invoke("quit-and-install"),
+
+  // New handler
+  setUpdateChannel: (channel: 'latest' | 'latest-dev') => ipcRenderer.invoke('set-update-channel', channel),
 };
 
 contextBridge.exposeInMainWorld("electronAPI", api);

src/main/preload.ts

@@ -1,4 +1,4 @@
-import { BrowserWindow } from "electron";
+import { BrowserWindow, ipcMain } from "electron";
 import { autoUpdater } from "electron-updater";
 import log from "electron-log";
 
@@ -8,6 +8,27 @@ export class UpdateService {
   constructor(mainWindow: BrowserWindow) {
     this.mainWindow = mainWindow;
     this.initializeAutoUpdater();
+    this.setupIpcHandlers();
+  }
+
+  private setupIpcHandlers() {
+    ipcMain.handle(
+      "set-update-channel",
+      (_, channel: "latest" | "latest-dev") => {
+        this.setUpdateChannel(channel);
+      }
+    );
+  }
+
+  private setUpdateChannel(channel: "latest" | "latest-dev") {
+    autoUpdater.allowPrerelease = channel === "latest-dev";
+
+    let baseUrl =
+      channel === "latest"
+        ? "https://github.com/Hermesiss/DevNullifier/releases/latest/download/"
+        : "https://github.com/Hermesiss/DevNullifier/releases/download/latest-dev/";
+
+    autoUpdater.setFeedURL(baseUrl);
   }
 
   private initializeAutoUpdater() {
@@ -16,22 +37,10 @@ export class UpdateService {
     autoUpdater.logger = log;
 
     // Configure update source and options
-    autoUpdater.channel = "latest";
     autoUpdater.allowDowngrade = false;
-    autoUpdater.setFeedURL({
-      provider: "github",
-      owner: "Hermesiss",
-      repo: "DevNullifier"
-    });
 
-    // Platform-specific configurations
-    if (process.platform === "win32") {
-      autoUpdater.updateConfigPath = "latest.yml";
-    } else if (process.platform === "darwin") {
-      autoUpdater.updateConfigPath = "latest-mac.yml";
-    } else if (process.platform === "linux") {
-      autoUpdater.updateConfigPath = "latest-linux.yml";
-    }
+    // Set update channel after config path
+    this.setUpdateChannel("latest");
 
     // Handle events
     autoUpdater.on("checking-for-update", () => {

src/main/updateService.ts

@@ -13,6 +13,11 @@
             </v-card-title>
 
             <v-card-text>
+                <div class="mb-4">
+                    <v-switch v-model="useBetaChannel" label="Use Beta Channel" color="warning" hide-details
+                        @change="handleBetaChannelChange" />
+                </div>
+
                 <div v-if="checking" class="d-flex align-center">
                     <v-progress-circular indeterminate size="24" class="mr-2" />
                     Checking for updates...
@@ -68,6 +73,7 @@ const error = ref<string | null>(null);
 const updateAvailable = ref(false);
 const updateInfo = ref<any>(null);
 const downloadProgress = ref<any>(null);
+const useBetaChannel = ref(localStorage.getItem('useBetaChannel') === 'true');
 
 // Format bytes to human readable format
 function formatBytes(bytes: number): string {
@@ -123,8 +129,16 @@ function handleUpdateStatus(status: { message: string; data?: any }) {
     }
 }
 
-onMounted(() => {
+async function handleBetaChannelChange() {
+    localStorage.setItem('useBetaChannel', useBetaChannel.value.toString());
+    await window.electronAPI.setUpdateChannel(useBetaChannel.value ? 'latest-dev' : 'latest');
+    checkForUpdates();
+}
+
+onMounted(async () => {
     window.electronAPI.onUpdateStatus(handleUpdateStatus);
+    // Set initial update channel
+    await window.electronAPI.setUpdateChannel(useBetaChannel.value ? 'latest-dev' : 'latest');
 });
 
 onUnmounted(() => {

src/renderer/components/UpdateButton.vue

@@ -57,6 +57,7 @@ export interface ElectronAPI {
   saveDeveloperProjects: (projects: ProjectInfo[]) => Promise<void>;
   loadSavedDeveloperProjects: () => Promise<ProjectInfo[]>;
   getSavedDeveloperProjectsCount: () => Promise<number>;
+  setUpdateChannel: (channel: 'latest' | 'latest-dev') => Promise<void>;
 }
 
 // Add global type augmentation for Window interface