Skip to content

Commit d3eb4c3

Browse files
committed
fix(connections): respect saved preferences and reclaimable memory
1 parent 6a60282 commit d3eb4c3

5 files changed

Lines changed: 102 additions & 55 deletions

File tree

Lines changed: 62 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
import * as NodeOS from "node:os";
2-
import * as NodeTimersPromises from "node:timers/promises";
32
import type { HostResourcesSnapshot } from "@t3tools/contracts";
43
import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
4+
import * as Context from "effect/Context";
55
import * as DateTime from "effect/DateTime";
66
import * as Effect from "effect/Effect";
77
import * as FileSystem from "effect/FileSystem";
8+
import * as Layer from "effect/Layer";
9+
import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
810

9-
const CACHE_MS = 5_000;
10-
11-
// All sockets share the sample. Idle servers do no polling or process scans.
12-
let latest: HostResourcesSnapshot | undefined;
13-
let pending: Promise<HostResourcesSnapshot> | undefined;
11+
export class HostResources extends Context.Service<
12+
HostResources,
13+
{ readonly read: Effect.Effect<HostResourcesSnapshot> }
14+
>()("t3/resourceTelemetry/HostResources") {}
1415

1516
function readCpu() {
1617
const cpus = NodeOS.cpus();
@@ -24,53 +25,64 @@ function readCpu() {
2425
return { ...cpu, count: cpus.length };
2526
}
2627

27-
async function sample(
28-
sampledAt: number,
29-
platform: NodeJS.Platform,
30-
readMeminfo: () => Promise<string>,
31-
): Promise<HostResourcesSnapshot> {
32-
const previousCpu = readCpu();
33-
// CPU counters need two readings; a bounded demand-only sample also works on Windows.
34-
await NodeTimersPromises.setTimeout(200);
35-
const cpu = readCpu();
36-
const totalDelta = cpu.total - previousCpu.total;
37-
const idleDelta = cpu.idle - previousCpu.idle;
38-
const cpuUtilization =
39-
previousCpu.count === cpu.count && totalDelta > 0 && idleDelta >= 0
40-
? Math.min(1, Math.max(0, 1 - idleDelta / totalDelta))
41-
: null;
42-
const totalMemoryBytes = NodeOS.totalmem();
43-
let availableMemoryBytes = NodeOS.freemem();
44-
if (platform === "linux") {
45-
const meminfo = await readMeminfo();
46-
const available = /^MemAvailable:\s+(\d+)\s+kB$/m.exec(meminfo)?.[1];
47-
if (available) availableMemoryBytes = Number(available) * 1024;
48-
}
49-
latest = {
50-
sampledAt,
51-
cpuUtilization,
52-
cpuCount: cpu.count,
53-
availableMemoryBytes: Math.min(totalMemoryBytes, Math.max(0, availableMemoryBytes)),
54-
totalMemoryBytes,
55-
};
56-
return latest;
28+
function darwinAvailableMemory(output: string): number | null {
29+
const pageSize = /page size of (\d+) bytes/.exec(output)?.[1];
30+
const free = /^Pages free:\s+(\d+)\./m.exec(output)?.[1];
31+
const inactive = /^Pages inactive:\s+(\d+)\./m.exec(output)?.[1];
32+
const speculative = /^Pages speculative:\s+(\d+)\./m.exec(output)?.[1];
33+
if (!pageSize || !free || !inactive || !speculative) return null;
34+
// vm_stat subtracts speculative pages from its printed "Pages free" count.
35+
// Adding them here counts each reclaimable page once; purgeable pages overlap.
36+
const available = (Number(free) + Number(inactive) + Number(speculative)) * Number(pageSize);
37+
return Number.isSafeInteger(available) && Number(pageSize) > 0 ? available : null;
5738
}
5839

59-
export const readHostResources = Effect.fn("HostResources.read")(function* () {
60-
const sampledAt = DateTime.toEpochMillis(yield* DateTime.now);
61-
if (latest && sampledAt >= latest.sampledAt && sampledAt - latest.sampledAt < CACHE_MS) {
62-
return latest;
63-
}
40+
export const make = Effect.fn("makeHostResources")(function* () {
6441
const fs = yield* FileSystem.FileSystem;
6542
const platform = yield* HostProcessPlatform;
66-
return yield* Effect.promise(() => {
67-
pending ??= sample(sampledAt, platform, () =>
68-
Effect.runPromise(
69-
fs.readFileString("/proc/meminfo").pipe(Effect.catch(() => Effect.succeed(""))),
70-
),
71-
).finally(() => {
72-
pending = undefined;
73-
});
74-
return pending;
43+
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
44+
45+
const sample = Effect.fn("HostResources.sample")(function* () {
46+
const previousCpu = readCpu();
47+
// CPU counters need two readings; idle servers do no polling or process scans.
48+
yield* Effect.sleep("200 millis");
49+
const cpu = readCpu();
50+
const totalDelta = cpu.total - previousCpu.total;
51+
const idleDelta = cpu.idle - previousCpu.idle;
52+
const cpuUtilization =
53+
previousCpu.count === cpu.count && totalDelta > 0 && idleDelta >= 0
54+
? Math.min(1, Math.max(0, 1 - idleDelta / totalDelta))
55+
: null;
56+
const totalMemoryBytes = NodeOS.totalmem();
57+
// On Windows libuv returns GlobalMemoryStatusEx.ullAvailPhys, including standby memory.
58+
let availableMemoryBytes = NodeOS.freemem();
59+
if (platform === "linux") {
60+
const meminfo = yield* fs
61+
.readFileString("/proc/meminfo")
62+
.pipe(Effect.catch(() => Effect.succeed("")));
63+
const available = /^MemAvailable:\s+(\d+)\s+kB$/m.exec(meminfo)?.[1];
64+
if (available) availableMemoryBytes = Number(available) * 1024;
65+
} else if (platform === "darwin") {
66+
const output = yield* spawner
67+
.string(ChildProcess.make("/usr/bin/vm_stat", [], { stdin: "ignore", stderr: "ignore" }))
68+
.pipe(
69+
Effect.timeout("1 second"),
70+
Effect.catch(() => Effect.succeed("")),
71+
);
72+
availableMemoryBytes = darwinAvailableMemory(output) ?? availableMemoryBytes;
73+
}
74+
return {
75+
sampledAt: DateTime.toEpochMillis(yield* DateTime.now),
76+
cpuUtilization,
77+
cpuCount: cpu.count,
78+
availableMemoryBytes: Math.min(totalMemoryBytes, Math.max(0, availableMemoryBytes)),
79+
totalMemoryBytes,
80+
};
7581
});
82+
83+
// One server-lifetime cache deduplicates simultaneous requests from all sockets.
84+
const read = yield* Effect.cachedWithTTL(sample(), "5 seconds");
85+
return HostResources.of({ read });
7686
});
87+
88+
export const layer = Layer.effect(HostResources, make());

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

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ import * as PairingGrantStore from "./auth/PairingGrantStore.ts";
161161
import * as CloudManagedEndpointRuntime from "./cloud/ManagedEndpointRuntime.ts";
162162
import * as CloudCliTokenManager from "./cloud/CliTokenManager.ts";
163163
import * as ProcessDiagnostics from "./diagnostics/ProcessDiagnostics.ts";
164+
import * as HostResources from "./resourceTelemetry/HostResources.ts";
164165
import * as ProcessResourceMonitor from "./diagnostics/ProcessResourceMonitor.ts";
165166
import * as TraceDiagnostics from "./diagnostics/TraceDiagnostics.ts";
166167
import * as DesktopTelemetryReceiver from "./resourceTelemetry/DesktopTelemetryReceiver.ts";
@@ -829,7 +830,8 @@ const buildAppUnderTest = (options?: {
829830
}),
830831
}),
831832
),
832-
Layer.provide(
833+
Layer.provide([
834+
HostResources.layer,
833835
Layer.mock(ProcessResourceMonitor.ProcessResourceMonitor)({
834836
readHistory: (input) =>
835837
Effect.succeed({
@@ -844,7 +846,7 @@ const buildAppUnderTest = (options?: {
844846
error: Option.none(),
845847
}),
846848
}),
847-
),
849+
]),
848850
Layer.provide(
849851
Layer.mock(TraceDiagnostics.TraceDiagnostics)({
850852
read: () =>
@@ -6065,7 +6067,35 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
60656067
assert.isAtLeast(first.cpuUtilization, 0);
60666068
assert.isAtMost(first.cpuUtilization, 1);
60676069
}
6068-
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
6070+
}).pipe(Effect.provide(NodeHttpServer.layerTest), TestClock.withLive),
6071+
);
6072+
6073+
it.effect("counts macOS reclaimable memory once and shares concurrent samples", () =>
6074+
Effect.gen(function* () {
6075+
const commandCalls = yield* Ref.make(0);
6076+
const hostResources = yield* HostResources.make().pipe(
6077+
Effect.provideService(HostProcessPlatform, "darwin"),
6078+
Effect.provide(
6079+
Layer.mock(ChildProcessSpawner.ChildProcessSpawner)({
6080+
string: () =>
6081+
Ref.update(commandCalls, (count) => count + 1).pipe(
6082+
Effect.as(
6083+
"Mach Virtual Memory Statistics: (page size of 16384 bytes)\n" +
6084+
"Pages free: 10.\nPages inactive: 20.\nPages speculative: 5.\n" +
6085+
"Pages purgeable: 999.\n",
6086+
),
6087+
),
6088+
}),
6089+
),
6090+
);
6091+
const [first, second] = yield* Effect.all([hostResources.read, hostResources.read], {
6092+
concurrency: "unbounded",
6093+
});
6094+
assert.equal(first.availableMemoryBytes, 35 * 16384);
6095+
assert.deepEqual(first, second);
6096+
assert.deepEqual(yield* hostResources.read, first);
6097+
assert.equal(yield* Ref.get(commandCalls), 1);
6098+
}).pipe(TestClock.withLive),
60696099
);
60706100

60716101
it.effect("routes websocket resource telemetry through the subscription", () =>

‎apps/server/src/server.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ import * as ServerSelfUpdate from "./cloud/selfUpdate.ts";
115115
import * as DesktopAppUpdate from "./desktopUpdate/DesktopAppUpdate.ts";
116116
import * as ServiceLauncherClient from "./cloud/serviceLauncherClient.ts";
117117
import * as ProcessDiagnostics from "./diagnostics/ProcessDiagnostics.ts";
118+
import * as HostResources from "./resourceTelemetry/HostResources.ts";
118119
import * as ProcessResourceMonitor from "./diagnostics/ProcessResourceMonitor.ts";
119120
import * as TraceDiagnostics from "./diagnostics/TraceDiagnostics.ts";
120121
import * as DesktopTelemetryReceiver from "./resourceTelemetry/DesktopTelemetryReceiver.ts";
@@ -199,6 +200,7 @@ const BackgroundLayerLive = BackgroundPolicy.layer.pipe(
199200
const UsageLayerLive = UsageService.layer.pipe(Layer.provide(ServerSettingsLayerLive));
200201

201202
const ResourceDiagnosticsLayerLive = Layer.mergeAll(
203+
HostResources.layer,
202204
ResourceTelemetryLayerLive,
203205
ProcessDiagnostics.layer.pipe(Layer.provide(ResourceTelemetryLayerLive)),
204206
ProcessResourceMonitor.layer.pipe(Layer.provide(ResourceTelemetryLayerLive)),

‎apps/server/src/ws.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ import { requiredScopeForRpcMethod } from "./auth/RpcAuthorization.ts";
127127
import * as ProcessDiagnostics from "./diagnostics/ProcessDiagnostics.ts";
128128
import * as ProcessResourceMonitor from "./diagnostics/ProcessResourceMonitor.ts";
129129
import * as ResourceTelemetry from "./resourceTelemetry/ResourceTelemetry.ts";
130-
import { readHostResources } from "./resourceTelemetry/HostResources.ts";
130+
import * as HostResources from "./resourceTelemetry/HostResources.ts";
131131
import * as AnalyticsService from "./telemetry/AnalyticsService.ts";
132132
import * as UsageLimitSources from "./usage/UsageLimitSources.ts";
133133
import * as UsageService from "./usage/UsageService.ts";
@@ -596,6 +596,7 @@ const makeWsRpcLayer = (
596596
const bootstrapCredentials = yield* PairingGrantStore.PairingGrantStore;
597597
const sessions = yield* SessionStore.SessionStore;
598598
const processDiagnostics = yield* ProcessDiagnostics.ProcessDiagnostics;
599+
const hostResources = yield* HostResources.HostResources;
599600
const processResourceMonitor = yield* ProcessResourceMonitor.ProcessResourceMonitor;
600601
const resourceTelemetry = yield* ResourceTelemetry.ResourceTelemetry;
601602
const usage = yield* UsageService.UsageService;
@@ -2000,7 +2001,7 @@ const makeWsRpcLayer = (
20002001
"rpc.aggregate": "server",
20012002
}),
20022003
[WS_METHODS.serverGetHostResources]: (_input) =>
2003-
observeRpcEffect(WS_METHODS.serverGetHostResources, readHostResources(), {
2004+
observeRpcEffect(WS_METHODS.serverGetHostResources, hostResources.read, {
20042005
"rpc.aggregate": "server",
20052006
}),
20062007
[WS_METHODS.serverGetProcessResourceHistory]: (input) =>

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3139,6 +3139,7 @@ export default function ChatView(props: ChatViewProps) {
31393139

31403140
const loadBalancingSettings = useClientSettings();
31413141
const automaticEnvironment = Boolean(
3142+
clientSettingsHydrated &&
31423143
draftId &&
31433144
!envLocked &&
31443145
hasMultipleEnvironments &&
@@ -6198,6 +6199,7 @@ export default function ChatView(props: ChatViewProps) {
61986199
!activeThread ||
61996200
isSendBusy ||
62006201
isConnecting ||
6202+
!clientSettingsHydrated ||
62016203
threadDetailLoading ||
62026204
sendInFlightRef.current ||
62036205
feedbackUploadsInFlightRef.current.has(routeThreadKey)

0 commit comments

Comments
 (0)