Skip to content

Fix live reload after atomic saves #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
orange2ai wants to merge 1 commit into from
Closed

Fix live reload after atomic saves #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 42 additions & 2 deletions src/main/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ interface WindowState {
watcher: FSWatcher | null
isInternalSave: boolean
debounceTimer: ReturnType<typeof setTimeout> | null
watchRefreshTimer: ReturnType<typeof setTimeout> | null
agentState: 'idle' | 'active' | 'cooldown'
lastExternalChange: number
agentCooldownTimer: ReturnType<typeof setTimeout> | null
Expand All @@ -38,7 +39,7 @@ let pendingFilePaths: string[] = []
function getState(win: BrowserWindow): WindowState {
let state = windowStates.get(win.id)
if (!state) {
state = { filePath: null, watcher: null, isInternalSave: false, debounceTimer: null, agentState: 'idle', lastExternalChange: 0, agentCooldownTimer: null }
state = { filePath: null, watcher: null, isInternalSave: false, debounceTimer: null, watchRefreshTimer: null, agentState: 'idle', lastExternalChange: 0, agentCooldownTimer: null }
windowStates.set(win.id, state)
}
return state
Expand Down Expand Up @@ -112,6 +113,10 @@ function stopWatching(state: WindowState): void {
clearTimeout(state.agentCooldownTimer)
state.agentCooldownTimer = null
}
if (state.watchRefreshTimer) {
clearTimeout(state.watchRefreshTimer)
state.watchRefreshTimer = null
}
state.agentState = 'idle'
state.lastExternalChange = 0
}
Expand Down Expand Up @@ -148,7 +153,14 @@ function watchFile(win: BrowserWindow, state: WindowState): void {
stopWatching(state)
const filePath = state.filePath
state.watcher = watch(filePath, (eventType) => {
if (eventType !== 'change' || state.isInternalSave) return
if (state.isInternalSave) return

if (eventType === 'rename') {
refreshWatchedFile(win, state)
return
}

if (eventType !== 'change') return

// Agent activity detection
const now = Date.now()
Expand All @@ -171,6 +183,34 @@ function watchFile(win: BrowserWindow, state: WindowState): void {
})
}

function refreshWatchedFile(win: BrowserWindow, state: WindowState): void {
if (!state.filePath) return
if (state.debounceTimer) {
clearTimeout(state.debounceTimer)
state.debounceTimer = null
}
if (state.watchRefreshTimer) {
clearTimeout(state.watchRefreshTimer)
}

const attemptRefresh = () => {
if (!state.filePath || win.isDestroyed()) return
if (!existsSync(state.filePath)) {
state.watchRefreshTimer = setTimeout(attemptRefresh, 200)
return
}

watchFile(win, state)
readFile(state.filePath, 'utf-8')
.then((data) => {
if (!win.isDestroyed()) win.webContents.send('file-changed', data)
})
.catch(() => {})
}

state.watchRefreshTimer = setTimeout(attemptRefresh, 150)
}

function loadFileInWindow(win: BrowserWindow, filePath: string): void {
readFile(filePath, 'utf-8')
.then((data) => {
Expand Down