Skip to content

Commit

Permalink
rewrite "not found" HTTP demo
Browse files Browse the repository at this point in the history
  • Loading branch information
@dalnefre
dalnefre committed Jan 26, 2025
1 parent d875075 commit 8f3206f
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 160 deletions.
2 changes: 1 addition & 1 deletion apps/tcp/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ Make sure you have Deno installed, then run

You can test it by running something like

nc 127.0.0.1 8370 | od -x
nc 127.0.0.1 8370 | od -t x1z

and inspecting the output for a random byte.
214 changes: 59 additions & 155 deletions apps/tcp/not_found.asm
View file
Original file line number Diff line number Diff line change
@@ -1,192 +1,96 @@
; A uFork program that listens for TCP connections, sending each connection
; a 404 Not Found HTTP response, then closing it.
; a "404 Not Found" HTTP response, then closing it.

.import
dev: "https://ufork.org/lib/dev.asm"
std: "https://ufork.org/lib/std.asm"
blob: "https://ufork.org/lib/blob.asm"
http: "https://ufork.org/lib/http_data.asm"

petname: ; the bind address
ref 0

;;; Example HTTP response
http_response:
;; HTTP/1.0 404 Not Found
pair_t 'H'
pair_t 'T'
pair_t 'T'
pair_t 'P'
pair_t '/'
pair_t '1'
pair_t '.'
pair_t '0'
pair_t ' '
pair_t '4'
pair_t '0'
pair_t '4'
pair_t ' '
pair_t 'N'
pair_t 'o'
pair_t 't'
pair_t ' '
pair_t 'F'
pair_t 'o'
pair_t 'u'
pair_t 'n'
pair_t 'd'
pair_t '\r'
pair_t '\n'
;; Content-Type: text/plain
pair_t 'C'
pair_t 'o'
pair_t 'n'
pair_t 't'
pair_t 'e'
pair_t 'n'
pair_t 't'
pair_t '-'
pair_t 'T'
pair_t 'y'
pair_t 'p'
pair_t 'e'
pair_t ':'
pair_t ' '
pair_t 't'
pair_t 'e'
pair_t 'x'
pair_t 't'
pair_t '/'
pair_t 'p'
pair_t 'l'
pair_t 'a'
pair_t 'i'
pair_t 'n'
pair_t '\r'
pair_t '\n'
;; Content-Length: 11
pair_t 'C'
pair_t 'o'
pair_t 'n'
pair_t 't'
pair_t 'e'
pair_t 'n'
pair_t 't'
pair_t '-'
pair_t 'L'
pair_t 'e'
pair_t 'n'
pair_t 'g'
pair_t 't'
pair_t 'h'
pair_t ':'
pair_t ' '
pair_t '1'
pair_t '1'
pair_t '\r'
pair_t '\n'
;;
pair_t '\r'
pair_t '\n'
content:
;; Not Found
pair_t 'N'
pair_t 'o'
pair_t 't'
pair_t ' '
pair_t 'F'
pair_t 'o'
pair_t 'u'
pair_t 'n'
pair_t 'd'
pair_t '\r'
pair_t '\n'
ref #nil

list_len: ; ( list -- len )
roll -2 ; k list
push 0 ; k list len=0
list_len_loop: ; k list len
pick 2 ; k list len list
typeq #pair_t ; k list len is_pair(list)
if_not list_len_end ; k list len
push 1 ; k list len 1
alu add ; k list len+1
roll 2 ; k len+1 list
nth -1 ; k len+1 rest(list)
roll 2 ; k rest(list) len+1
ref list_len_loop
list_len_end: ; k list len
roll 2 ; k len list
drop 1 ; k len
ref std.return_value

list_size: ; --
state 0 ; list
call list_len ; size=len
ref std.cust_send

; blob that must be read only once in sequential order
blob_once: ; list <- cust,req
msg -1 ; req
eq #? ; req==#?
if list_size ; --
msg -1 ; req
typeq #fixnum_t ; is_fix(req)
if_not std.rv_false ; --
state -1 ; rest
push blob_once ; rest blob_once
actor become ; --
state 1 ; first
ref std.cust_send

boot: ; _ <- {caps}

; Initialize static-content blob

push http.not_found_rsp ; list=http_request
msg 0 ; list {caps}
push listen ; list {caps} listen
actor create ; list cust=listen.{caps}
pair 1 ; cust,list
msg 0 ; cust,list {caps}
push dev.blob_key ; cust,list {caps} blob_key
dict get ; cust,list blob_dev
push blob.init ; cust,list blob_dev init
actor create ; cust,list init.blob_dev
ref std.send_msg

listen: ; {caps} <- blob

; Send a listen request to the TCP device.

msg 0 ; {caps}
push on_open_beh ; {caps} on_open_beh
actor create ; on_open=on_open_beh.{caps}
msg 0 ; blob
; push #? ; blob #?
; push std.sink_beh ; blob #? sink_beh
; actor create ; blob log=sink_beh.#?
state 0 ; blob {caps}
push dev.debug_key ; blob {caps} debug_key
dict get ; blob log=debug_dev
pair 1 ; log,blob

