cbaines/guile-knots
1
Fork 0
Code Issues 1 Pull requests Activity Actions

Compare commits

base: cbaines:338d08081e5c90cc23978147394021fa84a4f5cc
Branches Tags
cbaines:trunk
cbaines:pages
cbaines:actions-test
..
compare: cbaines:39ae5177f2527169721d7d895e2953021e136bf4
Branches Tags
cbaines:trunk
cbaines:pages
cbaines:actions-test

3 commits
338d08081e ... 39ae5177f2

Author SHA1 Message Date
Christopher Baines
39ae5177f2 Add spawn-fiber/knots
Some checks failed
/ test (push) Has been cancelled
Details 
Which is like spawn-fiber, but uses knots exception handling.
 2026-01-09 15:44:04 +00:00
Christopher Baines
991a5f6961 Make print-backtrace-and-exception/knots more reliable 
Catch failures in the Guile code for printing backtraces, and print
the partial backtrace, plus the backtrace of the exception that
happened.
 2026-01-09 15:31:54 +00:00
Christopher Baines
4642f7c7d2 Fix some issues handling head requests 
Rather than raising an exception when there's a body provided, use the
body as normal to inform the headers, as this is useful, and just
don't write the body to the client.
 2026-01-09 15:14:47 +00:00
3 changed files with 229 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

152
knots.scm
View file

