hellerve/request
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleaned up request end

Browse Source
This commit is contained in:
hellerve
2016-03-02 17:47:38 +01:00
parent ff36a6c652
commit 1fbdca93f4
1 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
request.zp
View File

@@ -22,7 +22,14 @@
(set-follow-redirects (lambda (flag) (set-follow-redirects (lambda (flag)
(set! FOLLOW-REDIRECTS flag))) (set! FOLLOW-REDIRECTS flag)))
(parse-request (lambda (req scheme path req-headers complete) (end-request (lambda (res sock)
(begin
(net:close-socket sock)
(if (and (in? [302 301] (res :status)) FOLLOW-REDIRECTS)
(request ((res :request) :scheme) ((res :headers) "Location") ((res :request) :headers))
res))))
(parse-request (lambda (req scheme path req-headers complete sock)
(let* ((split (string:split req "\r\n\r\n")) (let* ((split (string:split req "\r\n\r\n"))
(headers (string:split (car split) "\r\n")) (headers (string:split (car split) "\r\n"))
(body (if (> (length split) 1) (string:join (cdr split) #\newline) "")) (body (if (> (length split) 1) (string:join (cdr split) #\newline) ""))
@@ -37,9 +44,11 @@
:status (string->integer status) :status (string->integer status)
:http http-version :http http-version
:path path :path path
:request (make-hash :scheme scheme
:headers req-headers)
:status-message message))) :status-message message)))
(if (and (eq? (res :status) 302) FOLLOW-REDIRECTS complete) (if complete
(request scheme ((res :headers) "Location") req-headers) (end-request res sock)
res)))) res))))
(chunked (lambda (sock req) (chunked (lambda (sock req)
@@ -48,25 +57,25 @@
(num (car split)) (num (car split))
(size (string->number (++ "#x" num))) (size (string->number (++ "#x" num)))
(diff (- size (- (length body) (+ (length num) 4))))) (diff (- size (- (length body) (+ (length num) 4)))))
(let loop ((acc (string:join (cdr split) #\newline)) (if (eq? size 0)
(cur (byte-vector->string (net:recv sock (make-small diff)))) (end-request req sock)
(size diff)) (let loop ((acc (string:join (cdr split) #\newline))
(if (>= (length cur) size) (cur (byte-vector->string (net:recv sock (make-small diff))))
(let* ((chunk (substring cur 0 size)) (size diff))
(trail (substring cur size (length cur))) (if (>= (length cur) size)
(next (++ trail (byte-vector->string (net:recv sock BSIZE)))) (let* ((chunk (substring cur 0 size))
(split (string:split next "\r\n")) (trail (substring cur size (length cur)))
(num (car split)) (next (++ trail (byte-vector->string (net:recv sock BSIZE))))
(next (substring next (+ (length num) 2) (length next))) (split (string:split next "\r\n"))
(size (+ (string->number (++ "#x" num)) 2))) (num (car split))
(if (eq? size 2) (next (substring next (+ (length num) 2) (length next)))
(begin (size (+ (string->number (++ "#x" num)) 2)))
(net:close-socket sock) (if (eq? size 2)
(hash:set req :body (++ acc chunk))) (end-request req sock)
(loop (++ acc chunk) next size))) (loop (++ acc chunk) next size)))
(loop acc (loop acc
(++ cur (byte-vector->string (net:recv sock (make-small (- size (length cur)))))) (++ cur (byte-vector->string (net:recv sock (make-small (- size (length cur))))))
size)))))) size)))))))
(request (lambda (scheme path . req-headers) (request (lambda (scheme path . req-headers)
(let* ((path (if (string:starts-with path "http://") (substring path 7 (length path)) path)) (let* ((path (if (string:starts-with path "http://") (substring path 7 (length path)) path))
@@ -93,7 +102,7 @@
(len -1)) (len -1))
(if (eq? len -1) (if (eq? len -1)
(let* ((nrecvd (++ bytes recvd)) (let* ((nrecvd (++ bytes recvd))
(req (parse-request (byte-vector->string nrecvd) scheme path req-headers #f)) (req (parse-request (byte-vector->string nrecvd) scheme path req-headers #f sock))
(headers (get-from req :headers #{})) (headers (get-from req :headers #{}))
(l (get-from headers "Content-Length"))) (l (get-from headers "Content-Length")))
(if (and (eq? l (nil)) (not (eq? headers #{}))) (if (and (eq? l (nil)) (not (eq? headers #{})))
@@ -103,9 +112,7 @@
(loop recvd bytes (length recvd) (string->number l)))) (loop recvd bytes (length recvd) (string->number l))))
(let* ((ncur (+ cur (length recvd)))) (let* ((ncur (+ cur (length recvd))))
(if (>= ncur len) (if (>= ncur len)
(begin (parse-request (byte-vector->string (++ bytes recvd)) scheme path req-headers #t sock)
(net:close-socket sock)
(parse-request (byte-vector->string (++ bytes recvd)) scheme path req-headers #t))
(loop (net:recv sock (min BSIZE (- len cur))) (++ bytes recvd) ncur len))))))))) (loop (net:recv sock (min BSIZE (- len cur))) (++ bytes recvd) ncur len)))))))))
(get (lambda (path . headers) (get (lambda (path . headers)