Added basic connection guide

Author: iiNomad23

includes/api/WebSocketClient.h

@@ -34,7 +34,7 @@ class WebSocketClient {
 
     void startStream() const;
 
-    void run();
+    int run();
 
 private:
     WebSocketConnection connection;

includes/enums/Commands.h

@@ -16,7 +16,8 @@ enum Commands {
     SAVE,
     HELP,
     EXIT,
-    UNKNOWN,
+    CLOSE,
+    UNKNOWN
 };
 
 inline Commands stringToCommand(const std::string &commandStr) {
@@ -44,6 +45,9 @@ inline Commands stringToCommand(const std::string &commandStr) {
     if (commandStr == "exit") {
         return EXIT;
     }
+    if (commandStr == "close") {
+        return CLOSE;
+    }
     return UNKNOWN;
 }
 
@@ -56,6 +60,7 @@ inline void printHelp() {
             << "  start  - Start streaming\n"
             << "  save   - Take a screenshot and save it\n"
             << "  help   - List available commands\n"
+            << "  close  - Close the websocket connection\n"
             << "  exit   - Terminate the program\n";
 }
 

main.cpp

@@ -2,11 +2,35 @@
 // Created by Katie on 15/11/2024.
 //
 
+#include <chrono>
+#include <iostream>
+#include <thread>
 #include "includes/api/WebSocketClient.h"
 
 int main() {
+    std::string address;
+    std::string port;
+    std::string endpoint;
+
+    int connectionStatus = 0;
+    do {
+        std::cout << "Enter WebSocket server address:\n";
+        std::cin >> address;
+
+        std::cout << "Enter WebSocket server port:\n";
+        std::cin >> port;
+
+        std::cout << "Enter WebSocket endpoint:\n";
+        std::cin >> endpoint;
+
+        WebSocketClient client(address, port, "/publisher/" + endpoint);
+        connectionStatus = client.run();
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    } while (connectionStatus != 0);
+
     // WebSocketClient client("192.168.1.102", "8080", "/publisher/matrix");
-    WebSocketClient client("localhost", "8080", "/publisher/matrix-test");
-    client.run();
+    // WebSocketClient client("localhost", "8080", "/publisher/matrix-test");
+
     return 0;
 }

src/api/WebSocketClient.cpp

@@ -77,16 +77,16 @@ void WebSocketClient::startStream() const {
     }
 }
 
-void WebSocketClient::run() {
+int WebSocketClient::run() {
     WSADATA wsaData;
     if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) {
         std::cerr << "WSAStartup failed" << std::endl;
-        return;
+        return 1;
     }
 
     if (!connection.connect()) {
         std::cerr << "Failed to connect to WebSocket server" << std::endl;
-        return;
+        return 1;
     }
 
     printHelp();
@@ -125,7 +125,7 @@ void WebSocketClient::run() {
             case START:
                 keepRunning = true;
                 startStream();
-                break; // we can interrupt with Ctrl+C, so we need that
+                break;
             case SAVE:
                 saveScreenShot();
                 break;
@@ -135,6 +135,9 @@ void WebSocketClient::run() {
             case EXIT:
                 running = false;
                 break;
+            case CLOSE:
+                std::cout << "Closing websocket connection..." << std::endl;
+                return 1;
             default:
                 std::cout << "Unknown command" << std::endl;
                 break;
@@ -146,4 +149,5 @@ void WebSocketClient::run() {
     }
 
     connection.closeConnection();
+    return 0;
 }