Began adding integration tests, fixed one bug revealed by the first test.

Cargo.lock

@@ -268,6 +268,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "fastrand"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "fleck"
 version = "0.1.0"
@@ -284,8 +293,13 @@ dependencies = [
  "rand",
  "rudp",
  "serde",
+ "tempfile",
+ "test-log",
  "timerfd",
  "topological-sort",
+ "tracing",
+ "tracing-log",
+ "tracing-subscriber",
  "x25519-dalek",
 ]
 
@@ -373,6 +387,15 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "io-lifetimes"
 version = "0.6.1"
@@ -434,19 +457,21 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata",
+]
+
 [[package]]
 name = "memchr"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
-[[package]]
-name = "metashell"
-version = "0.1.0"
-dependencies = [
- "fleck",
-]
-
 [[package]]
 name = "mio"
 version = "0.8.5"
@@ -477,6 +502,12 @@ version = "6.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
 
+[[package]]
+name = "pin-project-lite"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+
 [[package]]
 name = "polyval"
 version = "0.6.0"
@@ -621,6 +652,15 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "regex"
 version = "1.7.0"
@@ -632,6 +672,15 @@ dependencies = [
  "regex-syntax",
 ]
 
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax",
+]
+
 [[package]]
 name = "regex-syntax"
 version = "0.6.28"
@@ -718,6 +767,15 @@ dependencies = [
  "opaque-debug",
 ]
 
+[[package]]
+name = "sharded-slab"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "signature"
 version = "1.6.4"
@@ -770,6 +828,19 @@ dependencies = [
  "unicode-xid 0.2.4",
 ]
 
