diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index baa3a15..ee980ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,7 +60,9 @@ jobs: files: | artifacts/**/*.dmg artifacts/**/*.zip - artifacts/**/*.exe + artifacts/**/*-setup.exe artifacts/**/*.AppImage artifacts/**/*.deb + artifacts/**/latest*.yml + artifacts/**/*.blockmap generate_release_notes: true diff --git a/electron-builder.yml b/electron-builder.yml index 54afc36..ab03316 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -49,4 +49,8 @@ linux: synopsis: Local voice notebook appImage: artifactName: ${name}-${version}.${ext} +publish: + provider: github + owner: adavila0703 + repo: Lyra npmRebuild: true diff --git a/package.json b/package.json index 9487024..18f9ec5 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,8 @@ }, "dependencies": { "@electron-toolkit/utils": "^4.0.0", - "@kutalia/whisper-node-addon": "^1.1.0" + "@kutalia/whisper-node-addon": "^1.1.0", + "electron-updater": "^6.8.9" }, "devDependencies": { "@electron-toolkit/tsconfig": "^2.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 389e0ef..8b40c33 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,6 +14,9 @@ importers: '@kutalia/whisper-node-addon': specifier: ^1.1.0 version: 1.1.0 + electron-updater: + specifier: ^6.8.9 + version: 6.8.9 devDependencies: '@electron-toolkit/tsconfig': specifier: ^2.0.0 @@ -869,6 +872,9 @@ packages: electron-to-chromium@1.5.427: resolution: {integrity: sha512-n14zb3FdsChZ2BNobqNHAJMcP3ifFv4paox2LvCrfVAQcqGiSURgbJl+PfMpHVCNFkStnNc+RRVtPBTVW5PDgw==} + electron-updater@6.8.9: + resolution: {integrity: sha512-ZhVxM9iGONUpZGI1FxdMRgJjUFXi7AYGVa5PwKlO1tV1/4zDxQmfKpXOHVztKrd6L9rLcFjERvi1Mf2vxyTkig==} + electron-vite@4.0.1: resolution: {integrity: sha512-QqacJbA8f1pmwUTqki1qLL5vIBaOQmeq13CZZefZ3r3vKVaIoC7cpoTgE+KPKxJDFTax+iFZV0VYvLVWPiQ8Aw==} engines: {node: ^20.19.0 || >=22.12.0} @@ -1163,6 +1169,13 @@ packages: lazy-val@1.0.5: resolution: {integrity: sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==} + lodash.escaperegexp@4.1.2: + resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==} + + lodash.isequal@4.5.0: + resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==} + deprecated: This package is deprecated. Use require('node:util').isDeepStrictEqual instead. + lodash@4.18.1: resolution: {integrity: sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==} @@ -1529,6 +1542,9 @@ packages: tiny-async-pool@1.3.0: resolution: {integrity: sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==} + tiny-typed-emitter@2.1.0: + resolution: {integrity: sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==} + tinyglobby@0.2.17: resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==} engines: {node: '>=12.0.0'} @@ -2547,6 +2563,19 @@ snapshots: electron-to-chromium@1.5.427: {} + electron-updater@6.8.9: + dependencies: + builder-util-runtime: 9.7.0 + fs-extra: 10.1.0 + js-yaml: 4.3.2 + lazy-val: 1.0.5 + lodash.escaperegexp: 4.1.2 + lodash.isequal: 4.5.0 + semver: 7.7.4 + tiny-typed-emitter: 2.1.0 + transitivePeerDependencies: + - supports-color + electron-vite@4.0.1(vite@6.4.3(@types/node@22.20.2)(jiti@2.7.0)): dependencies: '@babel/core': 7.29.7 @@ -2894,6 +2923,10 @@ snapshots: lazy-val@1.0.5: {} + lodash.escaperegexp@4.1.2: {} + + lodash.isequal@4.5.0: {} + lodash@4.18.1: {} lowercase-keys@2.0.0: {} @@ -3264,6 +3297,8 @@ snapshots: dependencies: semver: 5.7.2 + tiny-typed-emitter@2.1.0: {} + tinyglobby@0.2.17: dependencies: fdir: 6.5.0(picomatch@4.0.7) diff --git a/src/main/index.ts b/src/main/index.ts index ac79879..398a7b9 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -4,6 +4,7 @@ import { join } from 'node:path' import { tmpdir } from 'node:os' import { electronApp, optimizer, is } from '@electron-toolkit/utils' import { createPage, deletePage, getPage, listPages, savePage } from './pages' +import { registerUpdater } from './updater' import { broadcastStatus, ensureModel, pcmFromIpc, transcribePcm } from './whisper' import type { Page } from '../shared/types' @@ -181,6 +182,7 @@ app.whenReady().then(() => { }) registerIpc() + registerUpdater() createWindow() broadcastStatus({ state: 'idle' }) diff --git a/src/main/updater.ts b/src/main/updater.ts new file mode 100644 index 0000000..0e73455 --- /dev/null +++ b/src/main/updater.ts @@ -0,0 +1,121 @@ +import { app, BrowserWindow, ipcMain, shell } from 'electron' +import { spawnSync } from 'node:child_process' +import { join } from 'node:path' +import { autoUpdater } from 'electron-updater' +import type { UpdateStatus } from '../shared/types' + +const RELEASES_URL = 'https://github.com/adavila0703/Lyra/releases' +const CHECK_EVERY_MS = 4 * 60 * 60 * 1000 + +let current: UpdateStatus = { state: 'idle' } +let checkTimer: ReturnType | null = null +let userInitiated = false + +function updaterEnabled(): boolean { + if (!app.isPackaged) return false + if (process.env.VOICE_PAGES_SMOKE === '1' || process.env.VOICE_PAGES_SCREENSHOT === '1') { + return false + } + return true +} + +function macAppBundle(): string { + return join(app.getPath('exe'), '../../..') +} + +function canInstallInPlace(): boolean { + if (process.platform !== 'darwin') return true + const result = spawnSync('codesign', ['-dv', '--verbose=2', macAppBundle()], { + encoding: 'utf8' + }) + const text = `${result.stdout ?? ''}${result.stderr ?? ''}` + return /Authority=Developer ID Application/.test(text) +} + +function broadcast(status: UpdateStatus): void { + current = status + for (const win of BrowserWindow.getAllWindows()) { + win.webContents.send('updater:status', status) + } +} + +async function openReleases(): Promise { + await shell.openExternal(RELEASES_URL) +} + +async function checkForUpdates(): Promise { + if (!updaterEnabled()) return + try { + await autoUpdater.checkForUpdates() + } catch { + if (userInitiated) { + broadcast({ state: 'error', message: 'Could not check for updates.' }) + } + } +} + +export async function startUpdate(): Promise { + if (!updaterEnabled()) return + userInitiated = true + if (current.state === 'error' || !canInstallInPlace()) { + await openReleases() + return + } + if (current.state === 'ready') { + autoUpdater.quitAndInstall() + return + } + try { + await autoUpdater.downloadUpdate() + } catch { + broadcast({ state: 'error', message: 'Could not download the update.' }) + } +} + +export async function installUpdate(): Promise { + if (!updaterEnabled()) return + if (!canInstallInPlace() || current.state !== 'ready') { + await openReleases() + return + } + autoUpdater.quitAndInstall() +} + +export function registerUpdater(): void { + ipcMain.handle('updater:start', () => startUpdate()) + ipcMain.handle('updater:install', () => installUpdate()) + ipcMain.handle('updater:get', () => current) + + if (!updaterEnabled()) return + + autoUpdater.autoDownload = false + autoUpdater.autoInstallOnAppQuit = true + autoUpdater.allowPrerelease = false + + autoUpdater.on('update-available', (info) => { + broadcast({ state: 'available', version: info.version }) + }) + autoUpdater.on('update-not-available', () => { + broadcast({ state: 'idle' }) + }) + autoUpdater.on('download-progress', (progress) => { + broadcast({ state: 'downloading', percent: Math.round(progress.percent) }) + }) + autoUpdater.on('update-downloaded', (info) => { + broadcast({ state: 'ready', version: info.version }) + }) + autoUpdater.on('error', (error) => { + if (!userInitiated) return + broadcast({ + state: 'error', + message: error instanceof Error ? error.message : 'Update failed' + }) + }) + + void checkForUpdates() + checkTimer = setInterval(() => { + userInitiated = false + void checkForUpdates() + }, CHECK_EVERY_MS) + checkTimer.unref?.() +} diff --git a/src/preload/index.ts b/src/preload/index.ts index 5ef4442..c71759c 100644 --- a/src/preload/index.ts +++ b/src/preload/index.ts @@ -1,5 +1,5 @@ import { clipboard, contextBridge, ipcRenderer } from 'electron' -import type { Page, VoicePagesApi, WhisperStatus } from '../shared/types' +import type { Page, UpdateStatus, VoicePagesApi, WhisperStatus } from '../shared/types' const api: VoicePagesApi = { listPages: () => ipcRenderer.invoke('pages:list'), @@ -18,6 +18,20 @@ const api: VoicePagesApi = { return () => { ipcRenderer.removeListener('whisper:status', listener) } + }, + startUpdate: () => ipcRenderer.invoke('updater:start'), + installUpdate: () => ipcRenderer.invoke('updater:install'), + onUpdateStatus: (callback) => { + const listener = (_event: Electron.IpcRendererEvent, status: UpdateStatus): void => { + callback(status) + } + ipcRenderer.on('updater:status', listener) + void ipcRenderer.invoke('updater:get').then((status: UpdateStatus) => { + callback(status) + }) + return () => { + ipcRenderer.removeListener('updater:status', listener) + } } } diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index ed1c23a..e6de8de 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -1,7 +1,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import { startCapture, type CaptureHandle } from './audio/capture' import lyraIcon from './assets/lyra-icon.png' -import type { Page, PageSummary, WhisperStatus } from '../../shared/types' +import type { Page, PageSummary, UpdateStatus, WhisperStatus } from '../../shared/types' function formatUpdated(value: string): string { const date = new Date(value) @@ -41,6 +41,16 @@ function statusLabel( return 'Idle · everything stays on this computer' } +function updateChipLabel(status: UpdateStatus): string | null { + if (status.state === 'available') return 'Update' + if (status.state === 'downloading') { + return status.percent > 0 ? `Updating… ${status.percent}%` : 'Updating…' + } + if (status.state === 'ready') return 'Restart' + if (status.state === 'error') return 'Update failed' + return null +} + function appendTranscript(body: string, chunk: string): string { const text = chunk.trim() if (!text) return body @@ -64,6 +74,7 @@ export default function App(): React.JSX.Element { const [micName, setMicName] = useState('') const [error, setError] = useState(null) const [copied, setCopied] = useState(false) + const [update, setUpdate] = useState({ state: 'idle' }) const copiedTimer = useRef | null>(null) const captureRef = useRef(null) const currentRef = useRef(null) @@ -96,7 +107,12 @@ export default function App(): React.JSX.Element { useEffect(() => { void refreshList() - return window.api.onStatus(setStatus) + const stopStatus = window.api.onStatus(setStatus) + const stopUpdate = window.api.onUpdateStatus(setUpdate) + return () => { + stopStatus() + stopUpdate() + } }, [refreshList]) const persist = useCallback((page: Page, immediate = false) => { @@ -327,6 +343,17 @@ export default function App(): React.JSX.Element { return Math.min(100, Math.round((status.received / status.total) * 100)) }, [status]) + const updateLabel = updateChipLabel(update) + + const onUpdateChip = (): void => { + if (update.state === 'downloading') return + if (update.state === 'ready') { + void window.api.installUpdate() + return + } + void window.api.startUpdate() + } + return (
+ {updateLabel ? ( +
+ +
+ ) : null}
diff --git a/src/renderer/src/assets/styles.css b/src/renderer/src/assets/styles.css index 81aa351..79120dd 100644 --- a/src/renderer/src/assets/styles.css +++ b/src/renderer/src/assets/styles.css @@ -7,6 +7,7 @@ --rule: #d8cfc0; --accent: #b42318; --accent-soft: #f3d4cf; + --update: #2563eb; --sidebar: #e7dfd2; --shadow: 0 10px 30px rgba(47, 36, 22, 0.08); font-family: @@ -94,6 +95,29 @@ textarea { flex: 1; } +.sidebar-update { + padding: 8px 16px 16px; +} + +.update-chip { + display: inline-flex; + align-items: center; + border: 0; + border-radius: 999px; + padding: 6px 12px; + background: var(--update); + color: #fff; + font-size: 12px; + font-weight: 600; + letter-spacing: 0.01em; + cursor: pointer; +} + +.update-chip:disabled { + cursor: default; + opacity: 0.9; +} + .page-row { display: flex; align-items: stretch; diff --git a/src/shared/types.ts b/src/shared/types.ts index 39c5743..18fa934 100644 --- a/src/shared/types.ts +++ b/src/shared/types.ts @@ -19,6 +19,13 @@ export type WhisperStatus = | { state: 'downloading'; received: number; total: number } | { state: 'error'; message: string } +export type UpdateStatus = + | { state: 'idle' } + | { state: 'available'; version: string } + | { state: 'downloading'; percent: number } + | { state: 'ready'; version: string } + | { state: 'error'; message: string } + export type VoicePagesApi = { listPages: () => Promise getPage: (id: string) => Promise @@ -29,4 +36,7 @@ export type VoicePagesApi = { ensureModel: () => Promise transcribe: (pcm: Uint8Array) => Promise onStatus: (callback: (status: WhisperStatus) => void) => () => void + startUpdate: () => Promise + installUpdate: () => Promise + onUpdateStatus: (callback: (status: UpdateStatus) => void) => () => void }