@xulongzhe/clawbench 0.79.0 → 0.81.0

package/bin/clawbench.js

@@ -4,31 +4,20 @@ import { resolve, dirname } from "path";
 import { fileURLToPath } from "url";
 import { createRequire } from "module";
 import os from "os";
+import { resolvePlatformPackage, resolveBinName } from "./platform.js";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const require = createRequire(import.meta.url);
 
-const PLATFORM_MAP = {
-  "linux-x64": "@xulongzhe/clawbench-linux-x64",
-  "linux-arm64": "@xulongzhe/clawbench-linux-arm64",
-  "darwin-x64": "@xulongzhe/clawbench-darwin-x64",
-  "darwin-arm64": "@xulongzhe/clawbench-darwin-arm64",
-  "win32-x64": "@xulongzhe/clawbench-win32-x64",
-};
+const resolved = resolvePlatformPackage(process.platform, process.arch);
 
-// Termux 上报 process.platform === "android"，但它运行的是 Linux 用户态，
-// 其中 linux-arm64 的 Go 二进制可以直接执行，因此归一化到 linux。
-const platform = process.platform === "android" ? "linux" : process.platform;
-
-const key = `${platform}-${process.arch}`;
-const pkg = PLATFORM_MAP[key];
-
-if (!pkg) {
+if (!resolved) {
   console.error(`clawbench: 不支持的平台 ${process.platform}-${process.arch}`);
   process.exit(1);
 }
 
-const binName = platform === "win32" ? "clawbench.exe" : "clawbench";
+const { pkg } = resolved;
+const binName = resolveBinName(process.platform);
 
 let binPath;
 if (process.env.CLAWBENCH_BINARY_PATH) {

package/bin/platform.js

@@ -0,0 +1,32 @@
+// Platform → npm package resolution for the @xulongzhe/clawbench platform
+// binaries. Kept as a pure module (no side effects) so it can be unit tested
+// independently of the launcher's spawn logic.
+
+export const PLATFORM_MAP = {
+  "linux-x64": "@xulongzhe/clawbench-linux-x64",
+  "linux-arm64": "@xulongzhe/clawbench-linux-arm64",
+  "android-arm64": "@xulongzhe/clawbench-android-arm64",
+  "darwin-x64": "@xulongzhe/clawbench-darwin-x64",
+  "darwin-arm64": "@xulongzhe/clawbench-darwin-arm64",
+  "win32-x64": "@xulongzhe/clawbench-win32-x64",
+};
+
+// Termux 上报 process.platform === "android"，它运行在 Android 之上，
+// 只接受 PIE（e_type 3 / ET_DYN）的可执行文件。linux-arm64 二进制是
+// 非 PIE（e_type 2 / ET_EXEC），无法在 Android 上执行，因此 android
+// 必须单独映射到 GOOS=android 编译的 PIE 包，而不是复用 linux。
+export function resolvePlatformKey(platform, arch) {
+  return `${platform}-${arch}`;
+}
+
+// Returns { key, pkg } for a supported platform/arch, or null if unsupported.
+export function resolvePlatformPackage(platform, arch) {
+  const key = resolvePlatformKey(platform, arch);
+  const pkg = PLATFORM_MAP[key];
+  if (!pkg) return null;
+  return { key, pkg };
+}
+
+export function resolveBinName(platform) {
+  return platform === "win32" ? "clawbench.exe" : "clawbench";
+}

package/bin/platform.test.js

@@ -0,0 +1,55 @@
+import { describe, it, expect } from 'vitest'
+import {
+  PLATFORM_MAP,
+  resolvePlatformPackage,
+  resolveBinName,
+} from './platform.js'
+
+describe('resolvePlatformPackage', () => {
+  it('maps android/arm64 to the PIE android binary package', () => {
+    expect(resolvePlatformPackage('android', 'arm64')).toEqual({
+      key: 'android-arm64',
+      pkg: '@xulongzhe/clawbench-android-arm64',
+    })
+  })
+
+  it('keeps linux/arm64 mapped to the linux-arm64 package', () => {
+    expect(resolvePlatformPackage('linux', 'arm64')).toEqual({
+      key: 'linux-arm64',
+      pkg: '@xulongzhe/clawbench-linux-arm64',
+    })
+  })
+
+  it('maps darwin/arm64 and linux/x64 to their packages', () => {
+    expect(resolvePlatformPackage('darwin', 'arm64').pkg).toBe('@xulongzhe/clawbench-darwin-arm64')
+    expect(resolvePlatformPackage('linux', 'x64').pkg).toBe('@xulongzhe/clawbench-linux-x64')
+  })
+
+  it('maps win32/x64 to the win32 package', () => {
+    expect(resolvePlatformPackage('win32', 'x64').pkg).toBe('@xulongzhe/clawbench-win32-x64')
+  })
+
+  it('returns null for unsupported platform/arch combos', () => {
+    expect(resolvePlatformPackage('win32', 'ia32')).toBeNull()
+    expect(resolvePlatformPackage('freebsd', 'x64')).toBeNull()
+    expect(resolvePlatformPackage('android', 'x64')).toBeNull()
+  })
+})
+
+describe('resolveBinName', () => {
+  it('uses clawbench.exe for win32', () => {
+    expect(resolveBinName('win32')).toBe('clawbench.exe')
+  })
+
+  it('uses the plain name for every other platform including android', () => {
+    expect(resolveBinName('android')).toBe('clawbench')
+    expect(resolveBinName('linux')).toBe('clawbench')
+    expect(resolveBinName('darwin')).toBe('clawbench')
+  })
+})
+
+describe('PLATFORM_MAP', () => {
+  it('contains an android-arm64 entry so Termux selects the PIE binary', () => {
+    expect(PLATFORM_MAP['android-arm64']).toBe('@xulongzhe/clawbench-android-arm64')
+  })
+})

package/install.js

@@ -5,30 +5,20 @@ import { readFileSync } from "fs";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { createRequire } from "module";
+import { resolvePlatformPackage } from "./bin/platform.js";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const require = createRequire(import.meta.url);
 
-const PLATFORM_MAP = {
-  "linux-x64": "@xulongzhe/clawbench-linux-x64",
-  "linux-arm64": "@xulongzhe/clawbench-linux-arm64",
-  "darwin-x64": "@xulongzhe/clawbench-darwin-x64",
-  "darwin-arm64": "@xulongzhe/clawbench-darwin-arm64",
-  "win32-x64": "@xulongzhe/clawbench-win32-x64",
-};
+const resolved = resolvePlatformPackage(process.platform, process.arch);
 
-// Termux 上报 process.platform === "android"，但它运行的是 Linux 用户态，
-// 其中 linux-arm64 的 Go 二进制可以直接执行，因此归一化到 linux。
-const platform = process.platform === "android" ? "linux" : process.platform;
-
-const key = `${platform}-${process.arch}`;
-const pkg = PLATFORM_MAP[key];
-
-if (!pkg) {
+if (!resolved) {
   // 不支持的平台，静默跳过
   process.exit(0);
 }
 
+const { pkg } = resolved;
+
 // 检查平台包是否已通过 optionalDependencies 安装
 try {
   require.resolve(`${pkg}/package.json`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xulongzhe/clawbench",
-  "version": "0.79.0",
+  "version": "0.81.0",
   "description": "Mobile-first AI workstation — Go backend + Vue3 frontend",
   "type": "module",
   "bin": {
@@ -14,12 +14,12 @@
     "postinstall": "node install.js"
   },
   "optionalDependencies": {
-    "@xulongzhe/clawbench-linux-x64": "0.79.0",
-    "@xulongzhe/clawbench-linux-arm64": "0.79.0",
-    "@xulongzhe/clawbench-android-arm64": "0.79.0",
-    "@xulongzhe/clawbench-darwin-x64": "0.79.0",
-    "@xulongzhe/clawbench-darwin-arm64": "0.79.0",
-    "@xulongzhe/clawbench-win32-x64": "0.79.0"
+    "@xulongzhe/clawbench-linux-x64": "0.81.0",
+    "@xulongzhe/clawbench-linux-arm64": "0.81.0",
+    "@xulongzhe/clawbench-android-arm64": "0.81.0",
+    "@xulongzhe/clawbench-darwin-x64": "0.81.0",
+    "@xulongzhe/clawbench-darwin-arm64": "0.81.0",
+    "@xulongzhe/clawbench-win32-x64": "0.81.0"
   },
   "engines": {
     "node": ">=14"