jbs-client 0.0.1 → 0.0.5

package/README.md

@@ -1,61 +1,14 @@
 # jbs-client
 
-`jbs-client` is the CLI client for [JVMByteSwapTool](https://github.com/sunwu51/JVMByteSwapTool).
+Prebuilt OpenTUI CLI distribution package.
 
-It is built with OpenTUI and connects to the JVMByteSwapTool WebSocket service by default.
+This package is intended to be published together with platform-specific packages:
 
-## Install
+- `jbs-client-windows-x64`
+- `jbs-client-windows-arm64`
+- `jbs-client-linux-x64`
+- `jbs-client-linux-arm64`
+- `jbs-client-darwin-x64`
+- `jbs-client-darwin-arm64`
 
-```bash
-npm i -g jbs-client
-```
-
-## Run
-
-```bash
-jbs-client
-```
-
-By default, the client connects to:
-
-```text
-ws://localhost:18000
-```
-
-## Options
-
-```bash
-jbs-client --host localhost --ws_port 18000 --connect true
-```
-
-Supported startup parameters:
-
-- `--host <host>`: WebSocket host, default is `localhost`
-- `--ws_port <port>`: WebSocket port, default is `18000`
-- `--connect <true|false>`: whether to connect to the backend on startup, default is `true`
-
-Examples:
-
-```bash
-jbs-client --host 192.168.1.10 --ws_port 18000
-```
-
-```bash
-jbs-client --connect false
-```
-
-When `--connect false` is used, the UI starts without opening the backend WebSocket connection. You can edit the WebSocket URL inside the TUI and reconnect manually.
-
-## Keyboard
-
-- `Ctrl+C`: exit the client
-- `Tab` / `Shift+Tab`: switch focus
-- `Up` / `Down`: change selected action in the menu
-- `Enter`: open an action or submit the current form
-- `Esc`: return from the form view to the main menu
-
-## Release Build
-
-This repository publishes prebuilt binaries through GitHub Releases and npm wrapper packages.
-
-Pushing a tag like `v0.0.1` triggers the release workflow, builds all supported platforms, zips each platform binary, and uploads them to the corresponding GitHub Release.
+Publish the platform packages first, then publish the root `jbs-client` wrapper package.

package/bin/jbs-client.js

@@ -0,0 +1,71 @@
+#!/usr/bin/env node
+
+const childProcess = require("child_process");
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+
+function run(target) {
+  const result = childProcess.spawnSync(target, process.argv.slice(2), {
+    stdio: "inherit",
+    shell: false,
+  });
+  if (result.error) {
+    console.error(result.error.message);
+    process.exit(1);
+  }
+  process.exit(typeof result.status === "number" ? result.status : 0);
+}
+
+const envPath = process.env.JBS_CLIENT_BIN_PATH;
+if (envPath) {
+  run(envPath);
+}
+
+const scriptPath = fs.realpathSync(__filename);
+const scriptDir = path.dirname(scriptPath);
+const cached = path.join(scriptDir, ".jbs-client");
+if (fs.existsSync(cached)) {
+  run(cached);
+}
+
+const platformMap = {
+  darwin: "darwin",
+  linux: "linux",
+  win32: "windows",
+};
+const archMap = {
+  x64: "x64",
+  arm64: "arm64",
+};
+
+const platform = platformMap[os.platform()] || os.platform();
+const arch = archMap[os.arch()] || os.arch();
+const packageName = `jbs-client-${platform}-${arch}`;
+const binaryName = platform === "windows" ? "jbs-client.exe" : "jbs-client";
+
+function findBinary(startDir) {
+  let current = startDir;
+  for (;;) {
+    const modules = path.join(current, "node_modules");
+    if (fs.existsSync(modules)) {
+      const candidate = path.join(modules, packageName, "bin", binaryName);
+      if (fs.existsSync(candidate)) {
+        return candidate;
+      }
+    }
+    const parent = path.dirname(current);
+    if (parent === current) {
+      return undefined;
+    }
+    current = parent;
+  }
+}
+
+const resolved = findBinary(scriptDir);
+if (!resolved) {
+  console.error(`Unable to find installed binary package "${packageName}".`);
+  process.exit(1);
+}
+
+run(resolved);

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "jbs-client",
-  "version": "0.0.1",
-  "type": "module",
-  "scripts": {
-    "start": "bun run src/index.tsx",
-    "dev": "bun --watch run src/index.tsx",
-    "test": "bun test",
-    "build": "bun run build.ts",
-    "build:npm": "bun run build.ts"
+  "version": "0.0.5",
+  "description": "JBS Client terminal UI powered by OpenTUI",
+  "license": "UNLICENSED",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sunwu51/jbs-client-opentui.git"
   },
-  "dependencies": {
-    "@opentui/core": "0.1.97",
-    "@opentui/react": "^0.1.97",
-    "react": "^19.2.0"
+  "bin": "./bin/jbs-client.js",
+  "scripts": {
+    "postinstall": "node ./postinstall.mjs"
   },
-  "devDependencies": {
-    "@types/bun": "^1.2.20",
-    "@types/react": "^19.1.11",
-    "typescript": "^5.9.2"
+  "optionalDependencies": {
+    "jbs-client-windows-x64": "0.0.5",
+    "jbs-client-windows-arm64": "0.0.5",
+    "jbs-client-linux-x64": "0.0.5",
+    "jbs-client-linux-arm64": "0.0.5",
+    "jbs-client-darwin-x64": "0.0.5",
+    "jbs-client-darwin-arm64": "0.0.5"
   }
 }

package/.github/workflows/release.yml

@@ -1,54 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - "v*"
-
-permissions:
-  contents: write
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: latest
-
-      - name: Install Dependencies
-        run: bun install
-
-      - name: Build Packages
-        run: bun run build
-
-      - name: Prepare Release Assets
-        shell: bash
-        run: |
-          set -euo pipefail
-          mkdir -p release-assets
-
-          while IFS= read -r dir; do
-            name="$(basename "$dir")"
-            if [ "$name" = "jbs-client" ]; then
-              continue
-            fi
-
-            (
-              cd "$dir/bin"
-              zip -r "../../../release-assets/${name}.zip" .
-            )
-          done < <(find dist/npm -mindepth 1 -maxdepth 1 -type d | sort)
-
-          ls -lah release-assets
-
-      - name: Upload Release Assets
-        uses: softprops/action-gh-release@v2
-        with:
-          files: release-assets/*.zip
-          generate_release_notes: true

package/build.ts

@@ -1,162 +0,0 @@
-import { cp, mkdir, rm, writeFile } from "node:fs/promises";
-import { basename, join, resolve } from "node:path";
-import { $ } from "bun";
-import packageJson from "./package.json" with { type: "json" };
-
-const entrypoint = "./src/index.tsx";
-const outdir = "dist";
-const npmOutdir = join(outdir, "npm");
-const rootPackageName = "jbs-client";
-const templateDir = "scripts/npm";
-const projectRoot = resolve(".");
-
-const targets = [
-  { target: "bun-windows-x64", os: "win32", cpu: "x64" },
-  { target: "bun-windows-arm64", os: "win32", cpu: "arm64" },
-  { target: "bun-linux-x64", os: "linux", cpu: "x64" },
-  { target: "bun-linux-arm64", os: "linux", cpu: "arm64" },
-  { target: "bun-darwin-x64", os: "darwin", cpu: "x64" },
-  { target: "bun-darwin-arm64", os: "darwin", cpu: "arm64" }
-] satisfies Array<{
-  target: Bun.Build.CompileTarget;
-  os: "win32" | "linux" | "darwin";
-  cpu: "x64" | "arm64";
-}>;
-
-function platformLabel(os: string) {
-  return os === "win32" ? "windows" : os;
-}
-
-function binaryName(os: string) {
-  return os === "win32" ? `${rootPackageName}.exe` : rootPackageName;
-}
-
-function packageNameForTarget(os: string, cpu: string) {
-  return `${rootPackageName}-${platformLabel(os)}-${cpu}`;
-}
-
-function createRootPackageJson() {
-  const optionalDependencies = Object.fromEntries(
-    targets.map((item) => [packageNameForTarget(item.os, item.cpu), packageJson.version])
-  );
-
-  return {
-    name: rootPackageName,
-    version: packageJson.version,
-    description: "JBS Client terminal UI powered by OpenTUI",
-    license: "UNLICENSED",
-    bin: {
-      [rootPackageName]: "./bin/jbs-client"
-    },
-    scripts: {
-      postinstall: "node ./postinstall.mjs"
-    },
-    optionalDependencies
-  };
-}
-
-function createPlatformPackageJson(name: string, os: string, cpu: string, bin: string) {
-  return {
-    name,
-    version: packageJson.version,
-    description: "Prebuilt binary for JBS Client OpenTUI",
-    license: "UNLICENSED",
-    os: [os],
-    cpu: [cpu],
-    preferUnplugged: true,
-    bin: {
-      [rootPackageName]: `./bin/${bin}`
-    }
-  };
-}
-
-async function installCrossPlatformNativeDependencies() {
-  if (process.env.SKIP_CROSS_PLATFORM_INSTALL === "1") {
-    console.log("Skipping cross-platform native dependency install");
-    return;
-  }
-
-  const opentuiCoreVersion = packageJson.dependencies["@opentui/core"];
-
-  if (!opentuiCoreVersion) {
-    throw new Error("Missing @opentui/core dependency");
-  }
-
-  console.log(`Installing cross-platform OpenTUI native packages (${opentuiCoreVersion})`);
-  try {
-    await $`bun install --os="*" --cpu="*" ${`@opentui/core@${opentuiCoreVersion}`}`.cwd(projectRoot);
-  } catch (error) {
-    throw new Error(
-      `Failed to install cross-platform OpenTUI packages. Run 'bun install --os="*" --cpu="*" @opentui/core@${opentuiCoreVersion}' manually or set SKIP_CROSS_PLATFORM_INSTALL=1 if dependencies are already present.`,
-      { cause: error }
-    );
-  }
-}
-
-async function copyTemplates() {
-  const rootPublishDir = join(npmOutdir, rootPackageName);
-  await mkdir(join(rootPublishDir, "bin"), { recursive: true });
-  await cp(join(templateDir, "bin", "jbs-client"), join(rootPublishDir, "bin", "jbs-client"));
-  await cp(join(templateDir, "postinstall.mjs"), join(rootPublishDir, "postinstall.mjs"));
-  await cp(join(templateDir, "README.md"), join(rootPublishDir, "README.md"));
-  await writeFile(join(rootPublishDir, "package.json"), `${JSON.stringify(createRootPackageJson(), null, 2)}\n`);
-}
-
-async function buildTarget(item: (typeof targets)[number]) {
-  const packageName = packageNameForTarget(item.os, item.cpu);
-  const packageDir = join(npmOutdir, packageName);
-  const binDir = join(packageDir, "bin");
-  const outputFile = join(binDir, binaryName(item.os));
-
-  console.log(`Building ${item.target} -> ${outputFile}`);
-  await mkdir(binDir, { recursive: true });
-
-  const result = await Bun.build({
-    entrypoints: [entrypoint],
-    root: projectRoot,
-    target: "bun",
-    minify: true,
-    tsconfig: "./tsconfig.json",
-    compile: {
-      autoloadBunfig: false,
-      autoloadDotenv: false,
-      autoloadPackageJson: false,
-      autoloadTsconfig: false,
-      target: item.target,
-      outfile: outputFile
-    }
-  });
-
-  if (!result.success) {
-    for (const log of result.logs) {
-      console.error(log);
-    }
-    throw new Error(`Build failed for ${item.target}`);
-  }
-
-  await writeFile(
-    join(packageDir, "package.json"),
-    `${JSON.stringify(createPlatformPackageJson(packageName, item.os, item.cpu, basename(outputFile)), null, 2)}\n`
-  );
-  await cp(join(templateDir, "README.md"), join(packageDir, "README.md"));
-}
-
-async function main() {
-  await installCrossPlatformNativeDependencies();
-  await rm(resolve(outdir), { recursive: true, force: true });
-  await mkdir(npmOutdir, { recursive: true });
-
-  await copyTemplates();
-
-  for (const target of targets) {
-    await buildTarget(target);
-  }
-
-  console.log(`Publish root package from ${join(npmOutdir, rootPackageName)}`);
-  console.log("Publish platform packages first, then publish the root wrapper package.");
-}
-
-void main().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});