diff --git a/electron/main/index.ts b/electron/main/index.ts index 2cf9cbc..6b7d968 100644 --- a/electron/main/index.ts +++ b/electron/main/index.ts @@ -1,13 +1,13 @@ import {app, BrowserWindow, ipcMain, shell} from 'electron' import {release} from 'node:os' import {join} from 'node:path' -import {Settings} from "../../shared/schema"; +import {EncoderOptions, Settings} from "../../shared/schema"; import {SettingsRepository} from "../rerun-manager/settings-repository"; -import {Encoder, EncoderOptions} from "../rerun-manager/encoder"; -import IpcMainInvokeEvent = Electron.IpcMainInvokeEvent; +import {Encoder} from "../rerun-manager/encoder"; import {InternalServer} from "../rerun-manager/internal-server"; import {emit} from "./helpers"; import {platform} from "node:process"; +import IpcMainInvokeEvent = Electron.IpcMainInvokeEvent; // The built directory structure // @@ -41,7 +41,11 @@ if (require('electron-squirrel-startup')) { app.quit() } -require('update-electron-app')() +require('update-electron-app')({ + repo: 'bitinflow/rerun-encoder', + updateInterval: '1 hour', + logger: require('electron-log') +}) // Remove electron security warnings // This warning only shows in development mode @@ -150,7 +154,7 @@ ipcMain.handle('open-win', (_, arg) => { ipcMain.handle('version', async () => app.getVersion()) ipcMain.handle('settings', async () => settingsRepository.getSettings()) -ipcMain.handle('logout', async () => settingsRepository.logout()) +ipcMain.handle('logout', async () => await settingsRepository.logout()) ipcMain.handle('quit', async () => app.quit()) ipcMain.handle('minimize', async () => win.minimize()) ipcMain.handle('encode', async (event: IpcMainInvokeEvent, ...args: any[]) => { diff --git a/electron/rerun-manager/internal-server.ts b/electron/rerun-manager/internal-server.ts index 52040f2..f1fd743 100644 --- a/electron/rerun-manager/internal-server.ts +++ b/electron/rerun-manager/internal-server.ts @@ -34,7 +34,7 @@ export class InternalServer { }); router.get('/oauth', (ctx) => { - if(process.env.VITE_DEV_SERVER_URL) { + if (process.env.VITE_DEV_SERVER_URL) { ctx.body = fs.readFileSync(join(__dirname, '..', '..', 'public', 'callback.html'), {encoding: 'utf8'}) } else { ctx.body = fs.readFileSync(join(process.env.DIST, 'callback.html'), {encoding: 'utf8'}) diff --git a/package.json b/package.json index 65da8bf..3cb2422 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "rerun-encoder", "private": true, "productName": "Rerun Encoder", - "version": "1.0.3", + "version": "1.0.4", "description": "Official Rerun Encoder App for Rerun Manager", "main": "dist-electron/main/index.js", "scripts": { @@ -62,6 +62,7 @@ "axios": "^1.3.4", "cors": "^2.8.5", "defu": "^6.1.2", + "electron-log": "^5.0.0-beta.16", "electron-squirrel-startup": "^1.0.0", "express": "^4.18.2", "fluent-ffmpeg": "^2.1.2",