@rainbow-robotics/muscat-plugin-kit 1.3.6-dev.0 → 1.3.6-dev.2

package/cli/bin/muscat-pk.mjs

@@ -35,6 +35,11 @@ function readVersion(binPath) {
 
 const isBinaryMode = typeof Bun !== "undefined";
 
+// 바이너리에는 package.json 이 없다 — 컴파일 시 임베드한 버전을 쓴다.
+if (isBinaryMode && !process.env.MUSCAT_PK_VERSION) {
+  process.env.MUSCAT_PK_VERSION = (await import("../src/templates-embedded.mjs")).KIT_VERSION;
+}
+
 (function delegateToLocalInstall() {
   try {
     const localBin = resolveLocalCliBin();

package/cli/bundle-templates.mjs

@@ -2,7 +2,7 @@
 // Pre-build step: serialise cli/templates/** into cli/src/templates-embedded.mjs
 // so that `bun build --compile` can embed them without needing the filesystem.
 import { readdirSync, readFileSync, writeFileSync, statSync } from "node:fs";
-import { resolve, relative } from "node:path";
+import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const root = resolve(fileURLToPath(import.meta.url), "..");
@@ -19,10 +19,15 @@ function walk(baseDir, prefix) {
 }
 walk(resolve(root, "templates") + "/", "");
 walk(resolve(root, "docker") + "/", "docker/");
+// Dockerfile.bridge 의 COPY 대상
+files["src/socketBridge.mjs"] = readFileSync(resolve(root, "src/socketBridge.mjs"), "base64");
+
+const { version } = JSON.parse(readFileSync(resolve(root, "../package.json"), "utf8"));
 
 writeFileSync(out,
   `// AUTO-GENERATED by cli/bundle-templates.mjs — do not edit.\n` +
   `// ponytail: generated at publish time; not tracked in git.\n` +
+  `export const KIT_VERSION = ${JSON.stringify(version)};\n` +
   `export const TEMPLATES = ${JSON.stringify(files)};\n`
 );
 console.log(`bundled ${Object.keys(files).length} template files → src/templates-embedded.mjs`);

package/cli/src/bridge.mjs

@@ -5,8 +5,9 @@
 //     it at localhost:10000 too — no host.docker.internal needed (robust cross-OS).
 import { spawnSync } from "node:child_process";
 import { createServer, connect } from "node:net";
-import { existsSync } from "node:fs";
-import { resolve } from "node:path";
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { dirname, resolve } from "node:path";
 import { canSkipImageBuild, hasBin, kitRoot, log, pruneMuskatImages } from "./util.mjs";
 import { MEDIA_PORTS, mediaPortFlags } from "./ports.mjs";
 import { usesHostNetwork } from "./zenohDev.mjs";
@@ -15,16 +16,30 @@ export const BRIDGE_IMAGE = "muscat-pk-bridge";
 export const BRIDGE_CONTAINER = "muscat-pk-bridge-run";
 export const BRIDGE_PORT = 10000;
 
-const DOCKERFILE = resolve(kitRoot, "cli/docker/Dockerfile.bridge");
-const BUILD_CONTEXT = resolve(kitRoot, "cli");
+// 컴파일된 바이너리에는 cli/ 트리가 없어 임베드 스냅샷에서 build context 를 tmp 에 복원한다.
+const BRIDGE_CONTEXT_FILES = ["docker/Dockerfile.bridge", "docker/bridge-package.json", "src/socketBridge.mjs"];
+
+async function resolveBridgeContext() {
+  const context = resolve(kitRoot, "cli");
+  const dockerfile = resolve(context, "docker/Dockerfile.bridge");
+  if (existsSync(dockerfile)) return { dockerfile, context };
+
+  const { TEMPLATES } = await import("./templates-embedded.mjs");
+  const dir = resolve(tmpdir(), "muscat-pk-bridge-context");
+  for (const key of BRIDGE_CONTEXT_FILES) {
+    const b64 = TEMPLATES[key];
+    if (!b64) throw new Error(`Embedded file missing: ${key}. Reinstall muscat-plugin-kit.`);
+    const file = resolve(dir, key);
+    mkdirSync(dirname(file), { recursive: true });
+    writeFileSync(file, Buffer.from(b64, "base64"));
+  }
+  return { dockerfile: resolve(dir, "docker/Dockerfile.bridge"), context: dir };
+}
 
 function assertDockerReady() {
   if (!hasBin("docker")) {
     throw new Error("Docker not found. `muscat-pk dev` runs the Socket.IO bridge in a container.");
   }
-  if (!existsSync(DOCKERFILE)) {
-    throw new Error(`kit Dockerfile missing at ${DOCKERFILE} (reinstall muscat-plugin-kit).`);
-  }
 }
 
 // Is a host TCP port already bound? (Catches another bridge or a stray process.)
@@ -54,13 +69,14 @@ function waitForPort(port, timeoutMs = 15_000) {
   });
 }
 
-function ensureImage() {
+async function ensureImage() {
   if (canSkipImageBuild(BRIDGE_IMAGE)) {
     log.step(`${BRIDGE_IMAGE} already built — skipping docker build`);
     return;
   }
+  const { dockerfile, context } = await resolveBridgeContext();
   log.step(`docker build -t ${BRIDGE_IMAGE} (first run is slow, then cached)…`);
-  const r = spawnSync("docker", ["build", "-t", BRIDGE_IMAGE, "-f", DOCKERFILE, BUILD_CONTEXT], { stdio: "inherit" });
+  const r = spawnSync("docker", ["build", "-t", BRIDGE_IMAGE, "-f", dockerfile, context], { stdio: "inherit" });
   if (r.status !== 0) throw new Error("docker build failed (bridge image).");
   pruneMuskatImages();
 }
@@ -104,7 +120,7 @@ export async function startBridge({ zenohPort = null, pluginPorts = [] } = {}) {
   const media = mediaBusy.length === 0;
   if (!media) log.warn(`MediaMTX port(s) already in use: ${mediaBusy.join(", ")} — video streaming disabled in dev.`);
 
-  ensureImage();
+  await ensureImage();
 
   log.step("starting Socket.IO bridge container…");
   // The backend joins THIS container's netns (--network container:), and a

package/cli/src/util.mjs

@@ -317,6 +317,7 @@ export async function resolveDockerfile(name) {
 
 /** This kit's installed version (from its package.json). */
 export function kitVersion() {
+  if (process.env.MUSCAT_PK_VERSION) return process.env.MUSCAT_PK_VERSION;
   try {
     return JSON.parse(readFileSync(resolve(kitRoot, "package.json"), "utf8"))
       .version;

package/cli/storybook-dist/project.json

@@ -1 +1 @@
-{"generatedAt":1791426431592,"userSince":1750932757926,"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":false,"hasStorybookEslint":true,"refCount":0,"testPackages":{"@vitest/browser":"3.2.4","@vitest/coverage-v8":"3.2.4","playwright":"1.59.1","vitest":"3.2.4"},"hasRouterPackage":false,"monorepo":"Turborepo","packageManager":{"type":"yarn","version":"berry","agent":"yarn@berry"},"preview":{"usesGlobals":false},"framework":{"name":"@storybook/react-vite","options":{}},"builder":"@storybook/builder-vite","renderer":"@storybook/react","portableStoriesFileCount":0,"applicationFileCount":0,"storybookVersion":"8.6.18","storybookVersionSpecifier":"^8.6.4","language":"typescript","storybookPackages":{"@chromatic-com/storybook":{"version":"3.2.7"},"@storybook/addon-essentials":{"version":"8.6.18"},"@storybook/addon-links":{"version":"8.6.18"},"@storybook/addon-onboarding":{"version":"8.6.18"},"@storybook/addon-themes":{"version":"8.6.18"},"@storybook/blocks":{"version":"8.6.18"},"@storybook/experimental-addon-test":{"version":"8.6.18"},"@storybook/react":{"version":"8.6.18"},"@storybook/react-vite":{"version":"8.6.18"},"@storybook/test":{"version":"8.6.18"},"@storybook/theming":{"version":"8.6.18"},"eslint-plugin-storybook":{"version":"0.11.6"},"storybook":{"version":"8.6.18"},"storybook-addon-react-docgen":{"version":"1.2.44"}},"addons":{"$SNIP/node_modules/@storybook/addon-links":{"version":null},"$SNIP/node_modules/@storybook/addon-essentials":{"version":null},"$SNIP/node_modules/@chromatic-com/storybook":{"version":null},"$SNIP/node_modules/@storybook/addon-themes":{"version":null},"$SNIP/node_modules/@storybook/experimental-addon-test":{"version":null}}}
+{"generatedAt":1791428163529,"userSince":1750932757926,"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":false,"hasStorybookEslint":true,"refCount":0,"testPackages":{"@vitest/browser":"3.2.4","@vitest/coverage-v8":"3.2.4","playwright":"1.59.1","vitest":"3.2.4"},"hasRouterPackage":false,"monorepo":"Turborepo","packageManager":{"type":"yarn","version":"berry","agent":"yarn@berry"},"preview":{"usesGlobals":false},"framework":{"name":"@storybook/react-vite","options":{}},"builder":"@storybook/builder-vite","renderer":"@storybook/react","portableStoriesFileCount":0,"applicationFileCount":0,"storybookVersion":"8.6.18","storybookVersionSpecifier":"^8.6.4","language":"typescript","storybookPackages":{"@chromatic-com/storybook":{"version":"3.2.7"},"@storybook/addon-essentials":{"version":"8.6.18"},"@storybook/addon-links":{"version":"8.6.18"},"@storybook/addon-onboarding":{"version":"8.6.18"},"@storybook/addon-themes":{"version":"8.6.18"},"@storybook/blocks":{"version":"8.6.18"},"@storybook/experimental-addon-test":{"version":"8.6.18"},"@storybook/react":{"version":"8.6.18"},"@storybook/react-vite":{"version":"8.6.18"},"@storybook/test":{"version":"8.6.18"},"@storybook/theming":{"version":"8.6.18"},"eslint-plugin-storybook":{"version":"0.11.6"},"storybook":{"version":"8.6.18"},"storybook-addon-react-docgen":{"version":"1.2.44"}},"addons":{"$SNIP/node_modules/@storybook/addon-links":{"version":null},"$SNIP/node_modules/@storybook/addon-essentials":{"version":null},"$SNIP/node_modules/@chromatic-com/storybook":{"version":null},"$SNIP/node_modules/@storybook/addon-themes":{"version":null},"$SNIP/node_modules/@storybook/experimental-addon-test":{"version":null}}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rainbow-robotics/muscat-plugin-kit",
-  "version": "1.3.6-dev.0",
+  "version": "1.3.6-dev.2",
   "type": "module",
   "engines": {
     "node": ">=20"
@@ -53,8 +53,8 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@rainbow-robotics/plugin-ui": "1.3.6-dev.0",
-    "@rainbow-robotics/preview-host": "1.3.6-dev.0",
+    "@rainbow-robotics/plugin-ui": "1.3.6-dev.2",
+    "@rainbow-robotics/preview-host": "1.3.6-dev.2",
     "postcss": "^8.5.8",
     "socket.io": "^4.8.1",
     "typescript": "^5.8.0",