phibelle-kit 1.0.28 → 1.0.30

package/dist/commands/watch-scene.js

@@ -2,9 +2,11 @@ import chalk from "chalk";
 import * as path from "path";
 import * as fs from "fs";
 import { WebSocketServer } from "ws";
-import { unpackageScene, parseSceneJson } from "../lib/scene/scene-packaging.js";
+import { unpackageScene, parseSceneJson, packageSceneFromFilesystem } from "../lib/scene/scene-packaging.js";
 import { createScriptWatcher } from "../lib/scene/script-watcher.js";
 import { toErrorMessage } from "../lib/utils.js";
+import readline from "readline";
+const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
 const WS_PORT = 31113;
 const SCENE_SYNC_TYPE = "phibelle-kit-scene-sync";
 const SCENE_FILE_NAME = "scene.phibelle";
@@ -22,7 +24,7 @@ export async function watchSceneCommand() {
     console.log();
     console.log(chalk.gray("  Press Ctrl+C to stop"));
     console.log();
-    let latestSceneJson = "";
+    let latestSceneJson = readLocalSceneJson(sceneDir);
     let scriptWatcher = null;
     let currentClient = null;
     function startWatcher() {
@@ -36,6 +38,9 @@ export async function watchSceneCommand() {
     const wss = new WebSocketServer({ port: WS_PORT });
     wss.on("connection", (ws) => {
         currentClient = ws;
+        console.log(chalk.green("  ✓ Connected to web app"));
+        let initialSyncResolved = false;
+        let initialSyncPending = false;
         ws.on("message", async (data) => {
             const raw = Buffer.isBuffer(data) ? data.toString("utf8") : String(data);
             if (!raw || raw.length === 0)
@@ -49,6 +54,47 @@ export async function watchSceneCommand() {
             catch {
                 return;
             }
+            if (!initialSyncResolved) {
+                if (initialSyncPending)
+                    return;
+                initialSyncPending = true;
+                try {
+                    latestSceneJson = await packageAndPersistLocalScene(sceneDir, latestSceneJson);
+                }
+                catch (error) {
+                    initialSyncPending = false;
+                    console.log(chalk.red("  ✖ Failed to package local scene: " + toErrorMessage(error)));
+                    return;
+                }
+                if (incoming.sceneData === latestSceneJson) {
+                    initialSyncResolved = true;
+                    initialSyncPending = false;
+                    startWatcher();
+                    return;
+                }
+                const choice = await promptForInitialSyncChoice().catch((error) => {
+                    console.log(chalk.red("  ✖ " + toErrorMessage(error)));
+                    ws.close();
+                    return null;
+                });
+                if (!choice || currentClient !== ws)
+                    return;
+                if (choice === "push-local") {
+                    initialSyncResolved = true;
+                    initialSyncPending = false;
+                    if (ws.readyState === ws.OPEN) {
+                        ws.send(latestSceneJson);
+                        startWatcher();
+                        console.log(chalk.green("  ✓ Pushed local scene to app"));
+                    }
+                    return;
+                }
+                initialSyncResolved = true;
+                initialSyncPending = false;
+                console.log(chalk.cyan("  Accepting scene from web app..."));
+            }
+            if (currentClient !== ws)
+                return;
             latestSceneJson = incoming.sceneData;
             const scenePath = path.join(sceneDir, SCENE_FILE_NAME);
             fs.writeFileSync(scenePath, incoming.sceneData, "utf8");
@@ -73,6 +119,7 @@ export async function watchSceneCommand() {
         scriptWatcher?.close();
         scriptWatcher = null;
         wss.close();
+        rl.close();
         console.log(chalk.gray("  Goodbye"));
         console.log();
         process.exit(0);
@@ -106,6 +153,39 @@ function printEditorLink(sceneId, lastPrintedLink) {
     console.log(chalk.cyan(`  Editor: ${editorUrl}`));
     return editorUrl;
 }
+function readLocalSceneJson(sceneDir) {
+    const scenePath = path.join(sceneDir, SCENE_FILE_NAME);
+    if (!fs.existsSync(scenePath)) {
+        throw new Error(`Missing ${SCENE_FILE_NAME} in ${sceneDir}. Run "phibelle-kit clone" first.`);
+    }
+    const sceneJson = fs.readFileSync(scenePath, "utf8");
+    parseSceneJson(sceneJson);
+    return sceneJson;
+}
+async function packageAndPersistLocalScene(sceneDir, sceneJson) {
+    const packagedSceneJson = await packageSceneFromFilesystem(sceneJson, sceneDir);
+    parseSceneJson(packagedSceneJson);
+    fs.writeFileSync(path.join(sceneDir, SCENE_FILE_NAME), packagedSceneJson, "utf8");
+    return packagedSceneJson;
+}
+async function promptForInitialSyncChoice() {
+    console.log(chalk.yellow("  Choose initial sync direction:"));
+    console.log(chalk.cyan("    [p] Push local scene to the web app"));
+    console.log(chalk.cyan("    [a] Accept the current web app scene"));
+    while (true) {
+        const answer = (await askQuestion("  Initial sync [p/a]: ")).trim().toLowerCase();
+        if (answer === "p" || answer === "push" || answer === "local")
+            return "push-local";
+        if (answer === "a" || answer === "accept" || answer === "web" || answer === "app")
+            return "accept-web";
+        console.log(chalk.yellow("  Please enter 'p' to push local or 'a' to accept the web app scene."));
+    }
+}
+function askQuestion(prompt) {
+    return new Promise((resolve) => {
+        rl.question(prompt, resolve);
+    });
+}
 function getRequiredManifestSceneId(sceneDir) {
     const manifestPath = path.join(sceneDir, MANIFEST_FILE_NAME);
     if (!fs.existsSync(manifestPath)) {

package/dist/lib/scene/scene-packaging.d.ts

@@ -18,3 +18,4 @@ export declare function unpackageScene(sceneJson: string, sceneDir: string, scen
  * Used by script watcher to produce scene snapshot to send to FE.
  */
 export declare function patchSceneFromFile(sceneJson: string, sceneDir: string, relativePath: string, eventType: "change" | "add"): Promise<string>;
+export declare function packageSceneFromFilesystem(sceneJson: string, sceneDir: string): Promise<string>;

package/dist/lib/scene/scene-packaging.js

@@ -133,6 +133,8 @@ export async function patchSceneFromFile(sceneJson, sceneDir, relativePath, even
         const fileContent = await fs.readFile(filePath, "utf8");
         if (!parsed.sceneScriptStore)
             parsed.sceneScriptStore = { sceneScript: "", sceneProperties: [], lastModifiedSceneScript: 0 };
+        if (parsed.sceneScriptStore.sceneScript === fileContent)
+            return sceneJson;
         parsed.sceneScriptStore.sceneScript = fileContent;
         parsed.sceneScriptStore.lastModifiedSceneScript = Date.now();
         return JSON.stringify(parsed);
@@ -142,7 +144,11 @@ export async function patchSceneFromFile(sceneJson, sceneDir, relativePath, even
         const sceneProperties = JSON.parse(fileContent);
         if (!parsed.sceneScriptStore)
             parsed.sceneScriptStore = { sceneScript: "", sceneProperties: [], lastModifiedSceneScript: 0 };
-        parsed.sceneScriptStore.sceneProperties = Array.isArray(sceneProperties) ? sceneProperties : [];
+        const nextSceneProperties = Array.isArray(sceneProperties) ? sceneProperties : [];
+        if (JSON.stringify(parsed.sceneScriptStore.sceneProperties ?? []) === JSON.stringify(nextSceneProperties)) {
+            return sceneJson;
+        }
+        parsed.sceneScriptStore.sceneProperties = nextSceneProperties;
         return JSON.stringify(parsed);
     }
     const scriptMatch = relativePath.match(new RegExp(`^([^/]+)\\/${ENTITY_SCRIPT_FILE.replace(".", "\\.")}$`));
@@ -155,6 +161,8 @@ export async function patchSceneFromFile(sceneJson, sceneDir, relativePath, even
             const entity = entities[existingId];
             if (!entity)
                 return sceneJson;
+            if (entity.script === fileContent)
+                return sceneJson;
             entity.script = fileContent;
             entity.scriptVersion = (entity.scriptVersion ?? 0) + 1;
             return JSON.stringify(parsed);
@@ -175,7 +183,10 @@ export async function patchSceneFromFile(sceneJson, sceneDir, relativePath, even
         const entity = entities[entityId];
         if (!entity)
             return sceneJson;
-        entity.properties = Array.isArray(properties) ? properties : [];
+        const nextProperties = Array.isArray(properties) ? properties : [];
+        if (JSON.stringify(entity.properties ?? []) === JSON.stringify(nextProperties))
+            return sceneJson;
+        entity.properties = nextProperties;
         return JSON.stringify(parsed);
     }
     const transformsMatch = relativePath.match(new RegExp(`^([^/]+)\\/${ENTITY_TRANSFORMS_FILE.replace(".", "\\.")}$`));
@@ -191,16 +202,63 @@ export async function patchSceneFromFile(sceneJson, sceneDir, relativePath, even
             return sceneJson;
         if (!entity.transform)
             entity.transform = { position: DEFAULT_POSITION, rotation: DEFAULT_ROTATION, scale: DEFAULT_SCALE };
-        if (data.position !== undefined)
-            entity.transform.position = JSON.stringify(data.position);
-        if (data.rotation !== undefined)
-            entity.transform.rotation = JSON.stringify(data.rotation);
-        if (data.scale !== undefined)
-            entity.transform.scale = JSON.stringify(data.scale);
+        const nextPosition = data.position !== undefined ? JSON.stringify(data.position) : entity.transform.position;
+        const nextRotation = data.rotation !== undefined ? JSON.stringify(data.rotation) : entity.transform.rotation;
+        const nextScale = data.scale !== undefined ? JSON.stringify(data.scale) : entity.transform.scale;
+        if (entity.transform.position === nextPosition &&
+            entity.transform.rotation === nextRotation &&
+            entity.transform.scale === nextScale) {
+            return sceneJson;
+        }
+        entity.transform.position = nextPosition;
+        entity.transform.rotation = nextRotation;
+        entity.transform.scale = nextScale;
         return JSON.stringify(parsed);
     }
     return sceneJson;
 }
+export async function packageSceneFromFilesystem(sceneJson, sceneDir) {
+    const manifestRaw = await fs.readFile(path.join(sceneDir, "manifest.json"), "utf8");
+    const manifest = JSON.parse(manifestRaw);
+    const appDir = getSceneAppDir(sceneDir);
+    let packagedSceneJson = sceneJson;
+    packagedSceneJson = await applyIfExists(packagedSceneJson, sceneDir, manifest.sceneScript ?? SCENE_SCRIPT_FILE);
+    packagedSceneJson = await applyIfExists(packagedSceneJson, sceneDir, manifest.sceneProperties ?? SCENE_PROPERTIES_FILE);
+    for (const folderName of Object.values(manifest.entities)) {
+        packagedSceneJson = await applyIfExists(packagedSceneJson, sceneDir, path.join(folderName, ENTITY_SCRIPT_FILE).replace(/\\/g, "/"));
+        packagedSceneJson = await applyIfExists(packagedSceneJson, sceneDir, path.join(folderName, ENTITY_PROPERTIES_FILE).replace(/\\/g, "/"));
+        packagedSceneJson = await applyIfExists(packagedSceneJson, sceneDir, path.join(folderName, ENTITY_TRANSFORMS_FILE).replace(/\\/g, "/"));
+    }
+    let appEntries = [];
+    try {
+        appEntries = await fs.readdir(appDir, { withFileTypes: true });
+    }
+    catch {
+        return packagedSceneJson;
+    }
+    for (const entry of appEntries) {
+        if (!entry.isDirectory())
+            continue;
+        if (Object.values(manifest.entities).includes(entry.name))
+            continue;
+        const relativeScriptPath = path.join(entry.name, ENTITY_SCRIPT_FILE).replace(/\\/g, "/");
+        packagedSceneJson = await applyIfExists(packagedSceneJson, sceneDir, relativeScriptPath, "add");
+        packagedSceneJson = await applyIfExists(packagedSceneJson, sceneDir, path.join(entry.name, ENTITY_PROPERTIES_FILE).replace(/\\/g, "/"));
+        packagedSceneJson = await applyIfExists(packagedSceneJson, sceneDir, path.join(entry.name, ENTITY_TRANSFORMS_FILE).replace(/\\/g, "/"));
+    }
+    return packagedSceneJson;
+}
+async function applyIfExists(sceneJson, sceneDir, relativePath, eventType = "change") {
+    const appDir = getSceneAppDir(sceneDir);
+    const filePath = path.join(appDir, relativePath);
+    try {
+        await fs.access(filePath);
+    }
+    catch {
+        return sceneJson;
+    }
+    return patchSceneFromFile(sceneJson, sceneDir, relativePath, eventType);
+}
 async function addNewEntityFromFolder(parsed, manifest, sceneDir, folderName, appDir) {
     if (Object.values(manifest.entities).includes(folderName))
         return JSON.stringify(parsed);

package/dist/scene-setup/tsconfig-file.d.ts

@@ -1 +1 @@
-export declare const TSCONFIG_FILE = "{\n  \"compilerOptions\": {\n    \"jsx\": \"react-jsx\",\n    \"module\": \"ESNext\",\n    \"moduleResolution\": \"bundler\",\n    \"esModuleInterop\": true,\n    \"allowUmdGlobalAccess\": true,\n    \"baseUrl\": \".\",\n    \"skipLibCheck\": true,\n    \"lib\": [\"ES2015\", \"DOM\"]\n  },\n  \"include\": [\n    \"app/**/*.tsx\",\n    \"global.d.ts\"\n  ]\n}";
+export declare const TSCONFIG_FILE = "{\n  \"compilerOptions\": {\n    \"jsx\": \"react-jsx\",\n    \"module\": \"ESNext\",\n    \"moduleResolution\": \"bundler\",\n    \"esModuleInterop\": true,\n    \"allowUmdGlobalAccess\": true,\n    \"baseUrl\": \".\",\n    \"skipLibCheck\": true,\n    \"lib\": [\"ES2017\", \"DOM\"]\n  },\n  \"include\": [\n    \"app/**/*.tsx\",\n    \"global.d.ts\"\n  ]\n}";

package/dist/scene-setup/tsconfig-file.js

@@ -7,7 +7,7 @@ export const TSCONFIG_FILE = `{
     "allowUmdGlobalAccess": true,
     "baseUrl": ".",
     "skipLibCheck": true,
-    "lib": ["ES2015", "DOM"]
+    "lib": ["ES2017", "DOM"]
   },
   "include": [
     "app/**/*.tsx",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phibelle-kit",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "CLI tool for interacting with the Phibelle engine",
   "type": "module",
   "bin": {