Compare commits

..

No commits in common. "34fc4d2d964922019d310882b3335fb93d169c60" and "4fd7dec4db8b5cf18f16b742f8108348405ff14b" have entirely different histories.

3 changed files with 23 additions and 8 deletions

View File

@ -179,10 +179,7 @@ interface FetchResult {
async function fetchAndValidateSubscription(options: FetchOptions): Promise<FetchResult> {
const { url, useProxy, mixedPort, userAgent, authToken, timeout, substore } = options
const headers: Record<string, string> = {
'User-Agent': userAgent,
'Accept-Encoding': 'identity'
}
const headers: Record<string, string> = { 'User-Agent': userAgent }
if (authToken) headers['Authorization'] = authToken
let res: chromeRequest.Response<string>

View File

@ -132,7 +132,7 @@ export async function triggerFloatingWindow(): Promise<void> {
export async function closeFloatingWindow(): Promise<void> {
if (floatingWindow) {
ipcMain.removeAllListeners('updateFloatingWindow')
floatingWindow.destroy()
floatingWindow.close()
floatingWindow = null
}
await showTrayIcon()

View File

@ -46,6 +46,7 @@ const Logs: React.FC = () => {
const [trace, setTrace] = useState(true)
const virtuosoRef = useRef<VirtuosoHandle>(null)
const traceRef = useRef(trace)
const filteredLogs = useMemo(() => {
if (filter === '') return logs
@ -58,10 +59,29 @@ const Logs: React.FC = () => {
localStorage.setItem(LOGS_FILTER_KEY, filter)
}, [filter])
useEffect(() => {
traceRef.current = trace
if (trace) {
setLogs([...cachedLogs.log])
}
}, [trace])
useEffect(() => {
if (!trace) return
virtuosoRef.current?.scrollToIndex({
index: filteredLogs.length - 1,
behavior: 'smooth',
align: 'end',
offset: 0
})
}, [filteredLogs, trace])
useEffect(() => {
const old = cachedLogs.trigger
cachedLogs.trigger = (a): void => {
setLogs([...a])
if (traceRef.current) {
setLogs([...a])
}
}
return (): void => {
cachedLogs.trigger = old
@ -112,8 +132,6 @@ const Logs: React.FC = () => {
<Virtuoso
ref={virtuosoRef}
data={filteredLogs}
initialTopMostItemIndex={filteredLogs.length - 1}
followOutput={trace}
itemContent={(i, log) => (
<LogItem index={i} time={log.time} type={log.type} payload={log.payload} />
)}