#1859 - Integrated the runtime execution for web client. Added in the webclient application execution action. Now fixing http status code issues.

src/primaite/simulator/network/networks.py

@@ -157,6 +157,8 @@ def arcd_uc2_network() -> Network:
         operating_state=NodeOperatingState.ON,
     )
     client_2.power_on()
+    web_browser = client_2.software_manager["WebBrowser"]
+    web_browser.target_url = "http://arcd.com/users/"
     network.connect(endpoint_b=client_2.ethernet_port[1], endpoint_a=switch_2.switch_ports[2])
 
     # Domain Controller

src/primaite/simulator/network/protocols/http.py

@@ -1,4 +1,4 @@
-from enum import Enum
+from enum import Enum, IntEnum
 
 from primaite.simulator.network.protocols.packet import DataPacket
 
@@ -25,7 +25,7 @@ class HttpRequestMethod(Enum):
     """Apply partial modifications to a resource."""
 
 
-class HttpStatusCode(Enum):
+class HttpStatusCode(IntEnum):
     """List of available HTTP Statuses."""
 
     OK = 200

src/primaite/simulator/system/applications/database_client.py

@@ -75,11 +75,11 @@ class DatabaseClient(Application):
         """
         if is_reattempt:
             if self.connected:
-                self.sys_log.info(f"{self.name}: DatabaseClient connected to {server_ip_address} authorised")
+                self.sys_log.info(f"{self.name}: DatabaseClient connection to {server_ip_address} authorised")
                 self.server_ip_address = server_ip_address
                 return self.connected
             else:
-                self.sys_log.info(f"{self.name}: DatabaseClient connected to {server_ip_address} declined")
+                self.sys_log.info(f"{self.name}: DatabaseClient connection to {server_ip_address} declined")
                 return False
         payload = {"type": "connect_request", "password": password}
         software_manager: SoftwareManager = self.software_manager

src/primaite/simulator/system/applications/web_browser.py

@@ -2,6 +2,7 @@ from ipaddress import IPv4Address
 from typing import Dict, Optional
 from urllib.parse import urlparse
 
+from primaite.simulator.core import RequestManager, RequestType
 from primaite.simulator.network.protocols.http import HttpRequestMethod, HttpRequestPacket, HttpResponsePacket
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port
@@ -16,6 +17,8 @@ class WebBrowser(Application):
     The application requests and loads web pages using its domain name and requesting IP addresses using DNS.
     """
 
+    target_url: Optional[str] = None
+
     domain_name_ip_address: Optional[IPv4Address] = None
     "The IP address of the domain name for the webpage."
 
@@ -32,6 +35,14 @@ class WebBrowser(Application):
         super().__init__(**kwargs)
         self.run()
 
+    def _init_request_manager(self) -> RequestManager:
+        rm = super()._init_request_manager()
+        rm.add_request(
+            name="execute", request_type=RequestType(func=lambda request, context: self.get_webpage())  # noqa
+        )
+
+        return rm
+
     def describe_state(self) -> Dict:
         """
         Produce a dictionary describing the current state of the WebBrowser.
@@ -51,7 +62,7 @@ class WebBrowser(Application):
         self.domain_name_ip_address = None
         self.latest_response = None
 
-    def get_webpage(self, url: str) -> bool:
+    def get_webpage(self) -> bool:
         """
         Retrieve the webpage.
 
@@ -60,6 +71,7 @@ class WebBrowser(Application):
         :param: url: The address of the web page the browser requests
         :type: url: str
         """
+        url = self.target_url
         # reset latest response
         self.latest_response = None
 
@@ -71,7 +83,6 @@ class WebBrowser(Application):
 
         # get the IP address of the domain name via DNS
         dns_client: DNSClient = self.software_manager.software["DNSClient"]
-
         domain_exists = dns_client.check_domain_exists(target_domain=parsed_url.hostname)
 
         # if domain does not exist, the request fails

src/primaite/simulator/system/services/web_server/web_server.py

@@ -29,8 +29,9 @@ class WebServer(Service):
         :rtype: Dict
         """
         state = super().describe_state()
+
         state["last_response_status_code"] = (
-            self.last_response_status_code.value if self.last_response_status_code else None
+            self.last_response_status_code.value if isinstance(self.last_response_status_code, HttpStatusCode) else None
         )
         return state
 
@@ -84,6 +85,7 @@ class WebServer(Service):
 
         # return true if response is OK
         self.last_response_status_code = response.status_code
+        print(self.last_response_status_code)
         return response.status_code == HttpStatusCode.OK
 
     def _handle_get_request(self, payload: HttpRequestPacket) -> HttpResponsePacket: