stomp: minor updates

mrjbq7 · May 9, 2024 · 641cf5c · 641cf5c
1 parent 60f4712
commit 641cf5c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/extra/stomp/cli/cli.factor b/extra/stomp/cli/cli.factor
@@ -14,12 +14,8 @@ INITIALIZED-SYMBOL: stomp-port [ 61613 ]
 CONSTANT: stomp-mailbox $[ <mailbox> ]
 
 : put-frame ( frame -- )
-    [ "put: " write dup . flush ] with-global
     stomp-mailbox mailbox-put ;
 
-: get-frame ( frame -- )
-    [ "\nget: " write . flush ] with-global ;
-
 CONSTANT: COMMANDS {
     T{ command
         { name "abort" }
@@ -77,7 +73,7 @@ M: stomp-command-loop run-command-loop
     [
         stomp-host get resolve-host [ ipv4? ] filter random
         stomp-port get with-port utf8 [
-            stomp-mailbox [ nl get-frame ] stomp-loop
+            stomp-mailbox [ [ nl . flush ] with-global ] stomp-loop
         ] with-client
     ] in-thread call-next-method ;
 

diff --git a/extra/stomp/stomp.factor b/extra/stomp/stomp.factor
@@ -24,6 +24,8 @@ INITIALIZED-SYMBOL: stomp-version [ "1.1" ]
         { "1.2" [ "\\" "\\\\" replace "\n" "\\n" replace ":" "\\c" replace "\r" "\\r" replace ] }
     } case ;
 
+! XXX: unescape-header
+
 : read-command ( -- command )
     readln ;
 
@@ -94,7 +96,7 @@ INITIALIZED-SYMBOL: stomp-ack-mode [ "auto" ]
 : write-frame ( frame -- )
     receipt-id stomp-debug
     [ command>> print ]
-    [ headers>> [ ":" swap [ write ] tri@ nl ] assoc-each nl ]
+    [ headers>> [ escape-header ":" swap [ write ] tri@ nl ] assoc-each nl ]
     [ body>> [ write ] when* 0 write1 ] tri flush ;
 
 SYMBOL: stomp-heartbeat