@mafly/bdev-cli 1.0.2 → 1.0.3

package/dist/utils/mojang.js

@@ -28,19 +28,55 @@ export function findMojangPath(customPath, projectDir = process.cwd()) {
     }
     const platform = os.platform();
     if (platform === "win32") {
+        const appData = process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
         const localAppData = process.env.LOCALAPPDATA ||
             path.join(os.homedir(), "AppData", "Local");
+        // Modern Windows GDK Bedrock (Shared folder contains dev packs)
+        const gdkShared = path.join(appData, "Minecraft Bedrock", "Users", "Shared", "games", "com.mojang");
+        if (fs.existsSync(gdkShared)) {
+            return makeLocations(gdkShared, "retail");
+        }
+        const gdkPreviewShared = path.join(appData, "Minecraft Bedrock Preview", "Users", "Shared", "games", "com.mojang");
+        if (fs.existsSync(gdkPreviewShared)) {
+            return makeLocations(gdkPreviewShared, "preview");
+        }
+        // Classic UWP Retail
         const retail = path.join(localAppData, "Packages", "Microsoft.MinecraftUWP_8wekyb3d8bbwe", "LocalState", "games", "com.mojang");
         if (fs.existsSync(retail)) {
             return makeLocations(retail, "retail");
         }
+        // Classic UWP Preview
         const preview = path.join(localAppData, "Packages", "Microsoft.MinecraftWindowsBeta_8wekyb3d8bbwe", "LocalState", "games", "com.mojang");
         if (fs.existsSync(preview)) {
             return makeLocations(preview, "preview");
         }
     }
