Skip to content

Commit 8165392

Browse files
committed
fix(core): count embedded WKWebViews as WebKit for audio sync
1 parent ce9d7af commit 8165392

5 files changed

Lines changed: 23 additions & 5 deletions

File tree

‎packages/core/src/runtime/mediaClock.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,5 @@ export function startsSoundOnlyInsideATap(): boolean {
1111

1212
export function isWebKit(): boolean {
1313
const { userAgent } = navigator;
14-
return (
15-
/AppleWebKit.*(Safari|Version)\//.test(userAgent) &&
16-
!/Chrom(e|ium)\/|Edg\/|Android/.test(userAgent)
17-
);
14+
return /AppleWebKit/.test(userAgent) && !/Chrom(e|ium)\/|Edg\/|Android/.test(userAgent);
1815
}

‎packages/core/src/runtime/mediaSteer.test.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ const media = (tag: "audio" | "video") => document.createElement(tag);
66
describe("steerMedia", () => {
77
afterEach(() => vi.restoreAllMocks());
88

9+
it("treats an embedded WKWebView, whose user agent has no Safari token, as WebKit", () => {
10+
vi.spyOn(navigator, "userAgent", "get").mockReturnValue(
11+
"Mozilla/5.0 (iPhone; CPU iPhone OS 18_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",
12+
);
13+
expect(steerMedia(media("audio"), 0.35, 1, true)).toEqual({ rate: 1, seek: false });
14+
});
15+
916
it("never steers WebKit audio: it is seeked only once its lag holds past 0.65 s", () => {
1017
vi.spyOn(navigator, "userAgent", "get").mockReturnValue(
1118
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15",

‎packages/core/vitest.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ export default defineConfig({
44
test: {
55
include: ["src/**/*.test.ts"],
66
environment: "jsdom",
7+
setupFiles: ["./vitest.setup.ts"],
78
coverage: {
89
provider: "v8",
910
include: ["src/runtime/**/*.ts"],

‎packages/core/vitest.setup.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Object.defineProperty(navigator, "userAgent", {
2+
configurable: true,
3+
get: () =>
4+
"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/156.0.0.0 Safari/537.36",
5+
});

‎packages/player/vitest.config.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,15 @@ export default defineConfig({
2626
test: {
2727
environment: "happy-dom",
2828
environmentOptions: {
29-
happyDOM: { settings: { handleDisabledFileLoadingAsSuccess: true } },
29+
happyDOM: {
30+
settings: {
31+
handleDisabledFileLoadingAsSuccess: true,
32+
navigator: {
33+
userAgent:
34+
"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/156.0.0.0 Safari/537.36",
35+
},
36+
},
37+
},
3038
},
3139
setupFiles: ["./src/slideshow/test-setup.ts"],
3240
},

0 commit comments

Comments
 (0)