fix(package): ignore stale packed tarballs (#95126) · ope...

Recent Commits to openclaw:main

vincentkoc · 2026-06-20 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -357,6 +357,30 @@ async function newestOpenClawTarball(outputDir, packOutput) {`
`357`	`357`	`return path.join(outputDir, packed);`
`358`	`358`	`}`
`359`	`359`
	`360`	`+async function cleanPackedOpenClawTarballs(outputDir) {`
	`361`	`+let entries;`
	`362`	`+try {`
	`363`	`+entries = await fs.readdir(outputDir);`
	`364`	`+} catch (error) {`
	`365`	`+if (error?.code === "ENOENT") {`
	`366`	`+entries = [];`
	`367`	`+} else {`
	`368`	`+throw error;`
	`369`	`+}`
	`370`	`+}`
	`371`	`+await Promise.all(`
	`372`	`+entries`
	`373`	`+.filter((entry) => {`
	`374`	`+try {`
	`375`	`+return resolvePackedOpenClawFileName(entry) === entry;`
	`376`	`+} catch {`
	`377`	`+return false;`
	`378`	`+}`
	`379`	`+})`
	`380`	`+.map((entry) => fs.rm(path.join(outputDir, entry), { force: true })),`
	`381`	`+);`
	`382`	`+}`
	`383`	`+`
`360`	`384`	`export async function packOpenClawPackageForDocker(sourceDir, outputDir, options = {}) {`
`361`	`385`	`const runCaptureImpl = options.runCaptureImpl ?? runCapture;`
`362`	`386`	`const prepareChangelog = options.prepareChangelog ?? preparePackageChangelog;`
`@@ -365,6 +389,7 @@ export async function packOpenClawPackageForDocker(sourceDir, outputDir, options`
`365`	`389`	`await prepareChangelog(sourceDir);`
`366`	`390`	`let packOutput;`
`367`	`391`	`try {`
	`392`	`+await cleanPackedOpenClawTarballs(outputDir);`
`368`	`393`	`packOutput = await runCaptureImpl(`
`369`	`394`	`"npm",`
`370`	`395`	`["pack", "--silent", "--ignore-scripts", "--pack-destination", outputDir],`

Original file line number	Diff line number	Diff line change
`@@ -570,6 +570,32 @@ async function moveNewestPackedTarball(outputDir, packOutput, outputName) {`
`570`	`570`
`571`	`571`	`export const moveNewestPackedTarballForTest = moveNewestPackedTarball;`
`572`	`572`
	`573`	`+async function cleanPackedOpenClawTarballs(outputDir) {`
	`574`	`+let entries;`
	`575`	`+try {`
	`576`	`+entries = await fs.readdir(outputDir);`
	`577`	`+} catch (error) {`
	`578`	`+if (error?.code === "ENOENT") {`
	`579`	`+entries = [];`
	`580`	`+} else {`
	`581`	`+throw error;`
	`582`	`+}`
	`583`	`+}`
	`584`	`+await Promise.all(`
	`585`	`+entries`
	`586`	`+.filter((entry) => {`
	`587`	`+try {`
	`588`	`+return resolvePackedOpenClawTarballFilename(entry) === entry;`
	`589`	`+} catch {`
	`590`	`+return false;`
	`591`	`+}`
	`592`	`+})`
	`593`	`+.map((entry) => fs.rm(path.join(outputDir, entry), { force: true })),`
	`594`	`+);`
	`595`	`+}`
	`596`	`+`
	`597`	`+export const cleanPackedOpenClawTarballsForTest = cleanPackedOpenClawTarballs;`
	`598`	`+`
`573`	`599`	`function normalizeUrlHostname(hostname) {`
`574`	`600`	`return hostname.replace(/^\[/u, "").replace(/\]$/u, "").replace(/\.+$/u, "").toLowerCase();`
`575`	`601`	`}`
`@@ -1307,6 +1333,7 @@ async function resolveCandidate(options) {`
`1307`	`1333`	`const npmPackRunner = resolveNpmPackageCandidatePackRunner(options.packageSpec, outputDir, {`
`1308`	`1334`	`env: process.env,`
`1309`	`1335`	`});`
	`1336`	`+await cleanPackedOpenClawTarballs(outputDir);`
`1310`	`1337`	`const packOutput = await run(npmPackRunner.command, npmPackRunner.args, {`
`1311`	`1338`	`capture: true,`
`1312`	`1339`	`env: npmPackRunner.env,`

Original file line number	Diff line number	Diff line change
`@@ -253,14 +253,41 @@ describe("package-openclaw-for-docker", () => {`
`253`	`253`	`}),`
`254`	`254`	`).rejects.toThrow("missing packed OpenClaw tarball");`
`255`	`255`
`256`		`-fs.writeFileSync(path.join(outputDir, "openclaw-2026.6.17.tgz"), "");`
`257`	`256`	`await expect(`
`258`	`257`	`packOpenClawPackageForDocker("/repo", outputDir, {`
`259`	`258`	`prepareChangelog: async () => {},`
`260`	`259`	`restoreChangelog: async () => {},`
`261`		`-runCaptureImpl: async () => "npm notice\n",`
	`260`	`+runCaptureImpl: async () => {`
	`261`	`+fs.writeFileSync(path.join(outputDir, "openclaw-2026.6.17.tgz"), "");`
	`262`	`+return "npm notice\n";`
	`263`	`+},`
	`264`	`+}),`
	`265`	`+).resolves.toBe(path.join(outputDir, "openclaw-2026.6.17.tgz"));`
	`266`	`+} finally {`
	`267`	`+fs.rmSync(outputDir, { recursive: true, force: true });`
	`268`	`+}`
	`269`	`+});`
	`270`	`+`
	`271`	`+it("ignores stale package tarballs before fallback scanning npm output", async () => {`
	`272`	`+const outputDir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-docker-pack-stale-"));`
	`273`	`+try {`
	`274`	`+fs.writeFileSync(path.join(outputDir, "openclaw-9999.1.1.tgz"), "stale");`
	`275`	`+`
	`276`	`+await expect(`
	`277`	`+packOpenClawPackageForDocker("/repo", outputDir, {`
	`278`	`+prepareChangelog: async () => {},`
	`279`	`+restoreChangelog: async () => {},`
	`280`	`+runCaptureImpl: async () => {`
	`281`	`+fs.writeFileSync(path.join(outputDir, "openclaw-2026.6.17.tgz"), "current");`
	`282`	`+return "npm notice\n";`
	`283`	`+},`
`262`	`284`	`}),`
`263`	`285`	`).resolves.toBe(path.join(outputDir, "openclaw-2026.6.17.tgz"));`
	`286`	`+`
	`287`	`+expect(fs.existsSync(path.join(outputDir, "openclaw-9999.1.1.tgz"))).toBe(false);`
	`288`	`+expect(fs.readFileSync(path.join(outputDir, "openclaw-2026.6.17.tgz"), "utf8")).toBe(`
	`289`	`+"current",`
	`290`	`+);`
`264`	`291`	`} finally {`
`265`	`292`	`fs.rmSync(outputDir, { recursive: true, force: true });`
`266`	`293`	`}`

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import { afterEach, describe, expect, it } from "vitest";`
`9`	`9`	`import {`
`10`	`10`	`ARTIFACT_TARBALL_SCAN_MAX_ENTRIES,`
`11`	`11`	`cleanupPackageSourceWorktreeForTest,`
	`12`	`+cleanPackedOpenClawTarballsForTest,`
`12`	`13`	`downloadUrl,`
`13`	`14`	`findSingleTarballForTest,`
`14`	`15`	`loadTrustedPackageSource,`
`@@ -263,6 +264,25 @@ describe("resolve-openclaw-package-candidate", () => {`
`263`	`264`	`}`
`264`	`265`	`});`
`265`	`266`
	`267`	`+it("cleans stale package tarballs before npm fallback scanning", async () => {`
	`268`	`+const dir = await mkdtemp(path.join(tmpdir(), "openclaw-package-npm-pack-stale-"));`
	`269`	`+tempDirs.push(dir);`
	`270`	`+await writeFile(path.join(dir, "openclaw-9999.1.1.tgz"), "stale");`
	`271`	`+await writeFile(path.join(dir, "openclaw-C:evil.tgz"), "unsafe");`
	`272`	`+`
	`273`	`+await cleanPackedOpenClawTarballsForTest(dir);`
	`274`	`+await writeFile(path.join(dir, "openclaw-2026.6.17.tgz"), "current");`
	`275`	`+`
	`276`	`+await expect(`
	`277`	`+moveNewestPackedTarballForTest(dir, "npm notice\n", "openclaw-current.tgz"),`
	`278`	`+).resolves.toBe(path.join(dir, "openclaw-current.tgz"));`
	`279`	`+await expect(missing(path.join(dir, "openclaw-9999.1.1.tgz"))).resolves.toBe(true);`
	`280`	`+await expect(readFile(path.join(dir, "openclaw-C:evil.tgz"), "utf8")).resolves.toBe("unsafe");`
	`281`	`+await expect(readFile(path.join(dir, "openclaw-current.tgz"), "utf8")).resolves.toBe(`
	`282`	`+"current",`
	`283`	`+);`
	`284`	`+});`
	`285`	`+`
`266`	`286`	`it("bounds captured command stderr tails on failures", async () => {`
`267`	`287`	`await expect(`
`268`	`288`	`runCommandForTest(`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main