-    // Check WSL
+    // Check Linux / Bedrock-on-linux / Proton / WSL
     if (platform === "linux") {
+        // 1. Bedrock-on-Linux (Proton / Wine)
+        const bolBase = path.join(os.homedir(), ".local", "share", "bedrock-on-linux");
+        if (fs.existsSync(bolBase)) {
+            const profilesDir = path.join(bolBase, "profiles");
+            if (fs.existsSync(profilesDir)) {
+                try {
+                    const profiles = fs.readdirSync(profilesDir);
+                    for (const prof of profiles) {
+                        const sharedPfx = path.join(profilesDir, prof, "compatdata", "pfx", "drive_c", "users", "steamuser", "AppData", "Roaming", "Minecraft Bedrock", "Users", "Shared", "games", "com.mojang");
+                        if (fs.existsSync(sharedPfx)) {
+                            return makeLocations(sharedPfx, "linux");
+                        }
+                    }
+                }
+                catch {
+                    // ignore profile read errors
+                }
+            }
+            const defaultShared = path.join(bolBase, "compatdata", "pfx", "drive_c", "users", "steamuser", "AppData", "Roaming", "Minecraft Bedrock", "Users", "Shared", "games", "com.mojang");
+            if (fs.existsSync(defaultShared)) {
+                return makeLocations(defaultShared, "linux");
+            }
+        }
+        // 2. Check WSL
         try {
             const isWsl = Boolean(process.env.WSL_DISTRO_NAME) ||
                 fs.readFileSync("/proc/version", "utf-8").toLowerCase().includes("microsoft");
@@ -49,14 +85,14 @@ export function findMojangPath(customPath, projectDir = process.cwd()) {
                 if (fs.existsSync(mntCUsers)) {
                     const users = fs.readdirSync(mntCUsers);
                     for (const u of users) {
+                        const gdk = path.join(mntCUsers, u, "AppData", "Roaming", "Minecraft Bedrock", "Users", "Shared", "games", "com.mojang");
+                        if (fs.existsSync(gdk)) {
+                            return makeLocations(gdk, "wsl");
+                        }
                         const retail = path.join(mntCUsers, u, "AppData", "Local", "Packages", "Microsoft.MinecraftUWP_8wekyb3d8bbwe", "LocalState", "games", "com.mojang");
                         if (fs.existsSync(retail)) {
                             return makeLocations(retail, "wsl");
                         }
-                        const preview = path.join(mntCUsers, u, "AppData", "Local", "Packages", "Microsoft.MinecraftWindowsBeta_8wekyb3d8bbwe", "LocalState", "games", "com.mojang");
-                        if (fs.existsSync(preview)) {
-                            return makeLocations(preview, "wsl");
-                        }
                     }
                 }
             }
@@ -64,7 +100,7 @@ export function findMojangPath(customPath, projectDir = process.cwd()) {
         catch {
             // Ignore read errors
         }
-        // Native Linux launcher locations
+        // 3. Native Linux mcpelauncher locations
         const linuxMcpelauncherPaths = [
             path.join(os.homedir(), ".var", "app", "io.mrarm.mcpelauncher", "data", "mcpelauncher", "games", "com.mojang"),
             path.join(os.homedir(), ".local", "share", "mcpelauncher", "games", "com.mojang"),
@@ -78,10 +114,22 @@ export function findMojangPath(customPath, projectDir = process.cwd()) {
     return null;
 }
 function makeLocations(root, type) {
+    // If pointing to a specific user XUID directory in Bedrock GDK (e.g. Users/<XUID>/games/com.mojang),
+    // Bedrock GDK only scans packs from Users/Shared/games/com.mojang.
+    let packsRoot = root;
+    try {
+        const sharedCandidate = path.resolve(root, "..", "..", "..", "Shared", "games", "com.mojang");
+        if (fs.existsSync(sharedCandidate)) {
+            packsRoot = sharedCandidate;
+        }
+    }
+    catch {
+        // Ignore resolution errors
+    }
     return {
-        root,
-        devBehaviorPacks: path.join(root, "development_behavior_packs"),
-        devResourcePacks: path.join(root, "development_resource_packs"),
+        root: packsRoot,
+        devBehaviorPacks: path.join(packsRoot, "development_behavior_packs"),
+        devResourcePacks: path.join(packsRoot, "development_resource_packs"),
         type,
     };
 }

package/dist/utils/wsserver.js

@@ -35,12 +35,19 @@ export class BedrockHotReloadServer {
         server.on("connection", (socket) => {
             this.clients.add(socket);
             logger.success(pc.green("Minecraft connected to WebSocket hot reload!"));
-            // Delay welcome message 500ms so Bedrock completes internal handshake
-            setTimeout(() => {
-                if (socket.readyState === WebSocket.OPEN) {
-                    this.sendCommandToSocket(socket, 'tellraw @a {"rawtext":[{"text":"§a[bdev] Connected to hot reload server!"}]}');
-                }
-            }, 500);
+            // Bedrock expects an event subscription to establish connection cleanly
+            const subscribePayload = {
+                header: {
+                    version: 1,
+                    requestId: uuidv4(),
+                    messageType: "commandRequest",
+                    messagePurpose: "subscribe",
+                },
+                body: {
+                    eventName: "PlayerMessage",
+                },
+            };
+            socket.send(JSON.stringify(subscribePayload));
             socket.on("message", (data) => {
                 try {
                     const res = JSON.parse(data.toString());
@@ -69,7 +76,8 @@ export class BedrockHotReloadServer {
         }
     }
     sendCommandToSocket(socket, commandLine) {
-        const formatted = commandLine.startsWith("/") ? commandLine : `/${commandLine}`;
+        // Bedrock commandLine must NOT have a leading slash
+        const cleanCmd = commandLine.startsWith("/") ? commandLine.slice(1) : commandLine;
         const payload = {
             header: {
                 version: 1,
@@ -79,7 +87,7 @@ export class BedrockHotReloadServer {
             },
             body: {
                 version: 1,
-                commandLine: formatted,
+                commandLine: cleanCmd,
                 origin: {
                     type: "player",
                 },
@@ -91,9 +99,7 @@ export class BedrockHotReloadServer {
         if (this.clients.size === 0) {
             return;
         }
-        // Notify in game chat and execute reload command
-        this.sendCommand('tellraw @a {"rawtext":[{"text":"§e[bdev] Reloading scripts..."}]}');
-        this.sendCommand("/reload");
+        this.sendCommand("reload");
     }
     get clientCount() {
         return this.clients.size;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mafly/bdev-cli",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Modern CLI tool for Minecraft Bedrock Edition Addon development",
   "author": "Mafly",
   "license": "MIT",