Skip to content

fix(tui): clean up SDK event listeners on unmount #8254

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

Open
sauerdaniel wants to merge 1 commit into
base: dev
Choose a base branch
from
+19 −12
Open

fix(tui): clean up SDK event listeners on unmount #8254

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
31 changes: 19 additions & 12 deletions packages/opencode/src/cli/cmd/tui/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { render, useKeyboard, useRenderer, useTerminalDimensions } from "@opentu
import { Clipboard } from "@tui/util/clipboard"
import { TextAttributes } from "@opentui/core"
import { RouteProvider, useRoute } from "@tui/context/route"
import { Switch, Match, createEffect, untrack, ErrorBoundary, createSignal, onMount, batch, Show, on } from "solid-js"
import { Switch, Match, createEffect, untrack, ErrorBoundary, createSignal, onMount, onCleanup, batch, Show, on } from "solid-js"
import { Installation } from "@/installation"
import { Flag } from "@/flag/flag"
import { DialogProvider, useDialog } from "@tui/ui/dialog"
Expand Down Expand Up @@ -554,37 +554,40 @@ function App() {
}
})

sdk.event.on(TuiEvent.CommandExecute.type, (evt) => {
// Store unsubscribe functions for cleanup
const unsubs: (() => void)[] = []

unsubs.push(sdk.event.on(TuiEvent.CommandExecute.type, (evt) => {
command.trigger(evt.properties.command)
})
}))

sdk.event.on(TuiEvent.ToastShow.type, (evt) => {
unsubs.push(sdk.event.on(TuiEvent.ToastShow.type, (evt) => {
toast.show({
title: evt.properties.title,
message: evt.properties.message,
variant: evt.properties.variant,
duration: evt.properties.duration,
})
})
}))

sdk.event.on(TuiEvent.SessionSelect.type, (evt) => {
unsubs.push(sdk.event.on(TuiEvent.SessionSelect.type, (evt) => {
route.navigate({
type: "session",
sessionID: evt.properties.sessionID,
})
})
}))

sdk.event.on(SessionApi.Event.Deleted.type, (evt) => {
unsubs.push(sdk.event.on(SessionApi.Event.Deleted.type, (evt) => {
if (route.data.type === "session" && route.data.sessionID === evt.properties.info.id) {
route.navigate({ type: "home" })
toast.show({
variant: "info",
message: "The current session was deleted",
})
}
})
}))

sdk.event.on(SessionApi.Event.Error.type, (evt) => {
unsubs.push(sdk.event.on(SessionApi.Event.Error.type, (evt) => {
const error = evt.properties.error
if (error && typeof error === "object" && error.name === "MessageAbortedError") return
const message = (() => {
Expand All @@ -604,15 +607,19 @@ function App() {
message,
duration: 5000,
})
})
}))

sdk.event.on(Installation.Event.UpdateAvailable.type, (evt) => {
unsubs.push(sdk.event.on(Installation.Event.UpdateAvailable.type, (evt) => {
toast.show({
variant: "info",
title: "Update Available",
message: `OpenCode v${evt.properties.version} is available. Run 'opencode upgrade' to update manually.`,
duration: 10000,
})
}))

onCleanup(() => {
unsubs.forEach((unsub) => unsub())
})

return (
Expand Down