+[[package]]
+name = "tempfile"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "redox_syscall",
+ "rustix 0.36.7",
+ "windows-sys",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.3"
@@ -779,6 +850,27 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "test-log"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38f0c854faeb68a048f0f2dc410c5ddae3bf83854ef0e4977d58306a5edef50e"
+dependencies = [
+ "proc-macro2 1.0.47",
+ "quote 1.0.21",
+ "syn 1.0.103",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
 [[package]]
 name = "timerfd"
 version = "1.3.0"
@@ -794,6 +886,53 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d"
 
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if",
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
+dependencies = [
+ "matchers",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+]
+
 [[package]]
 name = "typenum"
 version = "1.15.0"
@@ -828,6 +967,12 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"

Cargo.toml

@@ -29,3 +29,9 @@ rand = { version = "0.7", features = ["getrandom"] }
 [dev-dependencies]
 pretty_env_logger = "0.4.0"
 clap = { version = "4.1.8", features = ["derive"] }
+tempfile = "3.4.0"
+test-log = { version = "0.2.11", default-features = false, features = ["trace"] }
+
+tracing = { version = "0.1.37", default-features = false }
+tracing-log = { version = "0.1.3" }
+tracing-subscriber = { version = "0.3", default-features = false, features = ["env-filter", "fmt"] }

src/fleck_core/crypto.rs

@@ -108,6 +108,7 @@ impl SignPacket {
 
 #[derive(serde::Serialize, serde::Deserialize, Debug)]
 pub struct KeyExchange {
+    pubkey: ed25519_dalek::PublicKey,
     key: x25519_dalek::PublicKey,
 }
 
@@ -171,8 +172,11 @@ impl Service for EncryptionService {
 
 impl EncryptionService {
     fn new_node(&self, node: &mut std::rc::Rc<fleck_core::node::Node>) {
+        // we may want to initiate a handshake, if we're not already doing that...
         if let Some(peer) = node.peer().as_ref() {
-            self.begin_handshake(peer)
+            if !self.state.borrow().contains_key(peer) {
+                self.begin_handshake(peer)
+            }
         }
     }
 
@@ -186,6 +190,7 @@ impl EncryptionService {
             log::trace!("sending KeyExchange message");
             self.api.queue::<fleck_core::SendPacketChannel>(
                 fleck_core::msg::Message::build(KeyExchange {
+                    pubkey: self.api.with_service(|ns: &fleck_core::NodeService| ns.self_node().pubkey().clone()),
                     key: x25519_dalek::PublicKey::from(&secret),
                 })
                 .with_peer(with.clone()),
@@ -234,6 +239,12 @@ impl EncryptionService {
             msg.1,
             &state
         );
+
+        // tell the node service about this peer, just in case they don't know already.
+        self.api.with_service(|ns: &fleck_core::NodeService| {
+            ns.inform_of(msg.1.pubkey, peer.clone());
+        });
+
         match state {
             KeyExchangeState::NoState => {
                 states.insert(peer.clone(), KeyExchangeState::Given(msg.1.key));

src/fleck_core/io.rs

@@ -2,7 +2,7 @@ use std::{
     cell::{Cell, RefCell},
     collections::HashMap,
     os::unix::prelude::RawFd,
-    rc::Rc,
+    rc::Rc, time::Duration,
 };
 
 use crate::prelude::*;
@@ -113,31 +113,38 @@ impl IOService {
         // flush any events generated during startup
         self.api.services.borrow().event_root().fire_all();
 
-        let mut events = mio::Events::with_capacity(128);
         loop {
-            let pr = self.poll.borrow_mut().poll(&mut events, None);
-            if pr.is_err() {
-                continue;
-            }
-            let handlers = self.handlers.borrow();
-            for evt in &events {
-                match handlers.get(&evt.token()) {
-                    Some(h) => {
-                        if evt.is_readable() {
-                            h.ready_read(h);
-                        }
-                        if evt.is_writable() {
-                            h.ready_write(h);
-                        }
-                    },
-                    None => {
-                        log::trace!("Received event with valid token but no handler!");
-                    },
-                }
-            }
-            drop(handlers);
+            self.run_once(None);
+        }
+    }
+
+    pub(crate) fn run_once(&self, timeout: Option<Duration>) {
+        // flush any events generated before this run
+        self.api.services.borrow().event_root().fire_all();
 
-            self.api.services.borrow().event_root().fire_all();
+        let mut events = mio::Events::with_capacity(128);
+        let pr = self.poll.borrow_mut().poll(&mut events, timeout);
+        if pr.is_err() {
+            return;
+        }
+        let handlers = self.handlers.borrow();
+        for evt in &events {
+            match handlers.get(&evt.token()) {
+                Some(h) => {
+                    if evt.is_readable() {
+                        h.ready_read(h);
+                    }
+                    if evt.is_writable() {
+                        h.ready_write(h);
+                    }
+                },
+                None => {
+                    log::trace!("Received event with valid token but no handler!");
+                },
+            }
         }
+        drop(handlers);
+
+        self.api.services.borrow().event_root().fire_all();
     }
 }

src/lib.rs

@@ -36,6 +36,9 @@ pub mod prelude {
 
 use prelude::*;
 
+#[cfg(test)]
+mod test;
+
 /// Entry point to a running fleck instance.
 pub struct API {
     services: std::cell::RefCell<service::ServiceStack>,
@@ -57,16 +60,31 @@ impl API {
 
     /// Run the fleck instance. Note that this function will not return until fleck is shut down.
     pub fn run(self: &Rc<Self>) {
-        // check state
-        self.with_service(|node: &fleck_core::NodeService| {
-            // check that we have a self node
-            node.self_node();
-        });
+        self.check_state();
 
         self.with_service(|io: &fleck_core::io::IOService| {
             io.run();
         });
     }
+
+    /// Run the fleck event-handling loop once and return.
+    ///
+    /// Note that this will do more work than invoking run(), but may be useful for integration
+    /// into other event loops.
+    pub fn run_once(self: &Rc<Self>) {
+        self.check_state();
+
+        self.with_service(|io: &fleck_core::io::IOService| {
+            io.run_once(Some(std::time::Duration::ZERO));
+        });
+    }
+
+    fn check_state(self: &Rc<Self>) {
+        // check that we have a self node
+        self.with_service(|node: &fleck_core::NodeService| {
+            node.self_node();
+        });
+    }
 }
 
 impl API {

src/test/handshake.rs

@@ -0,0 +1,61 @@
+use crate::fleck_core;
+
+#[test_log::test]
+fn end_to_end() {
+    tracing_log::LogTracer::init().unwrap();
+    let skeleton = super::TestSkeleton::new();
+
+    let span_f1 = tracing::span!(tracing::Level::TRACE, "f1");
+    let span_f2 = tracing::span!(tracing::Level::TRACE, "f2");
+
+    let f1 = crate::API::new();
+    let f2 = crate::API::new();
+
+    let f1pk = f1.with_service(|ns: &fleck_core::NodeService| {
+        ns.build_ephemeral_self_node();
+        ns.self_node().pubkey().clone()
+    });
+    let f2pk = f2.with_service(|ns: &fleck_core::NodeService| {
+        ns.build_ephemeral_self_node();
+        ns.self_node().pubkey().clone()
+    });
+
+    f1.with_service(|io: &fleck_core::io::IOService| {
+        fleck_core::io::UnixSocketBuilder::default()
+            .set_path(skeleton.socket_path().to_str().unwrap())
+            .serve_mode()
+            .build(io);
+    });
+
+    f2.with_service(|pd: &fleck_core::discovery::PeerDiscovery| {
+        pd.new_peer(
+            f2.with_service(|io: &fleck_core::io::IOService| {
+                fleck_core::io::UnixSocketBuilder::default()
+                    .set_path(skeleton.socket_path().to_str().unwrap())
+                    .connect_mode()
+                    .build(io)
+            })
+            .connected_peer(),
+        )
+    });
+
+    // run for a few rounds of the event loops, without firing any ticks.
+    for _ in 0..5 {
+        {
+            let _guard = span_f1.enter();
+            f1.run_once();
+        }
+        {
+            let _guard = span_f2.enter();
+            f2.run_once();
+        }
+    }
+
+    // check that they know about each other.
+    f1.with_service(|ns: &fleck_core::NodeService| {
+        assert!(ns.node_by_pubkey(&f2pk).is_some());
+    });
+    f2.with_service(|ns: &fleck_core::NodeService| {
+        assert!(ns.node_by_pubkey(&f1pk).is_some());
+    });
+}

src/test/mod.rs

@@ -0,0 +1,17 @@
+mod handshake;
+
+struct TestSkeleton {
+    tmpfile: tempfile::NamedTempFile,
+}
+
+impl TestSkeleton {
+    fn new() -> Self {
+        Self {
+            tmpfile: tempfile::NamedTempFile::new().expect("couldn't create temporary file?"),
+        }
+    }
+
+    pub fn socket_path(&self) -> &std::path::Path {
+        self.tmpfile.path()
+    }
+}