Skip to content

Commit f7cd455

Browse files
committed
fix(server): reject missing and unsupported android java runtimes
1 parent 9b4c80f commit f7cd455

2 files changed

Lines changed: 57 additions & 15 deletions

File tree

‎apps/server/src/device/LocalDeviceHost.test.ts‎

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ const diagnose = (
293293
FileSystem.FileSystem,
294294
FileSystem.makeNoop({
295295
exists: (file) => Effect.succeed(files.includes(file)),
296+
readFileString: () => Effect.succeed('JAVA_VERSION="17.0.1"'),
296297
}),
297298
),
298299
Effect.provide(platform === "win32" ? NodePath.layerWin32 : NodePath.layerPosix),
@@ -383,6 +384,7 @@ describe("Android SDK availability", () => {
383384
"/sdk/emulator/emulator",
384385
"/sdk/tools/bin/avdmanager",
385386
"/sdk/cmdline-tools/latest/bin/avdmanager",
387+
"/jdk/bin/java",
386388
],
387389
{ ANDROID_HOME: "/sdk", JAVA_HOME: "/jdk" },
388390
);
@@ -429,6 +431,7 @@ describe("Android SDK availability", () => {
429431
files: ReadonlyArray<string>,
430432
environment: NodeJS.ProcessEnv,
431433
platform: NodeJS.Platform,
434+
version = "17.0.1",
432435
) =>
433436
LocalDeviceHost.__testing.androidJava.pipe(
434437
Effect.provideService(HostProcess.Environment, { PATH: "", ...environment }),
@@ -437,20 +440,41 @@ describe("Android SDK availability", () => {
437440
FileSystem.FileSystem,
438441
FileSystem.makeNoop({
439442
exists: (file) => Effect.succeed(files.includes(file)),
443+
realPath: (file) => Effect.succeed(file),
444+
readFileString: () => Effect.succeed(`JAVA_VERSION="${version}"`),
440445
readDirectory: (directory) =>
441446
Effect.succeed(
442447
files
443448
.filter((file) => file.startsWith(`${directory}/`))
444-
.map((file) => file.slice(directory.length + 1)),
449+
.map((file) => file.slice(directory.length + 1).split("/")[0]!),
445450
),
446451
}),
447452
),
448453
Effect.provide(platform === "win32" ? NodePath.layerWin32 : NodePath.layerPosix),
449454
);
455+
expect(yield* javaHome([], { JAVA_HOME: "/removed" }, "linux")).toBeNull();
456+
expect(
457+
yield* javaHome(["/old/bin/java"], { JAVA_HOME: "/old" }, "linux", "1.8.0"),
458+
).toBeNull();
459+
const fs = yield* FileSystem.FileSystem;
460+
const directory = yield* fs.makeTempDirectoryScoped();
461+
yield* fs.makeDirectory(`${directory}/bin`);
462+
yield* fs.writeFileString(`${directory}/bin/java`, "#!/bin/sh\nexit 0\n");
463+
yield* fs.chmod(`${directory}/bin/java`, 0o755);
464+
yield* fs.writeFileString(`${directory}/release`, 'JAVA_VERSION="11.0.1"');
465+
expect(
466+
yield* LocalDeviceHost.__testing.androidJava.pipe(
467+
Effect.provideService(HostProcess.Environment, {
468+
HOME: directory,
469+
PATH: `${directory}/bin`,
470+
}),
471+
Effect.provideService(HostProcess.Platform, "linux"),
472+
),
473+
).toBeNull();
450474
const studio = "/opt/android-studio/jbr";
451-
expect(yield* javaHome([`${studio}/bin/java`], { JAVA_HOME: " /jdk " }, "linux")).toBe(
452-
"/jdk",
453-
);
475+
expect(
476+
yield* javaHome(["/jdk/bin/java", `${studio}/bin/java`], { JAVA_HOME: " /jdk " }, "linux"),
477+
).toBe("/jdk");
454478
expect(yield* javaHome([`${studio}/bin/java`], { HOME: "/test/home" }, "linux")).toBe(studio);
455479
expect(
456480
yield* javaHome(
@@ -466,12 +490,15 @@ describe("Android SDK availability", () => {
466490
);
467491
expect(
468492
yield* javaHome(
469-
[`${macStudio}/bin/java`, "/Library/Java/JavaVirtualMachines/temurin-17.jdk"],
493+
[
494+
`${macStudio}/bin/java`,
495+
"/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home/bin/java",
496+
],
470497
{ HOME: "/Users/test" },
471498
"darwin",
472499
),
473-
).toBeUndefined();
474-
}),
500+
).toBe("/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home");
501+
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
475502
);
476503

477504
it.effect("reports an absent SDK without running or installing tools", () =>
@@ -641,6 +668,9 @@ it.effect("keeps local Android and iOS available without ffmpeg", () =>
641668
yield* fs.makeDirectory(`${baseDir}/bin`);
642669
yield* fs.writeFileString(`${baseDir}/bin/xcrun`, "#!/bin/sh\nexit 0\n");
643670
yield* fs.chmod(`${baseDir}/bin/xcrun`, 0o755);
671+
yield* fs.makeDirectory(`${baseDir}/jdk/bin`, { recursive: true });
672+
yield* fs.writeFileString(`${baseDir}/jdk/bin/java`, "");
673+
yield* fs.writeFileString(`${baseDir}/jdk/release`, 'JAVA_VERSION="17.0.1"');
644674
for (const [directory, tool] of [
645675
["platform-tools", "adb"],
646676
["emulator", "emulator"],
@@ -655,7 +685,7 @@ it.effect("keeps local Android and iOS available without ffmpeg", () =>
655685
HOME: baseDir,
656686
PATH: `${baseDir}/bin`,
657687
ANDROID_HOME: `${baseDir}/sdk`,
658-
JAVA_HOME: "/jdk",
688+
JAVA_HOME: `${baseDir}/jdk`,
659689
}),
660690
Effect.provideService(HostProcess.Platform, "darwin"),
661691
);

‎apps/server/src/device/LocalDeviceHost.ts‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,22 +137,35 @@ const androidJava = Effect.gen(function* () {
137137
const path = yield* Path.Path;
138138
const environment = yield* HostProcess.Environment;
139139
const platform = yield* HostProcess.Platform;
140+
// JDK release metadata avoids spawning Java on every device command.
141+
const supported = Effect.fn("LocalDeviceHost.supportedJava")(function* (directory: string) {
142+
const executable = path.join(directory, "bin", platform === "win32" ? "java.exe" : "java");
143+
if (!(yield* fs.exists(executable).pipe(Effect.orElseSucceed(() => false)))) return false;
144+
const release = yield* fs
145+
.readFileString(path.join(directory, "release"))
146+
.pipe(Effect.orElseSucceed(() => ""));
147+
return Number(/^JAVA_VERSION="(\d+)/m.exec(release)?.[1] ?? 0) >= 17;
148+
});
140149
const javaHome = environment.JAVA_HOME?.trim();
141-
if (javaHome) return javaHome;
150+
if (javaHome) return (yield* supported(javaHome)) ? javaHome : null;
142151
const home = environment.HOME ?? environment.USERPROFILE ?? "";
143152
const java = yield* resolveCommandPath("java");
153+
if (java && !(platform === "darwin" && java === "/usr/bin/java")) {
154+
const resolved = yield* fs.realPath(java).pipe(Effect.orElseSucceed(() => java));
155+
if (yield* supported(path.dirname(path.dirname(resolved)))) return undefined;
156+
}
144157
if (platform === "darwin") {
145158
// /usr/bin/java is a launcher stub that fails unless a JDK is registered here.
146159
for (const directory of [
147160
"/Library/Java/JavaVirtualMachines",
148161
path.join(home, "Library", "Java", "JavaVirtualMachines"),
149162
]) {
150163
const installed = yield* fs.readDirectory(directory).pipe(Effect.orElseSucceed(() => []));
151-
if (installed.length > 0) return undefined;
164+
for (const name of installed) {
165+
const candidate = path.join(directory, name, "Contents", "Home");
166+
if (yield* supported(candidate)) return candidate;
167+
}
152168
}
153-
if (java && java !== "/usr/bin/java") return undefined;
154-
} else if (java) {
155-
return undefined;
156169
}
157170
const candidates =
158171
platform === "win32"
@@ -176,8 +189,7 @@ const androidJava = Effect.gen(function* () {
176189
"/snap/android-studio/current/jbr",
177190
];
178191
for (const candidate of candidates) {
179-
const executable = path.join(candidate, "bin", platform === "win32" ? "java.exe" : "java");
180-
if (yield* fs.exists(executable).pipe(Effect.orElseSucceed(() => false))) return candidate;
192+
if (yield* supported(candidate)) return candidate;
181193
}
182194
return null;
183195
});

0 commit comments

Comments
 (0)