@pab-iprg/huohuo 1.0.0-preview.1 → 1.0.0-preview.3

package/cli.js

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
 
 // distribution/bootstrap/entry.ts
-import { readFile as readFile7, realpath as realpath5 } from "node:fs/promises";
-import { createReadStream as createReadStream2 } from "node:fs";
+import { open as open3, readFile as readFile7, realpath as realpath5 } from "node:fs/promises";
 import { Readable } from "node:stream";
 import { homedir } from "node:os";
 import { dirname as dirname5, join as join6, resolve as resolve5 } from "node:path";
@@ -457,10 +456,6 @@ function evaluateResources(sample, policy, costs, phase) {
     blocked = true;
     reasons.push("\u7CFB\u7EDF\u5185\u5B58\u538B\u529B\u4E25\u91CD");
   }
-  if (sample.pressure === "high" || sample.pressure === "unknown") {
-    limited = true;
-    reasons.push(sample.pressure === "high" ? "\u7CFB\u7EDF\u5185\u5B58\u538B\u529B\u504F\u9AD8" : "\u538B\u529B\u4FE1\u53F7\u7F3A\u5931\uFF0C\u4FDD\u5B88\u8FD0\u884C");
-  }
   const disks = diskBudgets(sample, costs, policy.diskReserveBytes);
   for (const disk of disks) {
     if (disk.availableBytes === null) {
@@ -468,9 +463,16 @@ function evaluateResources(sample, policy, costs, phase) {
       reasons.push(`\u6587\u4EF6\u7CFB\u7EDF\u53EF\u7528\u7A7A\u95F4\u672A\u77E5\uFF1A${disk.device}`);
     } else if (disk.availableBytes < disk.requiredBytes) {
       blocked = true;
-      reasons.push(`\u6587\u4EF6\u7CFB\u7EDF\u7A7A\u95F4\u4E0D\u8DB3\uFF1A\u53EF\u7528 ${disk.availableBytes} \u5B57\u8282\uFF0C\u9700\u8981 ${disk.requiredBytes} \u5B57\u8282`);
+      const available = (disk.availableBytes / 1e9).toFixed(2);
+      const required = (disk.requiredBytes / 1e9).toFixed(2);
+      const missing = (Math.ceil((disk.requiredBytes - disk.availableBytes) / 1e7) / 100).toFixed(2);
+      reasons.push(`\u78C1\u76D8\u7A7A\u95F4\u4E0D\u8DB3\uFF1A\u5269\u4F59 ${available} GB\uFF0C\u9700\u8981 ${required} GB\u3002\u8BF7\u81F3\u5C11\u518D\u817E\u51FA ${missing} GB\u3002`);
     }
   }
+  if (sample.pressure === "high" || sample.pressure === "unknown") {
+    limited = true;
+    reasons.push(sample.pressure === "high" ? "\u5F53\u524D\u5185\u5B58\u6BD4\u8F83\u7D27\u5F20\uFF0C\u53EF\u4EE5\u5148\u5173\u95ED\u6682\u65F6\u4E0D\u7528\u7684\u5E94\u7528\u3002" : "\u6682\u65F6\u65E0\u6CD5\u786E\u8BA4\u5185\u5B58\u538B\u529B\u3002");
+  }
   const status = blocked ? "blocked" : unknown ? "unknown" : limited ? "limited" : "pass";
   return { status, reasons, disks, sample, policy, concurrency: status === "pass" ? Math.min(1, availableParallelism()) : 0 };
 }
