Send all server init data to client in one go

yazz · Oct 26, 2023 · 63b9f67 · 63b9f67
1 parent 09d8664
commit 63b9f67
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 52 deletions.
diff --git a/public/go.html b/public/go.html
@@ -2865,26 +2865,27 @@
 
 
 
-
-
-
-
-
+                    send_is_win:                        isWin
                 // ----------------------------------------------------------------------------------------------
                 //
                 //                  Share the container environment variables with the front end
                 //
                 // ----------------------------------------------------------------------------------------------
-                socket.on('env_vars',async function(data) {
-                    console.log("env_vars received from server socket: " + JSON.stringify(data,null,2));
+                socket.on('server_init_data',async function(data) {
+                    console.log("Server init data received from server socket: " + JSON.stringify(data,null,2));
+
+                    networkIntranetIpAddress = data.network_ip_address_intranet
+                    isWin                    = data.send_is_win
+                    console.log("networkIntranetIpAddress: " + networkIntranetIpAddress);
+                    console.log("isWin:                    " + isWin);
 
-                    var allEnvVarNames = Object.keys(data.value)
+                    var allEnvVarNames = Object.keys(data.env_vars)
                     for (var i=0; i< allEnvVarNames.length;i++) {
                         try
                         {
                             let envName = allEnvVarNames[i].replace(/[^a-zA-Z0-9]/g,'_')
                             //console.log(envName)
-                            var valueEnvVar = data.value[envName]
+                            var valueEnvVar = data.env_vars[envName]
                             var cmddd = '($' + envName + " =  String.raw`" +  String.raw`${valueEnvVar}` +"`)"
 
                             eval(cmddd)
@@ -2924,38 +2925,6 @@
 
 
 
-                // ----------------------------------------------------------------------------------------------
-                //
-                //                  Share the container environent variables with the front end
-                //
-                // ----------------------------------------------------------------------------------------------
-                socket.on('network_ip_address_intranet',function(data) {
-                    console.log("network_ip_address_intranet  received from server socket: " + JSON.stringify(data,null,2));
-
-                    networkIntranetIpAddress = data.value
-                });
-
-
-
-
-
-                // ----------------------------------------------------------------------------------------------
-                //
-                //
-                //
-                // ----------------------------------------------------------------------------------------------
-                socket.on('send_is_win',function(data) {
-                    console.log("send_is_win received from server socket: " + JSON.stringify(data,null,2));
-
-                    isWin = data.value
-                });
-
-
-
-
-
-
-
 
 
 

diff --git a/src/electron.js b/src/electron.js
@@ -3579,19 +3579,13 @@ function        websocketFn                             (  ws  ) {
     serverwebsockets.push(ws);
     sendToBrowserViaWebSocket(ws, {type: "ws_socket_connected"});
     sendOverWebSockets({
-        type:   "env_vars",
-        value:   envVars
-    });
-    //console.log('Socket connected : ' + serverwebsockets.length);
-    sendOverWebSockets({
-        type:   "network_ip_address_intranet",
-        value:   hostaddressintranet
-    });
-    sendOverWebSockets({
-        type:   "send_is_win",
-        value:   isWin
+        type:                               "server_init_data",
+        env_vars:                           envVars,
+        network_ip_address_intranet:        hostaddressintranet,
+        send_is_win:                        isWin
     });
 
+
     ws.on('message', async function(msg) {
         let receivedMessage = eval("(" + msg + ")");