@rainbow-robotics/muscat-plugin-kit 0.1.2-dev.39 → 0.1.2-dev.40

package/cli/bundle-templates.mjs

@@ -6,19 +6,19 @@ import { resolve, relative } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const root = resolve(fileURLToPath(import.meta.url), "..");
-const templatesDir = resolve(root, "templates");
 const out = resolve(root, "src/templates-embedded.mjs");
 
 const files = {};
-function walk(dir) {
-  for (const name of readdirSync(dir)) {
-    const full = resolve(dir, name);
-    if (statSync(full).isDirectory()) { walk(full); continue; }
-    const key = relative(templatesDir, full);
+function walk(baseDir, prefix) {
+  for (const name of readdirSync(baseDir)) {
+    const full = resolve(baseDir, name);
+    const key = prefix + name;
+    if (statSync(full).isDirectory()) { walk(full + "/", key + "/"); continue; }
     files[key] = readFileSync(full, "base64");
   }
 }
-walk(templatesDir);
+walk(resolve(root, "templates") + "/", "");
+walk(resolve(root, "docker") + "/", "docker/");
 
 writeFileSync(out,
   `// AUTO-GENERATED by cli/bundle-templates.mjs — do not edit.\n` +

package/cli/src/build.mjs

@@ -17,11 +17,13 @@ import { execSync, spawnSync } from "node:child_process";
 import { ensureDocker, findPluginRoot, hasBin, humanSize, log, parseArgs } from "./util.mjs";
 import { assertManifest, manifestRuntime } from "./manifest.mjs";
 
-// Find a usable node binary (for running vite as subprocess).
-function findNodeBin() {
-  if (typeof Bun === "undefined") return process.execPath; // already node
-  for (const c of ["node", "node20", "node18"]) {
-    if (hasBin(c)) return c;
+// Find a usable JS runtime for running vite as a subprocess.
+// In binary (Bun) mode, try `bun` first (it can run vite directly), then node.
+// In node mode, use the current process.
+function findJsRuntime() {
+  if (typeof Bun === "undefined") return { bin: process.execPath, isBun: false };
+  for (const c of ["bun", "node", "node20", "node18"]) {
+    if (hasBin(c)) return { bin: c, isBun: c === "bun" };
   }
   return null;
 }
@@ -37,21 +39,30 @@ function findViteBin(pluginRoot) {
   }
 }
 
-// Run vite build in the plugin project.
-// Returns true on success, false if vite/node not available.
+// Run vite build in the plugin project. Throws if runtime or vite not found.
 function runViteBuild(pluginRoot, { mode = "production" } = {}) {
-  const node = findNodeBin();
-  if (!node) return false;
+  const runtime = findJsRuntime();
+  if (!runtime) {
+    throw new Error(
+      "Node.js 20+ (or Bun) is required to build the plugin UI.\n" +
+      "  Install Node.js: https://nodejs.org\n" +
+      "  Then run: npm install  (inside the plugin directory)",
+    );
+  }
   const viteBin = findViteBin(pluginRoot);
-  if (!viteBin || !existsSync(viteBin)) return false;
+  if (!viteBin || !existsSync(viteBin)) {
+    throw new Error(
+      "vite not found in this plugin's node_modules.\n" +
+      `  Run: npm install  (inside ${pluginRoot})`,
+    );
+  }
 
   log.step(`vite build (mode: ${mode})`);
-  const r = spawnSync(node, [viteBin, "build", "--mode", mode], {
-    cwd: pluginRoot,
-    stdio: "inherit",
-  });
+  // bun can run vite directly; node needs the explicit bin path
+  const args = runtime.isBun ? ["run", viteBin, "build", "--mode", mode]
+                              : [viteBin, "build", "--mode", mode];
+  const r = spawnSync(runtime.bin, args, { cwd: pluginRoot, stdio: "inherit" });
   if (r.status !== 0) throw new Error("vite build failed");
-  return true;
 }
 
 function isMainBranch() {
@@ -82,13 +93,13 @@ export async function exportRos2Build(root, archs = ["amd64", "arm64"]) {
       const dockerPlatform = ARCH_DOCKER_PLATFORM[arch];
       if (!dockerPlatform) { log.warn(`unknown arch '${arch}' — skipped`); continue; }
       const archImage = `${ROS2_DEV_IMAGE}-${arch}`;
-      ensureImage(archImage, { platform: dockerPlatform });
+      await ensureImage(archImage, { platform: dockerPlatform });
       colconBuild(root, { symlink: false, arch });
       log.ok(`dist/ros2_ws/install-${arch}/ ready`);
     }
   } else {
     // rclpy / pure Python: arch-agnostic, build once
-    ensureImage();
+    await ensureImage();
     colconBuild(root, { symlink: false });
     log.ok("dist/ros2_ws/install/ ready");
   }
@@ -119,7 +130,7 @@ export async function exportCppBuild(root, distDir, archs = ["amd64", "arm64"])
     const dockerPlatform = ARCH_DOCKER_PLATFORM[arch];
     if (!dockerPlatform) { log.warn(`unknown arch '${arch}' — skipped`); continue; }
     const archImage = `${CPP_DEV_IMAGE}-${arch}`;
-    ensureImage(archImage, { platform: dockerPlatform });
+    await ensureImage(archImage, { platform: dockerPlatform });
     cmakeBuild(root, { buildType: "Release", arch });
     const buildDir = `cpp/build-${arch}`;
     const built = resolve(root, buildDir, entry);
@@ -233,9 +244,12 @@ export async function buildPlugin({ root, minify = false } = {}) {
   rmSync(distDir, { recursive: true, force: true });
   mkdirSync(distDir, { recursive: true });
 
-  const viteOk = runViteBuild(pluginRoot, { mode: minify ? "production" : "development" });
-  if (!viteOk) {
-    log.warn("vite not found — UI bundle skipped. Install Node.js and run: npm install");
+  const manifest = JSON.parse(readFileSync(resolve(pluginRoot, "manifest.json"), "utf8"));
+  const contributesUi = (manifest.contributes ?? []).some((c) => c.ui);
+  const uiDir = resolve(pluginRoot, "ui");
+  const hasUiFiles = existsSync(uiDir) && readdirSync(uiDir).some((f) => /\.[tj]sx?$/.test(f));
+  if (contributesUi || hasUiFiles) {
+    runViteBuild(pluginRoot, { mode: minify ? "production" : "development" });
   }
 
   // Stage distribution files.
@@ -417,7 +431,7 @@ export async function runBuild(args) {
     if (needsLock) {
       const { lockAndVendor } = await import("./python.mjs");
       try {
-        lockAndVendor(pluginRoot, archs);
+        await lockAndVendor(pluginRoot, archs);
       } catch (e) {
         log.warn(`python lock/vendor skipped: ${e.message}`);
       }

package/cli/src/cpp.mjs

@@ -2,31 +2,25 @@
 // Matches the robot OS so the compiled binary is relocatable to the robot.
 // Used by dev:back (interactive dev loop) and build (export the binary into the ZIP).
 import { spawnSync } from "node:child_process";
-import { existsSync } from "node:fs";
-import { dirname, resolve } from "node:path";
-import { hasBin, kitRoot, log, pruneMuskatImages } from "./util.mjs";
+import { dirname } from "node:path";
+import { hasBin, log, pruneMuskatImages, resolveDockerfile } from "./util.mjs";
 
 export const CPP_DEV_IMAGE = "muscat-pk-cpp-dev";
 
-// Dockerfile lives inside the kit — plugin authors never see or edit it.
-const DOCKERFILE = resolve(kitRoot, "cli/docker/Dockerfile.cpp");
-
 export function assertDockerReady() {
   if (!hasBin("docker")) {
     throw new Error("Docker not found. C++ builds need Docker (Ubuntu 24.04 + cmake container).");
   }
-  if (!existsSync(DOCKERFILE)) {
-    throw new Error(`kit Dockerfile missing at ${DOCKERFILE} (reinstall muscat-plugin-kit).`);
-  }
 }
 
 /** Build the dev image from the kit's bundled Dockerfile (Docker layer-caches). */
-export function ensureImage(image = CPP_DEV_IMAGE, { platform = null } = {}) {
+export async function ensureImage(image = CPP_DEV_IMAGE, { platform = null } = {}) {
+  const dockerfile = await resolveDockerfile("Dockerfile.cpp");
   log.step(`docker build -t ${image}${platform ? ` (${platform})` : ""} (first run is slow, then cached)…`);
   const platformFlags = platform ? ["--platform", platform] : [];
   const r = spawnSync(
     "docker",
-    ["build", ...platformFlags, "-t", image, "-f", DOCKERFILE, dirname(DOCKERFILE)],
+    ["build", ...platformFlags, "-t", image, "-f", dockerfile, dirname(dockerfile)],
     { stdio: "inherit" },
   );
   if (r.status !== 0) throw new Error("docker build failed.");

package/cli/src/devBack.mjs

@@ -33,9 +33,9 @@ import {
 // Runs in a warm Ubuntu 24.04 + Python 3.12 container (matches the robot).
 // Under `muscat-pk dev`, it shares the bridge container's netns, so the SDK
 // reaches the Socket.IO bridge at the default localhost:10000.
-function runPython(root) {
+async function runPython(root) {
   pyAssertDockerReady();
-  pyEnsureImage();
+  await pyEnsureImage();
 
   const manifest = readManifest(root);
   const pluginId = manifest.id ?? "";
@@ -94,12 +94,12 @@ function runPython(root) {
 }
 
 // ── ros2 ───────────────────────────────────────────────────────────────────────
-function runRos2(root) {
+async function runRos2(root) {
   assertDockerReady();
   const pkg = ros2PackageName(root);
   if (!pkg) throw new Error("no ROS2 package found under ros2_ws/src.");
 
-  ensureImage();
+  await ensureImage();
 
   const manifest = readManifest(root);
   const pluginId = manifest.id ?? "";
@@ -167,13 +167,13 @@ function runRos2(root) {
 }
 
 // ── cpp ──────────────────────────────────────────────────────────────────────
-function runCpp(root) {
+async function runCpp(root) {
   cppAssertDockerReady();
   const manifest = readManifest(root);
   const entry = manifest.runtime?.entry;
   if (!entry) throw new Error("runtime.entry (the built executable name) is required for cpp.");
 
-  cppEnsureImage();
+  await cppEnsureImage();
 
   const pluginId = manifest.id ?? "";
   const container = `${CPP_DEV_IMAGE}-run`;
@@ -245,7 +245,7 @@ export async function runDevBack() {
   const root = findPluginRoot();
   warnManifest(root);
   const type = manifestRuntime(root);
-  if (type === "ros2") return runRos2(root);
-  if (type === "cpp") return runCpp(root);
-  return runPython(root);
+  if (type === "ros2") return await runRos2(root);
+  if (type === "cpp") return await runCpp(root);
+  return await runPython(root);
 }

package/cli/src/python.mjs

@@ -2,30 +2,25 @@
 // Used by dev:back (hot-reload) and build (lock + wheel vendor).
 import { spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
-import { dirname, resolve } from "node:path";
-import { hasBin, kitRoot, log, pruneMuskatImages } from "./util.mjs";
+import { dirname } from "node:path";
+import { hasBin, log, pruneMuskatImages, resolveDockerfile } from "./util.mjs";
 
 export const PYTHON_DEV_IMAGE = "muscat-pk-python-dev";
 
-// Dockerfile lives inside the kit — plugin authors never see or edit it.
-const DOCKERFILE = resolve(kitRoot, "cli/docker/Dockerfile.python");
-
 export function assertDockerReady() {
   if (!hasBin("docker")) {
     throw new Error("Docker not found. The Python backend runs in a container (Ubuntu 24.04 + Python 3.12).");
   }
-  if (!existsSync(DOCKERFILE)) {
-    throw new Error(`kit Dockerfile missing at ${DOCKERFILE} (reinstall muscat-plugin-kit).`);
-  }
 }
 
 /** Build the dev image from the kit's bundled Dockerfile (Docker layer-caches). */
-export function ensureImage(image = PYTHON_DEV_IMAGE, { platform = null } = {}) {
+export async function ensureImage(image = PYTHON_DEV_IMAGE, { platform = null } = {}) {
+  const dockerfile = await resolveDockerfile("Dockerfile.python");
   log.step(`docker build -t ${image}${platform ? ` (${platform})` : ""} (first run is slow, then cached)…`);
   const platformFlags = platform ? ["--platform", platform] : [];
   const r = spawnSync(
     "docker",
-    ["build", ...platformFlags, "-t", image, "-f", DOCKERFILE, dirname(DOCKERFILE)],
+    ["build", ...platformFlags, "-t", image, "-f", dockerfile, dirname(dockerfile)],
     { stdio: "inherit" },
   );
   if (r.status !== 0) throw new Error("docker build failed.");
@@ -47,14 +42,14 @@ const ARCH_DOCKER_PLATFORM = {
  * none-any 휠은 pip이 두 번째 arch에서 자동 skip → 중복 없음.
  * requirements.txt 없으면 조용히 건너뜀.
  */
-export function lockAndVendor(pluginRoot, archs = ["x86_64", "aarch64"]) {
+export async function lockAndVendor(pluginRoot, archs = ["x86_64", "aarch64"]) {
   const reqTxt = resolve(pluginRoot, "requirements.txt");
   if (!existsSync(reqTxt)) {
     log.warn("requirements.txt not found — lock/vendor skipped");
     return;
   }
 
-  ensureImage();
+  await ensureImage();
 
   log.step("generating lock (uv pip compile)…");
   const lockResult = spawnSync(
@@ -82,7 +77,7 @@ export function lockAndVendor(pluginRoot, archs = ["x86_64", "aarch64"]) {
     }
     // arch별 이미지 빌드 (--platform 지정) → pip이 glibc+arch 자동 감지 → 올바른 휠 선택.
     const archImage = `${PYTHON_DEV_IMAGE}-${arch}`;
-    ensureImage(archImage, { platform: dockerPlatform });
+    await ensureImage(archImage, { platform: dockerPlatform });
 
     log.step(`vendoring wheels for ${arch} (${dockerPlatform})…`);
     // 패키지별 개별 download로 private/미공개 패키지 실패 시에도 나머지 계속 진행.

package/cli/src/ros2.mjs

@@ -3,14 +3,10 @@
 import { spawnSync } from "node:child_process";
 import { existsSync, readdirSync } from "node:fs";
 import { dirname, resolve } from "node:path";
-import { hasBin, kitRoot, log, pruneMuskatImages } from "./util.mjs";
+import { hasBin, log, pruneMuskatImages, resolveDockerfile } from "./util.mjs";
 
 export const ROS2_DEV_IMAGE = "muscat-pk-ros2-dev";
 
-// Dockerfile lives inside the kit — plugin authors never see or edit it.
-// It has no COPY/ADD, so the build context is irrelevant (its own dir is used).
-const DOCKERFILE = resolve(kitRoot, "cli/docker/Dockerfile.dev");
-
 /** First package directory under ros2_ws/src (the colcon package name). */
 export function ros2PackageName(root) {
   const srcDir = resolve(root, "ros2_ws/src");
@@ -25,9 +21,6 @@ export function assertDockerReady() {
   if (!hasBin("docker")) {
     throw new Error("Docker not found. ROS2 needs Docker (Jazzy + Python 3.12 container).");
   }
-  if (!existsSync(DOCKERFILE)) {
-    throw new Error(`kit Dockerfile missing at ${DOCKERFILE} (reinstall muscat-plugin-kit).`);
-  }
 }
 
 export const ARCH_DOCKER_PLATFORM = {
@@ -36,12 +29,13 @@ export const ARCH_DOCKER_PLATFORM = {
 };
 
 /** Build the dev image from the kit's bundled Dockerfile (Docker layer-caches). */
-export function ensureImage(image = ROS2_DEV_IMAGE, { platform = null } = {}) {
+export async function ensureImage(image = ROS2_DEV_IMAGE, { platform = null } = {}) {
+  const dockerfile = await resolveDockerfile("Dockerfile.dev");
   log.step(`docker build -t ${image}${platform ? ` (${platform})` : ""} (first run is slow, then cached)…`);
   const platformFlags = platform ? ["--platform", platform] : [];
   const r = spawnSync(
     "docker",
-    ["build", ...platformFlags, "-t", image, "-f", DOCKERFILE, dirname(DOCKERFILE)],
+    ["build", ...platformFlags, "-t", image, "-f", dockerfile, dirname(dockerfile)],
     { stdio: "inherit" },
   );
   if (r.status !== 0) throw new Error("docker build failed.");

package/cli/src/util.mjs

@@ -1,7 +1,8 @@
 // Shared helpers for muscat-pk.
 import { spawnSync } from "node:child_process";
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
+import { tmpdir } from "node:os";
 import { fileURLToPath } from "node:url";
 import { createInterface } from "node:readline/promises";
 
@@ -129,6 +130,24 @@ export function humanSize(bytes) {
   return `${(bytes / (1024 * 1024)).toFixed(2)} MB`;
 }
 
+/**
+ * Return the on-disk path of a bundled Dockerfile.
+ * In npm-install mode the real file exists under cli/docker/.
+ * In compiled-binary mode it doesn't — extract from the embedded snapshot to tmpdir.
+ */
+export async function resolveDockerfile(name) {
+  const real = resolve(kitRoot, "cli/docker", name);
+  if (existsSync(real)) return real;
+  const { TEMPLATES } = await import("./templates-embedded.mjs");
+  const b64 = TEMPLATES[`docker/${name}`];
+  if (!b64) throw new Error(`Embedded Dockerfile missing: docker/${name}. Reinstall muscat-plugin-kit.`);
+  const dir = resolve(tmpdir(), "muscat-pk-docker");
+  mkdirSync(dir, { recursive: true });
+  const tmp = resolve(dir, name);
+  writeFileSync(tmp, Buffer.from(b64, "base64"));
+  return tmp;
+}
+
 /** This kit's installed version (from its package.json). */
 export function kitVersion() {
   try {
@@ -178,8 +197,8 @@ export async function checkKitUpdate({ timeoutMs = 2000 } = {}) {
         [
           "",
           line,
-          `  muscat-plugin-kit 새 버전이 있습니다: ${current} → ${latest}`,
-          `  업데이트:  muscat-pk update`,
+          `  muscat-plugin-kit update available: ${current} → ${latest}`,
+          `  Update:  muscat-pk update`,
           line,
           "",
         ].join("\n"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rainbow-robotics/muscat-plugin-kit",
-  "version": "0.1.2-dev.39",
+  "version": "0.1.2-dev.40",
   "type": "module",
   "engines": {
     "node": ">=20"
@@ -31,7 +31,7 @@
     "@types/react-dom": "^19.0.4"
   },
   "dependencies": {
-    "@rainbow-robotics/preview-host": "0.1.2-dev.39",
+    "@rainbow-robotics/preview-host": "0.1.2-dev.40",
     "socket.io": "^4.8.1"
   },
   "optionalDependencies": {