@@ -585,6 +587,32 @@ async function install(home, candidate, hooks = {}, programsOnly = false) {
     if (!programsOnly && !record && (await readdir(home)).some((name) => name !== "state")) throw new Error("\u76EE\u5F55\u542B\u65E0\u5B89\u88C5\u8BB0\u5F55\u7684\u65E2\u6709\u5185\u5BB9\uFF1B\u8BF7\u6838\u67E5\u5F52\u5C5E\u6216\u9009\u62E9\u7A7A\u76EE\u5F55");
     if (!programsOnly && !record && (await readdir(join3(home, "state"))).some((name) => name !== "install.lock")) throw new Error("\u76EE\u5F55\u542B\u65E0\u6CD5\u786E\u8BA4\u5F52\u5C5E\u7684\u72B6\u6001\uFF1B\u672A\u91CD\u5EFA\u5B89\u88C5");
     if (programsOnly && (await readInstallation(home))?.status !== "ready") throw new Error("\u5F53\u524D\u5B89\u88C5\u4E0D\u5B8C\u6574\uFF0C\u5148\u4FEE\u590D\u539F\u7248\u672C");
+    const bundleDirectory = hooks.bundleDirectory;
+    if (!programsOnly && record && bundleDirectory && candidate && ["installing", "blocked", "failed"].includes(record.status) && ["preflight", "download"].includes(record.stage) && Object.keys(record.stages).every((stage2) => stage2 === "preflight" || stage2 === "download")) {
+      const hasFile = async (path) => {
+        try {
+          await access(path);
+          return true;
+        } catch (error) {
+          if (error.code === "ENOENT") return false;
+          throw error;
+        }
+      };
+      const bundled = (release2) => [release2.runtime, release2.python, release2.pythonDependencies].filter((artifact2) => artifact2.bundled);
+      const oldAssets = bundled(record.release);
+      const available = await Promise.all(oldAssets.map(async (artifact2) => {
+        const file = artifact2.sha256 + ".tgz";
+        return await hasFile(join3(bundleDirectory, file)) || await hasFile(join3(home, "cache", file));
+      }));
+      if (available.includes(false)) {
+        const next = validateRelease(candidate);
+        const nextAssets = bundled(next);
+        if (next.runtime.bundled && next.version === record.release.version && (await Promise.all(nextAssets.map((artifact2) => hasFile(join3(bundleDirectory, artifact2.sha256 + ".tgz"))))).every(Boolean)) {
+          record = void 0;
+          hooks.progress?.("resume-current-package");
+        }
+      }
+    }
     const release = record?.release ?? validateRelease(candidate);
     if (release.platform.os !== process.platform || release.platform.arch !== process.arch || !versionAtLeast(osRelease(), release.platform.minimumOsRelease) || !versionAtLeast(process.versions.node, "24.8.0") || Number(process.versions.node.split(".")[0]) !== release.nodeMajor) {
       throw new Error("\u6B64\u53D1\u884C\u5C1A\u672A\u9A8C\u8BC1\u5F53\u524D OS/CPU/Node \u7EC4\u5408\uFF1B\u672A\u5F00\u59CB\u91CD\u4E0B\u8F7D");
@@ -656,7 +684,12 @@ async function install(home, candidate, hooks = {}, programsOnly = false) {
       }
       const result = evaluateResources(observation, release.budget, costs, "install");
       await atomicJSON(join3(home, "state/resources.json"), result);
-      if (result.status === "unknown" || result.status === "blocked") throw Object.assign(new Error(result.reasons.join("\uFF1B")), { code: "RESOURCE_BLOCKED" });
+      if (result.status === "unknown" || result.status === "blocked") {
+        const details = result.reasons.map((reason) => `- ${reason}`).join("\n");
+        throw Object.assign(new Error(`\u706B\u706B\u6682\u65F6\u65E0\u6CD5\u7EE7\u7EED\u5B89\u88C5\u3002
+${details}
+\u5904\u7406\u540E\uFF0C\u91CD\u65B0\u8FD0\u884C\u521A\u624D\u7684\u5B89\u88C5\u547D\u4EE4\u3002`), { code: "RESOURCE_BLOCKED" });
+      }
     };
     const stage = async (name, action) => {
       hooks.progress?.(name);
@@ -1041,11 +1074,18 @@ async function uninstall(home, hooks = {}) {
 // distribution/bootstrap/entry.ts
 function artifactSource(source, directory) {
   return async (url, options) => {
+    const bundled = /^https:\/\/bundled\.invalid\/([a-f0-9]{64})\.tgz$/.exec(String(url));
+    if (!directory && !bundled) return fetch(url, options);
     const artifact2 = source && [source.runtime, source.python, source.pythonDependencies].find((item) => item.url === String(url));
-    if (!directory && !artifact2?.bundled) return fetch(url, options);
-    if (!artifact2) throw new Error("\u672C\u673A\u4EA7\u7269\u76EE\u5F55\u7F3A\u5C11\u8BE5\u56FA\u5B9A\u53D1\u884C\u8D44\u6E90");
+    const sha256 = bundled?.[1] ?? artifact2?.sha256;
+    if (!sha256) throw new Error("\u672C\u673A\u4EA7\u7269\u76EE\u5F55\u7F3A\u5C11\u8BE5\u56FA\u5B9A\u53D1\u884C\u8D44\u6E90");
     const root = directory ?? join6(dirname5(fileURLToPath(import.meta.url)), "assets");
-    return new Response(Readable.toWeb(createReadStream2(join6(root, artifact2.sha256 + ".tgz"), { signal: options?.signal ?? void 0 })));
+    const path = join6(root, sha256 + ".tgz");
+    const file = await open3(path).catch((error) => {
+      if (error.code === "ENOENT" && bundled) throw new Error("\u7F3A\u5C11\u4E0A\u6B21\u5B89\u88C5\u4F7F\u7528\u7684\u6587\u4EF6\u3002\u8BF7\u7528\u4E0A\u6B21\u5B89\u88C5\u65F6\u7684\u7248\u672C\u7EE7\u7EED\u3002");
+      throw error;
+    });
+    return new Response(Readable.toWeb(file.createReadStream({ signal: options?.signal ?? void 0 })));
   };
 }
 async function main(args = process.argv.slice(2)) {
@@ -1081,7 +1121,8 @@ async function main(args = process.argv.slice(2)) {
     "install-runtime": "\u51C6\u5907 Python \u8FD0\u884C\u73AF\u5883",
     "install-dependencies": "\u5B89\u88C5\u706B\u706B\u4E0E\u56FA\u5B9A\u4F9D\u8D56",
     "assemble-profiles": "\u914D\u7F6E\u5BF9\u8BDD\u4E0E\u540E\u53F0\u7814\u7A76",
-    verify: "\u68C0\u67E5\u5B89\u88C5\u7ED3\u679C"
+    verify: "\u68C0\u67E5\u5B89\u88C5\u7ED3\u679C",
+    "resume-current-package": "\u4E0A\u6B21\u5B89\u88C5\u5C1A\u672A\u5199\u5165\u8FD0\u884C\u73AF\u5883\uFF0C\u5C06\u4F7F\u7528\u5F53\u524D\u7248\u672C\u91CD\u65B0\u68C0\u67E5"
   };
   const progress = (stage) => console.log(`\u706B\u706B\uFF1A${labels[stage] ?? stage}`);
   if (command === "upgrade") {
@@ -1136,7 +1177,7 @@ async function main(args = process.argv.slice(2)) {
   }
   if (!record || record.status !== "ready") {
     let catalog = null;
-    if (!record) {
+    if (!record || ["preflight", "download"].includes(record.stage)) {
       try {
         catalog = JSON.parse(await readFile7(releaseFile ?? join6(dirname5(fileURLToPath(import.meta.url)), "release.json"), "utf8"));
       } catch (e) {
@@ -1145,7 +1186,8 @@ async function main(args = process.argv.slice(2)) {
     }
     const source = (await readInstallation(home))?.release ?? catalog;
     const fetcher = artifactSource(source, artifactDirectory);
-    record = await install(home, catalog, { fetcher, progress });
+    const bundleDirectory = !releaseFile && !artifactDirectory ? join6(dirname5(fileURLToPath(import.meta.url)), "assets") : void 0;
+    record = await install(home, catalog, { fetcher, progress, bundleDirectory });
   }
   const installedHome = record.home;
   await run(process.execPath, [join6(installationPaths(installedHome, record.release).runtime, "lib/distribution/managed.js"), "start", installedHome, ...noOpen ? ["--no-open"] : []], installedHome);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pab-iprg/huohuo",
-  "version": "1.0.0-preview.1",
+  "version": "1.0.0-preview.3",
   "type": "module",
   "description": "火火投研伙伴安装入口",
   "bin": {

package/release.json

@@ -13,11 +13,11 @@
   "runtime": {
     "name": "@huohuo/research-agent",
     "version": "1.0.0",
-    "url": "https://bundled.invalid/3357844499b0a3ee1e273eccc4ce7c4afde2d354a9ff4f473720e7875cdbabf7.tgz",
-    "sha256": "3357844499b0a3ee1e273eccc4ce7c4afde2d354a9ff4f473720e7875cdbabf7",
-    "integrity": "sha512-Yzy/15UCnJiyFjL5gnGFS5ro0Orkd155EFGs2YTLtY37mo/nxnfkRrLPMsdh4aABEfCS0Dpu6ve+MKqkiyh5qQ==",
-    "downloadBytes": 2542280,
-    "expandedBytes": 8237016,
+    "url": "https://bundled.invalid/99aad243ba1aa9749053a7c136aa6b8e4d8fe043075cb3dfca7853359cb94a76.tgz",
+    "sha256": "99aad243ba1aa9749053a7c136aa6b8e4d8fe043075cb3dfca7853359cb94a76",
+    "integrity": "sha512-mXfudYnjEC4Oqwrg6mrOjnu8Q+S5wAxbK/gTSeAyPTzPF5uj9jyqNaWLE+nXe+gc2IazdRRhBii917dFsLUZyA==",
+    "downloadBytes": 2543158,
+    "expandedBytes": 8239765,
     "bundled": true
   },
   "python": {