use xml format for editor actions

Author: CodedRedGIT

editor/client/ui/bottom-tabs.tsx

@@ -116,10 +116,15 @@ export class BottomTabs implements InspectorUIWidget {
 
     // @ts-expect-error Global
     (game as ClientGame).on(NewRecommendedActions, e => {
-      if (e.plan) {
+      if (Array.isArray(e.plan) && e.plan.length > 0) {
         aiSuggestionsPopup.setPlan(e.plan);
         recommendedActionsTab.classList.remove("hidden");
         loadingActionsTab.classList.add("hidden");
+      } else if (Array.isArray(e.plan) && e.plan.length === 0) {
+        aiSuggestionsPopup.setPlan([]);
+        aiSuggestionsPopup.hide();
+        recommendedActionsTab.classList.add("hidden");
+        loadingActionsTab.classList.add("hidden");
       } else if (e.plan === "fail") {
         recommendedActionsTab.classList.add("hidden");
         loadingActionsTab.classList.add("hidden");

multiplayer/server-host/edit-watcher.ts

@@ -5,7 +5,7 @@ import { GameSession } from "./session.ts";
 export async function watchForEditChanges(session: GameSession) {
   const instance = session.parent;
   const worldDir = instance.info.worldDirectory;
-  const editorActionsPath = `${worldDir}/editorActions.json`;
+  const editorActionsPath = `${worldDir}/editorActions.xml`;
 
   ["src", "instructions"].forEach(dir =>
     Deno.mkdirSync(`${worldDir}/${dir}`, { recursive: true }),
@@ -43,13 +43,42 @@ export async function watchForEditChanges(session: GameSession) {
       if (!event.paths.includes(editorActionsPath)) continue;
       if (event.kind === "create" || event.kind === "modify") {
         await processEditorActionsFile(session, editorActionsPath);
+      } else if (event.kind === "remove") {
+        session.broadcastPacket({
+          t: "EditorActions",
+          actions: [],
+        });
       }
     }
   };
 
   await Promise.all([watchScriptChanges(), watchEditorActions()]);
 }
 
+function parseEditorActionsXml(
+  content: string,
+): Array<{ editDescription: string; editCode: string }> {
+  const actions: Array<{ editDescription: string; editCode: string }> = [];
+  const editorBlockRegex = /<editor>([\s\S]*?)<\/editor>/g;
+
+  let match;
+  while ((match = editorBlockRegex.exec(content)) !== null) {
+    const block = match[1];
+
+    const descMatch = /<editDescription>([\s\S]*?)<\/editDescription>/.exec(block);
+    const codeMatch = /<editCode>([\s\S]*?)<\/editCode>/.exec(block);
+
+    if (descMatch && codeMatch) {
+      actions.push({
+        editDescription: descMatch[1].trim(),
+        editCode: codeMatch[1].trim(),
+      });
+    }
+  }
+
+  return actions;
+}
+
 async function processEditorActionsFile(session: GameSession, filePath: string) {
   await new Promise(resolve => setTimeout(resolve, 50));
 
@@ -58,17 +87,13 @@ async function processEditorActionsFile(session: GameSession, filePath: string)
     if (!stat) return;
 
     const content = await Deno.readTextFile(filePath);
-    if (!content.trim()) return;
-
-    const actions = JSON.parse(content);
-    if (!Array.isArray(actions) || actions.length === 0) return;
+    const actions = parseEditorActionsXml(content);
 
     session.broadcastPacket({
       t: "EditorActions",
       actions: actions,
     });
   } catch (error) {
     if (error instanceof Deno.errors.NotFound) return;
-    if (error instanceof SyntaxError && error.message.includes("JSON")) return;
   }
 }

multiplayer/server-host/web/routes/script-editing.ts

@@ -603,6 +603,30 @@ export const serveScriptEditingAPI = (router: Router) => {
     ),
   );
 
+  const parseEditorActionsXml = (
+    content: string,
+  ): Array<{ editDescription: string; editCode: string }> => {
+    const actions: Array<{ editDescription: string; editCode: string }> = [];
+    const editorBlockRegex = /<editor>([\s\S]*?)<\/editor>/g;
+
+    let match;
+    while ((match = editorBlockRegex.exec(content)) !== null) {
+      const block = match[1];
+
+      const descMatch = /<editDescription>([\s\S]*?)<\/editDescription>/.exec(block);
+      const codeMatch = /<editCode>([\s\S]*?)<\/editCode>/.exec(block);
+
+      if (descMatch && codeMatch) {
+        actions.push({
+          editDescription: descMatch[1].trim(),
+          editCode: codeMatch[1].trim(),
+        });
+      }
+    }
+
+    return actions;
+  };
+
   router.get("/api/v1/edit/:instance_id/:world_name/editor-actions", async ctx => {
     const worldId = `${ctx.params.instance_id}/${ctx.params.world_name}`;
     const instance = [...instances.values()].find(inst => inst.info.worldId === worldId);
@@ -613,12 +637,12 @@ export const serveScriptEditingAPI = (router: Router) => {
       return;
     }
 
-    const editorActionsPath = path.join(instance.info.worldDirectory, "editorActions.json");
+    const editorActionsPath = path.join(instance.info.worldDirectory, "editorActions.xml");
 
     try {
       const content = await Deno.readTextFile(editorActionsPath);
-      const actions = JSON.parse(content);
-      ctx.response.body = { payload: Array.isArray(actions) ? actions : [] };
+      const actions = parseEditorActionsXml(content);
+      ctx.response.body = { payload: actions };
     } catch (error) {
       if (error instanceof Deno.errors.NotFound) {
         ctx.response.body = { payload: [] };
@@ -639,7 +663,7 @@ export const serveScriptEditingAPI = (router: Router) => {
       return;
     }
 
-    const editorActionsPath = path.join(instance.info.worldDirectory, "editorActions.json");
+    const editorActionsPath = path.join(instance.info.worldDirectory, "editorActions.xml");
 
     try {
       await Deno.remove(editorActionsPath);