x.websocket: move to net.websocket module (#10648)

Author: helto4real

.github/workflows/websockets.yml

@@ -27,25 +27,25 @@ jobs:
       - name: v doctor
         run: ./v doctor
       - name: Run websockets tests
-        run: ./v -g test vlib/x/websocket/
+        run: ./v -g test vlib/net/websocket/
 
   ## Autobahn integrations tests
       - name: Run autobahn services
-        run: docker-compose -f ${{github.workspace}}/vlib/x/websocket/tests/autobahn/docker-compose.yml up -d
+        run: docker-compose -f ${{github.workspace}}/vlib/net/websocket/tests/autobahn/docker-compose.yml up -d
 
       - name: Wait for the service to start
         run: sleep 10s
 
       - name: Build client test
-        run: docker exec autobahn_client "/src/v" "/src/vlib/x/websocket/tests/autobahn/autobahn_client.v"
+        run: docker exec autobahn_client "/src/v" "/src/vlib/net/websocket/tests/autobahn/autobahn_client.v"
       - name: Run client test
-        run: docker exec autobahn_client "/src/vlib/x/websocket/tests/autobahn/autobahn_client"
+        run: docker exec autobahn_client "/src/vlib/net/websocket/tests/autobahn/autobahn_client"
 
       - name: Build client wss test
-        run: docker exec autobahn_client "/src/v" "/src/vlib/x/websocket/tests/autobahn/autobahn_client_wss.v"
+        run: docker exec autobahn_client "/src/v" "/src/vlib/net/websocket/tests/autobahn/autobahn_client_wss.v"
 
       - name: Run client wss test
-        run: docker exec autobahn_client "/src/vlib/x/websocket/tests/autobahn/autobahn_client_wss"
+        run: docker exec autobahn_client "/src/vlib/net/websocket/tests/autobahn/autobahn_client_wss"
       - name: Run server test
         run: docker exec autobahn_server "wstest" "-m" "fuzzingclient" "-s" "/config/fuzzingclient.json"
 

cmd/tools/vtest-self.v

@@ -44,11 +44,11 @@ const (
 		'vlib/vweb/request_test.v',
 		'vlib/net/http/request_test.v',
 		'vlib/vweb/route_test.v',
-		'vlib/x/websocket/websocket_test.v',
+		'vlib/net/websocket/websocket_test.v',
 		'vlib/crypto/rand/crypto_rand_read_test.v',
 	]
 	skip_with_fsanitize_address   = [
-		'vlib/x/websocket/websocket_test.v',
+		'vlib/net/websocket/websocket_test.v',
 	]
 	skip_with_fsanitize_undefined = [
 		'do_not_remove',
@@ -83,7 +83,7 @@ const (
 		'vlib/vweb/request_test.v',
 		'vlib/net/http/request_test.v',
 		'vlib/vweb/route_test.v',
-		'vlib/x/websocket/websocket_test.v',
+		'vlib/net/websocket/websocket_test.v',
 		'vlib/net/http/http_httpbin_test.v',
 		'vlib/net/http/header_test.v',
 	]
@@ -98,7 +98,7 @@ const (
 		'vlib/v/tests/orm_sub_struct_test.v',
 		'vlib/net/websocket/ws_test.v',
 		'vlib/net/unix/unix_test.v',
-		'vlib/x/websocket/websocket_test.v',
+		'vlib/net/websocket/websocket_test.v',
 		'vlib/vweb/tests/vweb_test.v',
 		'vlib/vweb/request_test.v',
 		'vlib/net/http/request_test.v',

examples/websocket/client-server/client.v

@@ -1,7 +1,7 @@
 module main
 
 import os
-import x.websocket
+import net.websocket
 import term
 
 // This client should be compiled an run in different konsoles

examples/websocket/client-server/server.v

@@ -1,6 +1,6 @@
 module main
 
-import x.websocket
+import net.websocket
 import term
 
 // this server accepts client connections and broadcast all messages to other connected clients

examples/websocket/ping.v

@@ -2,7 +2,7 @@ module main
 
 import time
 import os
-import x.websocket
+import net.websocket
 
 fn main() {
 	println('press enter to quit...\n')
@@ -12,6 +12,8 @@ fn main() {
 	os.get_line()
 }
 
+// start_server starts the websocket server, it receives messages
+// and send it back to the client that sent it
 fn start_server() ? {
 	mut s := websocket.new_server(.ip6, 30000, '')
 	// Make that in execution test time give time to execute at least one time
@@ -36,6 +38,8 @@ fn start_server() ? {
 	}
 }
 
+// start_client starts the websocket client, it writes a message to
+// the server and prints all the messages received
 fn start_client() ? {
 	mut ws := websocket.new_client('ws://localhost:30000') ?
 	// mut ws := websocket.new_client('wss://echo.websocket.org:443')?

vlib/x/openssl/openssl.v renamed to vlib/net/openssl/ssl_connection.v

@@ -1,17 +1,41 @@
 module openssl
 
 import net
-import net.openssl as nssl
 import time
 
+// SSLConn is the current connection
+pub struct SSLConn {
+mut:
+	sslctx   &C.SSL_CTX
+	ssl      &C.SSL
+	handle   int
+	duration time.Duration
+}
+
+// new_ssl_conn instance an new SSLCon struct
+pub fn new_ssl_conn() &SSLConn {
+	return &SSLConn{
+		sslctx: 0
+		ssl: 0
+		handle: 0
+	}
+}
+
+// Select operation
+enum Select {
+	read
+	write
+	except
+}
+
 // shutdown closes the ssl connection and do clean up
 pub fn (mut s SSLConn) shutdown() ? {
 	if s.ssl != 0 {
 		mut res := 0
 		for {
 			res = C.SSL_shutdown(voidptr(s.ssl))
 			if res < 0 {
-				err_res := nssl.ssl_error(res, s.ssl) or {
+				err_res := ssl_error(res, s.ssl) or {
 					break // We break to free rest of resources
 				}
 				if err_res == .ssl_error_want_read {
@@ -99,7 +123,7 @@ pub fn (mut s SSLConn) connect(mut tcp_conn net.TcpConn, hostname string) ? {
 	for {
 		res = C.SSL_connect(voidptr(s.ssl))
 		if res != 1 {
-			err_res := nssl.ssl_error(res, s.ssl) ?
+			err_res := ssl_error(res, s.ssl) ?
 			if err_res == .ssl_error_want_read {
 				for {
 					ready := @select(s.handle, .read, s.duration) ?
@@ -128,7 +152,7 @@ pub fn (mut s SSLConn) socket_read_into_ptr(buf_ptr &byte, len int) ?int {
 	for {
 		res = C.SSL_read(voidptr(s.ssl), buf_ptr, len)
 		if res < 0 {
-			err_res := nssl.ssl_error(res, s.ssl) ?
+			err_res := ssl_error(res, s.ssl) ?
 			if err_res == .ssl_error_want_read {
 				for {
 					ready := @select(s.handle, .read, s.duration) ?
@@ -170,7 +194,7 @@ pub fn (mut s SSLConn) write(bytes []byte) ?int {
 			remaining := bytes.len - total_sent
 			mut sent := C.SSL_write(voidptr(s.ssl), ptr, remaining)
 			if sent <= 0 {
-				err_res := nssl.ssl_error(sent, s.ssl) ?
+				err_res := ssl_error(sent, s.ssl) ?
 				if err_res == .ssl_error_want_read {
 					for {
 						ready := @select(s.handle, .read, s.duration) ?
@@ -202,9 +226,9 @@ This is basically a copy of Emily socket implementation of select.
 	This have to be consolidated into common net lib features
 	when merging this to V
 */
-[typedef]
-pub struct C.fd_set {
-}
+// [typedef]
+// pub struct C.fd_set {
+// }
 
 // Select waits for an io operation (specified by parameter `test`) to be available
 fn @select(handle int, test Select, timeout time.Duration) ?bool {