src/docker/containers.v

@@ -3,22 +3,17 @@ module docker
 import json
 import net.urllib
 import time
-import net.http
 
 struct Container {
 	id    string   [json: Id]
 	names []string [json: Names]
 }
 
-pub fn (mut d DockerDaemon) containers() ?[]Container {
+// containers returns a list of all currently running containers
-	d.send_request('GET', urllib.parse('/v1.41/containers/json')?)?
+pub fn containers() ?[]Container {
-	res_header := d.read_response_head()?
+	res := request('GET', urllib.parse('/v1.41/containers/json') ?) ?
-	content_length := res_header.header.get(http.CommonHeader.content_length)?.int()
-	res := d.read_response_body(content_length)?
 
-	data := json.decode([]Container, res)?
+	return json.decode([]Container, res.text) or {}
-
-	return data
 }
 
 pub struct NewContainer {

src/docker/docker.v

@@ -5,12 +5,16 @@ import net.urllib
 import net.http
 import json
 
+const socket = '/var/run/docker.sock'
+
+const buf_len = 1024
+
 // send writes a request to the Docker socket, waits for a response & returns
 // it.
 fn send(req &string) ?http.Response {
 	// Open a connection to the socket
-	mut s := unix.connect_stream(socket) or {
+	mut s := unix.connect_stream(docker.socket) or {
-		return error('Failed to connect to socket ${socket}.')
+		return error('Failed to connect to socket ${docker.socket}.')
 	}
 
 	defer {
@@ -21,19 +25,19 @@ fn send(req &string) ?http.Response {
 	}
 
 	// Write the request to the socket
-	s.write_string(req) or { return error('Failed to write request to socket ${socket}.') }
+	s.write_string(req) or { return error('Failed to write request to socket ${docker.socket}.') }
 
 	s.wait_for_write() ?
 
 	mut c := 0
-	mut buf := []u8{len: buf_len}
+	mut buf := []u8{len: docker.buf_len}
 	mut res := []u8{}
 
 	for {
-		c = s.read(mut buf) or { return error('Failed to read data from socket ${socket}.') }
+		c = s.read(mut buf) or { return error('Failed to read data from socket ${docker.socket}.') }
 		res << buf[..c]
 
-		if c < buf_len {
+		if c < docker.buf_len {
 			break
 		}
 	}
@@ -41,7 +45,7 @@ fn send(req &string) ?http.Response {
 	// After reading the first part of the response, we parse it into an HTTP
 	// response. If it isn't chunked, we return early with the data.
 	parsed := http.parse_response(res.bytestr()) or {
-		return error('Failed to parse HTTP response from socket ${socket}.')
+		return error('Failed to parse HTTP response from socket ${docker.socket}.')
 	}
 
 	if parsed.header.get(http.CommonHeader.transfer_encoding) or { '' } != 'chunked' {
@@ -55,10 +59,12 @@ fn send(req &string) ?http.Response {
 		s.wait_for_write() ?
 
 		for {
-			c = s.read(mut buf) or { return error('Failed to read data from socket ${socket}.') }
+			c = s.read(mut buf) or {
+				return error('Failed to read data from socket ${docker.socket}.')
+			}
 			res << buf[..c]
 
-			if c < buf_len {
+			if c < docker.buf_len {
 				break
 			}
 		}

src/docker/socket.v

@@ -1,102 +0,0 @@
-module docker
-
-import net.unix
-import io
-import net.http
-import strings
-import net.urllib
-import json
-
-const (
-	socket         = '/var/run/docker.sock'
-	buf_len        = 10 * 1024
-	http_separator = [u8(`\r`), `\n`, `\r`, `\n`]
-)
-
-pub struct DockerDaemon {
-mut:
-	socket &unix.StreamConn
-	reader &io.BufferedReader
-}
-
-pub fn new_conn() ?&DockerDaemon {
-	s := unix.connect_stream(docker.socket)?
-
-	d := &DockerDaemon{
-		socket: s
-		reader: io.new_buffered_reader(reader: s)
-	}
-
-	return d
-}
-
-pub fn (mut d DockerDaemon) send_request(method string, url urllib.URL) ? {
-	req := '$method $url.request_uri() HTTP/1.1\nHost: localhost\n\n'
-
-	d.socket.write_string(req)?
-}
-
-pub fn (mut d DockerDaemon) send_request_with_body(method string, url urllib.URL, content_type string, body string) ? {
-	req := '$method $url.request_uri() HTTP/1.1\nHost: localhost\nContent-Type: $content_type\nContent-Length: $body.len\n\n$body\n\n'
-
-	d.socket.write_string(req)?
-}
-
-pub fn (mut d DockerDaemon) request_with_json<T>(method string, url urllib.URL, data &T) ? {
-	body := json.encode(data)
-
-	return request_with_body(method, url, 'application/json', body)
-}
-
-// read_response_head consumes the socket's contents until it encounters
-// '\r\n\r\n', after which it parses the response as an HTTP response.
-pub fn (mut d DockerDaemon) read_response_head() ?http.Response {
-	mut c := 0
-	mut buf := []u8{len: 4}
-	mut res := []u8{}
-
-	for {
-		c = d.reader.read(mut buf)?
-		res << buf[..c]
-
-		mut i := 0
-		mut match_len := 0
-
-		for i + match_len < c {
-			if buf[i + match_len] == docker.http_separator[match_len] {
-				match_len += 1
-			} else {
-				i += match_len + 1
-				match_len = 0
-			}
-		}
-
-		if match_len == 4 {
-			break
-		} else if match_len > 0 {
-			mut buf2 := []u8{len: 4 - match_len}
-			c2 := d.reader.read(mut buf2)?
-			res << buf2[..c2]
-
-			if buf2 == docker.http_separator[match_len..] {
-				break
-			}
-		}
-	}
-
-	return http.parse_response(res.bytestr())
-}
-
-pub fn (mut d DockerDaemon) read_response_body(length int) ?string {
-	mut buf := []u8{len: docker.buf_len}
-	mut c := 0
-	mut builder := strings.new_builder(docker.buf_len)
-
-	for builder.len < length {
-		c = d.reader.read(mut buf) or { break }
-
-		builder.write(buf[..c])?
-	}
-
-	return builder.str()
-}

src/main.v

@@ -31,7 +31,7 @@ fn main() {
 			logs.cmd(),
 		]
 	}
+
 	app.setup()
 	app.parse(os.args)
-	return
 }