@dptech-corp/bohr-cli 2.6.19 → 2.6.21

package/CHANGELOG.md

@@ -15,6 +15,29 @@
 
 ## [Unreleased]
 
+## [2.6.21] - 2026-08-13
+
+### Fixed
+
+- `bohr job log` 与 `bohr job download` 恢复接受 Bohr ID 位置参数；位置参数可重复，也可与现有 `--id/-i` 混用，旧脚本无需改写即可继续下载日志和结果文件。`job log/download/kill/terminate` 共用的 ID 解析现在会在请求前拒绝 `0` 和负数。
+
+## [2.6.20] - 2026-08-13
+
+### Added
+
+- `bohr wenyon` 子命令对所有用户开放，不再需要 entitlements 权限。
+- `npm install -g @dptech-corp/bohr-cli` 现在通过 postinstall 自动下载对应平台的 wenyon-cli（external 变体），无需额外操作。
+- `bohr auth login` 成功后自动写入 `~/.vouch/state.json`，wenyon-cli 认证无缝衔接。
+- `bohr auth logout` 同时清理 wenyon 认证状态。
+- `bohr wenyon` 调用前自动检测并刷新过期的 wenyon token。
+- wenyon-cli 下载新增 SHA256 校验。
+- 新增独立安装脚本 `scripts/install.sh`（Linux/macOS）和 `scripts/install.ps1`（Windows）。
+
+### Changed
+
+- wenyon-cli 下载改用 `variant=external` 参数获取外部版产物。
+- wenyon 平台检测扩展支持 windows-amd64 和 windows-arm64。
+
 ## [2.6.19] - 2026-08-13
 
 ### Breaking

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@dptech-corp/bohr-cli",
-  "version": "2.6.19",
+  "version": "2.6.21",
   "description": "CLI tool for Bohrium scientific computing platform",
   "bin": {
     "bohr": "run.js"
   },
+  "scripts": {
+    "postinstall": "node postinstall.js"
+  },
   "keywords": [
     "bohrium",
     "scientific-computing",
@@ -25,14 +28,15 @@
   ],
   "files": [
     "run.js",
+    "postinstall.js",
     "CHANGELOG.md"
   ],
   "optionalDependencies": {
-    "@dptech-corp/bohr-cli-darwin-arm64": "2.6.19",
-    "@dptech-corp/bohr-cli-darwin-amd64": "2.6.19",
-    "@dptech-corp/bohr-cli-linux-amd64": "2.6.19",
-    "@dptech-corp/bohr-cli-linux-arm64": "2.6.19",
-    "@dptech-corp/bohr-cli-windows-amd64": "2.6.19",
-    "@dptech-corp/bohr-cli-windows-arm64": "2.6.19"
+    "@dptech-corp/bohr-cli-darwin-arm64": "2.6.21",
+    "@dptech-corp/bohr-cli-darwin-amd64": "2.6.21",
+    "@dptech-corp/bohr-cli-linux-amd64": "2.6.21",
+    "@dptech-corp/bohr-cli-linux-arm64": "2.6.21",
+    "@dptech-corp/bohr-cli-windows-amd64": "2.6.21",
+    "@dptech-corp/bohr-cli-windows-arm64": "2.6.21"
   }
 }

package/postinstall.js

