Rename RequestData -> DataIn, ResponseData -> DataOut

This commit is contained in:
Tony Garnock-Jones 2018-11-05 17:48:50 +00:00
parent e9e837f181
commit df43e5fb1c
2 changed files with 13 additions and 11 deletions

View File

@ -29,15 +29,16 @@ assertion type HttpsServer(host, port, options);
assertion type WebSocket(id, server, path, query);
assertion type Request(id, server, method, path, query, req);
message type RequestData(id, chunk);
assertion type Response(id, code, message, headers, detail);
message type ResponseData(id, chunk);
message type DataIn(id, chunk);
message type DataOut(id, chunk);
Object.assign(module.exports, {
HttpServer, HttpsServer,
WebSocket, Request, RequestData,
Response, ResponseData,
WebSocket, Request, DataIn,
Response, DataOut,
});
spawn named 'HttpServerFactory' {
@ -163,7 +164,7 @@ function _server(host, port, httpsOptions) {
res.end();
facet.stop();
}
on message ResponseData(id, $chunk) {
on message DataOut(id, $chunk) {
res.write(chunk);
}
}
@ -201,13 +202,13 @@ function _server(host, port, httpsOptions) {
facet.stop();
}));
on asserted Observe(RequestData(id, _)) {
on asserted Observe(DataIn(id, _)) {
ws.on('message', Dataspace.wrapExternal((message) => {
^ RequestData(id, message);
^ DataIn(id, message);
}));
}
on message ResponseData(id, $message) {
on message DataOut(id, $message) {
ws.send(message);
}

View File

@ -36,6 +36,7 @@ function counter() {
assert Counter(id);
field this.counter = 0;
during Http.Request($reqId, server, 'get', ['counter', id], _, _) {
assert :snapshot Http.Response(
reqId, 200, "OK", {"Content-type": "text/html"},
@ -114,11 +115,11 @@ spawn named 'greetingServer' {
spawn named 'websocketEchoServer' {
during Http.WebSocket($reqId, server, ['echo'], _) {
on message Http.RequestData(reqId, $message) {
on message Http.DataIn(reqId, $message) {
console.log('got', reqId, message);
^ Http.ResponseData(reqId, message);
^ Http.DataOut(reqId, message);
}
stop on message Http.RequestData(reqId, "quit");
stop on message Http.DataIn(reqId, "quit");
}
}