diff options
| author | Shulhan <ms@kilabit.info> | 2026-02-06 07:08:29 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2026-02-06 07:08:29 +0700 |
| commit | 54d395f53e344a3cf3861c0e3d2f82ad14ecc602 (patch) | |
| tree | 9f19525f8b950ddd9d715d9abe71e5545df4d65e /testdata | |
| parent | a3c27356bfe3e56809f579b617e02829a7ea0a68 (diff) | |
| download | awwan-54d395f53e344a3cf3861c0e3d2f82ad14ecc602.tar.xz | |
all: improve the Server-Sent Events (SSE) output
In the ExecResponse, store the event in the Output instead of message
data, so the server can iterate the Output directly and pass it to
WriteEvent directly.
The event ID now start at 1 with type "begin".
This is to minimize confusion when comparing empty Last-Event-ID from
client, which is equal to 0.
Diffstat (limited to 'testdata')
| -rw-r--r-- | testdata/http_server/execute/cancel_test.data | 23 | ||||
| -rw-r--r-- | testdata/http_server/execute/local_test.data | 21 |
2 files changed, 29 insertions, 15 deletions
diff --git a/testdata/http_server/execute/cancel_test.data b/testdata/http_server/execute/cancel_test.data index edf21f9..2db8d38 100644 --- a/testdata/http_server/execute/cancel_test.data +++ b/testdata/http_server/execute/cancel_test.data @@ -18,36 +18,41 @@ The SSE data is quoted to make the string viewable. "begin_at": "2023-11-26T15:21:00Z", "end_at": "", "error": "", - "output": [] + "output": [ + { + "Type": "begin", + "Data": "2023-11-26T15:21:00Z", + "ID": "1" + } + ] }, "code": 200 } <<< local:/cancel.aww:1-:tail event: open +data: "" +id: event: begin data: "2023-11-26T15:21:00Z" +id: 1 event: message data: " === BEGIN: local /cancel.aww 1-\n" -id: 0 +id: 2 event: message data: " --> 1: sleep 300\n" -id: 1 +id: 3 event: message data: " !!! ExecLocal: signal: killed\n" -id: 2 - -event: message -data: "Local: ExecLocal: signal: killed" -id: 2 +id: 4 event: end data: "2023-11-26T15:21:00Z" -id: 2 +id: 5 diff --git a/testdata/http_server/execute/local_test.data b/testdata/http_server/execute/local_test.data index 5f96637..0c573b8 100644 --- a/testdata/http_server/execute/local_test.data +++ b/testdata/http_server/execute/local_test.data @@ -16,35 +16,44 @@ "begin_at": "2023-11-26T15:21:00Z", "end_at": "", "error": "", - "output": [] + "output": [ + { + "Type": "begin", + "Data": "2023-11-26T15:21:00Z", + "ID": "1" + } + ] }, "code": 200 } <<< local:/local.aww:1-:tail event: open +data: "" +id: event: begin data: "2023-11-26T15:21:00Z" +id: 1 event: message data: " === BEGIN: local /local.aww 1-\n" -id: 0 +id: 2 event: message data: " --> 1: echo \"test\"\n" -id: 1 +id: 3 event: message data: "test\n" -id: 2 +id: 4 event: message data: " === END: local /local.aww 1-\n" -id: 3 +id: 5 event: end data: "2023-11-26T15:21:00Z" -id: 3 +id: 6 |