dup 1 ; log,blob log,blob
push listening ; log,blob log,blob listening
actor become ; log,blob

push open_beh ; log,blob open_beh
actor create ; on_open=open_beh.log,blob
push petname ; on_open petname
push #? ; on_open petname #?
push std.sink_beh ; on_open petname #? sink_beh
actor create ; on_open petname callback=sink_beh.#?
actor self ; on_open petname callback=SELF
push #? ; on_open petname callback to_cancel=#?
pair 3 ; listen_req=to_cancel,callback,petname,on_open
msg 0 ; listen_req {caps}
state 0 ; listen_req {caps}
push dev.tcp_key ; listen_req {caps} tcp_key
dict get ; listen_req tcp_dev
ref std.send_msg

on_open_beh: ; {caps} <- conn
listening: ; log,blob <- ok,value

; Log result of listen request

; Create a read-once "blob" wrapping a static pair-list response.
state -1 ; blob
msg 0 ; blob ok,value
pair 1 ; (ok,value),blob
state 1 ; (ok,value),blob log
ref std.send_msg

push http_response ; http_response
push blob_once ; http_response blob_once
actor create ; blob=blob_once.http_response
open_beh: ; log,blob <- conn

; Send the blob over the connection.

state 0 ; blob {caps}
msg 0 ; blob {caps} conn
pair 1 ; blob conn,{caps}
push close_beh ; blob conn,{caps} close_beh
actor create ; blob callback=close_beh.conn,{caps}
state 0 ; log,blob
part 1 ; blob log
msg 0 ; blob log conn
pair 1 ; blob conn,log
push close_beh ; blob conn,log close_beh
actor create ; blob callback=close_beh.conn,log
push #? ; blob callback to_cancel=#?
pair 2 ; write_req=to_cancel,callback,blob
msg 0 ; write_req conn
ref std.send_msg

close_beh: ; conn,{caps} <- _
close_beh: ; conn,log <- ok,value

; Log result of write request

msg 0 ; ok,value
state -1 ; ok,value log
actor send ; --

; Close the connection.

push #nil ; #nil
; push #? ; #nil #?
; push std.sink_beh ; #nil #? sink_beh
; actor create ; #nil callback=sink_beh.#?
state -1 ; #nil {caps}
push dev.debug_key ; #nil {caps} debug_key
dict get ; #nil callback=debug_dev
state -1 ; #nil callback=log
push #? ; #nil callback to_cancel=#?
pair 2 ; close_req=to_cancel,callback,#nil
state 1 ; close_req conn
Expand Down
16 changes: 14 additions & 2 deletions apps/tcp/tcp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
// where <src> is the relative path (or absolute URL) to a .asm or .hum module
// to boot from, and <bind_address> defaults to 127.0.0.1:8370.

/*jslint deno, global */
/*jslint deno, global, long */

import hex from "https://ufork.org/lib/hex.js";
import {join} from "https://deno.land/[email protected]/path/join.ts";
import {toFileUrl} from "https://deno.land/[email protected]/path/to_file_url.ts";
import parseq from "https://ufork.org/lib/parseq.js";
Expand Down Expand Up @@ -54,6 +55,17 @@ function run() {
}
}

function audit(code, evidence, ep, kp) {
globalThis.console.error("code:", code, "evidence:", hex.from(evidence), "ep:", hex.from(ep), "kp:", hex.from(kp));
//const k_quad = core.u_read_quad(kp);
//globalThis.console.error("k_quad:", k_quad);
//const ip = k_quad.t;
//const sp = k_quad.x;
//hex.from(ucode.from_uf(cell), 16);
//globalThis.console.error("ip:", hex.from(ip), "sp:", hex.from(sp), "ep:", hex.from(k_quad.y));
//globalThis.console.error(core.u_sourcemap(ip));
}

const unqualified_src = Deno.args[0];
const bind_address = Deno.args[1] ?? "127.0.0.1:8370";
if (unqualified_src === undefined || unqualified_src === "") {
Expand All @@ -66,7 +78,7 @@ const src = new URL(unqualified_src, cwd_dir).href;
core = ufork.make_core({
wasm_url,
on_wakeup: run,
on_audit: globalThis.console.error,
on_audit: audit,
on_log: globalThis.console.error,
log_level: ufork.LOG_TRACE,
compilers: {asm: assemble, hum: compile_humus},
Expand Down
4 changes: 2 additions & 2 deletions docs/svg_drawing.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ the most-recent is returned.
### Write Request

When sent a request with input `fixnum`,
it writes that character to the drawing device and produces `#?`.
it writes that value to the drawing device and produces `#?`.
When sent a request with a nil-terminated pair-list of `fixnum`s,
it writes each character in sequential order to the drawing device and produces `#?`.
it writes each value in sequential order to the drawing device and produces `#?`.

For example, `'X',5,21,3,'F','o','o','F',0,127,0,255,#nil`
draws the text "Foo" filled with medium green starting at 5,21.
Expand Down

0 comments on commit 8f3206f

Please sign in to comment.