Merge pull request #5 from VerityIncorporated/main

Replaced GetClients with safer GetClientIdByIndex

Author: ProjectSky

scripting/include/websocket/ws.inc

@@ -310,13 +310,14 @@ methodmap WebSocketServer < Handle
   public native bool DisconnectClient(const char[] clientId);
 
   /**
-  * Get handles for all connected clients
+  * Gets a client ID by index
   *
-  * @param buffer           Array to store client handles
-  * @param maxSize          Maximum size of the array
-  * @return                 Number of handles stored
+  * @param index       Index of the client ID to retrieve
+  * @param buffer      String buffer to store the ID
+  * @param maxlength   Maximum length of the buffer
+  * @return            true on success, false if index is invalid
   */
-  public native int GetClients(WebSocket[] buffer, int maxSize);
+  public native bool GetClientIdByIndex(int index, char[] buffer, int maxlength);
 
   /**
   * Start the WebSocket server
@@ -340,6 +341,13 @@ methodmap WebSocketServer < Handle
   */
   public native void IsDeflateEnabled();
 
+  /**
+  * Maximum length of client IDs (including null terminator)
+  */
+  property int MaxClientIdLength {
+    public native get();
+  }
+
   /**
   * Retrieves connected clients
   */

src/smsdk_config.h

@@ -3,7 +3,7 @@
 
 #define SMEXT_CONF_NAME			"SourceMod WebSocket Extension"
 #define SMEXT_CONF_DESCRIPTION	"Provide JSON and WebSocket Native"
-#define SMEXT_CONF_VERSION		"1.0.4"
+#define SMEXT_CONF_VERSION		"1.0.5"
 #define SMEXT_CONF_AUTHOR		"ProjectSky"
 #define SMEXT_CONF_URL			"https://github.com/ProjectSky/sm-ext-websocket"
 #define SMEXT_CONF_LOGTAG		"websocket"

src/ws_natives_server.cpp

@@ -263,46 +263,45 @@ static cell_t ws_IsDeflateEnabled(IPluginContext *pContext, const cell_t *params
 	return pWebsocketServer->m_webSocketServer.isPerMessageDeflateEnabled();
 }
 
-static cell_t ws_GetClients(IPluginContext *pContext, const cell_t *params)
+static cell_t ws_GetClientIdByIndex(IPluginContext *pContext, const cell_t *params)
 {
-	WebSocketServer *pWebsocketServer = GetWsServerPointer(pContext, params[1]);
-
-	if (!pWebsocketServer)
-	{
-		return 0;
-	}
+    WebSocketServer *pWebsocketServer = GetWsServerPointer(pContext, params[1]);
+    if (!pWebsocketServer)
+    {
+        return 0;
+    }
 
-	cell_t *outputArray;
-	pContext->LocalToPhysAddr(params[2], &outputArray);
-	cell_t maxSize = params[3];
+    cell_t index = params[2];
+    const auto& ids = pWebsocketServer->getClientIds();
 
-	auto clients = pWebsocketServer->m_webSocketServer.getClients();
-	size_t count = 0;
+    if (index < 0 || static_cast<size_t>(index) >= ids.size())
+    {
+        return 0;
+    }
 
-	HandleSecurity sec(nullptr, myself->GetIdentity());
+    pContext->StringToLocal(params[3], params[4], ids[index].c_str());
 
-	for (const auto &client : clients)
-	{
-		if (count >= maxSize)
-			break;
-
-		WebSocketClient *pClient = new WebSocketClient(client.first.get());
-		HandleError err;
-		Handle_t handle = handlesys->CreateHandleEx(g_htWsClient, pClient, &sec, nullptr, &err);
-
-		if (handle != BAD_HANDLE)
-		{
-			pClient->m_websocket_handle = handle;
-			pClient->m_keepConnecting = true;
-			outputArray[count++] = handle;
-		}
-		else
-		{
-			delete pClient;
-		}
-	}
+    return 1;
+}
 
-	return count;
+static cell_t ws_GetMaxClientIdLength(IPluginContext *pContext, const cell_t *params)
+{
+    WebSocketServer *pWebsocketServer = GetWsServerPointer(pContext, params[1]);
+    if (!pWebsocketServer)
+    {
+        return 0;
+    }
+
+    const auto& ids = pWebsocketServer->getClientIds();
+    size_t maxLen = 0;
+
+    for (const auto& id : ids)
+    {
+        if (id.length() > maxLen)
+            maxLen = id.length();
+    }
+
+    return static_cast<cell_t>(maxLen + 1);
 }
 
 const sp_nativeinfo_t ws_natives_server[] =
@@ -320,7 +319,8 @@ const sp_nativeinfo_t ws_natives_server[] =
 	{"WebSocketServer.ClientsCount.get",       ws_GetClientsCount},
 	{"WebSocketServer.EnablePong.get",         ws_SetOrGetPongEnable},
 	{"WebSocketServer.EnablePong.set",         ws_SetOrGetPongEnable},
-	{"WebSocketServer.GetClients",             ws_GetClients},
+	{"WebSocketServer.GetClientIdByIndex",     ws_GetClientIdByIndex},
+	{"WebSocketServer.MaxClientIdLength.get",  ws_GetMaxClientIdLength},
 	{"WebSocketServer.DisableDeflate",         ws_DisableDeflate},
 	{"WebSocketServer.IsDeflateEnabled",       ws_IsDeflateEnabled},
 	{nullptr, nullptr}

src/ws_server.cpp

@@ -159,4 +159,16 @@ bool WebSocketServer::disconnectClient(const std::string& clientId) {
 		}
 	}
 	return false;
+}
+
+std::vector<std::string> WebSocketServer::getClientIds() {
+    std::vector<std::string> clientIds;
+
+    auto clients = m_webSocketServer.getClients();
+
+    for (const auto& client : clients) {
+        clientIds.push_back(client.second);
+    }
+
+    return clientIds;
 }

src/ws_server.h

@@ -15,6 +15,7 @@ class WebSocketServer
 	void broadcastMessage(const std::string& message);
 	bool sendToClient(const std::string& clientId, const std::string& message);
 	bool disconnectClient(const std::string& clientId);
+	std::vector<std::string> getClientIds();
 
 	ix::WebSocketServer m_webSocketServer;
 	Handle_t m_webSocketServer_handle = BAD_HANDLE;