feat(offline): play downloaded video, and drain the offline sync queue (0.4.6)
🏗️ Build and Test JellyTau / Run Tests (push) Successful in 20m34s
Publish Documentation / Build & publish docs to gitea-pages (push) Successful in 6m6s
Traceability Validation / Check Requirement Traces (push) Successful in 18s
Build & Release / Run Tests (push) Successful in 20m26s
🏗️ Build and Test JellyTau / Android Compile Check (push) Successful in 10m3s
Build & Release / Build Linux (push) Successful in 37m59s
Build & Release / Build Windows (push) Successful in 23m0s
Build & Release / Build Android (push) Successful in 40m26s
Build & Release / Create Release (push) Successful in 1m20s
🏗️ Build and Test JellyTau / Run Tests (push) Successful in 20m34s
Publish Documentation / Build & publish docs to gitea-pages (push) Successful in 6m6s
Traceability Validation / Check Requirement Traces (push) Successful in 18s
Build & Release / Run Tests (push) Successful in 20m26s
🏗️ Build and Test JellyTau / Android Compile Check (push) Successful in 10m3s
Build & Release / Build Linux (push) Successful in 37m59s
Build & Release / Build Windows (push) Successful in 23m0s
Build & Release / Build Android (push) Successful in 40m26s
Build & Release / Create Release (push) Successful in 1m20s
Bundles this session's work plus the concurrent search/offline/player changes.
Every gate passes on the combined tree: 885 frontend tests, 610 Rust tests,
clippy clean, boundary clean, trace coverage 86%.
Offline video playback — four separate defects, each of which alone stopped it:
DR-133 A completed download's file_path is already absolute (the worker
rewrites it on completion), but the player rooted it a second time and
handed the webview /data/user/0/app//data/user/0/app/videos/x.mp4.
DR-134 The asset protocol was never enabled: no protocol-asset feature and no
assetProtocol config, so convertFileSrc produced URLs nothing answered.
Also silently defeated the cached-thumbnail path, which fails soft to
the server copy and hid it whenever the server was reachable.
DR-137 Tauri's asset protocol answers a range-less request by reading the
whole file into memory, and only advertises Accept-Ranges from inside
its range branch, so the first request never learns ranges exist.
Chromium gave up with PIPELINE_ERROR_READ after ~31s. Local media is
now served by a loopback HTTP server: bounded 4 MiB chunks streamed
from the file handle, every response length-delimited, and a range-less
request answered with one chunk rather than the file. Confined by a
per-session token and to the app data directory, because loopback is
shared between apps on Android.
DR-138 Release builds set usesCleartextTraffic=false, so Android rejected the
request to that server before any I/O. A network-security-config
exempts 127.0.0.1 only; a remote server must still be HTTPS.
Downloads:
DR-135 download_item never records media_type and the reconnect resolver read
that NULL as 'audio', so a movie queued from a media card had its URL
resolved by get_audio_stream_url and completed as an audio-only
transcode. The item's own type now decides.
DR-136 Rows already downloaded that way are requeued on reconnect, since
prevention alone leaves them reading "downloaded" and still unplayable.
Known limitation: a download taken at `original` quality is a byte copy of the
source, so it can be any container. One such file is an AVI holding XVID, which
the webview cannot play in any case — the media server serves it correctly and
Chromium refuses it. That needs either a transcoded download preset or the
native ExoPlayer surface work, and is not addressed here.
Also fixes two ID collisions between concurrent work: DR-143 defined twice
(search vs offline gate) and UT-131 defined twice (Episode Focus hero vs channel
cap). The search requirement is now DR-147 and the channel-cap test UT-141, with
their code references and matrix rows updated.
This commit is contained in:
@@ -0,0 +1,162 @@
|
||||
// The offline "downloaded only" gate is a *backend* flag, so flipping it only
|
||||
// changes what the user sees if the listing is re-queried afterwards. Nothing
|
||||
// re-queried: the toggle greyed cards instantly (a pure frontend derivation in
|
||||
// MediaCard) while the item list stayed exactly as it was loaded, which is why
|
||||
// the filter read as "shows everything until I toggle, then greys some of it".
|
||||
//
|
||||
// `catalogFilterVersion` is the refetch signal, and it must bump only once the
|
||||
// backend has actually accepted the new flag — a reload racing the push would
|
||||
// re-query under the old gate and land back where it started.
|
||||
//
|
||||
// TRACES: UR-052 | DR-078, DR-143 | UT-137, UT-138, UT-139
|
||||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
||||
import { get } from "svelte/store";
|
||||
|
||||
const h = vi.hoisted(() => {
|
||||
function shim<T>(initial: T) {
|
||||
let value = initial;
|
||||
const subs = new Set<(v: T) => void>();
|
||||
return {
|
||||
set(v: T) {
|
||||
value = v;
|
||||
subs.forEach((fn) => fn(value));
|
||||
},
|
||||
subscribe(fn: (v: T) => void) {
|
||||
subs.add(fn);
|
||||
fn(value);
|
||||
return () => subs.delete(fn);
|
||||
},
|
||||
/**
|
||||
* Drop subscribers from previously imported copies of the module.
|
||||
* `vi.resetModules()` gives each test a fresh module instance, but this
|
||||
* store outlives them all — without this the stale instances keep
|
||||
* consuming `mockImplementationOnce` and pushing their own state.
|
||||
*/
|
||||
reset(v: T) {
|
||||
subs.clear();
|
||||
value = v;
|
||||
},
|
||||
};
|
||||
}
|
||||
return {
|
||||
isConnectedStore: shim(true),
|
||||
// Resolution is deferred so a test can observe the window between "command
|
||||
// issued" and "command accepted".
|
||||
pending: [] as Array<() => void>,
|
||||
setShowServerCatalog: vi.fn(
|
||||
() => new Promise<void>((resolve) => h.pending.push(() => resolve()))
|
||||
),
|
||||
};
|
||||
});
|
||||
|
||||
vi.mock("$lib/stores/connectivity", () => ({
|
||||
isConnected: { subscribe: h.isConnectedStore.subscribe },
|
||||
}));
|
||||
|
||||
vi.mock("$lib/api/bindings", () => ({
|
||||
commands: {
|
||||
setShowServerCatalog: h.setShowServerCatalog,
|
||||
syncFullCatalog: vi.fn(),
|
||||
resumeQueuedDownloads: vi.fn(),
|
||||
catalogSyncStatus: vi.fn(),
|
||||
},
|
||||
}));
|
||||
|
||||
vi.mock("$lib/stores/auth", () => ({
|
||||
auth: { getRepository: () => ({ getHandle: () => "handle-1" }) },
|
||||
}));
|
||||
|
||||
/** Let every issued setShowServerCatalog settle. */
|
||||
async function settle() {
|
||||
h.pending.splice(0).forEach((resolve) => resolve());
|
||||
await Promise.resolve();
|
||||
await Promise.resolve();
|
||||
}
|
||||
|
||||
describe("offline filter refetch signal (DR-143)", () => {
|
||||
beforeEach(() => {
|
||||
h.setShowServerCatalog.mockReset();
|
||||
h.setShowServerCatalog.mockImplementation(
|
||||
() => new Promise<void>((resolve) => h.pending.push(() => resolve()))
|
||||
);
|
||||
h.pending.length = 0;
|
||||
h.isConnectedStore.reset(true);
|
||||
vi.resetModules();
|
||||
});
|
||||
|
||||
it("bumps the version when going offline closes the gate", async () => {
|
||||
const mod = await import("./offlineCatalog");
|
||||
await settle();
|
||||
const before = get(mod.catalogFilterVersion);
|
||||
|
||||
h.isConnectedStore.set(false); // include: true → false
|
||||
await settle();
|
||||
|
||||
expect(h.setShowServerCatalog).toHaveBeenLastCalledWith(false);
|
||||
expect(get(mod.catalogFilterVersion)).toBeGreaterThan(before);
|
||||
});
|
||||
|
||||
it("bumps only after the backend accepts the flag, never before", async () => {
|
||||
const mod = await import("./offlineCatalog");
|
||||
await settle();
|
||||
const before = get(mod.catalogFilterVersion);
|
||||
|
||||
h.isConnectedStore.set(false);
|
||||
await Promise.resolve(); // command issued, not yet resolved
|
||||
|
||||
expect(h.setShowServerCatalog).toHaveBeenLastCalledWith(false);
|
||||
expect(get(mod.catalogFilterVersion)).toBe(before);
|
||||
|
||||
await settle();
|
||||
expect(get(mod.catalogFilterVersion)).toBeGreaterThan(before);
|
||||
});
|
||||
|
||||
it("bumps both ways as the offline toggle is flipped", async () => {
|
||||
const mod = await import("./offlineCatalog");
|
||||
h.isConnectedStore.set(false);
|
||||
await settle();
|
||||
const offlineGated = get(mod.catalogFilterVersion);
|
||||
|
||||
mod.showServerCatalog.set(true); // reveal the server catalog
|
||||
await settle();
|
||||
expect(h.setShowServerCatalog).toHaveBeenLastCalledWith(true);
|
||||
const revealed = get(mod.catalogFilterVersion);
|
||||
expect(revealed).toBeGreaterThan(offlineGated);
|
||||
|
||||
mod.showServerCatalog.set(false); // back to downloaded-only
|
||||
await settle();
|
||||
expect(h.setShowServerCatalog).toHaveBeenLastCalledWith(false);
|
||||
expect(get(mod.catalogFilterVersion)).toBeGreaterThan(revealed);
|
||||
});
|
||||
|
||||
it("does not bump when the effective gate is unchanged", async () => {
|
||||
const mod = await import("./offlineCatalog");
|
||||
await settle();
|
||||
const before = get(mod.catalogFilterVersion);
|
||||
|
||||
// Online, the toggle cannot close the gate — browsing reads the same cache.
|
||||
mod.showServerCatalog.set(true);
|
||||
await settle();
|
||||
|
||||
expect(get(mod.catalogFilterVersion)).toBe(before);
|
||||
});
|
||||
|
||||
it("retries the push after a failed one rather than latching the old gate", async () => {
|
||||
const mod = await import("./offlineCatalog");
|
||||
await settle();
|
||||
const before = get(mod.catalogFilterVersion);
|
||||
|
||||
h.setShowServerCatalog.mockImplementationOnce(() => Promise.reject(new Error("ipc down")));
|
||||
h.isConnectedStore.set(false);
|
||||
await settle();
|
||||
expect(get(mod.catalogFilterVersion)).toBe(before); // nothing to reload for
|
||||
|
||||
// The same transition must be attempted again, not skipped as "already sent".
|
||||
h.isConnectedStore.set(true);
|
||||
await settle();
|
||||
h.isConnectedStore.set(false);
|
||||
await settle();
|
||||
expect(h.setShowServerCatalog).toHaveBeenLastCalledWith(false);
|
||||
expect(get(mod.catalogFilterVersion)).toBeGreaterThan(before);
|
||||
});
|
||||
});
|
||||
@@ -25,30 +25,62 @@ import { isConnected } from "$lib/stores/connectivity";
|
||||
*/
|
||||
export const showServerCatalog: Writable<boolean> = writable(false);
|
||||
|
||||
/**
|
||||
* Bumped every time the backend's downloads-only gate *settles* into a new
|
||||
* state. Library pages watch it and re-query.
|
||||
*
|
||||
* The gate lives in Rust and is only consulted when a query runs, so flipping
|
||||
* it changes nothing already on screen. Without this signal the toggle merely
|
||||
* greyed cards — `MediaCard.isServerOnly` is a pure frontend derivation and
|
||||
* updates instantly — while the item list stayed as first loaded. That is the
|
||||
* "shows everything until I filter" behaviour: the listing had never been
|
||||
* re-queried under the closed gate. Going offline had the same problem, since
|
||||
* nothing reloads on the online → offline transition either.
|
||||
*
|
||||
* It bumps *after* the command resolves, never before: a reload racing the push
|
||||
* would re-query under the old gate and undo itself.
|
||||
*
|
||||
* TRACES: UR-052 | DR-143
|
||||
*/
|
||||
export const catalogFilterVersion: Writable<number> = writable(0);
|
||||
|
||||
// Keep the backend's offline library queries in sync with the UI toggle. The
|
||||
// offline cache holds the whole synced catalog, so `get_items` would otherwise
|
||||
// return every server item even offline with the toggle off. Include the
|
||||
// non-downloaded catalog only when online (fast browsing reads the same cache)
|
||||
// or when the "Show all server media" toggle is on.
|
||||
let lastIncludeCatalog: boolean | null = null;
|
||||
function pushCatalogVisibility(connected: boolean, showCatalog: boolean): void {
|
||||
async function pushCatalogVisibility(connected: boolean, showCatalog: boolean): Promise<void> {
|
||||
const include = connected || showCatalog;
|
||||
if (include === lastIncludeCatalog) return;
|
||||
lastIncludeCatalog = include;
|
||||
commands.setShowServerCatalog(include).catch((err) => {
|
||||
|
||||
try {
|
||||
await commands.setShowServerCatalog(include);
|
||||
} catch (err) {
|
||||
console.warn("[OfflineCatalog] Failed to set catalog visibility:", err);
|
||||
});
|
||||
// The backend is still on the old gate, so forget that we sent this —
|
||||
// otherwise the next identical transition is skipped as a no-op and the
|
||||
// frontend and backend disagree about the filter for the rest of the
|
||||
// session. No version bump: there is nothing new to re-query under.
|
||||
lastIncludeCatalog = null;
|
||||
return;
|
||||
}
|
||||
|
||||
catalogFilterVersion.update((n) => n + 1);
|
||||
}
|
||||
|
||||
let connectedNow = true;
|
||||
let showCatalogNow = false;
|
||||
// Fire-and-forget on purpose: the push handles its own failure, and subscribers
|
||||
// must not block. Consumers wait on `catalogFilterVersion` instead.
|
||||
isConnected.subscribe((v) => {
|
||||
connectedNow = v;
|
||||
pushCatalogVisibility(connectedNow, showCatalogNow);
|
||||
void pushCatalogVisibility(connectedNow, showCatalogNow);
|
||||
});
|
||||
showServerCatalog.subscribe((v) => {
|
||||
showCatalogNow = v;
|
||||
pushCatalogVisibility(connectedNow, showCatalogNow);
|
||||
void pushCatalogVisibility(connectedNow, showCatalogNow);
|
||||
});
|
||||
|
||||
/** Last time a full catalog sync completed, for a UI hint. */
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
// TRACES: UR-025 | DR-132 | UT-123
|
||||
import { describe, it, expect } from "vitest";
|
||||
import type { SyncQueueItem } from "$lib/api/bindings";
|
||||
import {
|
||||
describeOperation,
|
||||
describeSubject,
|
||||
isStuck,
|
||||
summarize,
|
||||
sortForDisplay,
|
||||
} from "./pendingSync.logic";
|
||||
|
||||
function row(overrides: Partial<SyncQueueItem> = {}): SyncQueueItem {
|
||||
return {
|
||||
id: 1,
|
||||
userId: "u1",
|
||||
operation: "report_playback_stopped",
|
||||
itemId: "ep1",
|
||||
payload: null,
|
||||
status: "pending",
|
||||
retryCount: 0,
|
||||
createdAt: "2026-08-01T10:00:00Z",
|
||||
errorMessage: null,
|
||||
itemName: null,
|
||||
...overrides,
|
||||
} as SyncQueueItem;
|
||||
}
|
||||
|
||||
describe("pending sync row description", () => {
|
||||
it("labels the operations the backend can queue", () => {
|
||||
expect(describeOperation("report_playback_stopped")).toBe("Watch position");
|
||||
expect(describeOperation("mark_played")).toBe("Marked as watched");
|
||||
expect(describeOperation("report_playback_start")).toBe("Playback started");
|
||||
});
|
||||
|
||||
it("still renders an operation it has no label for", () => {
|
||||
// An unlabelled row is the one heading for abandonment — it must not
|
||||
// render blank, which is the failure this whole surface exists to fix.
|
||||
expect(describeOperation("teleport_item")).toBe("teleport item");
|
||||
});
|
||||
|
||||
it("names the item when the catalog knows it, and falls back to the id", () => {
|
||||
expect(describeSubject(row({ itemName: "The Expanse S01E01" }))).toBe(
|
||||
"The Expanse S01E01",
|
||||
);
|
||||
expect(describeSubject(row({ itemName: null, itemId: "abc123" }))).toBe("abc123");
|
||||
expect(describeSubject(row({ itemName: null, itemId: null }))).toBe("Unknown item");
|
||||
});
|
||||
});
|
||||
|
||||
describe("stuck rows", () => {
|
||||
it("treats a failed or retried row as stuck", () => {
|
||||
expect(isStuck(row({ status: "failed", retryCount: 1 }))).toBe(true);
|
||||
expect(isStuck(row({ status: "pending", retryCount: 2 }))).toBe(true);
|
||||
expect(isStuck(row())).toBe(false);
|
||||
});
|
||||
|
||||
it("summarizes a mixed queue", () => {
|
||||
const summary = summarize([row(), row({ id: 2, status: "failed", retryCount: 1 })]);
|
||||
expect(summary).toEqual({ total: 2, stuck: 1, allStuck: false });
|
||||
});
|
||||
|
||||
it("reports allStuck only when every row has failed", () => {
|
||||
expect(summarize([row({ status: "failed", retryCount: 3 })]).allStuck).toBe(true);
|
||||
expect(summarize([]).allStuck).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("display order", () => {
|
||||
it("lists oldest first — the order they will be replayed in", () => {
|
||||
const sorted = sortForDisplay([
|
||||
row({ id: 3, createdAt: "2026-08-01T12:00:00Z" }),
|
||||
row({ id: 1, createdAt: "2026-08-01T10:00:00Z" }),
|
||||
row({ id: 2, createdAt: "2026-08-01T11:00:00Z" }),
|
||||
]);
|
||||
expect(sorted.map((r) => r.id)).toEqual([1, 2, 3]);
|
||||
});
|
||||
|
||||
it("keeps timestamp-less rows instead of dropping them", () => {
|
||||
const sorted = sortForDisplay([
|
||||
row({ id: 2, createdAt: null }),
|
||||
row({ id: 1, createdAt: "2026-08-01T10:00:00Z" }),
|
||||
]);
|
||||
expect(sorted.map((r) => r.id)).toEqual([1, 2]);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,79 @@
|
||||
// Presentation logic for the pending-sync queue.
|
||||
//
|
||||
// The queue's *meaning* lives in Rust (which operations exist, how they push,
|
||||
// when one is abandoned — DR-131). What lives here is purely how a row reads on
|
||||
// screen: its label, its subtitle, and whether it is currently erroring. Kept
|
||||
// out of the component so it can be unit-tested, the same pattern as
|
||||
// episodeStrip.ts.
|
||||
//
|
||||
// TRACES: UR-025 | DR-132 | UT-123
|
||||
|
||||
import type { SyncQueueItem } from "$lib/api/bindings";
|
||||
|
||||
/** How each queued operation reads in the list. */
|
||||
const OPERATION_LABELS: Record<string, string> = {
|
||||
report_playback_start: "Playback started",
|
||||
report_playback_stopped: "Watch position",
|
||||
update_progress: "Watch position",
|
||||
mark_played: "Marked as watched",
|
||||
mark_favorite: "Added to favourites",
|
||||
unmark_favorite: "Removed from favourites",
|
||||
playlist_create: "Playlist created",
|
||||
playlist_delete: "Playlist deleted",
|
||||
playlist_rename: "Playlist renamed",
|
||||
playlist_add_items: "Added to playlist",
|
||||
playlist_remove_items: "Removed from playlist",
|
||||
playlist_reorder_item: "Playlist reordered",
|
||||
};
|
||||
|
||||
/**
|
||||
* A human label for a queued operation. An operation this build has no label
|
||||
* for still reads as something — an unknown row is the case most worth showing,
|
||||
* since it is the one that will end up abandoned.
|
||||
*/
|
||||
export function describeOperation(operation: string): string {
|
||||
return OPERATION_LABELS[operation] ?? operation.replace(/_/g, " ");
|
||||
}
|
||||
|
||||
/** What the row is about: the item's title if the catalog knows it, else its id. */
|
||||
export function describeSubject(item: SyncQueueItem): string {
|
||||
return item.itemName ?? item.itemId ?? "Unknown item";
|
||||
}
|
||||
|
||||
/**
|
||||
* A row is "stuck" once it has failed at least once — that is what justifies
|
||||
* showing its error, and what a Retry button acts on.
|
||||
*/
|
||||
export function isStuck(item: SyncQueueItem): boolean {
|
||||
return item.status === "failed" || item.retryCount > 0;
|
||||
}
|
||||
|
||||
export interface PendingSyncSummary {
|
||||
total: number;
|
||||
stuck: number;
|
||||
/** True when every queued row has already failed — retrying needs the server. */
|
||||
allStuck: boolean;
|
||||
}
|
||||
|
||||
export function summarize(items: SyncQueueItem[]): PendingSyncSummary {
|
||||
const stuck = items.filter(isStuck).length;
|
||||
return {
|
||||
total: items.length,
|
||||
stuck,
|
||||
allStuck: items.length > 0 && stuck === items.length,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Oldest first — the order they will be replayed in, so the list reads as the
|
||||
* queue it is. Rows without a timestamp sort last rather than being dropped.
|
||||
*/
|
||||
export function sortForDisplay(items: SyncQueueItem[]): SyncQueueItem[] {
|
||||
return [...items].sort((a, b) => {
|
||||
if (!a.createdAt && !b.createdAt) return a.id - b.id;
|
||||
if (!a.createdAt) return 1;
|
||||
if (!b.createdAt) return -1;
|
||||
const diff = Date.parse(a.createdAt) - Date.parse(b.createdAt);
|
||||
return diff !== 0 ? diff : a.id - b.id;
|
||||
});
|
||||
}
|
||||
@@ -9,18 +9,11 @@
|
||||
import { commands } from "$lib/api/bindings";
|
||||
import { auth } from "$lib/stores/auth";
|
||||
|
||||
// Types matching Rust structs
|
||||
export interface SyncQueueItem {
|
||||
id: number;
|
||||
userId: string;
|
||||
operation: string;
|
||||
itemId: string | null;
|
||||
payload: string | null;
|
||||
status: string;
|
||||
retryCount: number;
|
||||
createdAt: string | null;
|
||||
errorMessage: string | null;
|
||||
}
|
||||
// The queue row shape comes from the generated bindings rather than a
|
||||
// hand-written mirror — the mirror had already drifted (it predates `itemName`),
|
||||
// and a drifted duplicate is how a field silently stops reaching the UI.
|
||||
import type { SyncQueueItem } from "$lib/api/bindings";
|
||||
export type { SyncQueueItem };
|
||||
|
||||
export type SyncOperation =
|
||||
| "mark_played"
|
||||
|
||||
Reference in New Issue
Block a user