@ -2,6 +2,7 @@
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 suspendable-ports) #:use-module (ice-9 suspendable-ports)
#:use-module (fibers)
#:use-module (fibers conditions) #:use-module (fibers conditions)
#:use-module (system repl debug) #:use-module (system repl debug)
#:export (call-with-default-io-waiters #:export (call-with-default-io-waiters
@ -15,7 +16,9 @@
knots-exception? knots-exception?
knots-exception-stack knots-exception-stack
print-backtrace-and-exception/knots)) print-backtrace-and-exception/knots
spawn-fiber/knots))
(define (call-with-default-io-waiters thunk) (define (call-with-default-io-waiters thunk)
(parameterize (parameterize
@ -67,6 +70,58 @@
(define* (print-backtrace-and-exception/knots (define* (print-backtrace-and-exception/knots
exn exn
#:key (port (current-error-port))) #:key (port (current-error-port)))
(define (get-string port stack)
(define stack-len
(stack-length stack))
(let ((knots-stacks
(map knots-exception-stack
(filter knots-exception?
(simple-exceptions exn)))))
(let* ((stack-vec
(stack->vector stack))
(stack-vec-length
(vector-length stack-vec)))
(print-frames (list->vector
(drop
(vector->list stack-vec)
(if (< stack-vec-length 5)
0
4)))
port
#:count (stack-length stack)))
(for-each
(lambda (stack)
(let* ((stack-vec
(stack->vector stack))
(stack-vec-length
(vector-length stack-vec)))
(print-frames (list->vector
(drop
(vector->list stack-vec)
(if (< stack-vec-length 4)
0
3)))
port
#:count (stack-length stack))))
knots-stacks)
(print-exception
port
(if (null? knots-stacks)
(stack-ref stack
(if (< stack-len 4)
stack-len
4))
(let* ((stack (last knots-stacks))
(stack-len (stack-length stack)))
(stack-ref stack
(if (< stack-len 3)
stack-len
3))))
'%exception
(list exn))))
(let* ((stack (let* ((stack
(match (fluid-ref %stacks) (match (fluid-ref %stacks)
((stack-tag . prompt-tag) ((stack-tag . prompt-tag)
@ -75,56 +130,53 @@
0 (and prompt-tag 1))) 0 (and prompt-tag 1)))
(_ (_
(make-stack #t)))) (make-stack #t))))
(stack-len (string-port
(stack-length stack)) (open-output-string))
(error-string (error-string
(call-with-output-string (with-exception-handler
(lambda (port) (lambda (exn)
(let ((knots-stacks (display (get-output-string string-port)
(map knots-exception-stack port)
(filter knots-exception? (close-output-port string-port)
(simple-exceptions exn))))) (display "\n\n" port)
(let* ((stack-vec (backtrace port)
(stack->vector stack)) (simple-format
(stack-vec-length
(vector-length stack-vec)))
(print-frames (list->vector
(drop
(vector->list stack-vec)
(if (< stack-vec-length 5)
0
4)))
port
#:count (stack-length stack)))
(for-each
(lambda (stack)
(let* ((stack-vec
(stack->vector stack))
(stack-vec-length
(vector-length stack-vec)))
(print-frames (list->vector
(drop
(vector->list stack-vec)
(if (< stack-vec-length 4)
0
3)))
port
#:count (stack-length stack))))
knots-stacks)
(print-exception
port port
(if (null? knots-stacks) "\nexception in print-backtrace-and-exception/knots: ~A\n"
(stack-ref stack exn)
(if (< stack-len 4) (raise-exception exn))
stack-len (lambda ()
4)) (get-string string-port stack)
(let* ((stack (last knots-stacks)) (let ((str (get-output-string string-port)))
(stack-len (stack-length stack))) (close-output-port string-port)
(stack-ref stack str)))))
(if (< stack-len 3)
stack-len
3))))
'%exception
(list exn)))))))
(display error-string port))) (display error-string port)))
(define* (spawn-fiber/knots thunk #:optional scheduler #:key parallel?)
(spawn-fiber
(lambda ()
(with-exception-handler
(lambda (exn)
(display "Uncaught exception in task:\n"
(current-error-port))
(print-backtrace-and-exception/knots exn))
(lambda ()
(with-exception-handler
(lambda (exn)
(let ((stack
(match (fluid-ref %stacks)
((stack-tag . prompt-tag)
(make-stack #t
0 prompt-tag
0 (and prompt-tag 1)))
(_
(make-stack #t)))))
(raise-exception
(make-exception
exn
(make-knots-exception stack)))))
thunk))
#:unwind? #t))
scheduler
#:parallel? parallel?))

121
knots/web-server.scm
View file

@ -228,8 +228,6 @@ on the procedure being called at any particular time."
(adapt-response-version response (adapt-response-version response
(request-version request)) (request-version request))
body)) body))
((not body)
(values response #vu8()))
((string? body) ((string? body)
(let* ((type (response-content-type response (let* ((type (response-content-type response
'(text/plain))) '(text/plain)))
@ -243,16 +241,15 @@ on the procedure being called at any particular time."
`(,@type (charset . ,charset)))) `(,@type (charset . ,charset))))
(string->bytevector body charset)))) (string->bytevector body charset))))
((not (or (bytevector? body) ((not (or (bytevector? body)
(procedure? body))) (procedure? body)
(eq? #f body)))
(raise-exception (raise-exception
(make-exception-with-irritants (make-exception-with-irritants
(list (make-exception-with-message (list (make-exception-with-message
"unexpected body type") "unexpected body type")
body)))) body))))
((and (response-must-not-include-body? response) ((and (response-must-not-include-body? response)
body body)
;; FIXME make this stricter: even an empty body should be prohibited.
(not (zero? (bytevector-length body))))
(raise-exception (raise-exception
(make-exception-with-irritants (make-exception-with-irritants
(list (make-exception-with-message (list (make-exception-with-message
@ -262,25 +259,24 @@ on the procedure being called at any particular time."
;; check length; assert type; add other required fields? ;; check length; assert type; add other required fields?
(values (response-maybe-add-connection-header-value (values (response-maybe-add-connection-header-value
request request
(if (procedure? body) (cond
(if (response-content-length response) ((procedure? body)
response (if (response-content-length response)
(extend-response response response
'transfer-encoding (extend-response response
'((chunked)))) 'transfer-encoding
(let ((rlen (response-content-length response)) '((chunked)))))
(blen (bytevector-length body))) ((bytevector? body)
(cond (let ((rlen (response-content-length response))
(rlen (if (= rlen blen) (blen (bytevector-length body)))
response (cond
(error "bad content-length" rlen blen))) (rlen (if (= rlen blen)
(else (extend-response response 'content-length blen)))))) response
(error "bad content-length" rlen blen)))
(else (extend-response response 'content-length blen)))))
(else response)))
(if (eq? (request-method request) 'HEAD) (if (eq? (request-method request) 'HEAD)
(raise-exception #f
(make-exception-with-irritants
(list (make-exception-with-message
"unexpected body type")
body)))
body))))) body)))))
(define (with-stack-and-prompt thunk) (define (with-stack-and-prompt thunk)
@ -405,41 +401,48 @@ on the procedure being called at any particular time."
(let ((response-start-time (let ((response-start-time
(get-internal-real-time)) (get-internal-real-time))
(body-written? (body-written?
(if (procedure? body) (cond
(let* ((type (response-content-type response ((and (procedure? body)
'(text/plain))) (not
(declared-charset (assq-ref (cdr type) 'charset)) (eq? (request-method request)
(charset (or declared-charset "ISO-8859-1")) 'HEAD)))
(body-port (let* ((type (response-content-type response
(if (response-content-length response) '(text/plain)))
client (declared-charset (assq-ref (cdr type) 'charset))
(make-chunked-output-port/knots (charset (or declared-charset "ISO-8859-1"))
client (body-port
#:keep-alive? #t (if (response-content-length response)
#:buffering client
(- buffer-size (make-chunked-output-port/knots
(chunked-output-port-overhead-bytes client
buffer-size)))))) #:keep-alive? #t
(set-port-encoding! body-port charset) #:buffering
(let ((body-written? (- buffer-size
(with-exception-handler (chunked-output-port-overhead-bytes
(lambda (exn) buffer-size))))))
#f) (set-port-encoding! body-port charset)
(lambda () (let ((body-written?
(with-exception-handler (with-exception-handler
(lambda (exn) (lambda (exn)
(print-backtrace-and-exception/knots exn) #f)
(raise-exception exn)) (lambda ()
(lambda () (with-exception-handler
(body body-port))) (lambda (exn)
#t) (print-backtrace-and-exception/knots exn)
#:unwind? #t))) (raise-exception exn))
(unless (response-content-length response) (lambda ()
(close-port body-port)) (body body-port)))
body-written?)) #t)
(begin #:unwind? #t)))
(put-bytevector client body) (unless (response-content-length response)
#t)))) (close-port body-port))
body-written?)))
((bytevector? body)
(put-bytevector client body)
#t)
(else
;; No body to write
#t))))
(if body-written? (if body-written?
(begin (begin
(force-output client) (force-output client)

65
tests/web-server.scm
View file

@ -1,5 +1,6 @@
(use-modules (srfi srfi-71) (use-modules (srfi srfi-71)
(rnrs bytevectors) (rnrs bytevectors)
(ice-9 match)
(ice-9 binary-ports) (ice-9 binary-ports)
(ice-9 textual-ports) (ice-9 textual-ports)
(tests) (tests)
@ -233,4 +234,68 @@
(assert-equal (get-message exception-handled-sucecssfully-channel) (assert-equal (get-message exception-handled-sucecssfully-channel)
#t)))) #t))))
(run-fibers-for-tests
(lambda ()
(let* ((web-server
(run-knots-web-server
(lambda (request)
(match (split-and-decode-uri-path
(uri-path (request-uri request)))
(("head-no-body")
(values '((content-type . (text/plain)))
#f))
(("head-empty-body")
(values '((content-type . (text/plain)))
""))
(("head-no-body-with-content-length")
(values '((content-type . (text/plain))
(content-length . 10))
#f))
(("head-with-body")
(values '((content-type . (text/plain)))
"foo"))
(("head-procedure-body")
(values '((content-type . (text/plain)))
(lambda _
(error "should not be run"))))
(("head-procedure-body-with-content-length")
(values '((content-type . (text/plain))
(content-length . 10))
(lambda _
(error "should not be run"))))))
#:port 0)) ;; Bind to any port
(port
(web-server-port web-server)))
(define* (head path)
(let ((uri
(build-uri 'http #:host "127.0.0.1" #:port port
#:path path)))
(http-head
uri
#:port (non-blocking-open-socket-for-uri uri))))
(let ((response
(head "/head-no-body")))
(assert-equal 200 (response-code response)))
(let ((response
(head "/head-empty-body")))
(assert-equal 200 (response-code response))
(assert-equal 0 (response-content-length response)))
(let ((response
(head "/head-no-body-with-content-length")))
(assert-equal 200 (response-code response))
(assert-equal 10 (response-content-length response)))
(let ((response
(head "/head-with-body")))
(assert-equal 200 (response-code response))
(assert-equal 3 (response-content-length response)))
(let ((response
(head "/head-procedure-body")))
(assert-equal 200 (response-code response)))
(let ((response
(head "/head-procedure-body-with-content-length")))
(assert-equal 200 (response-code response))
(assert-equal 10 (response-content-length response))))))
(display "web-server test finished successfully\n") (display "web-server test finished successfully\n")