mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-05-27 00:55:16 -07:00
fix autoplay gate to hold pause until subtitle prime and tokenization re
- use pluginRuntimeConfig.autoStart (not effectivePluginRuntimeConfig) so pause-until-ready is preserved when attaching to a background app - await subtitle priming before signaling autoplay readiness - move sub-auto/sid defaults to start-file so they are not overwritten after track load
This commit is contained in:
@@ -7,11 +7,15 @@ import { sendAppControlCommand } from '../../shared/app-control-client';
|
||||
import { startAppControlServer } from './app-control-server';
|
||||
|
||||
async function waitForSocketPath(socketPath: string): Promise<void> {
|
||||
const deadline = Date.now() + 1000;
|
||||
const timeoutMs = 1000;
|
||||
const deadline = Date.now() + timeoutMs;
|
||||
while (Date.now() < deadline) {
|
||||
if (fs.existsSync(socketPath)) return;
|
||||
await new Promise<void>((resolve) => setTimeout(resolve, 10));
|
||||
}
|
||||
throw new Error(
|
||||
`Timed out waiting for control socket ${socketPath} after ${timeoutMs}ms`,
|
||||
);
|
||||
}
|
||||
|
||||
test('app control server dispatches argv requests and replies ok', async () => {
|
||||
|
||||
@@ -2,6 +2,10 @@ import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { createAutoplayTokenizationWarmRelease } from './autoplay-tokenization-warm-release';
|
||||
|
||||
function flushMicrotasks(): Promise<void> {
|
||||
return new Promise((resolve) => setTimeout(resolve, 0));
|
||||
}
|
||||
|
||||
test('autoplay tokenization warm release signals immediately when warmups are ready', () => {
|
||||
const calls: string[] = [];
|
||||
const release = createAutoplayTokenizationWarmRelease({
|
||||
@@ -45,14 +49,17 @@ test('autoplay tokenization warm release primes subtitles before waiting for war
|
||||
|
||||
resolveWarmup();
|
||||
await warmup;
|
||||
await Promise.resolve();
|
||||
await flushMicrotasks();
|
||||
|
||||
assert.deepEqual(calls, ['prime', 'warmup', 'signal']);
|
||||
});
|
||||
|
||||
test('autoplay tokenization warm release does not await subtitle priming before signaling ready media', async () => {
|
||||
test('autoplay tokenization warm release waits for subtitle priming before signaling ready media', async () => {
|
||||
const calls: string[] = [];
|
||||
const never = new Promise<void>(() => {});
|
||||
let resolvePrime!: () => void;
|
||||
const prime = new Promise<void>((resolve) => {
|
||||
resolvePrime = resolve;
|
||||
});
|
||||
const release = createAutoplayTokenizationWarmRelease({
|
||||
isTokenizationWarmupReady: () => true,
|
||||
startTokenizationWarmups: async () => {
|
||||
@@ -61,7 +68,7 @@ test('autoplay tokenization warm release does not await subtitle priming before
|
||||
getCurrentMediaPath: () => '/tmp/video.mkv',
|
||||
primeCurrentSubtitle: () => {
|
||||
calls.push('prime');
|
||||
return never;
|
||||
return prime;
|
||||
},
|
||||
signalAutoplayReady: () => calls.push('signal'),
|
||||
warn: () => {},
|
||||
@@ -70,6 +77,12 @@ test('autoplay tokenization warm release does not await subtitle priming before
|
||||
release('/tmp/video.mkv');
|
||||
await Promise.resolve();
|
||||
|
||||
assert.deepEqual(calls, ['prime']);
|
||||
|
||||
resolvePrime();
|
||||
await prime;
|
||||
await Promise.resolve();
|
||||
|
||||
assert.deepEqual(calls, ['prime', 'signal']);
|
||||
});
|
||||
|
||||
|
||||
@@ -22,24 +22,41 @@ export function createAutoplayTokenizationWarmRelease(deps: {
|
||||
deps.signalAutoplayReady();
|
||||
};
|
||||
|
||||
const primeSubtitleForRelease = (mediaPath: string): Promise<void> | null => {
|
||||
if (!deps.primeCurrentSubtitle) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return Promise.resolve(deps.primeCurrentSubtitle(mediaPath)).catch((error) => {
|
||||
deps.warn('Startup subtitle priming failed before autoplay readiness release:', error);
|
||||
});
|
||||
} catch (error) {
|
||||
deps.warn('Startup subtitle priming failed before autoplay readiness release:', error);
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
return (mediaPath) => {
|
||||
const normalizedPath = normalizeMediaPath(mediaPath);
|
||||
if (!normalizedPath) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
void Promise.resolve(deps.primeCurrentSubtitle?.(normalizedPath)).catch((error) => {
|
||||
deps.warn('Startup subtitle priming failed before autoplay readiness release:', error);
|
||||
});
|
||||
} catch (error) {
|
||||
deps.warn('Startup subtitle priming failed before autoplay readiness release:', error);
|
||||
}
|
||||
const primePromise = primeSubtitleForRelease(normalizedPath);
|
||||
if (deps.isTokenizationWarmupReady()) {
|
||||
signalIfCurrent(normalizedPath);
|
||||
if (!primePromise) {
|
||||
signalIfCurrent(normalizedPath);
|
||||
return;
|
||||
}
|
||||
void primePromise.then(() => {
|
||||
signalIfCurrent(normalizedPath);
|
||||
});
|
||||
return;
|
||||
}
|
||||
void deps
|
||||
.startTokenizationWarmups()
|
||||
const warmupPromise = deps.startTokenizationWarmups();
|
||||
const readinessPromise = primePromise
|
||||
? Promise.all([primePromise, warmupPromise]).then(() => {})
|
||||
: warmupPromise;
|
||||
void readinessPromise
|
||||
.then(() => {
|
||||
signalIfCurrent(normalizedPath);
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user