From e5275d9861ffacff87607cb24e69e46cb826f25f Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 14 May 2019 13:39:09 -0700 Subject: [PATCH] updates +unix-task, aqua/ph compiles --- app/aqua-eyre.hoon | 2 +- app/aqua.hoon | 2 +- lib/ph/azimuth.hoon | 6 ++--- sys/zuse.hoon | 56 +++++++++++++++++++++++++++++++++++++-------- 4 files changed, 51 insertions(+), 15 deletions(-) diff --git a/app/aqua-eyre.hoon b/app/aqua-eyre.hoon index f40f5f8c4c..de8ac53c2b 100644 --- a/app/aqua-eyre.hoon +++ b/app/aqua-eyre.hoon @@ -137,7 +137,7 @@ ..abet-pe =. http-requests (~(del in http-requests) num) =. this - (emit-aqua-events [%event who [//http/0v1n.2m9vh %they num res]]~) + (emit-aqua-events [%event who [//http/0v1n.2m9vh %receive num [%start [p.res q.res] r.res &]]]~) ..abet-pe :: :: Got error in HTTP response diff --git a/app/aqua.hoon b/app/aqua.hoon index 600fa1fc74..02fd5757a9 100644 --- a/app/aqua.hoon +++ b/app/aqua.hoon @@ -461,7 +461,7 @@ %event ~? &(aqua-debug=| !?=(?(%belt %hear) -.q.ue.ae)) raw-event=[who.ae -.q.ue.ae] - ~? &(debug=& ?=(%they -.q.ue.ae)) + ~? &(debug=& ?=(%receive -.q.ue.ae)) raw-event=[who.ae ue.ae] (push-events:(pe who.ae) [ue.ae]~) == diff --git a/lib/ph/azimuth.hoon b/lib/ph/azimuth.hoon index 2efabfa6a5..0a60265f6a 100644 --- a/lib/ph/azimuth.hoon +++ b/lib/ph/azimuth.hoon @@ -114,10 +114,10 @@ :_ ~ :* %event who.pin - //http/0v1n.2m9vh - %they + //http-client/0v1n.2m9vh + %receive num.u.thus - [200 ~ `(as-octs:mimes:html resp)] + [%start [200 ~] `(as-octs:mimes:html resp) &] == :: ++ logs-to-json diff --git a/sys/zuse.hoon b/sys/zuse.hoon index a7032f0991..0447875bde 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -7488,16 +7488,52 @@ == :: ++ unix-task :: input from unix - $% {$belt p/belt:dill} :: dill: keyboard - {$blew p/blew:dill} :: dill: configure - {$boat ~} :: clay: reboot - {$born ~} :: eyre: new process - [%crud tag=@tas =tang] :: any vane: error report - {$hail ~} :: dill: refresh - {$hear p/lane:ames q/@} :: ames: input packet - {$hook ~} :: dill: hangup - {$into p/desk q/? r/mode:clay} :: clay: external edit - {$wake ~} :: behn: wakeup + $% :: %ames: new process + :: + [%barn ~] + :: %dill: keyboard input + :: + [%belt p=belt:dill] + :: %dill: configure terminal (resized) + :: + [%blew p=blew:dill] + :: %clay: new process + :: + [%boat ~] + :: %behn/%lient/%rver: new process + :: + [%born ~] + %cancel-request + :: any vane: error report + :: + [%crud tag=@tas =tang] + :: %dill: reset terminal configuration + :: + [%hail ~] + :: %ames: hear packet + :: + [%hear p=lane:ames q=@] + :: %clay: external edit + :: + [%into p=desk q=? r=mode:clay] + :: %rver: learn ports of live http servers + :: + [%live insecure=@ud secure=(unit @ud)] + :: %lient: hear (partial) http response + :: + [%receive id=@ud =http-event:http] + :: %rver: starts handling an inbound http request + :: + [%request secure=? =address:http-server =request:http] + :: %rver: starts handling an backdoor http request + :: + [%request-local secure=? =address:http-server =request:http] + :: %behn: wakeup + :: + [%wake ~] + :: %ames: send message + :: + [%want p=ship q=path r=*] == :: :: :::: ++azimuth :: (2az) azimuth