Skip to content

Commit 08930e1

Browse files
committed
fix(server): find the resource monitor when the server runs from its build output
Signed-off-by: Yordis Prieto <[email protected]>
1 parent a68e6e9 commit 08930e1

2 files changed

Lines changed: 49 additions & 24 deletions

File tree

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import * as HostProcess from "@t3tools/shared/HostProcess";
33
import { afterEach, assert, describe, it, vi } from "@effect/vitest";
44
import * as Effect from "effect/Effect";
55
import * as FileSystem from "effect/FileSystem";
6+
import * as Path from "effect/Path";
67

78
import * as ServerConfig from "../config.ts";
89
import * as ResourceMonitorBinary from "./ResourceMonitorBinary.ts";
@@ -88,6 +89,39 @@ describe("ResourceMonitorBinary", () => {
8889
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
8990
);
9091

92+
it.effect("looks for cargo build output from both the source and the bundled server layout", () =>
93+
Effect.gen(function* () {
94+
const fileSystem = yield* FileSystem.FileSystem;
95+
const path = yield* Path.Path;
96+
const baseDir = yield* fileSystem.makeTempDirectoryScoped({
97+
prefix: "t3-resource-monitor-binary-",
98+
});
99+
const service = yield* ResourceMonitorBinary.make().pipe(
100+
Effect.provide(ServerConfig.layerTest(process.cwd(), baseDir)),
101+
Effect.provideService(HostProcess.Platform, "darwin"),
102+
Effect.provideService(HostProcess.Architecture, "arm64"),
103+
Effect.provideService(HostProcess.Environment, {}),
104+
);
105+
const error = yield* Effect.flip(service.resolve);
106+
107+
assert.instanceOf(error, ResourceMonitorBinary.ResourceMonitorBinaryNotFound);
108+
const candidates = (error as ResourceMonitorBinary.ResourceMonitorBinaryNotFound).candidates;
109+
for (const crateRelative of [
110+
"../../../../native/resource-monitor",
111+
"../../../native/resource-monitor",
112+
]) {
113+
const crateDirectory = path.resolve(import.meta.dirname, crateRelative);
114+
for (const output of [
115+
path.join("target", "aarch64-apple-darwin", "release"),
116+
path.join("target", "release"),
117+
path.join("target", "debug"),
118+
]) {
119+
assert.include(candidates, path.join(crateDirectory, output, "t3-resource-monitor"));
120+
}
121+
}
122+
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
123+
);
124+
91125
it.effect("rejects bundled glibc binaries on musl Linux hosts", () =>
92126
Effect.gen(function* () {
93127
const fileSystem = yield* FileSystem.FileSystem;

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

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -146,37 +146,28 @@ export const make = Effect.fn("resourceTelemetry.resourceMonitorBinary.make")(fu
146146
environment.T3CODE_RESOURCE_MONITOR_PATH,
147147
config.resourceMonitorPath,
148148
].filter((candidate): candidate is string => Boolean(candidate));
149+
const cargoOutputDirectories =
150+
rustTarget === undefined
151+
? []
152+
: [
153+
path.join("target", rustTarget, "release"),
154+
path.join("target", "release"),
155+
path.join("target", "debug"),
156+
];
157+
const sourceCandidates = [
158+
path.resolve(import.meta.dirname, "../../../../native/resource-monitor"),
159+
path.resolve(import.meta.dirname, "../../../native/resource-monitor"),
160+
].flatMap((crateDirectory) =>
161+
cargoOutputDirectories.map((directory) => path.join(crateDirectory, directory, executableName)),
162+
);
149163
const bundledCandidates =
150164
platformKey === undefined || rustTarget === undefined
151165
? []
152166
: [
153167
path.resolve(import.meta.dirname, "resource-monitor", platformKey, executableName),
154168
path.resolve(import.meta.dirname, "resource-monitor", executableName),
155169
path.resolve(import.meta.dirname, "../resource-monitor", executableName),
156-
path.resolve(
157-
import.meta.dirname,
158-
"../../../../native/resource-monitor/target",
159-
rustTarget,
160-
"release",
161-
executableName,
162-
),
163-
path.resolve(
164-
import.meta.dirname,
165-
"../../../native/resource-monitor/target",
166-
rustTarget,
167-
"release",
168-
executableName,
169-
),
170-
path.resolve(
171-
import.meta.dirname,
172-
"../../../../native/resource-monitor/target/release",
173-
executableName,
174-
),
175-
path.resolve(
176-
import.meta.dirname,
177-
"../../../../native/resource-monitor/target/debug",
178-
executableName,
179-
),
170+
...sourceCandidates,
180171
];
181172
if (overrideCandidates.length === 0 && bundledCandidates.length === 0) {
182173
return ResourceMonitorBinary.of({

0 commit comments

Comments
 (0)