Squash-merge commit. Covers four areas: native video player, chat reliability, multi-tab, and hardening. ## Native video player - Direct HLS playback via `better_native_video_player` (forked from `plug-and-pay/flutter-native-video-player`, patched on `frosty-patches` branch) - Twitch GQL playback token fetching with platform cookie extraction (iOS Swift + Android Kotlin plugins) for authenticated streams - Quality selection (source, 720p, 480p, 360p, 160p, audio-only) persisted per channel - Picture-in-picture: iOS automatic inline PiP, Android auto-PiP on API 31+ guarded against older devices - Latency polling, chat latency sync, stall detection/recovery, startup auto-pause recovery, watchdog timers - **Twitch stitched-ad break detection** (HLS `EXT-X-DATERANGE`) on both platforms, emitting `adBreakChanged` so the host suspends latency/stall recovery and chat sync during ads (program-date-time is unreliable then). Matches `CLASS="twitch-stitched-ad"` / `ID="stitched-ad-"` **and** the `X-TV-TWITCH-AD-*` attribute prefix (the durable signal streamlink/yt-dlp use) - Shared `VideoPlayerInterface` so WebView and native paths are interchangeable via settings toggle - `PlaybackAccessToken` model, `TwitchGqlApi` client ## Chat delay & send reliability - **Optimistic send-finalize**: Twitch acks a sent message with a per-PRIVMSG USERSTATE (not an echo), which it can intermittently drop — more so under a long chat delay. A missing ack no longer shows a false "message may not have been sent" error; the send is finalized optimistically (local echo rendered), and only genuine rejection NOTICEs surface an error. Ack timeout scaled by the chat delay. - **Per-line chat-delay bypass**: control/state lines (USERSTATE/ROOMSTATE/GLOBALUSERSTATE), rejection NOTICEs, the reconnect notice, and untagged server lines bypass the delay so send-acks and PONGs aren't stalled; only displayable chat content is delayed, staying in sync with delayed video. - **Measured chat bottom-bar height**: the message list reflows to the composer's real measured height, fixing the input overlapping messages when a long message expands it (replaces a fixed-constant estimate). - IRC tag parsing handles valueless and escaped tags per the IRCv3 message-tags spec (fixes a recent-messages RangeError on certain tags). ## Chat / multi-tab - Redesigned tab chips: unread dot indicator, chips dim until WebSocket connects - Animated tab options popover replacing `MenuAnchor` (no animation hook in Flutter 3.44) - Simplified `ChatTabs` from `StatefulWidget` to `StatelessWidget` - Focus-current-channel fade bump to 0.55; section-header alpha lifted to match the muted-label tier - `addTab` now calls `setActiveTab` to snapshot outgoing tab's `lastSeenMessageId` — fixes spurious unread dots after adding a tab - `onActivateSourceTab` threaded into `ChatUserModal` so Reply in merged mode switches to the correct source tab's composer ## Bug fixes and hardening - **Reverted the experimental iOS low-latency mode** (5s live-edge join + 1.05x catch-up): AVPlayer can't sustain <~18s on Twitch (declared `TARGETDURATION:6` paces playlist refreshes), and the offset starved the buffer into pause-on-launch. Default join distance restored. - Fork (Android): **cap `BEHIND_LIVE_WINDOW` recovery** so a stream repeatedly falling off the live window can't silently re-prepare forever; emits `error` on exhaustion so the host recovery ladder takes over - Guard all Android `setAutoPipMode` calls with `_autoPipAvailable` — prevents `PlatformException` on Android 8–11; check `_disposed` after `isAutoPipAvailable` await to prevent post-dispose auto-PiP re-enable - Remove `_isInPipMode` guard from `_onPaused` so `_paused` tracks actual state, fixing PiP play/pause toggle getting stuck - Tighten iOS cookie domain check to exact `twitch.tv` / `.twitch.tv` suffix - Invalidate the stored web session token when Twitch rejects it with a 401 (profile card flips back to unlinked; future loads skip the doomed authenticated request), and re-extract the cookie on launch when logged in without a linked session - Send `play_session_id` and `player_backend=mediaplayer` to Usher, matching the web client / streamlink - Fork (iOS): restore program-date-time latency measurement (a prior rev measured distance to the manifest edge, reading ~0s and silently disabling high-latency recovery / chat-delay auto-sync); release platform views on dispose (per-stream view + AVPlayerViewController leak), track the observed AVPlayerItem for KVO removal (sibling-view crash), main-thread seek results, resolve superseded load futures - Fork (Android): clean up method handlers orphaned by PiP-time view disposal (leaked audio-focus listeners), drop the live-offset re-anchoring seekTo on metadata updates (latency creep), restore pre-duck volume, respect user pause in the stall watchdog, resolve superseded load futures - Deep review pass: expire the quality-switch flag so stall recovery isn't disabled for the session, cap latency-driven recovery (clock-skew loop), generation-guard the error overlay, two-strike offline confirmation, controller null-safety on quality switch - Tighten `/me` local-echo match (no longer renders `/meow ...` as an action); clear pending send text on disconnect ## Web / docs - Remove stale Cloudflare Images binding from `wrangler.jsonc` (covered by `images.unoptimized: true`) - Correct `web/AGENTS.md` Cache Components claim (feature not enabled) - Repo and agent config cleanup ## Test plan - [x] `flutter analyze` — clean (frosty + plugin lib) - [x] `flutter test` — 319/319 pass (adds `ChatLatencySync`, `StreamInfoPoller`, video timing invariants, `PlaybackAccessToken`, IRC tag parsing) - [x] Android plugin Kotlin compiles against the bumped fork rev - [ ] Native player plays live streams on iOS and Android - [ ] Quality switching works and persists across channel reopens - [ ] PiP enters/exits correctly; pause/resume toggle in PiP window works - [ ] Audio-only mode does not crash on Android < API 31 - [ ] Sending under a long synced chat delay no longer shows a false "may not have been sent" error - [ ] Long composer text reflows the message list (no input/message overlap) - [ ] Multi-tab: adding a tab does not mark previous tab as unread - [ ] Merged chat: Reply from user modal targets the correct tab's composer 🤖 Generated with [Claude Code](https://claude.com/claude-code)
345 lines
13 KiB
Dart
345 lines
13 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter/rendering.dart';
|
|
import 'package:flutter_mobx/flutter_mobx.dart';
|
|
import 'package:frosty/screens/channel/chat/emote_menu/emote_menu_panel.dart';
|
|
import 'package:frosty/screens/channel/chat/emote_menu/recent_emotes_panel.dart';
|
|
import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
|
|
import 'package:frosty/screens/channel/chat/stores/chat_tabs_store.dart';
|
|
import 'package:frosty/screens/channel/chat/widgets/chat_bottom_bar.dart';
|
|
import 'package:frosty/screens/channel/chat/widgets/chat_message.dart';
|
|
import 'package:frosty/utils.dart';
|
|
import 'package:frosty/utils/context_extensions.dart';
|
|
import 'package:frosty/widgets/frosty_page_view.dart';
|
|
import 'package:frosty/widgets/frosty_scrollbar.dart';
|
|
|
|
/// ~2x default to keep richer message widgets (emotes, badges, replies) built
|
|
/// ahead of fast scroll-back without holding the entire history.
|
|
const _chatCacheExtent = ScrollCacheExtent.pixels(500.0);
|
|
|
|
class Chat extends StatelessWidget {
|
|
final ChatStore chatStore;
|
|
final EdgeInsetsGeometry? listPadding;
|
|
|
|
/// Callback to add a new chat tab.
|
|
/// Passes this to ChatBottomBar for the ChatDetails menu.
|
|
final VoidCallback onAddChat;
|
|
|
|
/// When set, the widget operates in merged mode: messages come from all tabs
|
|
/// and the active tab determines the send target.
|
|
final ChatTabsStore? chatTabsStore;
|
|
|
|
const Chat({
|
|
super.key,
|
|
required this.chatStore,
|
|
this.listPadding,
|
|
required this.onAddChat,
|
|
this.chatTabsStore,
|
|
});
|
|
|
|
bool get _isMerged => chatTabsStore != null;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Observer(
|
|
builder: (context) {
|
|
return Column(
|
|
children: [
|
|
Expanded(
|
|
child: Stack(
|
|
alignment: AlignmentDirectional.bottomCenter,
|
|
children: [
|
|
// Wrap only the message list with GestureDetector
|
|
// so taps on ChatBottomBar don't trigger unfocus
|
|
GestureDetector(
|
|
behavior: HitTestBehavior.opaque,
|
|
onTap: () {
|
|
if (chatStore.assetsStore.showEmoteMenu) {
|
|
chatStore.assetsStore.showEmoteMenu = false;
|
|
} else if (chatStore.textFieldFocusNode.hasFocus) {
|
|
chatStore.unfocusInput();
|
|
}
|
|
},
|
|
child: MediaQuery(
|
|
data: MediaQuery.of(context).copyWith(
|
|
textScaler: chatStore.settings.messageScale.textScaler,
|
|
),
|
|
child: DefaultTextStyle(
|
|
style: context.defaultTextStyle.copyWith(
|
|
fontSize: chatStore.settings.fontSize,
|
|
),
|
|
child: Builder(
|
|
builder: (context) {
|
|
// Don't add bottom padding in horizontal landscape
|
|
// (immersive mode with home indicator on side).
|
|
// landscapeForceVerticalChat uses portrait layout
|
|
// with normal system UI, so still needs padding.
|
|
final isHorizontalLandscape =
|
|
context.isLandscape &&
|
|
!chatStore.settings.landscapeForceVerticalChat;
|
|
final bottomPadding =
|
|
chatStore.assetsStore.showEmoteMenu ||
|
|
isHorizontalLandscape
|
|
? 0.0
|
|
: MediaQuery.of(context).padding.bottom;
|
|
|
|
final scrollController = _isMerged
|
|
? chatTabsStore!.mergedScrollController
|
|
: chatStore.scrollController;
|
|
|
|
return FrostyScrollbar(
|
|
controller: scrollController,
|
|
padding: EdgeInsets.only(
|
|
top: MediaQuery.of(context).padding.top,
|
|
bottom:
|
|
chatStore.bottomBarHeight + bottomPadding,
|
|
),
|
|
child: Observer(
|
|
builder: (context) {
|
|
return _isMerged
|
|
? _buildMergedList(
|
|
scrollController,
|
|
bottomPadding,
|
|
)
|
|
: _buildNormalList(
|
|
scrollController,
|
|
bottomPadding,
|
|
);
|
|
},
|
|
),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
),
|
|
),
|
|
Positioned(
|
|
left: 0,
|
|
right: 0,
|
|
bottom: 0,
|
|
child: ChatBottomBar(
|
|
chatStore: chatStore,
|
|
onAddChat: onAddChat,
|
|
channelDisplayName: _isMerged
|
|
? getReadableName(
|
|
chatTabsStore!.activeTab.displayName,
|
|
chatTabsStore!.activeTab.channelLogin,
|
|
)
|
|
: null,
|
|
),
|
|
),
|
|
_buildResumeScrollButton(),
|
|
],
|
|
),
|
|
),
|
|
_buildEmoteMenu(context),
|
|
],
|
|
);
|
|
},
|
|
);
|
|
}
|
|
|
|
Widget _buildNormalList(
|
|
ScrollController scrollController,
|
|
double bottomPadding,
|
|
) {
|
|
return ListView.builder(
|
|
reverse: true,
|
|
padding: (listPadding ?? EdgeInsets.zero).add(
|
|
EdgeInsets.only(
|
|
bottom: chatStore.bottomBarHeight + bottomPadding,
|
|
),
|
|
),
|
|
addAutomaticKeepAlives: false,
|
|
scrollCacheExtent: _chatCacheExtent,
|
|
controller: scrollController,
|
|
itemCount: chatStore.renderMessages.length,
|
|
itemBuilder: (context, index) => ChatMessage(
|
|
ircMessage: chatStore.renderMessages[
|
|
chatStore.renderMessages.length - 1 - index],
|
|
chatStore: chatStore,
|
|
),
|
|
);
|
|
}
|
|
|
|
Widget _buildMergedList(
|
|
ScrollController scrollController,
|
|
double bottomPadding,
|
|
) {
|
|
final mergedMessages = chatTabsStore!.mergedMessages;
|
|
final channelIdToUserTwitch =
|
|
chatTabsStore!.mergedChannelIdToUserTwitch;
|
|
final currentChannelId = chatTabsStore!.activeTab.channelId;
|
|
|
|
return ListView.builder(
|
|
reverse: true,
|
|
padding: (listPadding ?? EdgeInsets.zero).add(
|
|
EdgeInsets.only(
|
|
bottom: chatStore.bottomBarHeight + bottomPadding,
|
|
),
|
|
),
|
|
addAutomaticKeepAlives: false,
|
|
scrollCacheExtent: _chatCacheExtent,
|
|
controller: scrollController,
|
|
itemCount: mergedMessages.length,
|
|
itemBuilder: (context, index) {
|
|
final merged =
|
|
mergedMessages[mergedMessages.length - 1 - index];
|
|
return ChatMessage(
|
|
ircMessage: merged.ircMessage,
|
|
chatStore: merged.chatStore,
|
|
inputChatStore: chatStore,
|
|
onActivateSourceTab: () {
|
|
final tabs = chatTabsStore!.tabs;
|
|
final idx = tabs.indexWhere(
|
|
(t) => t.channelId == merged.chatStore.channelId,
|
|
);
|
|
if (idx != -1 && idx != chatTabsStore!.activeTabIndex) {
|
|
chatTabsStore!.setActiveTab(idx, silent: true);
|
|
}
|
|
},
|
|
overrideChannelIdToUserTwitch: channelIdToUserTwitch,
|
|
overrideCurrentChannelId: currentChannelId,
|
|
);
|
|
},
|
|
);
|
|
}
|
|
|
|
Widget _buildResumeScrollButton() {
|
|
return Builder(
|
|
builder: (context) {
|
|
final isHorizontalLandscape =
|
|
context.isLandscape &&
|
|
!chatStore.settings.landscapeForceVerticalChat;
|
|
return AnimatedPadding(
|
|
duration: const Duration(milliseconds: 200),
|
|
padding: EdgeInsets.only(
|
|
left: 4,
|
|
top: 4,
|
|
right: 4,
|
|
bottom:
|
|
chatStore.bottomBarHeight +
|
|
(chatStore.assetsStore.showEmoteMenu ||
|
|
isHorizontalLandscape
|
|
? 0
|
|
: MediaQuery.of(context).padding.bottom),
|
|
),
|
|
child: Observer(
|
|
builder: (_) {
|
|
final isAutoScrolling = _isMerged
|
|
? chatTabsStore!.mergedAutoScroll
|
|
: chatStore.autoScroll;
|
|
final bufferCount = _isMerged
|
|
? chatTabsStore!.mergedBufferCount
|
|
: chatStore.messageBuffer.length;
|
|
final onResume = _isMerged
|
|
? chatTabsStore!.resumeMergedScroll
|
|
: chatStore.resumeScroll;
|
|
|
|
return AnimatedSwitcher(
|
|
duration: const Duration(milliseconds: 200),
|
|
switchInCurve: Curves.easeOut,
|
|
switchOutCurve: Curves.easeIn,
|
|
child: isAutoScrolling
|
|
? null
|
|
: ElevatedButton.icon(
|
|
onPressed: onResume,
|
|
icon: const Icon(
|
|
Icons.arrow_downward_rounded,
|
|
),
|
|
label: Text(
|
|
bufferCount > 0
|
|
? '$bufferCount new ${bufferCount == 1 ? 'message' : 'messages'}'
|
|
: 'Resume scroll',
|
|
style: const TextStyle(
|
|
fontFeatures: [
|
|
FontFeature.tabularFigures(),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
);
|
|
},
|
|
),
|
|
);
|
|
},
|
|
);
|
|
}
|
|
|
|
Widget _buildEmoteMenu(BuildContext context) {
|
|
return AnimatedContainer(
|
|
curve: Curves.ease,
|
|
duration: const Duration(milliseconds: 200),
|
|
height: chatStore.assetsStore.showEmoteMenu
|
|
? context.screenHeight / (context.isPortrait ? 3 : 2)
|
|
: 0,
|
|
child: AnimatedSwitcher(
|
|
duration: const Duration(milliseconds: 100),
|
|
switchInCurve: Curves.easeOut,
|
|
switchOutCurve: Curves.easeIn,
|
|
child: chatStore.assetsStore.showEmoteMenu
|
|
? ClipRect(
|
|
child: Column(
|
|
children: [
|
|
const Divider(),
|
|
Expanded(
|
|
child: FrostyPageView(
|
|
headers: [
|
|
'Recent',
|
|
if (chatStore.settings.showTwitchEmotes)
|
|
'Twitch',
|
|
if (chatStore.settings.show7TVEmotes) '7TV',
|
|
if (chatStore.settings.showBTTVEmotes) 'BTTV',
|
|
if (chatStore.settings.showFFZEmotes) 'FFZ',
|
|
],
|
|
tabActions: {
|
|
if (chatStore
|
|
.assetsStore
|
|
.recentEmotes
|
|
.isNotEmpty)
|
|
0: IconButton(
|
|
onPressed: () {
|
|
chatStore.assetsStore.recentEmotes.clear();
|
|
chatStore.updateNotification(
|
|
'Recent emotes cleared',
|
|
);
|
|
},
|
|
icon: const Icon(
|
|
Icons.delete_outline_rounded,
|
|
),
|
|
tooltip: 'Clear recent emotes',
|
|
iconSize: 20,
|
|
),
|
|
},
|
|
children: [
|
|
RecentEmotesPanel(chatStore: chatStore),
|
|
if (chatStore.settings.showTwitchEmotes)
|
|
EmoteMenuPanel(
|
|
chatStore: chatStore,
|
|
twitchEmotes: chatStore
|
|
.assetsStore
|
|
.userEmoteSectionToEmotes,
|
|
),
|
|
...[
|
|
if (chatStore.settings.show7TVEmotes)
|
|
chatStore.assetsStore.sevenTVEmotes,
|
|
if (chatStore.settings.showBTTVEmotes)
|
|
chatStore.assetsStore.bttvEmotes,
|
|
if (chatStore.settings.showFFZEmotes)
|
|
chatStore.assetsStore.ffzEmotes,
|
|
].map(
|
|
(emotes) => EmoteMenuPanel(
|
|
chatStore: chatStore,
|
|
emotes: emotes,
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
)
|
|
: null,
|
|
),
|
|
);
|
|
}
|
|
}
|