pd-edge: cleanup legacy/compat code

Author: fffonion

pd-edge-abi/src/abi_spec/tcp.rs

@@ -24,7 +24,7 @@ fn tcp_stream_bind(stream: i64, local_addr: &str) {
 }
 
 #[pd_host_function(name = "tcp::stream::set_target")]
-fn tcp_stream_set_target(stream: i64, target: &str) {
+fn tcp_stream_set_target(stream: i64, host: &str, port: i64) {
     unreachable!("abi declaration only")
 }
 

pd-edge-abi/src/abi_spec/udp.rs

@@ -24,7 +24,7 @@ fn udp_socket_bind(socket: i64, local_addr: &str) {
 }
 
 #[pd_host_function(name = "udp::socket::set_target")]
-fn udp_socket_set_target(socket: i64, target: &str) {
+fn udp_socket_set_target(socket: i64, host: &str, port: i64) {
     unreachable!("abi declaration only")
 }
 

pd-edge-abi/src/abi_spec/websocket.rs

@@ -19,7 +19,22 @@ fn websocket_connection_is_present(connection: i64) -> bool {
 }
 
 #[pd_host_function(name = "websocket::connection::set_target")]
-fn websocket_connection_set_target(connection: i64, target: &str) {
+fn websocket_connection_set_target(connection: i64, host: &str, port: i64) {
+    unreachable!("abi declaration only")
+}
+
+#[pd_host_function(name = "websocket::connection::set_scheme")]
+fn websocket_connection_set_scheme(connection: i64, scheme: &str) {
+    unreachable!("abi declaration only")
+}
+
+#[pd_host_function(name = "websocket::connection::set_path")]
+fn websocket_connection_set_path(connection: i64, path: &str) {
+    unreachable!("abi declaration only")
+}
+
+#[pd_host_function(name = "websocket::connection::set_query")]
+fn websocket_connection_set_query(connection: i64, query: &str) {
     unreachable!("abi declaration only")
 }
 

pd-edge/examples/console/sample_console_http3_client.rss

@@ -1,5 +1,5 @@
 // Run with:
-// cargo run -p pd-edge --bin pd-edge-console -- --program pd-edge/examples/console/sample_console_http3_client.rss --run -- https://127.0.0.1:4443 GET
+// cargo run -p pd-edge --bin pd-edge-console -- --program pd-edge/examples/console/sample_console_http3_client.rss --run -- 127.0.0.1 GET
 // Pass "-" as the body argument to stream the request body from stdin.
 // Pass "false" as the fourth argument to disable TLS certificate verification.
 
@@ -11,12 +11,18 @@ use tls;
 let argc = console::args::count();
 
 if argc == 0 {
-    console::stderr::write("usage: <url> [method] [body|-] [verify=true|false]\n");
-    console::stderr::write("example: https://127.0.0.1:4443 POST - false\n");
+    console::stderr::write("usage: <host> [method] [body|-] [verify=true|false]\n");
+    console::stderr::write("example: 127.0.0.1 POST - false\n");
     console::stderr::flush();
     runtime::exit();
 } else {
-    let target = console::args::get(0);
+    let host = console::args::get(0);
+    let port = 4443;
+    if host == "" {
+        console::stderr::write("host is required\n");
+        console::stderr::flush();
+        runtime::exit();
+    }
     let method = if argc > 1 => {
         console::args::get(1)
     } else => {
@@ -40,7 +46,8 @@ if argc == 0 {
     let verify_tls = verify_arg != "false" && verify_arg != "0" && verify_arg != "off";
 
     let exchange = http::exchange::new();
-    http::exchange::set_target(exchange, target);
+    http::exchange::set_target(exchange, host, port);
+    http::exchange::set_scheme(exchange, "https");
     http::exchange::set_method(exchange, method);
     http::exchange::set_version(exchange, "3");
     if body != "" {

pd-edge/examples/http/proxy/sample_proxy_program.rss

@@ -1,18 +1,14 @@
 use http;
 use proxy;
-use runtime;
 
-// Minimal forwarding sample: send the request to x-upstream-target and mirror the response.
-let upstream = http::request::get_header("x-upstream-target");
-
-if upstream == "" {
-    http::response::set_status(400);
-    http::response::set_body("missing x-upstream-target");
-    runtime::exit();
-}
+// Minimal forwarding sample wired to a fixed local upstream fixture.
+let upstream_host = "127.0.0.1";
+let upstream_port = 18080;
+let upstream_path = "/sample";
 
 let exchange = http::exchange::default_upstream();
-http::exchange::set_target(exchange, upstream);
+http::exchange::set_target(exchange, upstream_host, upstream_port);
+http::exchange::set_path(exchange, upstream_path);
 
 if http::request::get_header("Streaming") != "" {
     // Accessing the response metadata/body implicitly executes the outbound exchange.

pd-edge/examples/http/proxy/sample_request_transform_program.rss

@@ -1,18 +1,14 @@
 use http;
 use proxy;
-use runtime;
 
 // Forward requests after optionally rewriting the downstream body chunk-by-chunk.
-let upstream = http::request::get_header("x-upstream-target");
-
-if upstream == "" {
-    http::response::set_status(400);
-    http::response::set_body("missing x-upstream-target");
-    runtime::exit();
-}
+let upstream_host = "127.0.0.1";
+let upstream_port = 18081;
+let upstream_path = "/transform";
 
 let exchange = http::exchange::default_upstream();
-http::exchange::set_target(exchange, upstream);
+http::exchange::set_target(exchange, upstream_host, upstream_port);
+http::exchange::set_path(exchange, upstream_path);
 
 if http::request::get_header("Chunk-Transform") != "" {
     // Consume the request stream incrementally and annotate each chunk before upload.

pd-edge/examples/http/proxy/sample_sse_proxy_program.rss

@@ -1,19 +1,15 @@
 use http;
 use io;
-use runtime;
 use tcp;
 
-let target = http::request::get_header("x-upstream-target");
-
-if target == "" {
-    http::response::set_status(400);
-    http::response::set_body("missing x-upstream-target");
-    runtime::exit();
-}
+let upstream_host = "127.0.0.1";
+let upstream_port = 18082;
+let upstream_path = "/events";
 
 // Start the upstream exchange and mirror the SSE response head.
 let upstream = http::exchange::default_upstream();
-http::exchange::set_target(upstream, target);
+http::exchange::set_target(upstream, upstream_host, upstream_port);
+http::exchange::set_path(upstream, upstream_path);
 
 let status = http::exchange::get_status(upstream);
 http::response::set_status(status);

pd-edge/examples/http/proxy/sample_subrequest_proxy_program.rss

@@ -1,32 +1,30 @@
 use http;
-use runtime;
 use tcp;
 use tls;
 
-// Required request headers:
-// - x-primary-target: first upstream endpoint sent through the default exchange handle
-// - x-secondary-target: second upstream endpoint sent through an explicit exchange handle
-let primary_target = http::request::get_header("x-primary-target");
-let secondary_target = http::request::get_header("x-secondary-target");
-
-if primary_target == "" || secondary_target == "" {
-    http::response::set_status(400);
-    http::response::set_body("missing x-primary-target or x-secondary-target");
-    runtime::exit();
-}
+let primary_host = "127.0.0.1";
+let primary_port = 18083;
+let primary_path = "/plain";
+let secondary_host = "localhost";
+let secondary_port = 18483;
+let secondary_path = "/secure";
+let secondary_scheme = "https";
 
 // Use both the default handle and a second explicit handle to demonstrate concurrent subrequests.
 let primary = http::exchange::default_upstream();
 let secondary = http::exchange::new();
 
 http::exchange::set_method(primary, "POST");
-http::exchange::set_target(primary, primary_target);
+http::exchange::set_target(primary, primary_host, primary_port);
+http::exchange::set_path(primary, primary_path);
 http::exchange::set_header(primary, "x-exchange-id", "primary");
 // Writes against the exchange handle stage the outbound request body.
 tcp::stream::write(primary, "alpha");
 
 http::exchange::set_method(secondary, "POST");
-http::exchange::set_target(secondary, secondary_target);
+http::exchange::set_target(secondary, secondary_host, secondary_port);
+http::exchange::set_scheme(secondary, secondary_scheme);
+http::exchange::set_path(secondary, secondary_path);
 http::exchange::set_header(secondary, "x-exchange-id", "secondary");
 tcp::stream::write(secondary, "beta");
 

pd-edge/examples/http/upstream/sample_upstream_http2_program.rss

@@ -1,22 +1,23 @@
 use http;
 use tls;
 
-let origin = http::request::get_header("x-h2-origin");
+let origin_port = 18444;
 
-if origin == "" {
-    http::response::set_status(400);
-    http::response::set_body("missing x-h2-origin");
-} else {
+if true {
     let slow = http::exchange::new();
     let fast = http::exchange::new();
 
     // These are two different outbound HTTP requests to the same origin.
-    http::exchange::set_target(slow, origin + "/slow");
+    http::exchange::set_target(slow, "localhost", origin_port);
+    http::exchange::set_scheme(slow, "https");
+    http::exchange::set_path(slow, "/slow");
     http::exchange::set_method(slow, "POST");
     http::exchange::set_header(slow, "x-demo-request", "slow-request");
     http::exchange::set_body(slow, "alpha");
 
-    http::exchange::set_target(fast, origin + "/fast");
+    http::exchange::set_target(fast, "localhost", origin_port);
+    http::exchange::set_scheme(fast, "https");
+    http::exchange::set_path(fast, "/fast");
     http::exchange::set_method(fast, "PUT");
     http::exchange::set_header(fast, "x-demo-request", "fast-request");
     http::exchange::set_body(fast, "beta");
@@ -52,7 +53,9 @@ if origin == "" {
     );
 
     let reused = http::exchange::new();
-    http::exchange::set_target(reused, origin + "/reuse");
+    http::exchange::set_target(reused, "localhost", origin_port);
+    http::exchange::set_scheme(reused, "https");
+    http::exchange::set_path(reused, "/reuse");
     http::exchange::set_method(reused, "PATCH");
     http::exchange::set_header(reused, "x-demo-request", "reuse-request");
     http::exchange::set_body(reused, "gamma");

pd-edge/examples/http/upstream/sample_upstream_http3_program.rss

@@ -1,23 +1,24 @@
 use http;
 use tls;
 
-let origin = http::request::get_header("x-h3-origin");
+let origin_port = 18445;
 
-if origin == "" {
-    http::response::set_status(400);
-    http::response::set_body("missing x-h3-origin");
-} else {
+if true {
     let slow = http::exchange::new();
     let fast = http::exchange::new();
 
     // These are two different outbound HTTP requests to the same origin.
-    http::exchange::set_target(slow, origin + "/slow");
+    http::exchange::set_target(slow, "127.0.0.1", origin_port);
+    http::exchange::set_scheme(slow, "https");
+    http::exchange::set_path(slow, "/slow");
     http::exchange::set_method(slow, "POST");
     http::exchange::set_version(slow, "3");
     http::exchange::set_header(slow, "x-demo-request", "slow-request");
     http::exchange::set_body(slow, "alpha");
 
-    http::exchange::set_target(fast, origin + "/fast");
+    http::exchange::set_target(fast, "127.0.0.1", origin_port);
+    http::exchange::set_scheme(fast, "https");
+    http::exchange::set_path(fast, "/fast");
     http::exchange::set_method(fast, "PUT");
     http::exchange::set_version(fast, "3");
     http::exchange::set_header(fast, "x-demo-request", "fast-request");
@@ -54,7 +55,9 @@ if origin == "" {
     );
 
     let reused = http::exchange::new();
-    http::exchange::set_target(reused, origin + "/reuse");
+    http::exchange::set_target(reused, "127.0.0.1", origin_port);
+    http::exchange::set_scheme(reused, "https");
+    http::exchange::set_path(reused, "/reuse");
     http::exchange::set_method(reused, "PATCH");
     http::exchange::set_version(reused, "3");
     http::exchange::set_header(reused, "x-demo-request", "reuse-request");