Skip to content

Commit 8475e3c

Browse files
committed
fix(server): skip Linux libc detection on Windows
1 parent c30a6d9 commit 8475e3c

2 files changed

Lines changed: 33 additions & 3 deletions

File tree

‎apps/server/src/resourceTelemetry/ResourceMonitorBinary.test.ts‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,44 @@ import {
44
HostProcessEnvironment,
55
HostProcessPlatform,
66
} from "@t3tools/shared/hostProcess";
7-
import { assert, describe, it } from "@effect/vitest";
7+
import { afterEach, assert, describe, expect, it, vi } from "@effect/vitest";
88
import * as Effect from "effect/Effect";
99
import * as FileSystem from "effect/FileSystem";
1010

1111
import { ServerConfig } from "../config.ts";
1212
import * as ResourceMonitorBinary from "./ResourceMonitorBinary.ts";
1313

1414
describe("ResourceMonitorBinary", () => {
15+
afterEach(() => {
16+
vi.restoreAllMocks();
17+
});
18+
19+
it.effect("skips Linux libc detection on Windows", () =>
20+
Effect.gen(function* () {
21+
const getReport = vi.spyOn(process.report, "getReport").mockImplementation(() => {
22+
throw new Error("Linux libc detection must not run on Windows");
23+
});
24+
const fileSystem = yield* FileSystem.FileSystem;
25+
const baseDir = yield* fileSystem.makeTempDirectoryScoped({
26+
prefix: "t3-resource-monitor-binary-",
27+
});
28+
const binaryPath = `${baseDir}/t3-resource-monitor.exe`;
29+
yield* fileSystem.writeFileString(binaryPath, "binary");
30+
31+
const service = yield* ResourceMonitorBinary.make().pipe(
32+
Effect.provide(ServerConfig.layerTest(process.cwd(), baseDir)),
33+
Effect.provideService(HostProcessPlatform, "win32"),
34+
Effect.provideService(HostProcessArchitecture, "arm64"),
35+
Effect.provideService(HostProcessEnvironment, {
36+
T3CODE_RESOURCE_MONITOR_PATH: binaryPath,
37+
}),
38+
);
39+
40+
assert.equal(yield* service.resolve, binaryPath);
41+
expect(getReport).not.toHaveBeenCalled();
42+
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
43+
);
44+
1545
it.effect("resolves an executable override", () =>
1646
Effect.gen(function* () {
1747
const fileSystem = yield* FileSystem.FileSystem;

‎apps/server/src/resourceTelemetry/ResourceMonitorBinary.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export function resourceMonitorPlatformKey(
106106
export function resourceMonitorRustTarget(
107107
platform: NodeJS.Platform,
108108
architecture: NodeJS.Architecture,
109-
linuxLibc: ResourceMonitorLinuxLibc,
109+
linuxLibc?: ResourceMonitorLinuxLibc,
110110
): string | undefined {
111111
if (platform === "darwin") {
112112
return architecture === "arm64"
@@ -142,7 +142,7 @@ export const make = Effect.fn("resourceTelemetry.resourceMonitorBinary.make")(fu
142142
const platform = yield* HostProcessPlatform;
143143
const architecture = yield* HostProcessArchitecture;
144144
const environment = yield* HostProcessEnvironment;
145-
const linuxLibc = yield* ResourceMonitorHostLinuxLibc;
145+
const linuxLibc = platform === "linux" ? yield* ResourceMonitorHostLinuxLibc : undefined;
146146
const executableName = binaryName(platform);
147147
const platformKey = resourceMonitorPlatformKey(platform, architecture);
148148
const rustTarget = resourceMonitorRustTarget(platform, architecture, linuxLibc);

0 commit comments

Comments
 (0)