{"header":{"message":"work on communicating with core","description":null,"timestamp":"2021-01-12T00:58:47.694793677Z","authors":[{"email":"3611916+oreganoli@users.noreply.github.com","full_name":"oreganoli","name":"oreganoli"}]},"hash":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC","authors":[],"deps":{"hashes":[["AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC","work on communicating with core"],["AA",null],["6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC","gateway now parses HTTP requests into invocations"],["WXLXWHPVYBBSZ76TUABERVLQAN26QTZLF6NGZZMB56FUTCLPSB4QC","wrote an abstraction over client/server threads"],["QUPSHDL6MQBVCRQPZ3O7MMG27FJYCASSOWN6LI6X5K3VOL7TCAVAC","gateway now sees incoming IP addresses"],["WGQH6HZG7HZNKJYKXV6DACDXMPRA6YPXBPA6BOHZDMGVF2DLBQ6QC","Hyper hello world is up"],["DIIDKMIXQENUQIOIFHT62KAX4WL5MJWEB5BXHGUYCDSKIPRQVPOAC","moved Hyper server code out to lib.rs"]],"deps":["6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC","WXLXWHPVYBBSZ76TUABERVLQAN26QTZLF6NGZZMB56FUTCLPSB4QC"],"known":["WGQH6HZG7HZNKJYKXV6DACDXMPRA6YPXBPA6BOHZDMGVF2DLBQ6QC","DIIDKMIXQENUQIOIFHT62KAX4WL5MJWEB5BXHGUYCDSKIPRQVPOAC","QUPSHDL6MQBVCRQPZ3O7MMG27FJYCASSOWN6LI6X5K3VOL7TCAVAC"]},"hunks":[{"Replacement":{"inode":{"change":2,"pos":29},"path":"zhur_invk/src/lib.rs","line":9,"ins":{"up_context":[{"change":2,"pos":209}],"down_context":[{"change":2,"pos":250}],"flag":"BLOCK","start":0,"end":48,"inode":{"change":2,"pos":29}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":209},"to":{"change":2,"start":209,"end":250},"introduced_by":2}],"inode":{"change":2,"pos":29}},"ins_contents":[{"Add":{"text":"#[derive(Clone, Deserialize, Serialize, Debug)]","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:47"}}],"del_contents":[{"Del":{"text":"#[derive(Deserialize, Serialize, Debug)]","pos":"6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC:249"}}]}},{"Replacement":{"inode":{"change":2,"pos":485},"path":"zhur_invk/src/http.rs","line":21,"ins":{"up_context":[{"change":2,"pos":1212}],"down_context":[{"change":2,"pos":1253}],"flag":"BLOCK","start":49,"end":97,"inode":{"change":2,"pos":485}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1212},"to":{"change":2,"start":1212,"end":1253},"introduced_by":2}],"inode":{"change":2,"pos":485}},"ins_contents":[{"Add":{"text":"#[derive(Clone, Debug, Deserialize, Serialize)]","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:96"}}],"del_contents":[{"Del":{"text":"#[derive(Debug, Deserialize, Serialize)]","pos":"6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC:1252"}}]}},{"Replacement":{"inode":{"change":2,"pos":1938},"path":"zhur_invk/src/err.rs","line":5,"ins":{"up_context":[{"change":2,"pos":2075}],"down_context":[{"change":2,"pos":2116}],"flag":"BLOCK","start":98,"end":146,"inode":{"change":2,"pos":1938}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2075},"to":{"change":2,"start":2075,"end":2116},"introduced_by":2}],"inode":{"change":2,"pos":1938}},"ins_contents":[{"Add":{"text":"#[derive(Clone, Deserialize, Serialize, Debug)]","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:145"}}],"del_contents":[{"Del":{"text":"#[derive(Deserialize, Serialize, Debug)]","pos":"6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC:2115"}}]}},{"Edit":{"inode":{"change":2,"pos":1938},"path":"zhur_invk/src/err.rs","line":20,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2614}],"down_context":[{"change":2,"pos":2614}],"flag":"BLOCK","start":147,"end":227,"inode":{"change":2,"pos":1938}}},"contents":[{"Add":{"text":" /// The invocation could not be serialized for transport.","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:208"}},{"Add":{"text":" SerializeErr,","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:226"}}]}},{"Replacement":{"inode":{"change":2,"pos":1938},"path":"zhur_invk/src/err.rs","line":37,"ins":{"up_context":[{"change":2,"pos":3377}],"down_context":[{"change":2,"pos":3518}],"flag":"BLOCK","start":228,"end":374,"inode":{"change":2,"pos":1938}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3377},"to":{"change":2,"start":3377,"end":3518},"introduced_by":2}],"inode":{"change":2,"pos":1938}},"ins_contents":[{"Add":{"text":" Self::MalformedReply => \"The reply from the Zhur core server could not be properly deserialized as an app's HTTP output.\".to_owned(),","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:373"}}],"del_contents":[{"Del":{"text":" Self::MalformedReply => \"The reply from the Zhur core server could not be properly deserialized as an app's output.\".to_owned(),","pos":"6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC:3517"}}]}},{"Edit":{"inode":{"change":2,"pos":1938},"path":"zhur_invk/src/err.rs","line":39,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3627}],"down_context":[{"change":2,"pos":3627}],"flag":"BLOCK","start":375,"end":477,"inode":{"change":2,"pos":1938}}},"contents":[{"Add":{"text":" Self::SerializeErr => \"The invocation could not be serialized for transport.\".to_owned(),","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:476"}}]}},{"Replacement":{"inode":{"change":4,"pos":30},"path":"zhur_gate/src/main.rs","line":1,"ins":{"up_context":[{"change":4,"pos":30}],"down_context":[{"change":4,"pos":30}],"flag":"BLOCK","start":478,"end":602,"inode":{"change":4,"pos":30}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":30},"to":{"change":4,"start":0,"end":30},"introduced_by":4}],"inode":{"change":4,"pos":30}},"ins_contents":[{"Add":{"text":"use zhur_common::{init_logger, zmq,","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:513"}},{"Add":{"text":" msg::chan::{","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:530"}},{"Add":{"text":" client_server,","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:553"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:559"}},{"Add":{"text":"};","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:562"}},{"Add":{"text":"use zhur_gate::comms::Gate2CoreServer;","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:601"}}],"del_contents":[{"Del":{"text":"use zhur_common::init_logger;","pos":"DIIDKMIXQENUQIOIFHT62KAX4WL5MJWEB5BXHGUYCDSKIPRQVPOAC:29"}}]}},{"Edit":{"inode":{"change":4,"pos":30},"path":"zhur_gate/src/main.rs","line":10,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":435}],"down_context":[{"change":4,"pos":60}],"flag":"BLOCK","start":603,"end":888,"inode":{"change":4,"pos":30}}},"contents":[{"Add":{"text":" let zmq_ctx = zmq::Context::new();","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:641"}},{"Add":{"text":" let gate_core_server = Gate2CoreServer::new(&zmq_ctx);","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:700"}},{"Add":{"text":" let (client, server) = client_server(gate_core_server);","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:760"}},{"Add":{"text":" std::thread::spawn(move || {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:793"}},{"Add":{"text":" let mut server = server;","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:826"}},{"Add":{"text":" loop {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:841"}},{"Add":{"text":" server.handle()","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:869"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:879"}},{"Add":{"text":" });","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:887"}}]}},{"Replacement":{"inode":{"change":4,"pos":30},"path":"zhur_gate/src/main.rs","line":20,"ins":{"up_context":[{"change":4,"pos":79}],"down_context":[{"change":4,"pos":1170}],"flag":"BLOCK","start":889,"end":921,"inode":{"change":4,"pos":30}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":79},"to":{"change":4,"start":79,"end":105},"introduced_by":4}],"inode":{"change":4,"pos":30}},"ins_contents":[{"Add":{"text":" start_server(client).await;","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:920"}}],"del_contents":[{"Del":{"text":" start_server().await;","pos":"DIIDKMIXQENUQIOIFHT62KAX4WL5MJWEB5BXHGUYCDSKIPRQVPOAC:104"}}]}},{"Edit":{"inode":{"change":4,"pos":115},"path":"zhur_gate/src/lib.rs","line":13,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":150}],"down_context":[{"change":4,"pos":455}],"flag":"BLOCK","start":922,"end":1063,"inode":{"change":4,"pos":115}}},"contents":[{"Add":{"text":"/// Communication with the core module.","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:961"}},{"Add":{"text":"pub mod comms;","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:976"}},{"Add":{"text":"use zhur_common::msg::chan::*;","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1007"}},{"Add":{"text":"use zhur_invk::{HttpRes, Invocation, InvocationError};","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1062"}}]}},{"Replacement":{"inode":{"change":4,"pos":115},"path":"zhur_gate/src/lib.rs","line":19,"ins":{"up_context":[{"change":4,"pos":486}],"down_context":[{"change":4,"pos":516}],"flag":"BLOCK","start":1064,"end":1161,"inode":{"change":4,"pos":115}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":486},"to":{"change":4,"start":486,"end":516},"introduced_by":4}],"inode":{"change":4,"pos":115}},"ins_contents":[{"Add":{"text":"pub async fn start_server(client: ChannelClient>) {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1160"}}],"del_contents":[{"Del":{"text":"pub async fn start_server() {","pos":"DIIDKMIXQENUQIOIFHT62KAX4WL5MJWEB5BXHGUYCDSKIPRQVPOAC:515"}}]}},{"Edit":{"inode":{"change":4,"pos":115},"path":"zhur_gate/src/lib.rs","line":36,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":266}],"down_context":[{"change":4,"pos":266}],"flag":"BLOCK","start":1162,"end":1203,"inode":{"change":4,"pos":115}}},"contents":[{"Add":{"text":" let client = client.clone();","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1202"}}]}},{"Replacement":{"inode":{"change":4,"pos":115},"path":"zhur_gate/src/lib.rs","line":38,"ins":{"up_context":[{"change":4,"pos":291}],"down_context":[{"change":4,"pos":398}],"flag":"BLOCK","start":1204,"end":1420,"inode":{"change":4,"pos":115}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":291},"to":{"change":4,"start":291,"end":398},"introduced_by":4}],"inode":{"change":4,"pos":115}},"ins_contents":[{"Add":{"text":" Ok::<_, Infallible>(service_fn(move |req| handle_req(","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1273"}},{"Add":{"text":" FullRequest{ req, ip: ip.clone() },","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1329"}},{"Add":{"text":" client.clone() // TODO: remove this horrific hack","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1399"}},{"Add":{"text":" )))","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1419"}}],"del_contents":[{"Del":{"text":" Ok::<_, Infallible>(service_fn(move |req| handle_req(FullRequest{ req, ip: ip.clone() })))","pos":"QUPSHDL6MQBVCRQPZ3O7MMG27FJYCASSOWN6LI6X5K3VOL7TCAVAC:397"}}]}},{"Replacement":{"inode":{"change":4,"pos":442},"path":"zhur_gate/src/handle.rs","line":8,"ins":{"up_context":[{"change":2,"pos":4409}],"down_context":[{"change":2,"pos":4434}],"flag":"BLOCK","start":1421,"end":1474,"inode":{"change":4,"pos":442}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4409},"to":{"change":2,"start":4409,"end":4434},"introduced_by":2}],"inode":{"change":4,"pos":442}},"ins_contents":[{"Add":{"text":"use zhur_common::{log::*, msg::chan::ChannelClient};","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1473"}}],"del_contents":[{"Del":{"text":"use zhur_common::log::*;","pos":"6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC:4433"}}]}},{"Replacement":{"inode":{"change":4,"pos":442},"path":"zhur_gate/src/handle.rs","line":19,"ins":{"up_context":[{"change":4,"pos":835}],"down_context":[{"change":2,"pos":4759}],"flag":"BLOCK","start":1475,"end":1682,"inode":{"change":4,"pos":442}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":835},"to":{"change":4,"start":835,"end":917},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":917},"to":{"change":2,"start":4526,"end":4759},"introduced_by":2}],"inode":{"change":4,"pos":442}},"ins_contents":[{"Add":{"text":"pub async fn handle_req(req: FullRequest, mut client: ChannelClient>) -> Result, Infallible> {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1629"}},{"Add":{"text":" let invocation = match req.into_invoc().await {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1681"}}],"del_contents":[{"Del":{"text":"pub async fn handle_req(req: FullRequest) -> Result, Infallible> {","pos":"QUPSHDL6MQBVCRQPZ3O7MMG27FJYCASSOWN6LI6X5K3VOL7TCAVAC:916"}},{"Del":{"text":" let invocation = req.into_invoc().await;","pos":"6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC:4570"}},{"Del":{"text":" // TODO: actually send the invocation to the core and try to get something back.","pos":"6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC:4655"}},{"Del":{"text":" // Also TODO: extract all this stuff into its own function so we can ? it.","pos":"6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC:4734"}},{"Del":{"text":" match &invocation {","pos":"6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC:4758"}}]}},{"Replacement":{"inode":{"change":4,"pos":442},"path":"zhur_gate/src/handle.rs","line":24,"ins":{"up_context":[{"change":2,"pos":4930}],"down_context":[{"change":2,"pos":4973}],"flag":"BLOCK","start":1683,"end":1697,"inode":{"change":4,"pos":442}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4930},"to":{"change":2,"start":4930,"end":4973},"introduced_by":2}],"inode":{"change":4,"pos":442}},"ins_contents":[{"Add":{"text":" i","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1696"}}],"del_contents":[{"Del":{"text":" Ok(Response::new(text.into()))","pos":"6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC:4972"}}]}},{"Replacement":{"inode":{"change":4,"pos":442},"path":"zhur_gate/src/handle.rs","line":29,"ins":{"up_context":[{"change":2,"pos":5102}],"down_context":[{"change":2,"pos":5145}],"flag":"BLOCK","start":1698,"end":2458,"inode":{"change":4,"pos":442}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5102},"to":{"change":2,"start":5102,"end":5145},"introduced_by":2}],"inode":{"change":4,"pos":442}},"ins_contents":[{"Add":{"text":" return Ok(Response::new(text.into())) // TODO: Error pages","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1768"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1778"}},{"Add":{"text":" };","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1785"}},{"Add":{"text":" // TODO: actually send the invocation to the core and try to get something back.","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1870"}},{"Add":{"text":" let reply = client.request(invocation);","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1914"}},{"Add":{"text":" match reply {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1932"}},{"Add":{"text":" Ok(res) => {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:1953"}},{"Add":{"text":" info!(\"Got a well-formed HttpRes as an invocation result!\");","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2026"}},{"Add":{"text":" return Ok(Response::new(","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2063"}},{"Add":{"text":" format!(\"Response with body length {}\", res.body.len())","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2135"}},{"Add":{"text":" .into()","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2159"}},{"Add":{"text":" )) // TODO actually handle the damn HttpRes","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2215"}},{"Add":{"text":" },","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2226"}},{"Add":{"text":" Err(e) => {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2246"}},{"Add":{"text":" let text = format!(\"Got an invocation error: {}\", e);","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2312"}},{"Add":{"text":" warn!(\"{}\", &text);","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2344"}},{"Add":{"text":" return Ok(Response::new(text.into())) // TODO: Error pages","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2415"}},{"Add":{"text":" // TODO: Not brazen copypaste","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2457"}}],"del_contents":[{"Del":{"text":" Ok(Response::new(text.into()))","pos":"6LABQWDWWQUEDTXZBKETGLG65FZ66FJLLY5IW3IFCMYJUO65Q4BAC:5144"}}]}},{"FileAdd":{"meta":{"basename":"comms.rs","metadata":420},"path":"zhur_gate/src/comms.rs","context":[{"change":4,"pos":19}],"contents":[{"Add":{"text":"use bincode::deserialize;","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2496"}},{"Add":{"text":"use zhur_common::{bincode, log::warn, msg::chan::*, zmq};","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2554"}},{"Add":{"text":"use zhur_invk::{HttpRes, Invocation, InvocationError};","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2609"}},{"Add":{"text":"use zmq::{Context, Socket, SocketType};","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2649"}},{"Add":{"text":"/// Struct responsible for relaying requests from the gateway to the core.","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2724"}},{"Add":{"text":"pub struct Gate2CoreServer {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2753"}},{"Add":{"text":" /// ZMQ REQ socket.","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2777"}},{"Add":{"text":" req_socket: Socket,","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2801"}},{"Add":{"text":"}","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2803"}},{"Add":{"text":"impl Gate2CoreServer {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2826"}},{"Add":{"text":" pub fn new(zmq_ctx: &Context) -> Self {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2870"}},{"Add":{"text":" Self {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2885"}},{"Add":{"text":" req_socket: {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2911"}},{"Add":{"text":" let sck = zmq_ctx.socket(SocketType::REQ)","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:2969"}},{"Add":{"text":" .expect(\"Expected to be able to construct a socket.\");","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3040"}},{"Add":{"text":" let endpoint = match std::env::var(\"ZHUR_CORE_REP_URI\") {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3114"}},{"Add":{"text":" Ok(s) => s,","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3146"}},{"Add":{"text":" Err(_) => {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3178"}},{"Add":{"text":" warn!(\"ZHUR_CORE_REP_URI not set - assuming default value of tcp://127.0.0.1:8081!\");","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3288"}},{"Add":{"text":" \"tcp://127.0.0.1:8081\".to_owned()","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3346"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3368"}},{"Add":{"text":" };","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3387"}},{"Add":{"text":" sck.connect(&endpoint)","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3426"}},{"Add":{"text":" .expect(\"Expected to be able to connect a REQ socket from the gateway to the core.\");","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3528"}},{"Add":{"text":" sck","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3548"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3562"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3572"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3578"}},{"Add":{"text":"}","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3580"}},{"Add":{"text":"","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3581"}},{"Add":{"text":"impl HandleRequest> for Gate2CoreServer {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3668"}},{"Add":{"text":" fn handle(&mut self, msg: Invocation) -> Result {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3748"}},{"Add":{"text":" let invoc_bytes = match bincode::serialize(&msg) {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3807"}},{"Add":{"text":" Ok(b) => b,","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3831"}},{"Add":{"text":" Err(_) => return Err(InvocationError::SerializeErr)","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3895"}},{"Add":{"text":" };","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3906"}},{"Add":{"text":" match self.req_socket.send(invoc_bytes, 0) {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3959"}},{"Add":{"text":" Ok(_) => (),","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:3984"}},{"Add":{"text":" Err(_) => return Err(InvocationError::NoCore)","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4042"}},{"Add":{"text":" };","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4053"}},{"Add":{"text":" let response_bytes = match self.req_socket.recv_bytes(0) {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4120"}},{"Add":{"text":" Ok(b) => b,","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4144"}},{"Add":{"text":" Err(_) => return Err(InvocationError::MalformedReply)","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4210"}},{"Add":{"text":" };","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4221"}},{"Add":{"text":" match deserialize(&response_bytes) {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4266"}},{"Add":{"text":" Ok(r) => r,","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4290"}},{"Add":{"text":" Err(_) => Err(InvocationError::MalformedReply)","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4349"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4359"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4365"}},{"Add":{"text":"}","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4367"}}]}},{"Edit":{"inode":{"change":3,"pos":84},"path":"zhur_common/src/msg/chan.rs","line":10,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":371}],"down_context":[{"change":3,"pos":371}],"flag":"BLOCK","start":4368,"end":5117,"inode":{"change":3,"pos":84}}},"contents":[{"Add":{"text":"impl> ChannelServer {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4439"}},{"Add":{"text":" pub fn handle(&mut self) {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4470"}},{"Add":{"text":" // TODO: handle timeouts","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4503"}},{"Add":{"text":" let (req, reply_tx) = match self.request_rx.recv() {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4564"}},{"Add":{"text":" Ok(t) => {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4587"}},{"Add":{"text":" trace!(\"A ChannelServer got a request!\");","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4645"}},{"Add":{"text":" t","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4663"}},{"Add":{"text":" },","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4678"}},{"Add":{"text":" Err(_) => {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4702"}},{"Add":{"text":" panic!(\"A ChannelServer could not receive a request!\");","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4774"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4788"}},{"Add":{"text":" };","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4799"}},{"Add":{"text":" let reply = self.handler.handle(req);","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4845"}},{"Add":{"text":" match reply_tx.send(reply) {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4882"}},{"Add":{"text":" Ok(_) => {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4905"}},{"Add":{"text":" trace!(\"A ChannelServer replied to a request!\");","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4970"}},{"Add":{"text":" },","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:4985"}},{"Add":{"text":" Err(_) => {","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:5009"}},{"Add":{"text":" panic!(\"A ChannelServer could not respond to a request!\");","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:5084"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:5098"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:5108"}},{"Add":{"text":" }","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:5114"}},{"Add":{"text":"}","pos":"AGX35J5GL7C33UWYITQZEP6QRYBUTFJV3ANW6YMEMZ6WVWG7ZLXAC:5116"}}]}}],"owner":"oreganoli","repo":"zhur","login":null}

…

Dependencies

Change contents

Review