mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-05-26 00:55:16 -07:00
b1bdeabca8
* fix(jellyfin): show overlay, inject plugin, and fix stats title on playb - Show visible overlay automatically during Jellyfin playback so subtitleStyle applies - Inject bundled mpv plugin on auto-launch so keybindings work without overlay focus - Group Jellyfin playback stats under item metadata (jellyfin://host/item/id) instead of stream URLs so episodes merge with matching local titles - Mark ffsubsync unavailable in subsync modal for remote media paths - Drain queued second-instance commands even when onReady throws * fix(overlay): stabilize macOS focus handoff and sidebar Yomitan pause - Keep overlay visible during macOS foreground probe after overlay blur - Hold sidebar hover-pause while a Yomitan lookup popup remains open * fix(jellyfin): fix discovery loop, device identity, tray state, and Disc - Derive device identity from OS hostname; remove legacy configurable client/device fields - Prevent discovery playback from reloading active item, misreporting pause state, and duplicate overlay restores - Restart stale tray discovery sessions without re-login when server drops SubMiner cast target - Sync tray discovery checkbox state on Linux after CLI/startup/remote-session changes - Stop Discord presence falling back to stream URLs; prime title before tokenized stream loads - Fix picker library discovery when log level is above info - Fix config.example.jsonc trailing commas and array formatting * docs(release): trim and consolidate prerelease notes for 0.15.0 - Remove breaking changes section and several redundant bullet points - Consolidate per-platform updater notes into a single entry - Normalize em-dash separators to hyphens in section headers * fix(config): remove trailing commas from config.example.jsonc - Strip trailing commas throughout both config.example.jsonc copies - Reformat inline arrays to multi-line for JSON strictness - Update Jellyfin subtitle preload and playback launch tests and impl * fix(tokenizer): preserve known-word highlight when POS filters suppress - Known-word cache matches now set isKnown=true even for tokens excluded by POS filters - POS exclusion gate suppresses N+1, frequency, and JLPT only; known status is computed before the gate - Jellyfin subtitle preload continues after cleanup failures instead of aborting - Update config docs and option description to document the known-word bypass behavior * fix(jellyfin): send explicit hide/show overlay instead of toggle - Track overlay visibility in plugin state; y-t uses explicit hide/show commands when state is known - Prevent paused Jellyfin playback from resuming on overlay hide - Fix subtitle cache cleanup to only remove dirs after successful cleanup * fix(jellyfin): fix remote progress sync, seek reporting, and startup sto - arm active playback before loadfile with loadedMediaPath: null to suppress premature stop events - force immediate progress report on seek-like position jumps at the mpv time-pos level - send positionTicks and failed=false in reportStopped payload - remove EventName from HTTP timeline payloads (websocket-only field) - add startup grace window to drop stop events before media finishes loading * fix(jellyfin): fix overlay toggle sync, redirect reload, and AppImage bi - Sync visible-overlay state back to plugin via script messages to avoid toggle/hide drift - Collapse duplicate toggle events within 250ms to prevent hide-then-show on single keypress - Preserve manual hide across Jellyfin path-changing redirects even when media-title drops - Rearm managed subtitle defaults on path-changing redirects - Route toggleVisibleOverlay session binding through plugin toggle instead of app-side IPC - Show Linux/Hyprland overlay passively (showInactive) to avoid stealing mpv keyboard focus - Fix AppImage binary resolution to prefer $APPIMAGE env over mounted inner binary - Add stats window layer management so delete/update dialogs appear above stats window - Fix Jellyfin remote progress sync during Linux websocket reconnect windows * Fix CodeRabbit review feedback * fix(jellyfin): subtitle timing, resume progress, and overlay sync - Add per-stream subtitle delay persistence and auto timeline-offset correction - Strip server-selected subtitle stream from mpv load URL; suppress plugin subtitle rearm and auto-start during app-managed preload - Fix resume position lost when mpv resets on stop; use last known position for final progress/stopped reports - Keep Play vs Resume distinct to avoid early seek race on normal play - Fix discovery resume when remote play sends StartPositionTicks=0 despite saved progress - Deduplicate show/hide overlay commands using recorded visibility state - Rewrite docs-site Jellyfin page around cast-to-device UX * test: update lifecycle cleanup assertion * fix: clear aborted playback state, fix overlay passthrough, and guard du - Reset app_managed_playback_pending on lifecycle cleanup to prevent state leak into next item - Record visible overlay action only after command succeeds, not before - Non-native passive overlay now always click-through on re-show (fix isNonNativePassiveOverlay ordering) - Defer activeParsedSubtitleMediaPath assignment until after prefetch completes - Move autoplay gate release into the hide branch of toggleVisibleOverlay - Clear active Jellyfin playback when stopping media that never loaded - Reset managed subtitle delay and delay key when no external tracks are available - Await async removeDir in subtitle cache cleanup - Guard duplicate delete clicks in MediaDetailView and SessionsTab with refs - Escape key in DeleteConfirmDialog now calls stopPropagation and stopImmediatePropagation
278 lines
8.2 KiB
TypeScript
278 lines
8.2 KiB
TypeScript
import type { DiscordPresenceStylePreset } from '../../types/integrations';
|
|
import type { ResolvedConfig } from '../../types';
|
|
|
|
export interface DiscordPresenceSnapshot {
|
|
mediaTitle: string | null;
|
|
mediaPath: string | null;
|
|
subtitleText: string;
|
|
currentTimeSec?: number | null;
|
|
mediaDurationSec?: number | null;
|
|
paused: boolean | null;
|
|
connected: boolean;
|
|
sessionStartedAtMs: number;
|
|
}
|
|
|
|
type DiscordPresenceConfig = ResolvedConfig['discordPresence'];
|
|
|
|
export interface DiscordActivityPayload {
|
|
details: string;
|
|
state: string;
|
|
startTimestamp: number;
|
|
largeImageKey?: string;
|
|
largeImageText?: string;
|
|
smallImageKey?: string;
|
|
smallImageText?: string;
|
|
buttons?: Array<{ label: string; url: string }>;
|
|
}
|
|
|
|
type DiscordClient = {
|
|
login: () => Promise<void>;
|
|
setActivity: (activity: DiscordActivityPayload) => Promise<void>;
|
|
clearActivity: () => Promise<void>;
|
|
destroy: () => void;
|
|
};
|
|
|
|
type TimeoutLike = ReturnType<typeof setTimeout>;
|
|
|
|
interface PresenceStyleDefinition {
|
|
fallbackDetails: string;
|
|
largeImageKey: string;
|
|
largeImageText: string;
|
|
smallImageKey: string;
|
|
smallImageText: string;
|
|
buttonLabel: string;
|
|
buttonUrl: string;
|
|
}
|
|
|
|
const PRESENCE_STYLES: Record<DiscordPresenceStylePreset, PresenceStyleDefinition> = {
|
|
default: {
|
|
fallbackDetails: 'Sentence Mining',
|
|
largeImageKey: 'subminer-logo',
|
|
largeImageText: 'SubMiner',
|
|
smallImageKey: 'study',
|
|
smallImageText: '日本語学習中',
|
|
buttonLabel: '',
|
|
buttonUrl: '',
|
|
},
|
|
meme: {
|
|
fallbackDetails: 'Mining and crafting (Anki cards)',
|
|
largeImageKey: 'subminer-logo',
|
|
largeImageText: 'SubMiner',
|
|
smallImageKey: 'study',
|
|
smallImageText: 'Sentence Mining',
|
|
buttonLabel: '',
|
|
buttonUrl: '',
|
|
},
|
|
japanese: {
|
|
fallbackDetails: '文の採掘中',
|
|
largeImageKey: 'subminer-logo',
|
|
largeImageText: 'SubMiner',
|
|
smallImageKey: 'study',
|
|
smallImageText: 'イマージョン学習',
|
|
buttonLabel: '',
|
|
buttonUrl: '',
|
|
},
|
|
minimal: {
|
|
fallbackDetails: 'SubMiner',
|
|
largeImageKey: 'subminer-logo',
|
|
largeImageText: 'SubMiner',
|
|
smallImageKey: '',
|
|
smallImageText: '',
|
|
buttonLabel: '',
|
|
buttonUrl: '',
|
|
},
|
|
};
|
|
|
|
function resolvePresenceStyle(
|
|
preset: DiscordPresenceStylePreset | undefined,
|
|
): PresenceStyleDefinition {
|
|
return PRESENCE_STYLES[preset ?? 'default'] ?? PRESENCE_STYLES.default;
|
|
}
|
|
|
|
function trimField(value: string, maxLength = 128): string {
|
|
if (value.length <= maxLength) return value;
|
|
return `${value.slice(0, Math.max(0, maxLength - 1))}…`;
|
|
}
|
|
|
|
function sanitizeText(value: string | null | undefined, fallback: string): string {
|
|
const text = value?.trim();
|
|
if (!text) return fallback;
|
|
return text;
|
|
}
|
|
|
|
function basename(filePath: string | null): string {
|
|
if (!filePath) return '';
|
|
const parts = filePath.split(/[\\/]/);
|
|
return parts[parts.length - 1] ?? '';
|
|
}
|
|
|
|
function fallbackTitleFromMediaPath(mediaPath: string | null): string {
|
|
const trimmed = mediaPath?.trim();
|
|
if (!trimmed) return '';
|
|
if (/^[a-z][a-z0-9+.-]*:\/\//i.test(trimmed) && !trimmed.toLowerCase().startsWith('file://')) {
|
|
return '';
|
|
}
|
|
return basename(trimmed).split(/[?#]/)[0] ?? '';
|
|
}
|
|
|
|
function buildStatus(snapshot: DiscordPresenceSnapshot): string {
|
|
if (!snapshot.connected || !snapshot.mediaPath) return 'Idle';
|
|
if (snapshot.paused) return 'Paused';
|
|
return 'Playing';
|
|
}
|
|
|
|
function formatClock(totalSeconds: number | null | undefined): string {
|
|
if (!Number.isFinite(totalSeconds) || (totalSeconds ?? -1) < 0) return '--:--';
|
|
const rounded = Math.floor(totalSeconds as number);
|
|
const hours = Math.floor(rounded / 3600);
|
|
const minutes = Math.floor((rounded % 3600) / 60);
|
|
const seconds = rounded % 60;
|
|
if (hours > 0) {
|
|
return `${hours}:${String(minutes).padStart(2, '0')}:${String(seconds).padStart(2, '0')}`;
|
|
}
|
|
return `${String(minutes).padStart(2, '0')}:${String(seconds).padStart(2, '0')}`;
|
|
}
|
|
|
|
export function buildDiscordPresenceActivity(
|
|
config: DiscordPresenceConfig,
|
|
snapshot: DiscordPresenceSnapshot,
|
|
): DiscordActivityPayload {
|
|
const style = resolvePresenceStyle(config.presenceStyle);
|
|
const status = buildStatus(snapshot);
|
|
const title = sanitizeText(
|
|
snapshot.mediaTitle,
|
|
fallbackTitleFromMediaPath(snapshot.mediaPath) || 'Unknown media',
|
|
);
|
|
const details =
|
|
snapshot.connected && snapshot.mediaPath ? trimField(title) : style.fallbackDetails;
|
|
const timeline = `${formatClock(snapshot.currentTimeSec)} / ${formatClock(snapshot.mediaDurationSec)}`;
|
|
const state =
|
|
snapshot.connected && snapshot.mediaPath
|
|
? trimField(`${status} ${timeline}`)
|
|
: trimField(status);
|
|
|
|
const activity: DiscordActivityPayload = {
|
|
details,
|
|
state,
|
|
startTimestamp: Math.floor(snapshot.sessionStartedAtMs / 1000),
|
|
};
|
|
|
|
if (style.largeImageKey.trim().length > 0) {
|
|
activity.largeImageKey = style.largeImageKey.trim();
|
|
}
|
|
if (style.largeImageText.trim().length > 0) {
|
|
activity.largeImageText = trimField(style.largeImageText.trim());
|
|
}
|
|
if (style.smallImageKey.trim().length > 0) {
|
|
activity.smallImageKey = style.smallImageKey.trim();
|
|
}
|
|
if (style.smallImageText.trim().length > 0) {
|
|
activity.smallImageText = trimField(style.smallImageText.trim());
|
|
}
|
|
if (style.buttonLabel.trim().length > 0 && /^https?:\/\//.test(style.buttonUrl.trim())) {
|
|
activity.buttons = [
|
|
{
|
|
label: trimField(style.buttonLabel.trim(), 32),
|
|
url: style.buttonUrl.trim(),
|
|
},
|
|
];
|
|
}
|
|
|
|
return activity;
|
|
}
|
|
|
|
export function createDiscordPresenceService(deps: {
|
|
config: DiscordPresenceConfig;
|
|
createClient: () => DiscordClient;
|
|
now?: () => number;
|
|
setTimeoutFn?: (callback: () => void, delayMs: number) => TimeoutLike;
|
|
clearTimeoutFn?: (timer: TimeoutLike) => void;
|
|
logDebug?: (message: string, meta?: unknown) => void;
|
|
}) {
|
|
const now = deps.now ?? (() => Date.now());
|
|
const setTimeoutFn = deps.setTimeoutFn ?? ((callback, delayMs) => setTimeout(callback, delayMs));
|
|
const clearTimeoutFn = deps.clearTimeoutFn ?? ((timer) => clearTimeout(timer));
|
|
const logDebug = deps.logDebug ?? (() => {});
|
|
|
|
let client: DiscordClient | null = null;
|
|
let pendingSnapshot: DiscordPresenceSnapshot | null = null;
|
|
let debounceTimer: TimeoutLike | null = null;
|
|
let intervalTimer: TimeoutLike | null = null;
|
|
let lastActivityKey = '';
|
|
let lastSentAtMs = 0;
|
|
|
|
async function flush(): Promise<void> {
|
|
if (!client || !pendingSnapshot) return;
|
|
const elapsed = now() - lastSentAtMs;
|
|
if (elapsed < deps.config.updateIntervalMs) {
|
|
const delay = Math.max(0, deps.config.updateIntervalMs - elapsed);
|
|
if (intervalTimer) clearTimeoutFn(intervalTimer);
|
|
intervalTimer = setTimeoutFn(() => {
|
|
void flush();
|
|
}, delay);
|
|
return;
|
|
}
|
|
|
|
const payload = buildDiscordPresenceActivity(deps.config, pendingSnapshot);
|
|
const activityKey = JSON.stringify(payload);
|
|
if (activityKey === lastActivityKey) return;
|
|
|
|
try {
|
|
await client.setActivity(payload);
|
|
lastSentAtMs = now();
|
|
lastActivityKey = activityKey;
|
|
} catch (error) {
|
|
logDebug('[discord-presence] failed to set activity', error);
|
|
}
|
|
}
|
|
|
|
function scheduleFlush(snapshot: DiscordPresenceSnapshot): void {
|
|
pendingSnapshot = snapshot;
|
|
if (debounceTimer) {
|
|
clearTimeoutFn(debounceTimer);
|
|
}
|
|
debounceTimer = setTimeoutFn(() => {
|
|
debounceTimer = null;
|
|
void flush();
|
|
}, deps.config.debounceMs);
|
|
}
|
|
|
|
return {
|
|
async start(): Promise<void> {
|
|
if (!deps.config.enabled) return;
|
|
try {
|
|
client = deps.createClient();
|
|
await client.login();
|
|
} catch (error) {
|
|
client = null;
|
|
logDebug('[discord-presence] login failed', error);
|
|
}
|
|
},
|
|
publish(snapshot: DiscordPresenceSnapshot): void {
|
|
if (!client) return;
|
|
scheduleFlush(snapshot);
|
|
},
|
|
async stop(): Promise<void> {
|
|
if (debounceTimer) {
|
|
clearTimeoutFn(debounceTimer);
|
|
debounceTimer = null;
|
|
}
|
|
if (intervalTimer) {
|
|
clearTimeoutFn(intervalTimer);
|
|
intervalTimer = null;
|
|
}
|
|
pendingSnapshot = null;
|
|
lastActivityKey = '';
|
|
lastSentAtMs = 0;
|
|
if (!client) return;
|
|
try {
|
|
await client.clearActivity();
|
|
} catch (error) {
|
|
logDebug('[discord-presence] clear activity failed', error);
|
|
}
|
|
client.destroy();
|
|
client = null;
|
|
},
|
|
};
|
|
}
|