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

fix: exclude plugin dependency debris from package inventory

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-01 22:55:35 +01:00
parent 663552630a
commit 11a268819e
3 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/.generated/plugin-sdk-api-baseline.sha256
View File

@@ -1,2 +1,2 @@
8edcfb8af9862c6681bbf7fcba335943128ca7883e6982d0299eabcdf62386d4 plugin-sdk-api-baseline.json
5252b562f850cfe078903d3a3373ae5aa82041f6af8ccbc00fb9c94a89736e55 plugin-sdk-api-baseline.jsonl
1973d093c4fe08bc3f41d8c80ed089bf9674b299648c8958e9ca513327a8d3f0 plugin-sdk-api-baseline.json
4ef761cd8ce9f163fcce09ca17bcf58dfe6ae901108218fb9994e7c297a394d1 plugin-sdk-api-baseline.jsonl

31
src/infra/package-dist-inventory.test.ts
View File

@@ -113,6 +113,37 @@ describe("package dist inventory", () => {
});
});
it("keeps transient plugin dependency trees out of the inventory", async () => {
await withTempDir({ prefix: "openclaw-dist-inventory-plugin-deps-" }, async (packageRoot) => {
const realFile = path.join(packageRoot, "dist", "index.js");
const rootDependencyPackage = path.join(
packageRoot,
"dist",
"extensions",
"node_modules",
"openclaw",
"package.json",
);
const pluginDependencyPackage = path.join(
packageRoot,
"dist",
"extensions",
"slack",
"node_modules",
"left-pad",
"package.json",
);
await fs.mkdir(path.dirname(realFile), { recursive: true });
await fs.mkdir(path.dirname(rootDependencyPackage), { recursive: true });
await fs.mkdir(path.dirname(pluginDependencyPackage), { recursive: true });
await fs.writeFile(realFile, "export {};\n", "utf8");
await fs.writeFile(rootDependencyPackage, "{}", "utf8");
await fs.writeFile(pluginDependencyPackage, "{}", "utf8");
await expect(writePackageDistInventory(packageRoot)).resolves.toEqual(["dist/index.js"]);
});
});
it("reports runtime-created install staging dirs during installed dist verification", async () => {
await withTempDir({ prefix: "openclaw-dist-inventory-stage-" }, async (packageRoot) => {
const realFile = path.join(packageRoot, "dist", "real-AbC123.js");

23
src/infra/package-dist-inventory.ts
View File

@@ -46,6 +46,21 @@ function isInstallStageDirName(value: string): boolean {
return INSTALL_STAGE_DEBRIS_DIR_PATTERN.test(value);
}
function isLegacyPluginDependencyDirPath(relativePath: string): boolean {
const parts = normalizeRelativePath(relativePath).split("/");
if (parts[0]?.toLowerCase() !== "dist" || parts[1]?.toLowerCase() !== "extensions") {
return false;
}
const rootDependencyDir = parts[2] ?? "";
if (rootDependencyDir.toLowerCase() === "node_modules") {
return true;
}
const pluginDependencyDir = parts[3] ?? "";
return pluginDependencyDir.toLowerCase() === "node_modules";
}
export function isLegacyPluginDependencyInstallStagePath(relativePath: string): boolean {
const parts = normalizeRelativePath(relativePath).split("/");
return (
@@ -61,6 +76,9 @@ function isPackagedDistPath(relativePath: string): boolean {
if (!relativePath.startsWith("dist/")) {
return false;
}
if (isLegacyPluginDependencyDirPath(relativePath)) {
return false;
}
if (relativePath === PACKAGE_DIST_INVENTORY_RELATIVE_PATH) {
return false;
}
@@ -87,7 +105,10 @@ function isPackagedDistPath(relativePath: string): boolean {
}
function isOmittedDistSubtree(relativePath: string): boolean {
return OMITTED_DIST_SUBTREE_PATTERNS.some((pattern) => pattern.test(relativePath));
return (
isLegacyPluginDependencyDirPath(relativePath) ||
OMITTED_DIST_SUBTREE_PATTERNS.some((pattern) => pattern.test(relativePath))
);
}
async function collectRelativeFiles(rootDir: string, baseDir: string): Promise<string[]> {