@@ -0,0 +1,145 @@
+#!/usr/bin/env node
+/**
+ * postinstall: downloads wenyon-cli (external) for the current platform.
+ * Runs after `npm install -g @dptech-corp/bohr-cli`.
+ * Failure is non-fatal — bohr-cli works without wenyon, and `bohr tools install wenyon`
+ * can retry later.
+ */
+const https = require("https");
+const http = require("http");
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+const crypto = require("crypto");
+
+const WENYON_SERVER = "https://wenyon.dp.tech";
+const INSTALL_DIR = path.join(os.homedir(), ".bohr", "tools", "wenyon", "current");
+
+function getPlatform() {
+  const p = os.platform();
+  const a = os.arch();
+  const platformMap = { darwin: "darwin", linux: "linux", win32: "windows" };
+  const archMap = { x64: "amd64", arm64: "arm64" };
+  const mp = platformMap[p];
+  const ma = archMap[a];
+  if (!mp || !ma) return null;
+  return `${mp}-${ma}`;
+}
+
+function get(url) {
+  return new Promise((resolve, reject) => {
+    const mod = url.startsWith("https") ? https : http;
+    mod.get(url, { headers: { "User-Agent": "bohr-cli-postinstall" } }, (res) => {
+      if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+        return resolve(get(res.headers.location));
+      }
+      if (res.statusCode !== 200) {
+        res.resume();
+        return reject(new Error(`HTTP ${res.statusCode} from ${url}`));
+      }
+      const chunks = [];
+      res.on("data", (c) => chunks.push(c));
+      res.on("end", () => resolve(Buffer.concat(chunks)));
+      res.on("error", reject);
+    }).on("error", reject);
+  });
+}
+
+function downloadToFile(url, dest, timeoutMs = 300000) {
+  return new Promise((resolve, reject) => {
+    const mod = url.startsWith("https") ? https : http;
+    const follow = (u) => {
+      const req = mod.get(u, { headers: { "User-Agent": "bohr-cli-postinstall" }, timeout: timeoutMs }, (res) => {
+        if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+          res.resume();
+          return follow(res.headers.location);
+        }
+        if (res.statusCode !== 200) {
+          res.resume();
+          return reject(new Error(`HTTP ${res.statusCode}`));
+        }
+        const file = fs.createWriteStream(dest);
+        const hash = crypto.createHash("sha256");
+        res.on("data", (chunk) => {
+          file.write(chunk);
+          hash.update(chunk);
+        });
+        res.on("end", () => {
+          file.end(() => resolve(hash.digest("hex")));
+        });
+        res.on("error", (e) => { file.close(); reject(e); });
+      });
+      req.on("error", reject);
+      req.on("timeout", () => { req.destroy(); reject(new Error("download timed out")); });
+    };
+    follow(url);
+  });
+}
+
+async function main() {
+  const platform = getPlatform();
+  if (!platform) {
+    // Unsupported platform for wenyon — skip silently
+    return;
+  }
+
+  const metaUrl = `${WENYON_SERVER}/cli/releases/latest/download?platform=${platform}&variant=external`;
+
+  let meta;
+  try {
+    const buf = await get(metaUrl);
+    meta = JSON.parse(buf.toString());
+  } catch (e) {
+    console.error(`[postinstall] wenyon-cli: could not fetch release info (${e.message}), skipping`);
+    return;
+  }
+
+  if (!meta.url) {
+    console.error("[postinstall] wenyon-cli: no download URL in release response, skipping");
+    return;
+  }
+
+  // Check if already installed and up-to-date
+  const ext = platform.startsWith("windows") ? ".exe" : "";
+  const destPath = path.join(INSTALL_DIR, `wenyon-cli${ext}`);
+
+  if (fs.existsSync(destPath) && meta.version) {
+    try {
+      const { execFileSync } = require("child_process");
+      const out = execFileSync(destPath, ["version"], { encoding: "utf8", timeout: 5000 });
+      if (out.includes(meta.version)) {
+        console.log(`[postinstall] wenyon-cli ${meta.version} already installed`);
+        return;
+      }
+    } catch (_) {
+      // version check failed, proceed with install
+    }
+  }
+
+  console.log(`[postinstall] Installing wenyon-cli ${meta.version || ""} (${platform})...`);
+
+  fs.mkdirSync(INSTALL_DIR, { recursive: true });
+
+  const tmpPath = destPath + ".tmp";
+  try {
+    const actualHash = await downloadToFile(meta.url, tmpPath);
+
+    if (meta.sha256 && actualHash !== meta.sha256) {
+      fs.unlinkSync(tmpPath);
+      console.error(`[postinstall] wenyon-cli: SHA256 mismatch (expected ${meta.sha256}, got ${actualHash}), skipping`);
+      return;
+    }
+
+    fs.chmodSync(tmpPath, 0o755);
+    fs.renameSync(tmpPath, destPath);
+    console.log(`[postinstall] wenyon-cli ${meta.version || ""} installed to ${destPath}`);
+  } catch (e) {
+    try { fs.unlinkSync(tmpPath); } catch (_) {}
+    console.error(`[postinstall] wenyon-cli: download failed (${e.message}), skipping`);
+  }
+}
+
+main().catch((e) => {
+  // postinstall failures must not break npm install
+  console.error(`[postinstall] wenyon-cli: ${e.message}`);
+});