Refactor socket implementation with lock-free architecture

Core changes:
- Replace mutex-based synchronization with lock-free SPSC queues
- Add atomic operations for thread-safe socket state management
- Fix deadlock/crash when releasing sockets on Windows

New features:
- Add Unix domain socket support (UnixSocket)
- Add WebSocket client example (socket_websocket.sp)

Improvements:
- Update callback system with improved thread safety
- Refactor EventLoop with better async task handling

Author: ProjectSky

AMBuilder

@@ -16,6 +16,7 @@ for cxx in builder.targets:
     'src/impl/socket/SocketBase.cpp',
     'src/impl/socket/TcpSocket.cpp',
     'src/impl/socket/UdpSocket.cpp',
+    'src/impl/socket/UnixSocket.cpp',
     'src/impl/socket/SocketUtils.cpp',
     os.path.join(Extension.sm_root, 'public', 'smsdk_ext.cpp'),
   ]

README.md

@@ -6,8 +6,7 @@ A complete rewrite of the [original socket extension](https://github.com/JoinedS
 
 ## Features
 * Built on [libuv](https://github.com/libuv/libuv) for high-performance async I/O
-* TCP client and server support
-* UDP send/receive with SendTo support
+* TCP/UDP/UDS client and server support
 * IPv4/IPv6 support
 * Configurable socket options (timeout, buffer size, keep-alive, etc.)
 * Connect timeout for TCP connections

scripting/include/socket.inc

@@ -5,7 +5,8 @@
 
 enum SocketType {
 	SOCKET_TCP = 1,
-	SOCKET_UDP
+	SOCKET_UDP,
+	SOCKET_UNIX
 }
 
 enum SocketErrorType {
@@ -36,13 +37,13 @@ enum SocketOption {
 	SocketSendTimeout,         // SO_SNDTIMEO (ms, 0 = disabled)
 	DebugMode,                 // Enable debug logging
 	SocketConnectTimeout,      // Connect timeout (ms, 0 = disabled, TCP only)
-	SocketAutoClose            // Auto close handle on disconnect/error (0 = disabled, 1 = enabled)
+	SocketAutoFreeHandle       // Auto close handle on disconnect/error (0 = disabled, 1 = enabled)
 }
 
 /**
  * Callback for connection established
  *
- * @note TCP: Called when connection to remote host is established
+ * @note TCP/Unix: Called when connection to remote host is established
  * @note UDP: Called when Connect() hostname resolution completes (UDP is connectionless)
  *
  * @param socket    Socket handle
@@ -53,36 +54,36 @@ typedef SocketConnectCallback = function void (Socket socket, any data);
 /**
  * Callback for incoming connection on listening socket
  *
- * @note TCP only: Called when a new client connects to a listening socket
+ * @note TCP/Unix: Called when a new client connects to a listening socket
  * @note UDP: Not applicable (UDP is connectionless, use ReceiveCallback instead)
  *
  * @param socket      Listening socket handle
  * @param newSocket   New client socket handle
- * @param remoteIP    Client IP address
- * @param remotePort  Client port
+ * @param remoteIP    Client IP address (Unix: socket path)
+ * @param remotePort  Client port (Unix: 0)
  * @param data        User data passed to SetIncomingCallback
  */
 typedef SocketIncomingCallback = function void (Socket socket, Socket newSocket, const char[] remoteIP, int remotePort, any data);
 
 /**
  * Callback for data received
  *
- * @note TCP: Called when data is received from connected peer
+ * @note TCP/Unix: Called when data is received from connected peer
  * @note UDP: Called when data is received from any sender
  *
  * @param socket      Socket handle
  * @param buffer      Received data (null-terminated)
  * @param size        Data length (excluding null terminator)
- * @param senderIP    Sender IP address (UDP only, empty for TCP)
- * @param senderPort  Sender port (UDP only, 0 for TCP)
+ * @param senderIP    Sender IP address (TCP: remote peer, UDP: packet sender, Unix: empty)
+ * @param senderPort  Sender port (Unix: 0)
  * @param data        User data passed to SetReceiveCallback
  */
 typedef SocketReceiveCallback = function void (Socket socket, const char[] buffer, const int size, const char[] senderIP, int senderPort, any data);
 
 /**
  * Callback for remote disconnection
  *
- * @note TCP only: Called when remote peer closes the connection
+ * @note TCP/Unix: Called when remote peer closes the connection
  * @note UDP: Not applicable (UDP is connectionless)
  *
  * @param socket    Socket handle
@@ -93,26 +94,26 @@ typedef SocketDisconnectCallback = function void (Socket socket, any data);
 /**
  * Callback for socket error
  *
- * @param socket      Socket handle
- * @param errorType   Error type (SocketErrorType)
- * @param errorNum    System errno
- * @param data        User data passed to SetErrorCallback
+ * @param socket        Socket handle
+ * @param errorType     Error type (SocketErrorType)
+ * @param errorMsg      Error message string
+ * @param data          User data passed to SetErrorCallback
  */
-typedef SocketErrorCallback = function void (Socket socket, const int errorType, const int errorNum, any data);
+typedef SocketErrorCallback = function void (Socket socket, const int errorType, const char[] errorMsg, any data);
 
 /**
  * Callback for listen ready
  *
- * @note Called when Listen() completes and socket is ready to accept connections (TCP) or receive data (UDP)
+ * @note Called when Listen() completes and socket is ready to accept connections (TCP/Unix) or receive data (UDP)
  *
  * @param socket       Socket handle
- * @param localIP      Local bound IP address
- * @param localPort    Local bound port
+ * @param localIP      Local bound IP address (Unix: socket path)
+ * @param localPort    Local bound port (Unix: 0)
  * @param data         User data passed to SetListenCallback
  */
 typedef SocketListenCallback = function void (Socket socket, const char[] localIP, int localPort, any data);
 
-// Socket methodmap for TCP/UDP communication
+// Socket methodmap for TCP/UDP/Unix communication
 methodmap Socket < Handle {
 	/**
 	 * Creates a new socket
@@ -136,9 +137,10 @@ methodmap Socket < Handle {
 	 *
 	 * @note TCP: Establishes a connection to the remote host
 	 * @note UDP: Sets default destination for Send() (no actual connection)
+	 * @note Unix: Connects to the specified socket path (port is ignored)
 	 *
-	 * @param host    Remote IP or hostname
-	 * @param port    Remote port
+	 * @param host    Remote IP or hostname (Unix: socket path)
+	 * @param port    Remote port (Unix: ignored)
 	 */
 	public native void Connect(const char[] host, int port);
 
@@ -153,16 +155,16 @@ methodmap Socket < Handle {
 	 * Forcefully closes TCP connection with RST (TCP only)
 	 *
 	 * @note Immediately terminates connection without TIME_WAIT state
-	 * @note Only works for TCP sockets, returns false for UDP
+	 * @note Only works for TCP sockets, returns false for UDP/Unix
 	 *
 	 * @return    True on success
 	 */
 	public native bool CloseReset();
 
 	/**
-	 * Starts listening for connections (TCP) or receiving data (UDP)
+	 * Starts listening for connections (TCP/Unix) or receiving data (UDP)
 	 *
-	 * @note TCP: Starts accepting incoming connections (requires SetIncomingCallback)
+	 * @note TCP/Unix: Starts accepting incoming connections (requires SetIncomingCallback)
 	 * @note UDP: Starts receiving data (use SetReceiveCallback)
 	 *
 	 * @return    True on success
@@ -172,7 +174,7 @@ methodmap Socket < Handle {
 	/**
 	 * Sends data
 	 *
-	 * @note TCP: Sends to connected peer
+	 * @note TCP/Unix: Sends to connected peer
 	 * @note UDP: Requires prior Connect() call to set destination
 	 *
 	 * @param data    Data to send
@@ -195,7 +197,7 @@ methodmap Socket < Handle {
 	 *
 	 * @param option    Option to set
 	 * @param value     Option value
-	 * @return          True on success false on failure
+	 * @return          True on success, false on failure
 	 */
 	public native bool SetOption(SocketOption option, int value);
 
@@ -232,9 +234,9 @@ methodmap Socket < Handle {
 	public native void SetConnectCallback(SocketConnectCallback callback, any data = 0);
 
 	/**
-	 * Sets incoming connection callback (TCP only)
+	 * Sets incoming connection callback (TCP/Unix only)
 	 *
-	 * @note Required for TCP server mode. Not applicable for UDP.
+	 * @note Required for TCP/Unix server mode. Not applicable for UDP.
 	 *
 	 * @param callback    Callback function
 	 * @param data        User data passed to callback
@@ -256,7 +258,7 @@ methodmap Socket < Handle {
 	 *
 	 * @param buffer       Destination buffer
 	 * @param maxLength    Buffer size
-	 * @return             True on success false on failure
+	 * @return             True on success, false on failure
 	 */
 	public static native bool GetHostName(char[] buffer, int maxLength);
 
@@ -268,7 +270,7 @@ methodmap Socket < Handle {
 	 *
 	 * @param buffer       Destination buffer
 	 * @param maxLength    Buffer size
-	 * @return             True on success false on failure
+	 * @return             True on success, false on failure
 	 */
 	public native bool GetLocalAddress(char[] buffer, int maxLength);
 
@@ -283,7 +285,10 @@ methodmap Socket < Handle {
 	public native int GetLocalPort();
 
 	/**
-	 * Whether socket is connected
+	 * Whether socket is connected/listening
+	 *
+	 * @note TCP/Unix: True if connected to peer or listening for connections
+	 * @note UDP: True if socket is initialized
 	 */
 	property bool Connected {
 		public native get();

scripting/socket_http.sp

@@ -1,3 +1,23 @@
+/**
+ * Socket HTTP GET Example
+ *
+ * Demonstrates simple HTTP GET requests using TCP sockets.
+ * Supports multiple concurrent requests.
+ *
+ * Commands:
+ *   sm_httpget <host> [port] [path] - Make HTTP GET request
+ *
+ * Usage:
+ *   sm_httpget example.com              - GET http://example.com/
+ *   sm_httpget example.com 80 /api      - GET http://example.com/api
+ *   sm_httpget api.example.com 8080 /v1 - GET http://api.example.com:8080/v1
+ *
+ * Note: This is a basic HTTP/1.1 client. For HTTPS, use a dedicated HTTP library.
+ */
+
+#pragma semicolon 1
+#pragma newdecls required
+
 #include <sourcemod>
 #include <socket>
 
@@ -9,7 +29,6 @@ public Plugin myinfo = {
 	url = "https://github.com/ProjectSky/sm-ext-socket"
 }
 
-// HTTP request context
 enum struct HttpRequest {
 	Socket socket;
 	char host[128];
@@ -26,7 +45,6 @@ public void OnPluginStart() {
 	RegConsoleCmd("sm_httpget", Command_HttpGet, "Make HTTP GET request");
 }
 
-// Usage: sm_httpget <host> [port] [path]
 Action Command_HttpGet(int client, int args) {
 	if (args < 1) {
 		ReplyToCommand(client, "Usage: sm_httpget <host> [port] [path]");
@@ -51,11 +69,11 @@ Action Command_HttpGet(int client, int args) {
 	}
 
 	req.socket = new Socket();
-	req.socket.SetOption(SocketConnectTimeout, 10000);  // 10 second timeout
-	req.socket.SetConnectCallback(OnHttpConnect);
-	req.socket.SetReceiveCallback(OnHttpReceive);
-	req.socket.SetDisconnectCallback(OnHttpDisconnect);
-	req.socket.SetErrorCallback(OnHttpError);
+	req.socket.SetOption(SocketConnectTimeout, 10000);
+	req.socket.SetConnectCallback(Socket_OnConnect);
+	req.socket.SetReceiveCallback(Socket_OnReceive);
+	req.socket.SetDisconnectCallback(Socket_OnDisconnect);
+	req.socket.SetErrorCallback(Socket_OnError);
 
 	int index = g_Requests.PushArray(req);
 	req.socket.Connect(req.host, req.port);
@@ -65,7 +83,7 @@ Action Command_HttpGet(int client, int args) {
 	return Plugin_Handled;
 }
 
-static void OnHttpConnect(Socket socket, any data) {
+void Socket_OnConnect(Socket socket, any data) {
 	int index = FindRequestBySocket(socket);
 	if (index == -1) return;
 
@@ -85,7 +103,7 @@ static void OnHttpConnect(Socket socket, any data) {
 	socket.Send(request);
 }
 
-static void OnHttpReceive(Socket socket, const char[] buffer, const int size, const char[] senderIP, int senderPort, any data) {
+void Socket_OnReceive(Socket socket, const char[] buffer, const int size, const char[] senderIP, int senderPort, any data) {
 	int index = FindRequestBySocket(socket);
 	if (index == -1) return;
 
@@ -106,7 +124,7 @@ static void OnHttpReceive(Socket socket, const char[] buffer, const int size, co
 	g_Requests.SetArray(index, req);
 }
 
-static void OnHttpDisconnect(Socket socket, any data) {
+void Socket_OnDisconnect(Socket socket, any data) {
 	int index = FindRequestBySocket(socket);
 	if (index == -1) return;
 
@@ -134,14 +152,14 @@ static void OnHttpDisconnect(Socket socket, any data) {
 	CleanupRequest(index);
 }
 
-static void OnHttpError(Socket socket, const int errorType, const int errorNum, any data) {
+void Socket_OnError(Socket socket, const int errorType, const char[] errorMsg, any data) {
 	int index = FindRequestBySocket(socket);
 	if (index == -1) return;
 
 	HttpRequest req;
 	g_Requests.GetArray(index, req);
 
-	PrintToServer("[HTTP] Error for %s:%d: type=%d, errno=%d", req.host, req.port, errorType, errorNum);
+	PrintToServer("[HTTP] Error for %s:%d: type=%d, message=%s", req.host, req.port, errorType, errorMsg);
 	CleanupRequest(index);
 }
 
@@ -161,13 +179,4 @@ void CleanupRequest(int index) {
 	g_Requests.GetArray(index, req);
 	delete req.socket;
 	g_Requests.Erase(index);
-}
-
-public void OnPluginEnd() {
-	HttpRequest req;
-	for (int i = 0; i < g_Requests.Length; i++) {
-		g_Requests.GetArray(i, req);
-		delete req.socket;
-	}
-	delete g_Requests;
 }