next-cmd should only be called by get-document at the end of 20 status

client.rkt

@@ -166,7 +166,8 @@
          'get-document
          (string-append "unsupported scheme: ~a~n"
                         "  url: ~a~n")
-         (url-scheme destination) destination))
+         (url-scheme destination)
+         (url->string destination)))
 
       (define-values (status meta body-port)
         (net:request destination))
@@ -190,12 +191,15 @@
         [(and (>= status 10) (<= status 19))
          (displayln "input requested")
          (display "? ")
+         (flush-output)
 
          (get-document
           (struct-copy
            url
            destination
-           [query `((,(string->symbol (read-line)) . #f))]))]
+           [query `((,(string->symbol
+                       (read-line (current-input-port)
+                                  'any)) . #f))]))]
 
         ;;
         ;; 20-29 SUCCESS
@@ -214,12 +218,13 @@
              'get-document
              (string-append "unsupported mime ~a~n"
                             "  url: ~a~n")
-             meta destination)])
+             meta (url->string destination))])
 
          ;; If the document failed to be fetched (parser error,
          ;; unsupported mime, so on and so forth) this would not
          ;; ever be reached.
-         (set! history (cons destination history))]
+         (set! history (cons destination history))
+         (next-cmd)]
 
         ;;
         ;; 30-39 REDIRECT
@@ -243,7 +248,7 @@
                          "  url: ~a~n"
                          "  explanation: ~a~n")
           status
-          (string->url destination)
+          (url->string destination)
           (dict-ref temporary-failures
                     status
                     "temporary failure"))]
@@ -258,7 +263,7 @@
                          "  url: ~a~n"
                          "  explanation: ~a~n")
           status
-          (string->url destination)
+          (url->string destination)
           (dict-ref permanent-failures
                     status
                     "temporary failure"))]
@@ -271,6 +276,4 @@
           'get-document
           (string-append "resource requires a client certificate, "
                          "which this client does not yet support~a~n"
-                         "  url: ~a~n"))])
+                         "  url: ~a~n"))]))))
-
-      (next-cmd)))

gem300.rkt

@@ -1,3 +1,4 @@
+#! /usr/bin/env /usr/local/bin/racket
 #lang racket
 
 (require (prefix-in net: "net.rkt")
@@ -8,6 +9,8 @@
 (define (repl)
   (display "G-300 > ")
 
+  (flush-output)
+
   (with-handlers
     ([(or/c exn:fail:user?
             ;; todo: catch these errors separately and reformat them
@@ -17,7 +20,8 @@
       (λ (exn)
         (displayln (exn-message exn)))])
 
-    (match (regexp-match #px"(\\w+)\\s*(.*)" (read-line))
+    (match (regexp-match #px"(\\w+)\\s*(.*)"
+                         (read-line (current-input-port) 'any))
       [(or (list _ "go" url)
            (list _ "g" url))
        (send client go-cmd url)]
@@ -45,7 +49,20 @@
            (list _ "b" _))
        (send client back-cmd)]
 
+      [(or (list _ "quit" _)
+           (list _ "q" _ ))
+       (exit)]
+
       [else
        (displayln "no such command")]))
 
   (repl))
+
+(displayln
+ (string-append "welcome to gem300, a gemini client.\n"
+                "to learn more, type:\n"
+                "'go w6vvn.flounder.online/gem300/tutorial.gmi'"))
+
+(flush-output)
+
+(repl)

gmi.rkt

@@ -110,7 +110,7 @@
   (define (inner-iter acc rst)
     (let ([line (string-join acc)])
       (if (or (empty? rst)
-              (> (string-length line) 80))
+              (> (string-length line) 40))
           (values acc rst)
           (inner-iter (append acc (list (car rst)))
                       (cdr rst)))))