mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-06 06:20:43 +00:00
fix(tsgo): skip heavy-check lock for metadata commands
This commit is contained in:
@@ -114,6 +114,17 @@ export function shouldAcquireLocalHeavyCheckLockForOxlint(
|
||||
});
|
||||
}
|
||||
|
||||
export function shouldAcquireLocalHeavyCheckLockForTsgo(args, env = process.env) {
|
||||
if (env.OPENCLAW_TSGO_FORCE_LOCK === "1") {
|
||||
return true;
|
||||
}
|
||||
|
||||
return !args.some(
|
||||
(arg) =>
|
||||
arg === "--help" || arg === "-h" || arg === "--version" || arg === "-v" || arg === "--init",
|
||||
);
|
||||
}
|
||||
|
||||
export function shouldThrottleLocalHeavyChecks(env, hostResources) {
|
||||
if (!isLocalCheckEnabled(env)) {
|
||||
return false;
|
||||
|
||||
@@ -4,6 +4,7 @@ import path from "node:path";
|
||||
import {
|
||||
acquireLocalHeavyCheckLockSync,
|
||||
applyLocalTsgoPolicy,
|
||||
shouldAcquireLocalHeavyCheckLockForTsgo,
|
||||
} from "./lib/local-heavy-check-runtime.mjs";
|
||||
|
||||
const { args: finalArgs, env } = applyLocalTsgoPolicy(process.argv.slice(2), process.env);
|
||||
@@ -13,11 +14,13 @@ const tsBuildInfoFile = readFlagValue(finalArgs, "--tsBuildInfoFile");
|
||||
if (tsBuildInfoFile) {
|
||||
fs.mkdirSync(path.dirname(path.resolve(tsBuildInfoFile)), { recursive: true });
|
||||
}
|
||||
const releaseLock = acquireLocalHeavyCheckLockSync({
|
||||
cwd: process.cwd(),
|
||||
env,
|
||||
toolName: "tsgo",
|
||||
});
|
||||
const releaseLock = shouldAcquireLocalHeavyCheckLockForTsgo(finalArgs, env)
|
||||
? acquireLocalHeavyCheckLockSync({
|
||||
cwd: process.cwd(),
|
||||
env,
|
||||
toolName: "tsgo",
|
||||
})
|
||||
: () => {};
|
||||
|
||||
try {
|
||||
const result = spawnSync(tsgoPath, finalArgs, {
|
||||
|
||||
@@ -6,6 +6,7 @@ import {
|
||||
applyLocalOxlintPolicy,
|
||||
applyLocalTsgoPolicy,
|
||||
shouldAcquireLocalHeavyCheckLockForOxlint,
|
||||
shouldAcquireLocalHeavyCheckLockForTsgo,
|
||||
} from "../../scripts/lib/local-heavy-check-runtime.mjs";
|
||||
import { createScriptTestHarness } from "./test-helpers.js";
|
||||
|
||||
@@ -174,6 +175,28 @@ describe("local-heavy-check-runtime", () => {
|
||||
expect(env.GOMEMLIMIT).toBeUndefined();
|
||||
});
|
||||
|
||||
it("skips the heavy-check lock for tsgo metadata commands", () => {
|
||||
expect(shouldAcquireLocalHeavyCheckLockForTsgo(["--help"])).toBe(false);
|
||||
expect(shouldAcquireLocalHeavyCheckLockForTsgo(["-h"])).toBe(false);
|
||||
expect(shouldAcquireLocalHeavyCheckLockForTsgo(["--version"])).toBe(false);
|
||||
expect(shouldAcquireLocalHeavyCheckLockForTsgo(["-v"])).toBe(false);
|
||||
expect(shouldAcquireLocalHeavyCheckLockForTsgo(["--init"])).toBe(false);
|
||||
});
|
||||
|
||||
it("keeps the heavy-check lock for real tsgo runs", () => {
|
||||
expect(shouldAcquireLocalHeavyCheckLockForTsgo([])).toBe(true);
|
||||
expect(shouldAcquireLocalHeavyCheckLockForTsgo(["--extendedDiagnostics"])).toBe(true);
|
||||
});
|
||||
|
||||
it("allows forcing the tsgo lock back on", () => {
|
||||
expect(
|
||||
shouldAcquireLocalHeavyCheckLockForTsgo(
|
||||
["--help"],
|
||||
makeEnv({ OPENCLAW_TSGO_FORCE_LOCK: "1" }),
|
||||
),
|
||||
).toBe(true);
|
||||
});
|
||||
|
||||
it("serializes local oxlint runs onto one thread on constrained hosts", () => {
|
||||
const { args } = applyLocalOxlintPolicy([], makeEnv(), CONSTRAINED_HOST);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user