Skip to content

Commit 2b5a879

Browse files
akhialjuliusmarmingeclaude
authored
fix(mobile): load iOS device streams over HTTP on Android (#14284)
Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: Claude Fable 5.1 <[email protected]>
1 parent 74904e3 commit 2b5a879

3 files changed

Lines changed: 36 additions & 3 deletions

File tree

‎apps/mobile/src/features/devices/DeviceStreamWebView.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
1616
import { AppText } from "../../components/ui/AppText";
1717

1818
import {
19+
deviceStreamBaseUrl,
1920
deviceStreamDocument,
2021
deviceStreamMessage,
2122
type DeviceStreamConfiguration,
@@ -51,6 +52,7 @@ export function DeviceStreamWebView({
5152
key={`${attempt}:${configuration}`}
5253
ref={ref}
5354
configuration={configuration}
55+
baseUrl={deviceStreamBaseUrl(Platform.OS, props.platform, props.access.httpBase)}
5456
background={props.colors.background}
5557
onUnauthorized={props.onUnauthorized}
5658
onInputConnected={props.onInputConnected}
@@ -76,6 +78,7 @@ export function DeviceStreamWebView({
7678
function DeviceStreamDocumentView({
7779
ref,
7880
configuration,
81+
baseUrl,
7982
background,
8083
onUnauthorized,
8184
onInputConnected,
@@ -84,6 +87,7 @@ function DeviceStreamDocumentView({
8487
onRecoverProcess,
8588
}: NativeStreamBridge & {
8689
readonly configuration: string;
90+
readonly baseUrl: string;
8791
readonly background: string;
8892
readonly onRetry: () => void;
8993
readonly onStreaming: () => void;
@@ -113,8 +117,7 @@ function DeviceStreamDocumentView({
113117
}, [started]);
114118
const source = {
115119
html: deviceStreamDocument(configuration, deviceStreamScript),
116-
// Android WebCodecs needs a secure document; streams still use the environment's URLs.
117-
baseUrl: Platform.OS === "android" ? "https://localhost/" : "file:///",
120+
baseUrl,
118121
};
119122
const command = (button: keyof DeviceStreamRef) => {
120123
webView.current?.injectJavaScript(

‎apps/mobile/src/features/devices/device-stream-document.test.ts‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
11
import * as NodeVM from "node:vm";
22
import { describe, expect, it, vi } from "vite-plus/test";
33

4-
import { deviceStreamDocument, deviceStreamMessage } from "./device-stream-document";
4+
import {
5+
deviceStreamBaseUrl,
6+
deviceStreamDocument,
7+
deviceStreamMessage,
8+
} from "./device-stream-document";
59

610
describe("native device stream document", () => {
11+
it.each([
12+
["android", "ios", "http://192.168.1.10:3773/api/device-hub", "http://192.168.1.10:3773/"],
13+
["android", "ios", "https://env.example/t3/api/device-hub", "https://env.example/"],
14+
["android", "android", "http://192.168.1.10:3773/api/device-hub", "https://localhost/"],
15+
["ios", "ios", "http://192.168.1.10:3773/api/device-hub", "file:///"],
16+
] as const)(
17+
"uses a %s viewer base URL for %s targets on %s",
18+
(viewer, target, httpBase, expected) => {
19+
expect(deviceStreamBaseUrl(viewer, target, httpBase)).toBe(expected);
20+
},
21+
);
22+
723
it("keeps ticket and device values from terminating the embedded script", () => {
824
const deviceId = '</script><script>alert("device")</script>';
925
const configuration = JSON.stringify({ deviceId, ticket: "<ticket>" });

‎apps/mobile/src/features/devices/device-stream-document.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { DeviceHubAccess } from "@t3tools/client-runtime/device/hub-access";
22
import type { DevicePlatform } from "@t3tools/contracts";
3+
import type { PlatformOSType } from "react-native";
34

45
export interface DeviceStreamConfiguration {
56
readonly access: DeviceHubAccess;
@@ -15,6 +16,19 @@ export interface DeviceStreamConfiguration {
1516
};
1617
}
1718

19+
export function deviceStreamBaseUrl(
20+
viewerPlatform: PlatformOSType,
21+
devicePlatform: DevicePlatform,
22+
httpBase: string,
23+
) {
24+
if (viewerPlatform !== "android") return "file:///";
25+
// Android targets stream through WebCodecs, which needs a secure context. iOS targets
26+
// stream an MJPEG image from the environment, which a synthetic https document blocks as
27+
// mixed content on plain-http environments even with mixedContentMode="always".
28+
if (devicePlatform === "android") return "https://localhost/";
29+
return `${new URL(httpBase).origin}/`;
30+
}
31+
1832
export function deviceStreamDocument(configuration: string, script: string) {
1933
const safeConfiguration = configuration.replace(/</g, "\\u003c");
2034
const safeScript = script.replace(/<\/script/gi, "<\\/script");

0 commit comments

Comments
 (0)