some cleanup

src/lib/compiler.cpp

@@ -1499,14 +1499,14 @@ void component_render(String name, DTree props, Request& context)
 		return;
 	}
 
-	DTree previous_call = context.call;
-	context.call = props;
+	DTree previous_props = context.props;
+	context.props = props;
 
 	String error_message = "";
 	if(!compiler_invoke_component(&context, resolved_name, render_name, &error_message) && error_message != "")
 		print(component_error_banner(error_message));
 
-	context.call = previous_call;
+	context.props = previous_props;
 }
 
 String component(String name)

src/lib/compiler.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#define RENDER(X) extern "C" void __uce_render(Request& context)
-#define COMPONENT(X) extern "C" void __uce_component(Request& context)
-#define WS(X) extern "C" void __uce_websocket(Request& context)
+#define RENDER(X) extern "C" void __uce_render(X)
+#define COMPONENT(X) extern "C" void __uce_component(X)
+#define WS(X) extern "C" void __uce_websocket(X)
 #define EXPORT extern "C"
 
 String preprocess_shared_unit(Request* context, SharedUnit* su);

src/lib/types.h

@@ -157,9 +157,9 @@ struct Request {
 	StringMap session;
 	String session_loaded_hash = "";
 
-	DTree var;
+	//DTree var;
 	DTree cfg;
-	DTree call;
+	DTree props;
 	DTree connection;
 
 	String session_id = "";

src/linux_fastcgi.cpp

@@ -478,23 +478,17 @@ Request websocket_exec_build_event_request(DTree job, String message)
 	if(event_request.params["HTTP_COOKIE"].length() > 0)
 		event_request.cookies = parse_cookies(event_request.params["HTTP_COOKIE"]);
 
-	event_request.var["ws"]["message"] = message;
-	event_request.var["ws"]["connection_id"] = event_request.resources.websocket_connection_id;
-	event_request.var["ws"]["scope"] = event_request.resources.websocket_scope;
-	event_request.var["ws"]["connection_count"] = (f64)event_request.resources.websocket_scope_connection_ids.size();
-	event_request.var["ws"]["opcode"] = (f64)event_request.resources.websocket_opcode;
-	event_request.var["ws"]["is_binary"].set_bool(event_request.resources.websocket_is_binary);
-	event_request.var["ws"]["is_text"].set_bool(event_request.resources.websocket_is_text);
-	event_request.var["ws"]["document_uri"] = first(
+	event_request.params["WS_MESSAGE"] = message;
+	event_request.params["WS_CONNECTION_ID"] = event_request.resources.websocket_connection_id;
+	event_request.params["WS_SCOPE"] = event_request.resources.websocket_scope;
+	event_request.params["WS_CONNECTION_COUNT"] = (f64)event_request.resources.websocket_scope_connection_ids.size();
+	event_request.params["WS_OPCODE"] = (f64)event_request.resources.websocket_opcode;
+	event_request.params["WS_MESSAGE_TYPE"] = (event_request.resources.websocket_is_binary ? "BINARY" : "TEXT");
+	event_request.params["WS_DOCUMENT_URI"] = first(
 		event_request.params["DOCUMENT_URI"],
 		event_request.params["REQUEST_URI"]
 	);
 
-	event_request.call["message"] = message;
-	event_request.call["connection_id"] = event_request.resources.websocket_connection_id;
-	event_request.call["scope"] = event_request.resources.websocket_scope;
-	event_request.call["opcode"] = (f64)event_request.resources.websocket_opcode;
-	event_request.call["document_uri"] = event_request.var["ws"]["document_uri"].to_string();
 	return(event_request);
 }
 
@@ -689,13 +683,6 @@ String normalize_ws_scope(String scope)
 	return(expand_path(scope, cwd_get()));
 }
 
-String ws_message()
-{
-	if(!context)
-		return("");
-	return(context->call["message"].to_string());
-}
-
 bool config_truthy(String raw, bool default_value = true)
 {
 	raw = to_lower(trim(raw));
@@ -883,7 +870,7 @@ int handle_complete(FastCGIRequest& request) {
 				}
 			}
 
-			request.call = DTree();
+			request.props = DTree();
 			compiler_invoke(&request, request.params["SCRIPT_FILENAME"]);
 		}
 		catch(const std::exception& e)