ver 1.0.3

Sync changes from sm-ext-yyjson
Updated some HTTP functions

Author: ProjectSky

README.md

@@ -28,7 +28,7 @@ ambuild
 * [websocket](https://github.com/ProjectSky/sm-ext-websocket/blob/main/scripting/include/websocket/ws.inc)
 
 # Binary files
-* https://github.com/ProjectSky/sm-ext-websocket/actions
+* [GitHub Releases](https://github.com/ProjectSky/sm-ext-websocket/releases)
 
 ## TODO
 - [x] WebSocket server support
@@ -39,139 +39,5 @@ ambuild
 * HTTP functionality is not yet complete. Currently, only basic features are available
 * Server will not process data during the hibernation. You can set sv_hibernate_when_empty to 0 to disable hibernation
 
-## Client Example
-``` c++
-#include <sourcemod>
-#include <websocket>
-
-WebSocket
-g_hWS;
-
-public void OnPluginStart()
-{
-  RegServerCmd("ws_start", ws_start);
-  RegServerCmd("ws_close", ws_close);
-  RegServerCmd("ws_state", ws_state);
-}
-
-Action ws_start(int args)
-{
-  g_hWS = new WebSocket("ws://127.0.0.1:9999", WebSocket_JSON);
-  g_hWS.SetMessageCallback(onMessage);
-  g_hWS.SetOpenCallback(onOpen);
-  g_hWS.SetCloseCallback(onClose);
-  g_hWS.SetErrorCallback(onError)
-  g_hWS.Connect();
-}
-
-Action ws_close(int args)
-{
-  g_hWS.Disconnect();
-  return Plugin_Handled;
-}
-
-Action ws_state(int args)
-{
-  PrintToServer("ReadyState: %d", g_hWS.ReadyState);
-  return Plugin_Handled;
-}
-
-void onOpen(WebSocket ws)
-{
-  PrintToServer("onOpen: %x", ws);
-}
-
-void onClose(WebSocket ws, int code, const char[] reason)
-{
-  PrintToServer("onClose: %d, %s", code, reason);
-}
-
-void onMessage(WebSocket ws, const YYJSON message, int wireSize)
-{
-  char[] buffer = new char[wireSize];
-  message.ToString(buffer, wireSize);
-  PrintToServer("msg: %s, size: %d", buffer, wireSize);
-}
-
-void onError(WebSocket ws, const char[] errMsg)
-{
-  PrintToServer("onError: %s", errMsg);
-}
-```
-
-## Server Example
-``` c++
-#include <sourcemod>
-#include <websocket>
-
-WebSocketServer
-g_hWsServer;
-
-public void OnPluginStart()
-{
-  RegServerCmd("ws_server", ws_server);
-  RegServerCmd("ws_server_stop", ws_server_stop);
-  RegServerCmd("ws_server_broadcast", ws_server_broadcast);
-  RegServerCmd("ws_server_clients", ws_server_clients);
-  RegServerCmd("ws_server_sendtoclient", ws_server_sendtoclient);
-}
-
-Action ws_server(int args)
-{
-  g_hWsServer = new WebSocketServer("0.0.0.0", 9999);
-  g_hWsServer.SetMessageCallback(onSrvMessage);
-  g_hWsServer.SetOpenCallback(onSrvOpen);
-  g_hWsServer.SetCloseCallback(onSrvClose);
-  g_hWsServer.SetErrorCallback(onSrvError);
-  g_hWsServer.Start();
-  return Plugin_Handled;
-}
-
-Action ws_server_broadcast(int args)
-{
-  g_hWsServer.BroadcastMessage("Broadcast Message");
-  return Plugin_Handled;
-}
-
-Action ws_server_sendtoclient(int args)
-{
-  char clientId[4], message[256];
-  GetCmdArg(1, clientId, sizeof(clientId));
-  GetCmdArg(2, message, sizeof(message));
-
-  g_hWsServer.SendMessageToClient(clientId, message);
-  return Plugin_Handled;
-}
-
-Action ws_server_clients(int args)
-{
-  PrintToServer("Connected clients: %d", g_hWsServer.ClientsCount)
-  return Plugin_Handled;
-}
-
-Action ws_server_stop(int args)
-{
-  g_hWsServer.Stop();
-  return Plugin_Handled;
-}
-
-void onSrvMessage(WebSocketServer ws, WebSocket client, const char[] message, int wireSize, const char[] RemoteAddr, const char[] RemoteId)
-{
-  PrintToServer("message: %s, wireSize: %d, RemoteAddr: %s, RemoteId: %s", message, wireSize, RemoteAddr, RemoteId);
-}
-
-void onSrvError(WebSocketServer ws, const char[] errMsg, const char[] RemoteAddr, const char[] RemoteId)
-{
-  PrintToServer("onError: %s, RemoteAddr: %s, RemoteId: %s", errMsg, RemoteAddr, RemoteId);
-}
-
-void onSrvOpen(WebSocketServer ws, const char[] RemoteAddr, const char[] RemoteId)
-{
-  PrintToServer("onOpen: %x, RemoteAddr: %s, RemoteId: %s", ws, RemoteAddr, RemoteId);
-}
-
-void onSrvClose(WebSocketServer ws, int code, const char[] reason, const char[] RemoteAddr, const char[] RemoteId)
-{
-  PrintToServer("onClose: %d, reason: %s, RemoteAddr: %s, RemoteId: %s", code, reason, RemoteAddr, RemoteId);
-}
-```
+## Example
+* [Example Script](https://github.com/ProjectSky/sm-ext-websocket/tree/main/scripting)

pushbuild.txt

@@ -1,3 +1,4 @@
 0x0
 0x1
-0x2
+0x2
+0x3

scripting/include/websocket/http.inc

@@ -1,3 +1,5 @@
+// HTTP FUNCTIONS ARE NOT COMPLETED, THEY ARE STILL BEING TESTED
+
 // Define a typeset for HTTP response callbacks
 typeset ResponseCallback
 {
@@ -7,8 +9,9 @@ typeset ResponseCallback
   * @param http         HTTP request object
   * @param body         Response body
   * @param statusCode   HTTP status code
+  * @param bodySize     Size of the response body
   */
-  function void (HttpRequest http, const char[] body, int statusCode);
+  function void (HttpRequest http, const char[] body, int statusCode, int bodySize);
 }
 
 // Define a methodmap for HttpRequest, which extends Handle
@@ -29,8 +32,41 @@ methodmap HttpRequest < Handle
   */
   public native void SetResponseCallback(ResponseCallback fResponse);
 
- /**
- * Perform the HTTP request
- */
+  /**
+  * Perform the HTTP request
+  */
   public native void Perform();
+
+  /**
+  * Set the body of the HTTP request
+  *
+  * @param body   Body of the request
+  */
+  public native void SetBody(const char[] body);
+
+  /**
+  * Add a header to the HTTP request
+  *
+  * @param key   Header key
+  * @param value Header value
+  */
+  public native void AddHeader(const char[] key, const char[] value);
+
+  /**
+  * Get a header from the HTTP request
+  *
+  * @param key   Header key
+  * @param value Buffer to store the header value
+  * @param maxLength Maximum length of the value buffer
+  * @return True if the header was found, false otherwise
+  */
+  public native bool GetHeader(const char[] key, char[] value, int maxLength);
+
+  /**
+  * Check if a header exists in the HTTP request
+  *
+  * @param key   Header key
+  * @return True if the header exists, false otherwise
+  */
+  public native bool HasHeader(const char[] key);
 }

scripting/include/websocket/ws.inc

@@ -172,7 +172,7 @@ methodmap WebSocket < Handle
   /**
   * Set the handshake timeout for the WebSocket connection
   *
-  * @param                   timeout timeout in seconds
+  * @param                   timeout in seconds
   */
   property int HandshakeTimeout {
     public native set(int timeout);