Build for deploying on server

Author: 01Parzival10

bundles/org.dataflowanalysis.standalone/resources/WebEditor/src/features/serialize/analyze.ts

@@ -13,7 +13,7 @@ import { Action, SModelRoot } from "sprotty-protocol";
 import { LabelType, LabelTypeRegistry } from "../labels/labelTypeRegistry";
 import { DynamicChildrenProcessor } from "../dfdElements/dynamicChildren";
 import { EditorMode, EditorModeController } from "../editorMode/editorModeController";
-import { ws, wsId } from "../../index";
+import { sendMessageToWebsocket } from "../../index";
 
 /**
  * Type that contains all data related to a diagram.
@@ -72,7 +72,7 @@ export class AnalyzeDiagramCommand extends Command {
             editorMode: this.editorModeController?.getCurrentMode(),
         };
         const diagramJson = JSON.stringify(diagram, undefined, 4);
-        ws.send(wsId + ":Json:" + diagramJson);
+        sendMessageToWebsocket(":Json:" + diagramJson);
         return context.root;
     }
 

bundles/org.dataflowanalysis.standalone/resources/WebEditor/src/features/serialize/loadDFDandDD.ts

@@ -18,7 +18,7 @@ import { SavedDiagram } from "./save";
 import { LabelType, LabelTypeRegistry } from "../labels/labelTypeRegistry";
 import { LayoutModelAction } from "../autoLayout/command";
 import { EditorMode, EditorModeController } from "../editorMode/editorModeController";
-import { ws, wsId, setModelFileName } from "../../index";
+import { sendMessageToWebsocket, setModelFileName } from "../../index";
 import { Console } from "console";
 
 export interface LoadDFDandDDAction extends Action {
@@ -89,8 +89,7 @@ export class LoadDFDandDDCommand extends Command {
             const dictionaryFileContent = await this.readFileContent(dictionaryFile);
 
             // Send each file's content in separate WebSocket messages
-            ws.send(
-                wsId +
+            sendMessageToWebsocket(
                     ":DFD:" +
                     this.getFileNameWithoutExtension(dataflowFile) +
                     ":" +
@@ -99,7 +98,6 @@ export class LoadDFDandDDCommand extends Command {
                     dictionaryFileContent,
             );
             setModelFileName(dataflowFile.name.substring(0, dataflowFile.name.lastIndexOf(".")));
-            setFileNameInPageTitle(dataflowFile.name);
             return context.root;
         } catch (error) {
             return context.root;

bundles/org.dataflowanalysis.standalone/resources/WebEditor/src/features/serialize/loadPalladio.ts

@@ -18,7 +18,7 @@ import { SavedDiagram } from "./save";
 import { LabelType, LabelTypeRegistry } from "../labels/labelTypeRegistry";
 import { LayoutModelAction } from "../autoLayout/command";
 import { EditorMode, EditorModeController } from "../editorMode/editorModeController";
-import { ws, wsId, setModelFileName } from "../../index";
+import { sendMessageToWebsocket, setModelFileName } from "../../index";
 import { Console } from "console";
 
 export interface LoadPalladioAction extends Action {
@@ -107,13 +107,12 @@ export class LoadPalladioCommand extends Command {
             );
 
             // Construct the message format for WebSocket
-            const message = [
-                wsId + ":", // Add wsId only once at the start
+            const message = [ // Add wsId only once at the start
                 ...fileContents.map(({ name, content }) => `${name}:${content}`),
             ].join("---FILE---");
 
             // Send the structured message over WebSocket
-            ws.send(message);
+            sendMessageToWebsocket(message);
 
             // Set the model file name and page title based on one of the files (e.g., the first file)
             setModelFileName(files[0].name.substring(0, files[0].name.lastIndexOf(".")));

bundles/org.dataflowanalysis.standalone/resources/WebEditor/src/features/serialize/saveDFDandDD.ts

@@ -13,7 +13,7 @@ import { Action, SModelRoot } from "sprotty-protocol";
 import { LabelType, LabelTypeRegistry } from "../labels/labelTypeRegistry";
 import { DynamicChildrenProcessor } from "../dfdElements/dynamicChildren";
 import { EditorMode, EditorModeController } from "../editorMode/editorModeController";
-import { ws, wsId, modelFileName } from "../../index";
+import { sendMessageToWebsocket, modelFileName } from "../../index";
 
 export interface SaveDFDandDDAction extends Action {
     kind: typeof SaveDFDandDDAction.KIND;
@@ -68,7 +68,7 @@ export class SaveDFDandDDCommand extends Command {
             editorMode: this.editorModeController?.getCurrentMode(),
         };
         const diagramJson = JSON.stringify(diagram, undefined, 4);
-        ws.send(wsId + ":Json2DFD:" + modelFileName + ":" + diagramJson);
+        sendMessageToWebsocket("Json2DFD:" + modelFileName + ":" + diagramJson);
         return context.root;
     }
 

bundles/org.dataflowanalysis.standalone/resources/WebEditor/src/index.ts

@@ -94,15 +94,19 @@ modelSource
         console.error("Failed to show default UIs and load default diagram", error);
     });
 
-export const ws = new WebSocket(`ws://${window.location.hostname}:3000/events/`); // Change to the dynamic WebSocket port
-export var wsId = 0;
+var ws = new WebSocket(`wss://${window.location.hostname}/events/`); // Change to the dynamic WebSocket port
+var wsId = 0;
 
 export var modelFileName = "diagram";
 
 export function setModelFileName(name: string): void {
     modelFileName = name;
 }
 
+function reconnectWebSocket() {
+    ws = new WebSocket(`wss://${window.location.hostname}/events/`);
+}
+
 ws.onmessage = (event) => {
     console.log(event.data);
     if (event.data.startsWith("Error:")) {
@@ -130,6 +134,24 @@ ws.onmessage = (event) => {
     );
 };
 
+ws.onclose = () => {
+    reconnectWebSocket();
+}
+
+ws.onerror = () => {
+    reconnectWebSocket();
+}
+
+export function sendMessageToWebsocket(message: String) {
+    if (!ws || ws.readyState !== WebSocket.OPEN) {
+        console.warn("WebSocket not open. Attempting to reconnect...");
+        reconnectWebSocket();
+    } 
+        ws.send(wsId + ":" + message);
+    
+
+}
+
 export function setModelSource(file: File): void {
     modelSource
         .setModel({

bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/analysis/Converter.java

@@ -59,7 +59,7 @@ public static WebEditorDfd convertPCM(File usageModelFile, File allocationModelF
 
 
 	    		var dfdConverter = new DataFlowDiagramConverter();
-	    		return dfdConverter.dfdToWebAndAnalyzeAndAnnotateWithCustomTFGFinder(dfd, null, DFDTransposeFlowGraphFinder.class);
+	    		return dfdConverter.dfdToWebAndAnalyzeAndAnnotateWithCustomTFGFinder(dfd, null, DFDSimpleTransposeFlowGraphFinder.class);
 
 	    	} catch (Exception e) {
 				e.printStackTrace();

bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerUtils.java

@@ -36,7 +36,7 @@ private static void startServer() {
 	        {
 	            // Configure default max size
 	            wsContainer.setMaxTextMessageSize(Long.MAX_VALUE);
-	            wsContainer.setIdleTimeout(Duration.ofMinutes(20));
+	            wsContainer.setIdleTimeout(Duration.ofSeconds(-1));
 
 	            // Add websockets
 	            wsContainer.addMapping("/events/*", WebSocketServerHandler.class);

releng/org.dataflowanalysis.standalone.targetplatform/org.dataflowanalysis.standalone.targetplatform.targetplatform.target

@@ -153,8 +153,8 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
 			<repository location="https://dataflowanalysis.github.io/updatesite/nightly/dataflowanalysis/"/>
-			<unit id="org.dataflowanalysis.analysis.feature.feature.group" version="3.0.0.202411120241"/>
+			<unit id="org.dataflowanalysis.analysis.feature.feature.group" version="3.0.0.202411180256"/>
 		</location>
-		<location path="C:\Users\Huell\Desktop\Newfolder\AnalysisNew\workspace\plugins" type="Directory"/>
+		<location path="C:\Users\Huell\Desktop\AnalysisNew\workspace\plugins" type="Directory"/>
 	</locations>
 </target>