vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 09:50:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(update): preserve legacy global verify

Browse Source
This commit is contained in:
Ayaan Zaidi
2026-04-15 10:23:05 +05:30
parent 9e1df98475
commit aaa6b05f3b
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/infra/update-global.test.ts
View File

@@ -397,4 +397,26 @@ describe("update global helpers", () => {
);
});
});
it("falls back to legacy sidecar verification when the inventory is missing", async () => {
await withTempDir({ prefix: "openclaw-update-global-legacy-" }, async (packageRoot) => {
await fs.writeFile(
path.join(packageRoot, "package.json"),
JSON.stringify({ name: "openclaw", version: "1.0.0" }),
"utf-8",
);
for (const relativePath of BUNDLED_RUNTIME_SIDECAR_PATHS) {
const absolutePath = path.join(packageRoot, relativePath);
await fs.mkdir(path.dirname(absolutePath), { recursive: true });
await fs.writeFile(absolutePath, "export {};\n", "utf-8");
}
await expect(collectInstalledGlobalPackageErrors({ packageRoot })).resolves.toEqual([]);
await fs.rm(path.join(packageRoot, MATRIX_HELPER_API));
await expect(collectInstalledGlobalPackageErrors({ packageRoot })).resolves.toContain(
`missing bundled runtime sidecar ${MATRIX_HELPER_API}`,
);
});
});
});

24
src/infra/update-global.ts
View File

@@ -2,9 +2,13 @@ import fsSync from "node:fs";
import fs from "node:fs/promises";
import os from "node:os";
import path from "node:path";
import { BUNDLED_RUNTIME_SIDECAR_PATHS } from "../plugins/runtime-sidecar-paths.js";
import { normalizeLowercaseStringOrEmpty } from "../shared/string-coerce.js";
import { pathExists } from "../utils.js";
import { collectPackageDistInventoryErrors } from "./package-dist-inventory.js";
import {
PACKAGE_DIST_INVENTORY_RELATIVE_PATH,
collectPackageDistInventoryErrors,
} from "./package-dist-inventory.js";
import { readPackageVersion } from "./package-json.js";
import { applyPathPrepend } from "./path-prepend.js";
@@ -35,6 +39,7 @@ const NPM_GLOBAL_INSTALL_OMIT_OPTIONAL_FLAGS = [
"--omit=optional",
...NPM_GLOBAL_INSTALL_QUIET_FLAGS,
] as const;
const MISSING_PACKAGE_DIST_INVENTORY_ERROR = `missing package dist inventory ${PACKAGE_DIST_INVENTORY_RELATIVE_PATH}`;
function normalizePackageTarget(value: string): string {
return value.trim();
@@ -89,7 +94,22 @@ export async function collectInstalledGlobalPackageErrors(params: {
`expected installed version ${params.expectedVersion}, found ${installedVersion ?? "<missing>"}`,
);
}
errors.push(...(await collectPackageDistInventoryErrors(params.packageRoot)));
const distErrors = await collectPackageDistInventoryErrors(params.packageRoot);
if (distErrors.length === 1 && distErrors[0] === MISSING_PACKAGE_DIST_INVENTORY_ERROR) {
errors.push(...(await collectLegacyInstalledGlobalPackageErrors(params.packageRoot)));
return errors;
}
errors.push(...distErrors);
return errors;
}
async function collectLegacyInstalledGlobalPackageErrors(packageRoot: string): Promise<string[]> {
const errors: string[] = [];
for (const relativePath of BUNDLED_RUNTIME_SIDECAR_PATHS) {
if (!(await pathExists(path.join(packageRoot, relativePath)))) {
errors.push(`missing bundled runtime sidecar ${relativePath}`);
}
}
return errors;
}