Web converter update

src/features/serialize/loadDFDandDD.ts

@@ -80,16 +80,11 @@ export class LoadDFDandDDCommand extends Command {
             const dataflowFileContent = await this.readFileContent(dataflowFile);
             const dictionaryFileContent = await this.readFileContent(dictionaryFile);
 
-            // Send each file's content in separate WebSocket messages
-            sendMessage(
-                "DFD:" +
-                    this.getFileNameWithoutExtension(dataflowFile) +
-                    ":" +
-                    dataflowFileContent +
-                    "\n:DD:\n" +
-                    dictionaryFileContent,
-            );
             setModelFileName(dataflowFile.name.substring(0, dataflowFile.name.lastIndexOf(".")));
+
+            // Send each file's content in separate WebSocket messages
+            sendMessage("DFD:" + dataflowFileContent + "\n:DD:\n" + dictionaryFileContent);
+
             setFileNameInPageTitle(dataflowFile.name);
             return context.root;
         } catch (error) {

src/features/serialize/saveDFDandDD.ts

@@ -60,7 +60,7 @@ export class SaveDFDandDDCommand extends Command {
             mode: this.editorModeController?.getCurrentMode(),
         };
         const diagramJson = JSON.stringify(diagram, undefined, 4);
-        sendMessage("Json2DFD:" + getModelFileName() + ":" + diagramJson);
+        sendMessage("Json2DFD:" + diagramJson);
         return context.root;
     }
 

src/features/serialize/webSocketHandler.ts

@@ -1,6 +1,8 @@
 import { getModelFileName, logger, setModelSource, loadingIndicator } from "../../index";
 import { SaveDFDandDD } from "./saveDFDandDD";
 
+//Debug
+//const webSocketAdress = `ws://localhost:3000/events/`;
 const webSocketAdress = `wss://websocket.dataflowanalysis.org/events/`;
 
 let ws: WebSocket;
@@ -47,16 +49,21 @@ function initWebSocket() {
             loadingIndicator.hideIndicator();
             return;
         }
+
+        let message = event.data;
+        const name = message.split(":")[0];
+        message = message.replace(name + ":", "");
+
         if (event.data.trim().endsWith("</datadictionary:DataDictionary>")) {
-            const saveDFDandDD = new SaveDFDandDD(event.data);
+            const saveDFDandDD = new SaveDFDandDD(message);
             saveDFDandDD.saveDiagramAsDFD();
             loadingIndicator.hideIndicator();
             return;
         }
 
         // Otherwise, treat incoming data as JSON for model source:
         setModelSource(
-            new File([new Blob([event.data], { type: "application/json" })], getModelFileName() + ".json", {
+            new File([new Blob([message], { type: "application/json" })], name + ".json", {
                 type: "application/json",
             }),
         );
@@ -65,7 +72,7 @@ function initWebSocket() {
 }
 
 export function sendMessage(message: string) {
-    ws.send(wsId + ":" + message);
+    ws.send(wsId + ":" + getModelFileName() + ":" + message);
 }
 
 // Initialize immediately upon module load